OCaml support (#666)

* added some stuff

* add interface

* indent

* highlights and locals

* scope

* change some stuff

* add indents

* fix blanket highlight

* macro

* use inherits
pull/692/head
oberblastmeister 3 years ago committed by GitHub
parent 825bceeab6
commit 5766f5da8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
.gitmodules vendored

@ -102,6 +102,10 @@
path = helix-syntax/languages/tree-sitter-protobuf path = helix-syntax/languages/tree-sitter-protobuf
url = https://github.com/yusdacra/tree-sitter-protobuf.git url = https://github.com/yusdacra/tree-sitter-protobuf.git
shallow = true shallow = true
[submodule "helix-syntax/languages/tree-sitter-ocaml"]
path = helix-syntax/languages/tree-sitter-ocaml
url = https://github.com/tree-sitter/tree-sitter-ocaml
shallow = true
[submodule "helix-syntax/languages/tree-sitter-lua"] [submodule "helix-syntax/languages/tree-sitter-lua"]
path = helix-syntax/languages/tree-sitter-lua path = helix-syntax/languages/tree-sitter-lua
url = https://github.com/nvim-treesitter/tree-sitter-lua url = https://github.com/nvim-treesitter/tree-sitter-lua

@ -177,6 +177,7 @@ fn main() {
let ignore = vec![ let ignore = vec![
"tree-sitter-typescript".to_string(), "tree-sitter-typescript".to_string(),
"tree-sitter-haskell".to_string(), // aarch64 failures: https://github.com/tree-sitter/tree-sitter-haskell/issues/34 "tree-sitter-haskell".to_string(), // aarch64 failures: https://github.com/tree-sitter/tree-sitter-haskell/issues/34
"tree-sitter-ocaml".to_string(),
]; ];
let dirs = collect_tree_sitter_dirs(&ignore).unwrap(); let dirs = collect_tree_sitter_dirs(&ignore).unwrap();
@ -202,4 +203,6 @@ fn main() {
build_dir("tree-sitter-typescript/tsx", "tsx"); build_dir("tree-sitter-typescript/tsx", "tsx");
build_dir("tree-sitter-typescript/typescript", "typescript"); build_dir("tree-sitter-typescript/typescript", "typescript");
build_dir("tree-sitter-ocaml/ocaml", "ocaml");
build_dir("tree-sitter-ocaml/interface", "ocaml-interface")
} }

@ -0,0 +1 @@
Subproject commit 23d419ba45789c5a47d31448061557716b02750a

@ -224,6 +224,23 @@ roots = []
comment-token = ";" comment-token = ";"
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
[[language]]
name = "ocaml"
scope = "source.ocaml"
injection-regex = "ocaml"
file-types = ["ml"]
roots = []
comment-token = "(**)"
indent = { tab-width = 2, unit = " " }
[[language]]
name = "ocaml-interface"
scope = "source.ocaml.interface"
file-types = ["mli"]
roots = []
comment-token = "(**)"
indent = { tab-width = 2, unit = " "}
[[language]] [[language]]
name = "lua" name = "lua"
scope = "source.lua" scope = "source.lua"

@ -0,0 +1,160 @@
; Modules
;--------
[(module_name) (module_type_name)] @namespace
; Types
;------
[(class_name) (class_type_name) (type_constructor)] @type
[(constructor_name) (tag)] @constructor
; Functions
;----------
(let_binding
pattern: (value_name) @function
(parameter))
(let_binding
pattern: (value_name) @function
body: [(fun_expression) (function_expression)])
(value_specification (value_name) @function)
(external (value_name) @function)
(method_name) @method
; Variables
;----------
(value_pattern) @parameter
; Application
;------------
(infix_expression
left: (value_path (value_name) @function)
(infix_operator) @operator
(#eq? @operator "@@"))
(infix_expression
(infix_operator) @operator
right: (value_path (value_name) @function)
(#eq? @operator "|>"))
(application_expression
function: (value_path (value_name) @function))
; Properties
;-----------
[(label_name) (field_name) (instance_variable_name)] @property
; Constants
;----------
[(boolean) (unit)] @constant
[(number) (signed_number)] @number
(character) @character
(string) @string
(quoted_string "{" @string "}" @string) @string
(escape_sequence) @string.escape
[
(conversion_specification)
(pretty_printing_indication)
] @punctuation.special
; Keywords
;---------
[
"and" "as" "assert" "begin" "class" "constraint"
"end" "external" "in"
"inherit" "initializer" "lazy" "let" "match" "method" "module"
"mutable" "new" "nonrec" "object" "of" "private" "rec" "sig" "struct"
"type" "val" "virtual" "when" "with"
] @keyword
["fun" "function" "functor"] @keyword.function
["if" "then" "else"] @keyword.control.conditional
["exception" "try"] @keyword.control.exception
["include" "open"] @include
["for" "to" "downto" "while" "do" "done"] @keyword.control.loop
; Macros
;-------
(attribute ["[@" "]"] @attribute)
(item_attribute ["[@@" "]"] @attribute)
(floating_attribute ["[@@@" "]"] @attribute)
(extension ["[%" "]"] @function.macro)
(item_extension ["[%%" "]"] @function.macro)
(quoted_extension ["{%" "}"] @function.macro)
(quoted_item_extension ["{%%" "}"] @function.macro)
"%" @function.macro
["(" ")" "[" "]" "{" "}" "[|" "|]" "[<" "[>"] @punctuation.bracket
(object_type ["<" ">"] @punctuation.bracket)
[
"," "." ";" ":" "=" "|" "~" "?" "+" "-" "!" ">" "&"
"->" ";;" ":>" "+=" ":=" ".."
] @punctuation.delimiter
; Operators
;----------
[
(prefix_operator)
(sign_operator)
(infix_operator)
(hash_operator)
(indexing_operator)
(let_operator)
(and_operator)
(match_operator)
] @operator
(match_expression (match_operator) @keyword)
(value_definition [(let_operator) (and_operator)] @keyword)
;; TODO: this is an error now
;(prefix_operator "!" @operator)
(infix_operator ["&" "+" "-" "=" ">" "|" "%"] @operator)
(signed_number ["+" "-"] @operator)
["*" "#" "::" "<-"] @operator
; Attributes
;-----------
(attribute_id) @property
; Comments
;---------
[(comment) (line_number_directive) (directive) (shebang)] @comment
(ERROR) @error
; Blanket highlights
; ------------------
[(value_name) (type_variable)] @variable

@ -0,0 +1,13 @@
indent = [
"let_binding",
"type_binding",
"structure",
"signature",
"record_declaration",
"function_expression",
"match_case",
]
oudent = [
"}",
]

@ -0,0 +1,24 @@
; Scopes
;-------
[
(let_binding)
(class_binding)
(class_function)
(method_definition)
(fun_expression)
(object_expression)
(for_expression)
(match_case)
(attribute_payload)
] @local.scope
; Definitions
;------------
(value_pattern) @local.definition
; References
;-----------
(value_path . (value_name) @local.reference)
Loading…
Cancel
Save