Update PureScript grammar (#8712)

This commit is contained in:
postsolar 2023-11-05 15:16:25 +02:00 committed by GitHub
parent 2fddc2a4fc
commit a98ad137f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 8 deletions

View File

@ -1142,7 +1142,7 @@ formatter = { command = "purs-tidy", args = ["format"] }
[[grammar]] [[grammar]]
name = "purescript" 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]] [[language]]
name = "zig" name = "zig"

View File

@ -3,15 +3,13 @@
(integer) @constant.numeric.integer (integer) @constant.numeric.integer
(exp_negation) @constant.numeric.integer (exp_negation) @constant.numeric.integer
(exp_literal (float)) @constant.numeric.float (exp_literal (number)) @constant.numeric.float
(char) @constant.character (char) @constant.character
[ [
(string) (string)
(triple_quote_string) (triple_quote_string)
] @string ] @string
(con_unit) @constant.builtin ; unit, as in ()
(comment) @comment (comment) @comment
@ -36,6 +34,10 @@
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Keywords, operators, includes ; Keywords, operators, includes
; This needs to come before the other "else" in
; order to be highlighted correctly
(class_instance "else" @keyword)
[ [
"if" "if"
"then" "then"
@ -53,15 +55,20 @@
(operator) (operator)
(constructor_operator) (constructor_operator)
(type_operator) (type_operator)
(tycon_arrow)
(qualified_module) ; grabs the `.` (dot), ex: import System.IO (qualified_module) ; grabs the `.` (dot), ex: import System.IO
(all_names) (all_names)
; `_` wildcards in if-then-else and case-of expressions,
; as well as record updates and operator sections
(wildcard)
"=" "="
"|" "|"
"::" "::"
"∷" "∷"
"=>" "=>"
"⇒" "⇒"
"<="
"⇐"
"->" "->"
"→" "→"
"<-" "<-"
@ -89,6 +96,7 @@
"newtype" "newtype"
"type" "type"
"as" "as"
"hiding"
"do" "do"
"ado" "ado"
"forall" "forall"
@ -98,24 +106,40 @@
"infixr" "infixr"
] @keyword ] @keyword
(type_role_declaration
"role" @keyword
role: (type_role) @keyword)
(hole) @label
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Functions and variables ; 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) (signature name: (variable) @type)
(function name: (variable) @function) (function name: (variable) @function)
(class_instance (instance_name) @function)
(derive_declaration (instance_name) @function)
; true or false ; true or false
((variable) @constant.builtin.boolean ((variable) @constant.builtin.boolean
(#match? @constant.builtin.boolean "^(true|false)$")) (#match? @constant.builtin.boolean "^(true|false)$"))
; 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)))
(variable) @variable (variable) @variable
(exp_infix (variable) @operator) ; consider infix functions as operators
("@" @namespace) ; "as" pattern operator, e.g. x@Constructor ("@" @namespace) ; "as" pattern operator, e.g. x@Constructor
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Types ; Types