mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 03:47:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: fix merge conflicts

Browse source
This commit is contained in:
Nikita Revenco 2025-02-28 14:57:01 +00:00 • committed by Nik Revenco
parent f8a38a1229
commit d09f7730ec
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-term/src/commands.rs
View file

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

8
helix-term/src/commands/typed.rs
View file

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

2
xtask/src/main.rs
View file

@ -31,7 +31,7 @@ pub mod tasks {
]; ];
for language in lang_config().language { 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); let grammar_name = language.grammar.as_ref().unwrap_or(language_name);
for query_file in query_files { for query_file in query_files {
let language = get_language(grammar_name); let language = get_language(grammar_name);