I fear the upstream queries may be broken, somehow, as they don't work with `--apply-all-captures` which should match the "last query wins" matching behaviour of `nvim-treesitter`. I also removed `locals.scm`, as `tree-sitter` and `nvim-treesitter` don't agree on how to write it, and I don't really care about it. It does mean that the highlights can't tell the difference between `int` the built-in and `int` the type alias anymore, but that's a small edge-case (and `nvim-treesitter` didn't support it anyway).
This commit is contained in:
parent
89c9bb270d
commit
db10520755
11 changed files with 149 additions and 149 deletions
|
|
@ -8,9 +8,7 @@
|
|||
(let_expression)
|
||||
(function_declaration)
|
||||
(primitive_declaration)
|
||||
|
||||
(record_type)
|
||||
|
||||
(class_declaration)
|
||||
(class_type)
|
||||
(method_declaration)
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
; Built-ins {{{
|
||||
((function_call
|
||||
function: (identifier) @function.builtin)
|
||||
(#match? @function.builtin "^(chr|concat|exit|flush|getchar|not|ord|print|print_err|print_int|size|strcmp|streq|substring)$")
|
||||
(#is-not? local))
|
||||
(#any-of? @function.builtin
|
||||
"chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size"
|
||||
"strcmp" "streq" "substring"))
|
||||
|
||||
((type_identifier) @type.builtin
|
||||
(#match? @type.builtin "^(int|string|Object)$")
|
||||
(#is-not? local))
|
||||
(#any-of? @type.builtin "int" "string" "Object"))
|
||||
|
||||
((identifier) @variable.builtin
|
||||
(#match? @variable.builtin "^self$")
|
||||
(#is-not? local))
|
||||
; }}}
|
||||
(#eq? @variable.builtin "self"))
|
||||
|
||||
; }}}
|
||||
; Keywords {{{
|
||||
[
|
||||
"function"
|
||||
"method"
|
||||
"primitive"
|
||||
"function"
|
||||
"primitive"
|
||||
"method"
|
||||
] @keyword.function
|
||||
|
||||
[
|
||||
|
|
@ -27,14 +26,9 @@
|
|||
"while"
|
||||
] @keyword.repeat
|
||||
|
||||
[
|
||||
"new"
|
||||
] @keyword.constructor
|
||||
"new" @keyword.operator
|
||||
|
||||
|
||||
[
|
||||
"import"
|
||||
] @include
|
||||
"import" @keyword.import
|
||||
|
||||
[
|
||||
"array"
|
||||
|
|
@ -48,73 +42,80 @@
|
|||
"then"
|
||||
"type"
|
||||
"var"
|
||||
|
||||
"class"
|
||||
"extends"
|
||||
|
||||
"_cast"
|
||||
"_chunks"
|
||||
"_exp"
|
||||
"_lvalue"
|
||||
"_namety"
|
||||
] @keyword
|
||||
; }}}
|
||||
|
||||
"class" @keyword.type
|
||||
|
||||
; }}}
|
||||
; Operators {{{
|
||||
(operator) @operator
|
||||
|
||||
[
|
||||
","
|
||||
";"
|
||||
":"
|
||||
"."
|
||||
","
|
||||
";"
|
||||
":"
|
||||
"."
|
||||
] @punctuation.delimiter
|
||||
|
||||
[
|
||||
"("
|
||||
")"
|
||||
"["
|
||||
"]"
|
||||
"{"
|
||||
"}"
|
||||
"("
|
||||
")"
|
||||
"["
|
||||
"]"
|
||||
"{"
|
||||
"}"
|
||||
] @punctuation.bracket
|
||||
; }}}
|
||||
|
||||
; }}}
|
||||
; Functions and methods {{{
|
||||
(function_call
|
||||
function: (identifier) @function)
|
||||
|
||||
(function_declaration
|
||||
name: (identifier) @function)
|
||||
|
||||
(primitive_declaration
|
||||
name: (identifier) @function)
|
||||
|
||||
(method_call
|
||||
method: (identifier) @method)
|
||||
method: (identifier) @function.method)
|
||||
|
||||
(method_declaration
|
||||
name: (identifier) @method)
|
||||
name: (identifier) @function.method)
|
||||
|
||||
(parameters
|
||||
name: (identifier) @parameter)
|
||||
; }}}
|
||||
name: (identifier) @variable.parameter)
|
||||
|
||||
; }}}
|
||||
; Declarations {{{
|
||||
(import_declaration
|
||||
file: (string_literal) @string.special.path)
|
||||
; }}}
|
||||
|
||||
; }}}
|
||||
; Literals {{{
|
||||
(nil_literal) @constant.builtin
|
||||
(integer_literal) @number
|
||||
(string_literal) @string
|
||||
(escape_sequence) @string.escape
|
||||
; }}}
|
||||
|
||||
(integer_literal) @number
|
||||
|
||||
(string_literal) @string
|
||||
|
||||
(escape_sequence) @string.escape
|
||||
|
||||
; }}}
|
||||
; Misc {{{
|
||||
(comment) @comment
|
||||
(comment) @comment ; @spell
|
||||
|
||||
(type_identifier) @type
|
||||
(field_identifier) @property
|
||||
(identifier) @variable
|
||||
; }}}
|
||||
|
||||
(field_identifier) @variable.member
|
||||
|
||||
(identifier) @variable
|
||||
|
||||
; }}}
|
||||
; vim: sw=2 foldmethod=marker
|
||||
|
|
|
|||
|
|
@ -1,69 +1,104 @@
|
|||
; Control flow {{{
|
||||
(if_expression) @indent
|
||||
"then" @branch
|
||||
"else" @branch
|
||||
(if_expression) @indent.begin
|
||||
|
||||
(while_expression) @indent
|
||||
"do" @branch
|
||||
"then" @indent.branch
|
||||
|
||||
"else" @indent.branch
|
||||
|
||||
(while_expression) @indent.begin
|
||||
|
||||
"do" @indent.branch
|
||||
|
||||
(for_expression) @indent.begin
|
||||
|
||||
"to" @indent.branch
|
||||
|
||||
(for_expression) @indent
|
||||
"to" @branch
|
||||
; }}}
|
||||
|
||||
; Class {{{
|
||||
(class_declaration) @indent
|
||||
(class_declaration "}" @indent_end)
|
||||
(class_declaration) @indent.begin
|
||||
|
||||
(class_declaration
|
||||
"}" @indent.end)
|
||||
|
||||
(class_type) @indent.begin
|
||||
|
||||
(class_type
|
||||
"}" @indent.end)
|
||||
|
||||
(class_type) @indent
|
||||
(class_type "}" @indent_end)
|
||||
; }}}
|
||||
|
||||
; Groups {{{
|
||||
(let_expression) @indent
|
||||
"in" @branch
|
||||
"end" @branch
|
||||
(let_expression "end" @indent_end)
|
||||
(let_expression) @indent.begin
|
||||
|
||||
"in" @indent.branch
|
||||
|
||||
"end" @indent.branch
|
||||
|
||||
(let_expression
|
||||
"end" @indent.end)
|
||||
|
||||
(sequence_expression) @indent.begin
|
||||
|
||||
")" @indent.branch
|
||||
|
||||
(sequence_expression
|
||||
")" @indent.end)
|
||||
|
||||
(sequence_expression) @indent
|
||||
")" @branch
|
||||
(sequence_expression ")" @indent_end)
|
||||
; }}}
|
||||
|
||||
; Functions and methods {{{
|
||||
(parameters) @indent
|
||||
(parameters ")" @indent_end)
|
||||
(parameters) @indent.begin
|
||||
|
||||
(function_call) @indent
|
||||
(method_call) @indent
|
||||
")" @branch
|
||||
(parameters
|
||||
")" @indent.end)
|
||||
|
||||
(function_call) @indent.begin
|
||||
|
||||
(function_call
|
||||
")" @indent.end)
|
||||
|
||||
(method_call) @indent.begin
|
||||
|
||||
")" @indent.branch
|
||||
|
||||
(function_declaration) @indent.begin
|
||||
|
||||
(primitive_declaration) @indent.begin
|
||||
|
||||
(method_declaration) @indent.begin
|
||||
|
||||
(function_declaration) @indent
|
||||
(primitive_declaration) @indent
|
||||
(method_declaration) @indent
|
||||
; }}}
|
||||
|
||||
; Values and expressions {{{
|
||||
(array_value) @indent
|
||||
"]" @branch
|
||||
(array_value "]" @indent_end)
|
||||
(array_value) @indent.begin
|
||||
|
||||
(array_expression) @indent
|
||||
"of" @branch
|
||||
"]" @indent.branch
|
||||
|
||||
(record_expression) @indent
|
||||
"}" @branch
|
||||
(record_expression "}" @indent_end)
|
||||
(array_value
|
||||
"]" @indent.end)
|
||||
|
||||
(record_type) @indent
|
||||
"}" @branch
|
||||
(record_type "}" @indent_end)
|
||||
(array_expression) @indent.begin
|
||||
|
||||
"of" @indent.branch
|
||||
|
||||
(record_expression) @indent.begin
|
||||
|
||||
"}" @indent.branch
|
||||
|
||||
(record_expression
|
||||
"}" @indent.end)
|
||||
|
||||
(record_type) @indent.begin
|
||||
|
||||
"}" @indent.branch
|
||||
|
||||
(record_type
|
||||
"}" @indent.end)
|
||||
|
||||
(variable_declaration) @indent.begin
|
||||
|
||||
(variable_declaration) @indent
|
||||
; }}}
|
||||
|
||||
; Misc{{{
|
||||
(comment) @ignore
|
||||
(string_literal) @ignore
|
||||
; }}}
|
||||
(comment) @indent.ignore
|
||||
|
||||
(string_literal) @indent.ignore
|
||||
|
||||
; }}}
|
||||
; vim: sw=2 foldmethod=marker
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
(comment) @comment
|
||||
((comment) @injection.content
|
||||
(#set! injection.language "comment"))
|
||||
|
||||
; vim: sw=2 foldmethod=marker
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
; See this issue [1] for support for "lazy scoping" which is somewhat needed
|
||||
; for Tiger semantics (e.g: one can call a function before it has been defined
|
||||
; top-to-bottom).
|
||||
;
|
||||
; [1]: https://github.com/tree-sitter/tree-sitter/issues/918
|
||||
|
||||
; Scopes {{{
|
||||
[
|
||||
(for_expression)
|
||||
(let_expression)
|
||||
(function_declaration)
|
||||
] @local.scope
|
||||
; }}}
|
||||
|
||||
; Definitions {{{
|
||||
(type_declaration
|
||||
name: (identifier) @local.definition)
|
||||
|
||||
(parameters
|
||||
name: (identifier) @local.definition)
|
||||
|
||||
(function_declaration
|
||||
name: (identifier) @local.definition)
|
||||
(primitive_declaration
|
||||
name: (identifier) @local.definition)
|
||||
|
||||
(variable_declaration
|
||||
name: (identifier) @local.definition)
|
||||
; }}}
|
||||
|
||||
; References {{{
|
||||
(identifier) @local.reference
|
||||
; }}}
|
||||
|
||||
; vim: sw=2 foldmethod=marker
|
||||
Loading…
Add table
Add a link
Reference in a new issue