Fix tabs causing early cutoff

Fix some more inalignments

helix-term/src/ui/editor.rs

@@ -793,10 +793,10 @@ impl EditorView {
             // define sticky context styles
             let context_style = theme
                 .try_get("ui.sticky.context")
-                .unwrap_or_else(|| status_line_style);
+                .unwrap_or(status_line_style);
             let indicator_style = theme
                 .try_get("ui.sticky.indicator")
-                .unwrap_or_else(|| status_line_style);
+                .unwrap_or(status_line_style);
 
             let mut context_area = viewport;
             context_area.height = 1;
@@ -820,7 +820,11 @@ impl EditorView {
                 }
 
                 // get the len of bytes of the text that will be written (the "definition" line)
-                let already_written = text.line(node.line).len_bytes() as u16;
+                let line = text.line(node.line);
+                let tab_width_count = line.chars().filter(|c| *c == '\t').count();
+
+                let already_written =
+                    (line.len_bytes() + tab_width_count.saturating_mul(doc.tab_width() - 1)) as u16;
 
                 let dots = "...";
 

runtime/queries/go/context.scm

@@ -1,17 +1,18 @@
 ; Credits to nvim-treesitter/nvim-treesitter-context
 
 (function_declaration
-	result: (_) @context.end
+	body: (_) @context.end
 ) @context
 
 (method_declaration
-	result: (_) @context.end
+	body: (_) @context.end
 ) @context
 
-[
+([
   (const_declaration)
-  (if_statement)
+	(for_statement)
+	(if_statement)
   (import_declaration)
   (type_declaration)
   (var_declaration)
-] @context
+] @context)

runtime/queries/zig/context.scm

@@ -1,5 +1,4 @@
 (TopLevelDecl
-  (FnProto)
   (Block) @context.end
 ) @context