zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 07:21:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix constant highlighting in JS, TypeScript

Browse Source 
Previously, SCREAMING_SNAKE_CASE identifiers were highlighted as
types due to a mistake in the order of patterns in the highlight
queries.
This commit is contained in:
Max Brunsfeld 2023-03-06 15:38:12 -08:00
parent 246a6adab7
commit aba2914a31
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/zed/src/languages/javascript/highlights.scm
View File

@ -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)

13
crates/zed/src/languages/typescript/highlights.scm
View File

@ -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)