Fix constant highlighting in JS, TypeScript
Max Brunsfeld
created
Previously, SCREAMING_SNAKE_CASE identifiers were highlighted as
types due to a mistake in the order of patterns in the highlight
queries.
Change summary
crates/zed/src/languages/javascript/highlights.scm | 14 ++++----------
crates/zed/src/languages/typescript/highlights.scm | 13 +++++--------
2 files changed, 9 insertions(+), 18 deletions(-)
Detailed changes
@@ -43,8 +43,10 @@
; Special identifiers
-((identifier) @constructor
- (#match? @constructor "^[A-Z]"))
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+(type_identifier) @type
+(predefined_type) @type.builtin
([
(identifier)
@@ -192,14 +194,6 @@
"${" @punctuation.special
"}" @punctuation.special) @embedded
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
(type_arguments
"<" @punctuation.bracket
">" @punctuation.bracket)
@@ -46,6 +46,11 @@
((identifier) @constructor
(#match? @constructor "^[A-Z]"))
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+(type_identifier) @type
+(predefined_type) @type.builtin
+
([
(identifier)
(shorthand_property_identifier)
@@ -193,14 +198,6 @@
"${" @punctuation.special
"}" @punctuation.special) @embedded
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
(type_arguments
"<" @punctuation.bracket
">" @punctuation.bracket)