Skip to content

Commit

Permalink
Update PureScript grammar (#8712)
Browse files Browse the repository at this point in the history
  • Loading branch information
postsolar committed Nov 5, 2023
1 parent 2fddc2a commit a98ad13
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 8 deletions.
2 changes: 1 addition & 1 deletion languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ formatter = { command = "purs-tidy", args = ["format"] }

[[grammar]]
name = "purescript"
source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "0e36a885a941078bf40e559026be425764dc27bf" }
source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "593193b9bf0f46d5eee708a4e53044d2a9054897" }

[[language]]
name = "zig"
Expand Down
38 changes: 31 additions & 7 deletions runtime/queries/purescript/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@

(integer) @constant.numeric.integer
(exp_negation) @constant.numeric.integer
(exp_literal (float)) @constant.numeric.float
(exp_literal (number)) @constant.numeric.float
(char) @constant.character
[
(string)
(triple_quote_string)
] @string

(con_unit) @constant.builtin ; unit, as in ()

(comment) @comment


Expand All @@ -36,6 +34,10 @@
; ----------------------------------------------------------------------------
; Keywords, operators, includes

; This needs to come before the other "else" in
; order to be highlighted correctly
(class_instance "else" @keyword)

[
"if"
"then"
Expand All @@ -53,15 +55,20 @@
(operator)
(constructor_operator)
(type_operator)
(tycon_arrow)
(qualified_module) ; grabs the `.` (dot), ex: import System.IO
(all_names)

; `_` wildcards in if-then-else and case-of expressions,
; as well as record updates and operator sections
(wildcard)
"="
"|"
"::"
""
"=>"
""
"<="
""
"->"
""
"<-"
Expand Down Expand Up @@ -89,6 +96,7 @@
"newtype"
"type"
"as"
"hiding"
"do"
"ado"
"forall"
Expand All @@ -98,24 +106,40 @@
"infixr"
] @keyword

(type_role_declaration
"role" @keyword
role: (type_role) @keyword)

(hole) @label

; ----------------------------------------------------------------------------
; Functions and variables

(row_field (field_name) @variable.other.member)
(record_field (field_name) @variable.other.member)
(record_accessor (variable) @variable.other.member)
(exp_record_access (variable) @variable.other.member)

(signature name: (variable) @type)
(function name: (variable) @function)
(class_instance (instance_name) @function)
(derive_declaration (instance_name) @function)

; true or false
((variable) @constant.builtin.boolean
(#match? @constant.builtin.boolean "^(true|false)$"))

(variable) @variable
; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
(exp_ticked (_) @operator)
(exp_ticked (exp_name (variable) @operator))
(exp_ticked (exp_name (qualified_variable (variable) @operator)))

(exp_infix (variable) @operator) ; consider infix functions as operators
(variable) @variable

("@" @namespace) ; "as" pattern operator, e.g. x@Constructor


; ----------------------------------------------------------------------------
; Types

Expand Down

0 comments on commit a98ad13

Please sign in to comment.