From 31fca678393d44f459932fa5babac9678b26e6a8 Mon Sep 17 00:00:00 2001 From: Joosep Alviste Date: Fri, 23 Oct 2020 22:05:27 +0300 Subject: fix(javascript): fix constant variable highlight The `@constant` query gets overwritten by the `@constructor` query. They both query for variables starting with an uppercase letter, but the `@constant` query took effect first. --- queries/javascript/highlights.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'queries/javascript') diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm index 0b6504968..c0ce0fae8 100644 --- a/queries/javascript/highlights.scm +++ b/queries/javascript/highlights.scm @@ -17,15 +17,15 @@ (identifier) @variable +((identifier) @constructor + (#match? @constructor "^[A-Z]")) + ((identifier) @constant (#vim-match? @constant "^[A-Z_][A-Z\\d_]+$")) ((shorthand_property_identifier) @constant (#vim-match? @constant "^[A-Z_][A-Z\\d_]+$")) -((identifier) @constructor - (#match? @constructor "^[A-Z]")) - ((identifier) @variable.builtin (#vim-match? @variable.builtin "^(arguments|module|console|window|document)$")) -- cgit v1.2.3-70-g09d2