From dd57d97bb67f1bc30afe4e192082ee48c6c82dc6 Mon Sep 17 00:00:00 2001 From: Gaauwe Rombouts Date: Tue, 9 Dec 2025 17:50:23 +0100 Subject: [PATCH] Revert "Improve TS/TSX/JS syntax highlighting for parameters, types, and punctuation" (#44490) Reverts zed-industries/zed#43437 Internally we noticed some regression related to removed query for PascalCase identifiers. Reverting now to prevent this from going to preview, still planning to land this with the necessary fixes later. --- .../languages/src/javascript/highlights.scm | 39 +------- crates/languages/src/jsdoc/highlights.scm | 1 - crates/languages/src/tsx/highlights.scm | 93 +----------------- .../languages/src/typescript/highlights.scm | 94 +------------------ 4 files changed, 6 insertions(+), 221 deletions(-) diff --git a/crates/languages/src/javascript/highlights.scm b/crates/languages/src/javascript/highlights.scm index 378cb579f4..e5b84ab68d 100644 --- a/crates/languages/src/javascript/highlights.scm +++ b/crates/languages/src/javascript/highlights.scm @@ -47,45 +47,10 @@ left: (identifier) @function right: [(function_expression) (arrow_function)]) -; Parameters - -(required_parameter - (identifier) @variable.parameter) - -(required_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(optional_parameter - (identifier) @variable.parameter) - -(optional_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(catch_clause - parameter: (identifier) @variable.parameter) - -(index_signature - name: (identifier) @variable.parameter) - -(arrow_function - parameter: (identifier) @variable.parameter) - ; Special identifiers -; -(class_declaration - (type_identifier) @type.class) - -(extends_clause - value: (identifier) @type.class) +((identifier) @type + (#match? @type "^[A-Z]")) (type_identifier) @type (predefined_type) @type.builtin diff --git a/crates/languages/src/jsdoc/highlights.scm b/crates/languages/src/jsdoc/highlights.scm index 581b5d8111..103d32d0bd 100644 --- a/crates/languages/src/jsdoc/highlights.scm +++ b/crates/languages/src/jsdoc/highlights.scm @@ -1,3 +1,2 @@ (tag_name) @keyword.jsdoc (type) @type.jsdoc -(identifier) @variable.jsdoc diff --git a/crates/languages/src/tsx/highlights.scm b/crates/languages/src/tsx/highlights.scm index 816ae3c586..ef12b3d791 100644 --- a/crates/languages/src/tsx/highlights.scm +++ b/crates/languages/src/tsx/highlights.scm @@ -47,68 +47,13 @@ left: (identifier) @function right: [(function_expression) (arrow_function)]) -; Parameters - -(required_parameter - (identifier) @variable.parameter) - -(required_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(optional_parameter - (identifier) @variable.parameter) - -(optional_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(catch_clause - parameter: (identifier) @variable.parameter) - -(index_signature - name: (identifier) @variable.parameter) - -(arrow_function - parameter: (identifier) @variable.parameter) - -(type_predicate - name: (identifier) @variable.parameter) - ; Special identifiers -(type_annotation) @type +((identifier) @type + (#match? @type "^[A-Z]")) (type_identifier) @type (predefined_type) @type.builtin -(type_alias_declaration - (type_identifier) @type) - -(type_alias_declaration - value: (_ - (type_identifier) @type)) - -(interface_declaration - (type_identifier) @type) - -(class_declaration - (type_identifier) @type.class) - -(extends_clause - value: (identifier) @type.class) - -(extends_type_clause - type: (type_identifier) @type) - -(implements_clause - (type_identifier) @type) - ([ (identifier) (shorthand_property_identifier) @@ -286,42 +231,8 @@ "<" @punctuation.bracket ">" @punctuation.bracket) -(type_parameters - "<" @punctuation.bracket - ">" @punctuation.bracket) - (decorator "@" @punctuation.special) -(union_type - ("|") @punctuation.special) - -(intersection_type - ("&") @punctuation.special) - -(type_annotation - (":") @punctuation.special) - -(index_signature - (":") @punctuation.special) - -(type_predicate_annotation - (":") @punctuation.special) - -(public_field_definition - ("?") @punctuation.special) - -(property_signature - ("?") @punctuation.special) - -(method_signature - ("?") @punctuation.special) - -(optional_parameter - ([ - "?" - ":" - ]) @punctuation.special) - ; Keywords [ "abstract" diff --git a/crates/languages/src/typescript/highlights.scm b/crates/languages/src/typescript/highlights.scm index 94690ca30e..5e8d55581e 100644 --- a/crates/languages/src/typescript/highlights.scm +++ b/crates/languages/src/typescript/highlights.scm @@ -4,33 +4,11 @@ ; Special identifiers -(type_annotation) @type - +((identifier) @type + (#match? @type "^[A-Z]")) (type_identifier) @type (predefined_type) @type.builtin -(type_alias_declaration - (type_identifier) @type) - -(type_alias_declaration - value: (_ - (type_identifier) @type)) - -(interface_declaration - (type_identifier) @type) - -(class_declaration - (type_identifier) @type.class) - -(extends_clause - value: (identifier) @type.class) - -(extends_type_clause - type: (type_identifier) @type) - -(implements_clause - (type_identifier) @type) - ;; Enables ts-pretty-errors ;; The Lsp returns "snippets" of typescript, which are not valid typescript in totality, ;; but should still be highlighted @@ -136,40 +114,6 @@ (arrow_function) @function -; Parameters - -(required_parameter - (identifier) @variable.parameter) - -(required_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(optional_parameter - (identifier) @variable.parameter) - -(optional_parameter - (_ - ([ - (identifier) - (shorthand_property_identifier_pattern) - ]) @variable.parameter)) - -(catch_clause - parameter: (identifier) @variable.parameter) - -(index_signature - name: (identifier) @variable.parameter) - -(arrow_function - parameter: (identifier) @variable.parameter) - -(type_predicate - name: (identifier) @variable.parameter) - ; Literals (this) @variable.special @@ -300,42 +244,8 @@ "<" @punctuation.bracket ">" @punctuation.bracket) -(type_parameters - "<" @punctuation.bracket - ">" @punctuation.bracket) - (decorator "@" @punctuation.special) -(union_type - ("|") @punctuation.special) - -(intersection_type - ("&") @punctuation.special) - -(type_annotation - (":") @punctuation.special) - -(index_signature - (":") @punctuation.special) - -(type_predicate_annotation - (":") @punctuation.special) - -(public_field_definition - ("?") @punctuation.special) - -(property_signature - ("?") @punctuation.special) - -(method_signature - ("?") @punctuation.special) - -(optional_parameter - ([ - "?" - ":" - ]) @punctuation.special) - ; Keywords [