From 13ddd4d7522ce3e5a1abc0ea34e10ec4e445908a Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Mon, 23 Jun 2025 10:48:39 +0200 Subject: feat(swift)!: update parser and queries --- runtime/queries/swift/folds.scm | 2 +- runtime/queries/swift/highlights.scm | 23 ++++++----------------- runtime/queries/swift/indents.scm | 2 +- runtime/queries/swift/injections.scm | 3 +++ 4 files changed, 11 insertions(+), 19 deletions(-) (limited to 'runtime') diff --git a/runtime/queries/swift/folds.scm b/runtime/queries/swift/folds.scm index cfbc6d0b1..ca7f72593 100644 --- a/runtime/queries/swift/folds.scm +++ b/runtime/queries/swift/folds.scm @@ -26,7 +26,7 @@ (tuple_expression) ; ( foo + bar ) (array_literal) ; [ foo, bar ] (dictionary_literal) ; [ foo: bar, x: y ] - (lambda_literal) + (lambda_literal) (willset_didset_block) (willset_clause) (didset_clause) diff --git a/runtime/queries/swift/highlights.scm b/runtime/queries/swift/highlights.scm index 5c52ee9d6..b911183d1 100644 --- a/runtime/queries/swift/highlights.scm +++ b/runtime/queries/swift/highlights.scm @@ -158,25 +158,14 @@ ; See https://docs.swift.org/swift-book/documentation/the-swift-programming-language/lexicalstructure/#Keywords-and-Punctuation [ (diagnostic) - "#available" - "#unavailable" - "#fileLiteral" - "#colorLiteral" - "#imageLiteral" - "#keyPath" - "#selector" - "#externalMacro" + (availability_condition) + (playground_literal) + (key_path_string_expression) + (selector_expression) + (external_macro_definition) ] @function.macro -[ - "#column" - "#dsohandle" - "#fileID" - "#filePath" - "#file" - "#function" - "#line" -] @constant.macro +(special_literal) @constant.macro ; Statements (for_statement diff --git a/runtime/queries/swift/indents.scm b/runtime/queries/swift/indents.scm index 2366c3bd6..21a11bfa5 100644 --- a/runtime/queries/swift/indents.scm +++ b/runtime/queries/swift/indents.scm @@ -33,7 +33,7 @@ (tuple_expression) ; ( foo + bar ) (array_literal) ; [ foo, bar ] (dictionary_literal) ; [ foo: bar, x: y ] - (lambda_literal) + (lambda_literal) (willset_didset_block) (willset_clause) (didset_clause) diff --git a/runtime/queries/swift/injections.scm b/runtime/queries/swift/injections.scm index 19aae904e..6e01e2d4c 100644 --- a/runtime/queries/swift/injections.scm +++ b/runtime/queries/swift/injections.scm @@ -1,3 +1,6 @@ +((regex_literal) @injection.content + (#set! injection.language "regex")) + ([ (comment) (multiline_comment) -- cgit v1.2.3-70-g09d2