highlight(scala): update the Scala highlight queries (#5546)

There have been a lot of changes in tree-sitter/tree-sitter-scala,
including partial support for Scala 3 syntax and breaking changes in
some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

Co-authored-by: Anton Sviridov <keynmol@gmail.com>
Co-authored-by: Chris Kipp <ckipp@pm.me>
This commit is contained in:
eugene yokota 2023-01-16 10:48:17 -05:00 committed by GitHub
parent d3e0f18c89
commit 6f6334f3c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 100 additions and 31 deletions

View file

@ -1064,7 +1064,7 @@ language-server = { command = "metals" }
[[grammar]]
name = "scala"
source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8" }
source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "db1c8c23d7996476a791db85a0d292084c19c232" }
[[language]]
name = "dockerfile"

View file

@ -33,6 +33,26 @@
(type_definition
name: (type_identifier) @type)
(full_enum_case
name: (identifier) @type)
(simple_enum_case
name: (identifier) @type)
;; val/var definitions/declarations
(val_definition
pattern: (identifier) @variable)
(var_definition
pattern: (identifier) @variable)
(val_declaration
name: (identifier) @variable)
(var_declaration
name: (identifier) @variable)
; method definition
(class_definition
@ -48,7 +68,7 @@
(function_definition
name: (identifier) @function.method)))
; imports
; imports/exports
(import_declaration
path: (identifier) @namespace)
@ -58,7 +78,15 @@
path: (identifier) @type) (#match? @type "^[A-Z]"))
((stable_identifier (identifier) @type) (#match? @type "^[A-Z]"))
((import_selectors (identifier) @type) (#match? @type "^[A-Z]"))
(export_declaration
path: (identifier) @namespace)
((stable_identifier (identifier) @namespace))
((export_declaration
path: (identifier) @type) (#match? @type "^[A-Z]"))
((stable_identifier (identifier) @type) (#match? @type "^[A-Z]"))
((namespace_selectors (identifier) @type) (#match? @type "^[A-Z]"))
; method invocation
@ -66,10 +94,17 @@
(call_expression
function: (identifier) @function)
(call_expression
function: (operator_identifier) @function)
(call_expression
function: (field_expression
field: (identifier) @function.method))
(call_expression
function: (field_expression
field: (operator_identifier) @function.method))
((call_expression
function: (identifier) @variable.other.member)
(#match? @variable.other.member "^[A-Z]"))
@ -87,9 +122,15 @@
(function_definition
name: (identifier) @function)
(function_definition
name: (operator_identifier) @function)
(parameter
name: (identifier) @variable.parameter)
(binding
name: (identifier) @variable.parameter)
; expressions
@ -109,7 +150,7 @@
(symbol_literal) @string.special.symbol
[
(string)
(character_literal)
@ -118,29 +159,50 @@
(interpolation "$" @punctuation.special)
; annotations
(annotation) @attribute
;; keywords
;; storage in TextMate scope lingo means field or type
[
(opaque_modifier)
(infix_modifier)
(transparent_modifier)
(open_modifier)
"abstract"
"case"
"class"
"extends"
"final"
"finally"
;; `forSome` existential types not implemented yet
"implicit"
"lazy"
;; `macro` not implemented yet
"object"
"override"
"package"
"private"
"protected"
"sealed"
] @keyword.storage.modifier
[
"class"
"enum"
"extension"
"given"
"object"
"package"
"trait"
"type"
"val"
"var"
] @keyword.storage.type
[
"as"
"derives"
"end"
"extends"
;; `forSome` existential types not implemented yet
;; `macro` not implemented yet
;; `throws`
"using"
"with"
] @keyword
@ -152,33 +214,36 @@
"new" @keyword.operator
[
"else"
"if"
"match"
"try"
"catch"
"throw"
"case"
"catch"
"else"
"finally"
"if"
"match"
"then"
"throw"
"try"
] @keyword.control.conditional
[
"("
")"
"["
"]"
"{"
"}"
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket
[
"."
","
"."
","
] @punctuation.delimiter
[
"do"
"for"
"while"
"yield"
"do"
"for"
"while"
"yield"
] @keyword.control.repeat
"def" @keyword.function
@ -191,6 +256,8 @@
"import" @keyword.control.import
"export" @keyword.control.import
"return" @keyword.control.return
(comment) @comment
@ -200,4 +267,6 @@
(case_block
(case_clause ("case") @keyword.control.conditional))
(identifier) @variable
(identifier) @variable
(operator_identifier) @operator