From f0b877e2588306882f71eaad45a3f3e604885a34 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Tue, 25 Jul 2023 16:11:11 -0500 Subject: [PATCH] Tune regex highlights for usage in prompts Since regex is almost always injected into other languages, `pattern_character`s will inherit the highlight for the structure that injects them (for example `/foo/` in JavaScript or `~r/foo/` in Elixir). This removes the string highlight when used in the prompt. We also add `ERROR` node highlighting so that errors in regex syntax appear in the prompt. This resolves a TODO in the `regex_prompt` function about highlighting errors in the regex. --- helix-term/src/ui/mod.rs | 3 --- runtime/queries/regex/highlights.scm | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs index 8ca1b131f..215794e3c 100644 --- a/helix-term/src/ui/mod.rs +++ b/helix-term/src/ui/mod.rs @@ -142,9 +142,6 @@ pub fn regex_prompt( }; cx.jobs.callback(callback); - } else { - // Update - // TODO: mark command line as error } } } diff --git a/runtime/queries/regex/highlights.scm b/runtime/queries/regex/highlights.scm index cad08f409..302cc6b31 100644 --- a/runtime/queries/regex/highlights.scm +++ b/runtime/queries/regex/highlights.scm @@ -50,4 +50,4 @@ ]) (class_character) @constant.character -(pattern_character) @string +(ERROR) @error