Skip to content

Commit

Permalink
Add dart lsp config and queries (helix-editor#1250)
Browse files Browse the repository at this point in the history
* Add language: dart

The setup requires that dart be in the users path, such as:
```
export PATH="$HOME/Android/flutter/bin/cache/dart-sdk/bin/:$PATH"
```

Refactor the dart highlights

* lang: dart: add indents and locals

* lang: dart: corrections to local scope

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
  • Loading branch information
flukejones and archseer authored Dec 18, 2021
1 parent 0683f0a commit edf3c70
Show file tree
Hide file tree
Showing 6 changed files with 293 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,7 @@
path = helix-syntax/languages/tree-sitter-markdown
url = https://github.com/MDeiml/tree-sitter-markdown
shallow = true
[submodule "helix-syntax/languages/tree-sitter-dart"]
path = helix-syntax/languages/tree-sitter-dart
url = https://github.com/UserNobody14/tree-sitter-dart.git
shallow = true
1 change: 1 addition & 0 deletions helix-syntax/languages/tree-sitter-dart
Submodule tree-sitter-dart added at 6a2537
12 changes: 11 additions & 1 deletion languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,21 @@ roots = []

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

[[language]]
name = "dart"
scope = "source.dart"
file-types = ["dart"]
roots = ["pubspec.yaml"]
auto-format = true
comment-token = "//"
language-server = { command = "dart", args = ["language-server", "--client-id=helix"] }
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" }
language-server = { command = "metals" }
237 changes: 237 additions & 0 deletions runtime/queries/dart/highlights.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
(dotted_identifier_list) @string

; Methods
; --------------------
(super) @function.builtin

(function_expression_body (identifier) @function.method)
((identifier)(selector (argument_part)) @function.method)

; Annotations
; --------------------
(annotation
name: (identifier) @attribute)
(marker_annotation
name: (identifier) @attribute)

; Types
; --------------------
(class_definition
name: (identifier) @type)

(constructor_signature
name: (identifier) @function.method)

(function_signature
name: (identifier) @function.method)

(getter_signature
(identifier) @function.builtin)

(setter_signature
name: (identifier) @function.builtin)

(enum_declaration
name: (identifier) @type)

(enum_constant
name: (identifier) @type.builtin)

(void_type) @type.builtin

((scoped_identifier
scope: (identifier) @type)
(#match? @type "^[a-zA-Z]"))

((scoped_identifier
scope: (identifier) @type
name: (identifier) @type)
(#match? @type "^[a-zA-Z]"))

; the DisabledDrawerButtons in : const DisabledDrawerButtons(history: true),
(type_identifier) @type.builtin

; Variables
; --------------------
; the "File" in var file = File();
((identifier) @namespace
(#match? @namespace "^_?[A-Z].*[a-z]")) ; catch Classes or IClasses not CLASSES

("Function" @type.builtin)
(inferred_type) @type.builtin

; properties
(unconditional_assignable_selector
(identifier) @variable.other.member)

(conditional_assignable_selector
(identifier) @variable.other.member)

; assignments
; --------------------
; the "strings" in : strings = "some string"
(assignment_expression
left: (assignable_expression) @variable)

(this) @variable.builtin

; Parameters
; --------------------
(formal_parameter
name: (identifier) @variable)

(named_argument
(label (identifier) @variable))

; Literals
; --------------------
[
(hex_integer_literal)
(decimal_integer_literal)
(decimal_floating_point_literal)
;(octal_integer_literal)
;(hex_floating_point_literal)
] @constant.numeric.integer

(symbol_literal) @string.special.symbol
(string_literal) @string

[
(const_builtin)
(final_builtin)
] @variable.builtin

[
(true)
(false)
] @constant.builtin.boolean

(null_literal) @constant.builtin

(comment) @comment.line
(documentation_comment) @comment.block.documentation

; Tokens
; --------------------
(template_substitution
"$" @punctuation.special
"{" @punctuation.special
"}" @punctuation.special
) @embedded

(template_substitution
"$" @punctuation.special
(identifier_dollar_escaped) @variable
) @embedded

(escape_sequence) @constant.character.escape

; Punctuation
;---------------------
[
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket

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

; Operators
;---------------------
[
"@"
"?"
"=>"
".."
"=="
"&&"
"%"
"<"
">"
"="
">="
"<="
"||"
(multiplicative_operator)
(increment_operator)
(is_operator)
(prefix_operator)
(equality_operator)
(additive_operator)
] @operator

; Keywords
; --------------------
["import" "library" "export"] @keyword.control.import
["do" "while" "continue" "for"] @keyword.control.repeat
["return" "yield"] @keyword.control.return
["as" "in" "is"] @keyword.operator

[
"?."
"??"
"if"
"else"
"switch"
"default"
"late"
] @keyword.control.conditional

[
"try"
"throw"
"catch"
"finally"
(break_statement)
] @keyword.control.exception

; Reserved words (cannot be used as identifiers)
[
(case_builtin)
"abstract"
"async"
"async*"
"await"
"class"
"covariant"
"deferred"
"dynamic"
"enum"
"extends"
"extension"
"external"
"factory"
"Function"
"get"
"implements"
"interface"
"mixin"
"new"
"on"
"operator"
"part"
"required"
"set"
"show"
"static"
"super"
"sync*"
"typedef"
"with"
] @keyword

; when used as an identifier:
((identifier) @variable.builtin
(#match? @variable.builtin "^(abstract|as|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|set|static|typedef)$"))

; Error
(ERROR) @error

20 changes: 20 additions & 0 deletions runtime/queries/dart/indents.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
indent = [
"class_body",
"function_body",
"function_expression_body",
"declaration",
"initializers",
"switch_block",
"if_statement",
"formal_parameter_list",
"formal_parameter",
"list_literal",
"return_statement",
"arguments"
]

outdent = [
"}",
"]",
")"
]
20 changes: 20 additions & 0 deletions runtime/queries/dart/locals.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
; Scopes
;-------

[
(block)
(try_statement)
(catch_clause)
(finally_clause)
] @local.scope

; Definitions
;------------

(class_definition
body: (_) @local.definition)

; References
;------------

(identifier) @local.reference

0 comments on commit edf3c70

Please sign in to comment.