Skip to content

Commit

Permalink
Add scala syntax highlights (helix-editor#1278)
Browse files Browse the repository at this point in the history
* add partial scala syntax highlights

* ran cargo xtask docgen

* updated tree-sitter-scala, fixed highlights

* fix comments

* move identifier to the end of the highlights

* add indents
  • Loading branch information
dwat3r authored Dec 18, 2021
1 parent 3ef115d commit 0683f0a
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 1 deletion.
1 change: 1 addition & 0 deletions book/src/generated/lang-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
| racket | | | | `racket` |
| ruby || | | `solargraph` |
| rust |||| `rust-analyzer` |
| scala || | | `metals` |
| svelte || || `svelteserver` |
| toml || | | |
| tsq || | | |
Expand Down
9 changes: 9 additions & 0 deletions languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,12 @@ file-types = ["md"]
roots = []

indent = { tab-width = 2, unit = " " }

[[language]]
name = "scala"
scope = "source.scala"
roots = ["build.sbt"]
file-types = ["scala", "sbt"]
comment-token = "//"
indent = { tab-width = 2, unit = " " }
language-server = { command = "metals" }
203 changes: 203 additions & 0 deletions runtime/queries/scala/highlights.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
; CREDITS @stumash (stuart.mashaal@gmail.com)

;; variables


((identifier) @variable.builtin
(#match? @variable.builtin "^this$"))

(interpolation) @none

; Assume other uppercase names constants.
; NOTE: In order to distinguish constants we highlight
; all the identifiers that are uppercased. But this solution
; is not suitable for all occurrences e.g. it will highlight
; an uppercased method as a constant if used with no params.
; Introducing highlighting for those specific cases, is probably
; best way to resolve the issue.
((identifier) @constant (#match? @constant "^[A-Z]"))

;; types

(type_identifier) @type

(class_definition
name: (identifier) @type)

(object_definition
name: (identifier) @type)

(trait_definition
name: (identifier) @type)

(type_definition
name: (type_identifier) @type)

; method definition

(class_definition
body: (template_body
(function_definition
name: (identifier) @function.method)))
(object_definition
body: (template_body
(function_definition
name: (identifier) @function.method)))
(trait_definition
body: (template_body
(function_definition
name: (identifier) @function.method)))

; imports

(import_declaration
path: (identifier) @namespace)
((stable_identifier (identifier) @namespace))

((import_declaration
path: (identifier) @type) (#match? @type "^[A-Z]"))
((stable_identifier (identifier) @type) (#match? @type "^[A-Z]"))

((import_selectors (identifier) @type) (#match? @type "^[A-Z]"))

; method invocation


(call_expression
function: (identifier) @function)

(call_expression
function: (field_expression
field: (identifier) @function.method))

((call_expression
function: (identifier) @variable.other.member)
(#match? @variable.other.member "^[A-Z]"))

(generic_function
function: (identifier) @function)

(
(identifier) @function.builtin
(#match? @function.builtin "^super$")
)

; function definitions

(function_definition
name: (identifier) @function)

(parameter
name: (identifier) @variable.parameter)

; expressions


(field_expression field: (identifier) @variable.other.member)
(field_expression value: (identifier) @type
(#match? @type "^[A-Z]"))

(infix_expression operator: (identifier) @operator)
(infix_expression operator: (operator_identifier) @operator)
(infix_type operator: (operator_identifier) @operator)
(infix_type operator: (operator_identifier) @operator)

; literals
(boolean_literal) @constant.builtin.boolean
(integer_literal) @constant.numeric.integer
(floating_point_literal) @constant.numeric.float


(symbol_literal) @string.special.symbol

[
(string)
(character_literal)
(interpolated_string_expression)
] @string

(interpolation "$" @punctuation.special)

;; keywords

[
"abstract"
"case"
"class"
"extends"
"final"
"finally"
;; `forSome` existential types not implemented yet
"implicit"
"lazy"
;; `macro` not implemented yet
"object"
"override"
"package"
"private"
"protected"
"sealed"
"trait"
"type"
"val"
"var"
"with"
] @keyword

(null_literal) @constant.builtin
(wildcard) @keyword

;; special keywords

"new" @keyword.operator

[
"else"
"if"
"match"
"try"
"catch"
"throw"
] @keyword.control.conditional

[
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket

[
"."
","
] @punctuation.delimiter

[
"do"
"for"
"while"
"yield"
] @keyword.control.repeat

"def" @keyword.function

[
"=>"
"<-"
"@"
] @keyword.operator

"import" @keyword.control.import

"return" @keyword.control.return

(comment) @comment

;; `case` is a conditional keyword in case_block

(case_block
(case_clause ("case") @keyword.control.conditional))

(identifier) @variable
23 changes: 23 additions & 0 deletions runtime/queries/scala/indents.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

indent = [
"block",
"arguments",
"parameter",
"class_definition",
"trait_definition",
"object_definition",
"function_definition",
"val_definition",
"import_declaration",
"while_expression",
"do_while_expression",
"for_expression",
"try_expression",
"match_expression"
]

outdent = [
"}",
"]",
")"
]
1 change: 1 addition & 0 deletions runtime/queries/scala/injections.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(comment) @comment

0 comments on commit 0683f0a

Please sign in to comment.