From 97c163d5d0a8d8949782343a62924d9d5ce25718 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Sun, 17 Mar 2024 11:43:35 -0400 Subject: [PATCH] Fix malformed predicates in highlighting queries --- runtime/queries/go/highlights.scm | 4 ++-- runtime/queries/julia/highlights.scm | 6 +++--- runtime/queries/pkl/highlights.scm | 2 +- runtime/queries/pkl/injections.scm | 2 +- runtime/queries/scss/highlights.scm | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm index 8eed12afbdb3..7dc20e69c9a8 100644 --- a/runtime/queries/go/highlights.scm +++ b/runtime/queries/go/highlights.scm @@ -2,7 +2,7 @@ (call_expression function: (identifier) @function.builtin - (match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$")) + (#match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$")) (call_expression function: (identifier) @function) @@ -19,7 +19,7 @@ name: (identifier) @type.parameter)) ((type_identifier) @type.builtin - (match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$")) + (#match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$")) (type_identifier) @type diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm index 90baee21355d..013f50632576 100644 --- a/runtime/queries/julia/highlights.scm +++ b/runtime/queries/julia/highlights.scm @@ -231,7 +231,7 @@ ] @keyword ; TODO: fix this -((identifier) @keyword (match? @keyword "global|local")) +((identifier) @keyword (#match? @keyword "global|local")) ; --------- ; Operators @@ -277,12 +277,12 @@ ; SCREAMING_SNAKE_CASE ( (identifier) @constant - (match? @constant "^[A-Z][A-Z0-9_]*$")) + (#match? @constant "^[A-Z][A-Z0-9_]*$")) ; remaining identifiers that start with capital letters should be types (PascalCase) ( (identifier) @type - (match? @type "^[A-Z]")) + (#match? @type "^[A-Z]")) ; Field expressions are either module content or struct fields. ; Module types and constants should already be captured, so this diff --git a/runtime/queries/pkl/highlights.scm b/runtime/queries/pkl/highlights.scm index 501c9485945b..1de6ba3c0d4d 100644 --- a/runtime/queries/pkl/highlights.scm +++ b/runtime/queries/pkl/highlights.scm @@ -172,7 +172,7 @@ (clazz (identifier) @type) (typeAlias (identifier) @type) ((identifier) @type - (match? @type "^[A-Z]")) + (#match? @type "^[A-Z]")) (typeArgumentList "<" @punctuation.bracket diff --git a/runtime/queries/pkl/injections.scm b/runtime/queries/pkl/injections.scm index 15867f35e647..c5d2d4ac5e02 100644 --- a/runtime/queries/pkl/injections.scm +++ b/runtime/queries/pkl/injections.scm @@ -18,7 +18,7 @@ ( ((methodCallExpr (identifier) @methodName (argumentList (slStringLiteral) @injection.content)) (#set! injection.language "regex")) - (eq? @methodName "Regex")) + (#eq? @methodName "Regex")) ((lineComment) @injection.content (#set! injection.language "comment")) diff --git a/runtime/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm index 8ba00a881c33..de20e047464d 100644 --- a/runtime/queries/scss/highlights.scm +++ b/runtime/queries/scss/highlights.scm @@ -44,9 +44,9 @@ "@while" @keyword.control.repeat ((property_name) @variable - (match? @variable "^--")) + (#match? @variable "^--")) ((plain_value) @variable - (match? @variable "^--")) + (#match? @variable "^--")) (tag_name) @tag (universal_selector) @tag