Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Maskhjarnas tree-sitter-purescript #8306

Merged
merged 4 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/src/generated/lang-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
| prolog | | | | `swipl` |
| protobuf | ✓ | | ✓ | `bufls`, `pb` |
| prql | ✓ | | | |
| purescript | ✓ | | | `purescript-language-server` |
| purescript | ✓ | | | `purescript-language-server` |
| python | ✓ | ✓ | ✓ | `pylsp` |
| qml | ✓ | | ✓ | `qmlls` |
| r | ✓ | | | `R` |
Expand Down
5 changes: 4 additions & 1 deletion languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,10 @@ language-servers = [ "purescript-language-server" ]
indent = { tab-width = 2, unit = " " }
auto-format = true
formatter = { command = "purs-tidy", args = ["format"] }
grammar = "haskell"

[[grammar]]
name = "purescript"
source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "5f5a030826849b7be17596d372967f60051b42bd" }

[[language]]
name = "zig"
Expand Down
119 changes: 118 additions & 1 deletion runtime/queries/purescript/highlights.scm
Original file line number Diff line number Diff line change
@@ -1 +1,118 @@
; inherits: haskell
; ----------------------------------------------------------------------------
; Literals and comments

(integer) @constant.numeric.integer
(exp_negation) @constant.numeric.integer
(exp_literal (float)) @constant.numeric.float
(char) @constant.character
(string) @string

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

(comment) @comment


; ----------------------------------------------------------------------------
; Punctuation

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

[
(comma)
";"
] @punctuation.delimiter


; ----------------------------------------------------------------------------
; Keywords, operators, includes

[
"if"
"then"
"else"
"case"
"of"
] @keyword.control.conditional

[
"import"
"module"
] @keyword.control.import

[
(operator)
(constructor_operator)
(type_operator)
(tycon_arrow)
(qualified_module) ; grabs the `.` (dot), ex: import System.IO
(all_names)
"="
"|"
"::"
"=>"
"->"
"<-"
"\\"
"`"
"@"
] @operator

(qualified_module (module) @constructor)
(module) @namespace
(qualified_type (module) @namespace)
(qualified_variable (module) @namespace)
(import (module) @namespace)

[
(where)
"let"
"in"
"class"
"instance"
"derive"
"foreign"
"data"
"newtype"
"type"
"as"
"do"
"ado"
"forall"
"∀"
"infix"
"infixl"
"infixr"
] @keyword


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

(signature name: (variable) @type)
(function name: (variable) @function)

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

(variable) @variable

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

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


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

(type) @type

(constructor) @constructor

3 changes: 2 additions & 1 deletion runtime/queries/purescript/injections.scm
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
; inherits: haskell
((comment) @injection.content
(#set! injection.language "comment"))
5 changes: 4 additions & 1 deletion runtime/queries/purescript/locals.scm
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
; inherits: haskell
(signature name: (variable)) @local.definition
(function name: (variable)) @local.definition
(pat_name (variable)) @local.definition
(exp_name (variable)) @local.reference
13 changes: 13 additions & 0 deletions runtime/queries/purescript/textobjects.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(comment) @comment.inside

[
(data)
(type)
(newtype)
] @class.around

((signature)? (function rhs:(_) @function.inside)) @function.around
(exp_lambda) @function.around

(data (type_variable) @parameter.inside)
(patterns (_) @parameter.inside)