feat: fix merge conflicts

helix-term/src/commands.rs

@@ -21,7 +21,7 @@ use helix_core::{
     char_idx_at_visual_offset,
     chars::char_is_word,
     command_line,
-    comment::{self, DEFAULT_COMMENT_TOKEN},
+    comment::{self},
     doc_formatter::TextFormat,
     encoding, find_workspace,
     graphemes::{self, next_grapheme_boundary},

helix-term/src/commands/typed.rs

@@ -1606,7 +1606,7 @@ fn tree_sitter_scopes(
 
 fn tree_sitter_injections(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -3238,7 +3238,11 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         aliases: &[],
         doc: "Display injected languages for the file.",
         fun: tree_sitter_injections,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "debug-start",

xtask/src/main.rs

@@ -31,7 +31,7 @@ pub mod tasks {
         ];
 
         for language in lang_config().language {
-            let language_name = &language.language_id;
+            let language_name = &language.language_name;
             let grammar_name = language.grammar.as_ref().unwrap_or(language_name);
             for query_file in query_files {
                 let language = get_language(grammar_name);