Initial Ada language support (after stale) (#9908)
* Adding initial support for ada language, based off #7790 PR from tomekw * More translation to helix-specific tree-sitter scm labels, add ada gpr switch to ada LSP * Generate ada in lang-support.md using cargo xtask docgen * Update tree-sitter definitions according to comments * Remove .gpr glob from languages.toml * Fix unit in languages.toml for ada, update locals.scm to helix needs
This commit is contained in:
Damian Zaręba
GitHub
parent
0b6dea6dc2
commit
485c5cf0b8
6 changed files with 262 additions and 0 deletions
|
|
@ -1,5 +1,6 @@
|
|||
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| ada | ✓ | ✓ | | `ada_language_server`, `ada_language_server` |
|
||||
| agda | ✓ | | | |
|
||||
| astro | ✓ | | | |
|
||||
| awk | ✓ | ✓ | | `awk-language-server` |
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ use-grammars = { except = [ "hare", "wren", "gemini" ] }
|
|||
[language-server]
|
||||
|
||||
als = { command = "als" }
|
||||
ada-language-server = { command = "ada_language_server" }
|
||||
ada-gpr-language-server = {command = "ada_language_server", args = ["--language-gpr"]}
|
||||
awk-language-server = { command = "awk-language-server" }
|
||||
bash-language-server = { command = "bash-language-server", args = ["start"] }
|
||||
bass = { command = "bass", args = ["--lsp"] }
|
||||
|
|
@ -2367,6 +2369,21 @@ language-servers = [ "jsonnet-language-server" ]
|
|||
name = "jsonnet"
|
||||
source = { git = "https://github.com/sourcegraph/tree-sitter-jsonnet", rev = "0475a5017ad7dc84845d1d33187f2321abcb261d" }
|
||||
|
||||
[[language]]
|
||||
name = "ada"
|
||||
scope = "source.ada"
|
||||
injection-regex = "ada"
|
||||
file-types = ["adb", "ads", "gpr"]
|
||||
roots = ["alire.toml"]
|
||||
comment-token = "--"
|
||||
indent = { tab-width = 3, unit = " " }
|
||||
language-servers = ["ada-language-server", "ada-gpr-language-server"]
|
||||
|
||||
|
||||
[[grammar]]
|
||||
name = "ada"
|
||||
source = { git = "https://github.com/briot/tree-sitter-ada", rev = "ba0894efa03beb70780156b91e28c716b7a4764d" }
|
||||
|
||||
[[language]]
|
||||
name = "astro"
|
||||
scope = "source.astro"
|
||||
|
|
|
|||
15
runtime/queries/ada/folds.scm
Normal file
15
runtime/queries/ada/folds.scm
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
; Support for folding in Ada
|
||||
;; za toggles folding a package, subprogram, if statement or loop
|
||||
|
||||
[
|
||||
(package_declaration)
|
||||
(generic_package_declaration)
|
||||
(package_body)
|
||||
(subprogram_declaration)
|
||||
(subprogram_body)
|
||||
(block_statement)
|
||||
(if_statement)
|
||||
(loop_statement)
|
||||
(gnatprep_declarative_if_statement)
|
||||
(gnatprep_if_statement)
|
||||
] @fold
|
||||
176
runtime/queries/ada/highlights.scm
Normal file
176
runtime/queries/ada/highlights.scm
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
;; highlight queries.
|
||||
;; See the syntax at https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries
|
||||
;; See also https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations
|
||||
;; for a list of recommended @ tags, though not all of them have matching
|
||||
;; highlights in neovim.
|
||||
|
||||
[
|
||||
"abort"
|
||||
"abs"
|
||||
"abstract"
|
||||
"accept"
|
||||
"access"
|
||||
"all"
|
||||
"array"
|
||||
"at"
|
||||
"begin"
|
||||
"declare"
|
||||
"delay"
|
||||
"delta"
|
||||
"digits"
|
||||
"do"
|
||||
"end"
|
||||
"entry"
|
||||
"exit"
|
||||
"generic"
|
||||
"interface"
|
||||
"is"
|
||||
"limited"
|
||||
"of"
|
||||
"others"
|
||||
"out"
|
||||
"pragma"
|
||||
"private"
|
||||
"range"
|
||||
"synchronized"
|
||||
"tagged"
|
||||
"task"
|
||||
"terminate"
|
||||
"until"
|
||||
"when"
|
||||
] @keyword
|
||||
[
|
||||
"null"
|
||||
] @constant.builtin
|
||||
[
|
||||
"aliased"
|
||||
"constant"
|
||||
"renames"
|
||||
] @keyword.storage
|
||||
[
|
||||
"mod"
|
||||
"new"
|
||||
"protected"
|
||||
"record"
|
||||
"subtype"
|
||||
"type"
|
||||
] @type.builtin
|
||||
[
|
||||
"with"
|
||||
"use"
|
||||
] @keyword.control.import
|
||||
[
|
||||
"body"
|
||||
"function"
|
||||
"overriding"
|
||||
"procedure"
|
||||
"package"
|
||||
"separate"
|
||||
] @keyword.function
|
||||
[
|
||||
"and"
|
||||
"in"
|
||||
"not"
|
||||
"or"
|
||||
"xor"
|
||||
] @operator
|
||||
[
|
||||
"while"
|
||||
"loop"
|
||||
"for"
|
||||
"parallel"
|
||||
"reverse"
|
||||
"some"
|
||||
] @kewyord.control.repeat
|
||||
[
|
||||
"return"
|
||||
] @keyword.control.return
|
||||
[
|
||||
"case"
|
||||
"if"
|
||||
"else"
|
||||
"then"
|
||||
"elsif"
|
||||
"select"
|
||||
] @keyword.control.conditional
|
||||
[
|
||||
"exception"
|
||||
"raise"
|
||||
] @keyword.control.exception
|
||||
(comment) @comment
|
||||
(string_literal) @string
|
||||
(character_literal) @string
|
||||
(numeric_literal) @constant.numeric
|
||||
|
||||
;; Highlight the name of subprograms
|
||||
(procedure_specification name: (_) @function.builtin)
|
||||
(function_specification name: (_) @function.builtin)
|
||||
(package_declaration name: (_) @function.builtin)
|
||||
(package_body name: (_) @function.builtin)
|
||||
(generic_instantiation name: (_) @function.builtin)
|
||||
(entry_declaration . (identifier) @function.builtin)
|
||||
|
||||
;; Some keywords should take different categories depending on the context
|
||||
(use_clause "use" @keyword.control.import "type" @keyword.control.import)
|
||||
(with_clause "private" @keyword.control.import)
|
||||
(with_clause "limited" @keyword.control.import)
|
||||
(use_clause (_) @namespace)
|
||||
(with_clause (_) @namespace)
|
||||
|
||||
(loop_statement "end" @keyword.control.repeat)
|
||||
(if_statement "end" @keyword.control.conditional)
|
||||
(loop_parameter_specification "in" @keyword.control.repeat)
|
||||
(loop_parameter_specification "in" @keyword.control.repeat)
|
||||
(iterator_specification ["in" "of"] @keyword.control.repeat)
|
||||
(range_attribute_designator "range" @keyword.control.repeat)
|
||||
|
||||
(raise_statement "with" @keyword.control.exception)
|
||||
|
||||
(gnatprep_declarative_if_statement) @keyword.directive
|
||||
(gnatprep_if_statement) @keyword.directive
|
||||
(gnatprep_identifier) @keyword.directive
|
||||
|
||||
(subprogram_declaration "is" @keyword.function "abstract" @keyword.function)
|
||||
(aspect_specification "with" @keyword.function)
|
||||
|
||||
(full_type_declaration "is" @type.builtin)
|
||||
(subtype_declaration "is" @type.builtin)
|
||||
(record_definition "end" @type.builtin)
|
||||
(full_type_declaration (_ "access" @type.builtin))
|
||||
(array_type_definition "array" @type.builtin "of" @type.builtin)
|
||||
(access_to_object_definition "access" @type.builtin)
|
||||
(access_to_object_definition "access" @type.builtin
|
||||
[
|
||||
(general_access_modifier "constant" @type.builtin)
|
||||
(general_access_modifier "all" @type.builtin)
|
||||
]
|
||||
)
|
||||
(range_constraint "range" @type.builtin)
|
||||
(signed_integer_type_definition "range" @type.builtin)
|
||||
(index_subtype_definition "range" @type.builtin)
|
||||
(record_type_definition "abstract" @type.builtin)
|
||||
(record_type_definition "tagged" @type.builtin)
|
||||
(record_type_definition "limited" @type.builtin)
|
||||
(record_type_definition (record_definition "null" @type.builtin))
|
||||
(private_type_declaration "is" @type.builtin "private" @type.builtin)
|
||||
(private_type_declaration "tagged" @type.builtin)
|
||||
(private_type_declaration "limited" @type.builtin)
|
||||
(task_type_declaration "task" @type.builtin "is" @type.builtin)
|
||||
|
||||
;; Gray the body of expression functions
|
||||
(expression_function_declaration
|
||||
(function_specification)
|
||||
"is"
|
||||
(_) @attribute
|
||||
)
|
||||
(subprogram_declaration (aspect_specification) @attribute)
|
||||
|
||||
;; Highlight full subprogram specifications
|
||||
; (subprogram_body
|
||||
; [
|
||||
; (procedure_specification)
|
||||
; (function_specification)
|
||||
; ] @function.builtin.spec
|
||||
; )
|
||||
|
||||
|
||||
32
runtime/queries/ada/locals.scm
Normal file
32
runtime/queries/ada/locals.scm
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
;; Better highlighting by referencing to the definition, for variable references.
|
||||
;; See https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
|
||||
|
||||
(compilation) @local.scope
|
||||
(package_declaration) @local.scope
|
||||
(package_body) @local.scope
|
||||
(subprogram_declaration) @local.scope
|
||||
(subprogram_body) @local.scope
|
||||
(block_statement) @local.scope
|
||||
|
||||
(with_clause (_) @local.definition)
|
||||
(procedure_specification name: (_) @local.definition)
|
||||
(function_specification name: (_) @local.definition)
|
||||
(package_declaration name: (_) @local.definition)
|
||||
(package_body name: (_) @local.definition)
|
||||
(generic_instantiation . name: (_) @local.definition)
|
||||
(component_declaration . (identifier) @local.definition)
|
||||
(exception_declaration . (identifier) @local.definition)
|
||||
(formal_object_declaration . (identifier) @local.definition)
|
||||
(object_declaration . (identifier) @local.definition)
|
||||
(parameter_specification . (identifier) @local.definition)
|
||||
(full_type_declaration . (identifier) @local.definition)
|
||||
(private_type_declaration . (identifier) @local.definition)
|
||||
(private_extension_declaration . (identifier) @local.definition)
|
||||
(incomplete_type_declaration . (identifier) @local.definition)
|
||||
(protected_type_declaration . (identifier) @local.definition)
|
||||
(formal_complete_type_declaration . (identifier) @local.definition)
|
||||
(formal_incomplete_type_declaration . (identifier) @local.definition)
|
||||
(task_type_declaration . (identifier) @local.definition)
|
||||
(subtype_declaration . (identifier) @local.definition)
|
||||
|
||||
(identifier) @local.reference
|
||||
21
runtime/queries/ada/textobjects.scm
Normal file
21
runtime/queries/ada/textobjects.scm
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
;; Support for high-level text objects selections.
|
||||
;; For instance:
|
||||
;; maf (v)isually select (a) (f)unction or subprogram
|
||||
;; mif (v)isually select (i)nside a (f)unction or subprogram
|
||||
;; mai (v)isually select (a) (i)f statement (or loop)
|
||||
;; mii (v)isually select (i)nside an (i)f statement (or loop)
|
||||
;;
|
||||
;; For navigations using textobjects, check link below:
|
||||
;; https://docs.helix-editor.com/master/usage.html#navigating-using-tree-sitter-textobjects
|
||||
;;
|
||||
;; For Textobject queries explaination, check out link below:
|
||||
;; https://docs.helix-editor.com/master/guides/textobject.html
|
||||
|
||||
(subprogram_body) @function.around
|
||||
(subprogram_body (non_empty_declarative_part) @function.inside)
|
||||
(subprogram_body (handled_sequence_of_statements) @function.inside)
|
||||
(function_specification) @function.around
|
||||
(procedure_specification) @function.around
|
||||
(package_declaration) @function.around
|
||||
(generic_package_declaration) @function.around
|
||||
(package_body) @function.around
|
||||
Loading…
Reference in a new issue