Drop 'override.' prefix from capture names in override query

Max Brunsfeld and Julia Risley created 3 years ago

Co-authored-by: Julia Risley <julia@zed.dev>

Change summary

crates/language/src/buffer_tests.rs               | 4 ++--
crates/language/src/language.rs                   | 6 +++---
crates/zed/src/languages/c/overrides.scm          | 4 ++--
crates/zed/src/languages/cpp/overrides.scm        | 4 ++--
crates/zed/src/languages/css/overrides.scm        | 4 ++--
crates/zed/src/languages/elixir/overrides.scm     | 4 ++--
crates/zed/src/languages/go/overrides.scm         | 4 ++--
crates/zed/src/languages/html/overrides.scm       | 4 ++--
crates/zed/src/languages/javascript/overrides.scm | 6 +++---
crates/zed/src/languages/json/overrides.scm       | 3 +--
crates/zed/src/languages/python/overrides.scm     | 4 ++--
crates/zed/src/languages/ruby/overrides.scm       | 4 ++--
crates/zed/src/languages/rust/overrides.scm       | 4 ++--
crates/zed/src/languages/scheme/overrides.scm     | 4 ++--
crates/zed/src/languages/toml/overrides.scm       | 4 ++--
crates/zed/src/languages/tsx/overrides.scm        | 4 ++--
crates/zed/src/languages/typescript/overrides.scm | 4 ++--
17 files changed, 35 insertions(+), 36 deletions(-)

Detailed changes

crates/language/src/buffer_tests.rs 🔗

@@ -1421,8 +1421,8 @@ fn test_language_config_at(cx: &mut MutableAppContext) {
         )
         .with_override_query(
             r#"
-                (jsx_element) @override.element
-                (string) @override.string
+                (jsx_element) @element
+                (string) @string
             "#,
         )
         .unwrap();

crates/language/src/language.rs 🔗

@@ -829,10 +829,10 @@ impl Language {
 
         let mut values = HashMap::default();
         for (ix, name) in query.capture_names().iter().enumerate() {
-            if let Some(override_name) = name.strip_prefix("override.") {
-                let value = self.config.overrides.remove(override_name).ok_or_else(|| {
+            if !name.starts_with('_') {
+                let value = self.config.overrides.remove(name).ok_or_else(|| {
                     anyhow!(
-                        "language {:?} has override in query but not in config: {override_name:?}",
+                        "language {:?} has override in query but not in config: {name:?}",
                         self.config.name
                     )
                 })?;

crates/zed/src/languages/c/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_literal) @override.string
+(comment) @comment
+(string_literal) @string

crates/zed/src/languages/cpp/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_literal) @override.string
+(comment) @comment
+(string_literal) @string

crates/zed/src/languages/css/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_value) @override.string
+(comment) @comment
+(string_value) @string

crates/zed/src/languages/elixir/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-[(string) (charlist)] @override.string
+(comment) @comment
+[(string) (charlist)] @string

crates/zed/src/languages/go/overrides.scm 🔗

@@ -1,6 +1,6 @@
-(comment) @override.comment
+(comment) @comment
 [
   (interpreted_string_literal)
   (raw_string_literal)
   (rune_literal)
-] @override.string
+] @string

crates/zed/src/languages/html/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(quoted_attribute_value) @override.string
+(comment) @comment
+(quoted_attribute_value) @string

crates/zed/src/languages/javascript/overrides.scm 🔗

@@ -1,9 +1,9 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string
 
 [
   (jsx_element)
   (jsx_fragment)
   (jsx_self_closing_element)
   (jsx_expression)
-] @override.element
+] @element

crates/zed/src/languages/json/overrides.scm 🔗

@@ -1,2 +1 @@
-(comment) @comment
-(string) @override.string
+(string) @string

crates/zed/src/languages/python/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string

crates/zed/src/languages/ruby/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string

crates/zed/src/languages/rust/overrides.scm 🔗

@@ -1,8 +1,8 @@
 [
   (string_literal)
   (raw_string_literal)
-] @override.string
+] @string
 [
   (line_comment)
   (block_comment)
-] @override.comment
+] @comment

crates/zed/src/languages/scheme/overrides.scm 🔗

@@ -2,5 +2,5 @@
     (comment)
     (block_comment)
     (directive)
-] @override.comment
-(string) @override.string
+] @comment
+(string) @string

crates/zed/src/languages/toml/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string

crates/zed/src/languages/tsx/overrides.scm 🔗

@@ -3,5 +3,5 @@
   (jsx_fragment)
   (jsx_self_closing_element)
   (jsx_expression)
-] @override.element
-(string) @override.string
+] @element
+(string) @string

crates/zed/src/languages/typescript/overrides.scm 🔗

@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string