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

Add mlx language support #8

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
7 changes: 6 additions & 1 deletion extension.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/zed-extensions/ocaml"

[language_servers.ocamllsp]
name = "ocamllsp"
languages = ["OCaml", "OCaml Interface"]
languages = ["OCaml", "OCaml Interface", "mlx"]

[grammars.ocaml]
repository = "https://github.com/tree-sitter/tree-sitter-ocaml"
Expand All @@ -23,3 +23,8 @@ path = "grammars/interface"
[grammars.dune]
repository = "https://github.com/WHForks/tree-sitter-dune"
commit = "b3f7882e1b9a1d8811011bf6f0de1c74c9c93949"

[grammars.mlx]
repository = "https://github.com/ocaml-mlx/tree-sitter-mlx"
commit = "fbe904bbf55be15d34b57ba9c45750fc5187960f"
path = "grammars/mlx"
14 changes: 14 additions & 0 deletions languages/mlx/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name = "mlx"
grammar = "mlx"
path_suffixes = ["mlx"]
block_comment = ["(* ", " *)"]
autoclose_before = ";,=)}]"
brackets = [
{ start = "{", end = "}", close = true, newline = true },
{ start = "{|", end = "|", close = true, newline = true, not_in = ["string"] },
{ start = "[", end = "]", close = true, newline = true },
{ start = "[|", end = "|", close = true, newline = true, not_in = ["string"] },
{ start = "(", end = ")", close = true, newline = true },
{ start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] }
]
tab_size = 2
148 changes: 148 additions & 0 deletions languages/mlx/highlights.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
; Punctuation
;------------

[
"," "." ";" ":" "=" "|" "~" "?" "+" "-" "!" ">" "&"
"->" ";;" ":>" "+=" ":=" ".."
] @punctuation.delimiter

["(" ")" "[" "]" "{" "}" "[|" "|]" "[<" "[>"] @punctuation.bracket

(object_type ["<" ">"] @punctuation.bracket)

"%" @punctuation.special

(attribute ["[@" "]"] @punctuation.special)
(item_attribute ["[@@" "]"] @punctuation.special)
(floating_attribute ["[@@@" "]"] @punctuation.special)
(extension ["[%" "]"] @punctuation.special)
(item_extension ["[%%" "]"] @punctuation.special)
(quoted_extension ["{%" "}"] @punctuation.special)
(quoted_item_extension ["{%%" "}"] @punctuation.special)

; Keywords
;---------

[
"and" "as" "assert" "begin" "class" "constraint" "do" "done" "downto" "else"
"end" "exception" "external" "for" "fun" "function" "functor" "if" "in"
"include" "inherit" "initializer" "lazy" "let" "match" "method" "module"
"mutable" "new" "nonrec" "object" "of" "open" "private" "rec" "sig" "struct"
"then" "to" "try" "type" "val" "virtual" "when" "while" "with"
] @keyword

; Operators
;----------

[
(prefix_operator)
(sign_operator)
(pow_operator)
(mult_operator)
(add_operator)
(concat_operator)
(rel_operator)
(and_operator)
(or_operator)
(assign_operator)
(hash_operator)
(indexing_operator)
(let_operator)
(let_and_operator)
(match_operator)
] @operator

(match_expression (match_operator) @keyword)

(value_definition [(let_operator) (let_and_operator)] @keyword)

["*" "#" "::" "<-"] @operator

; Constants
;----------

(boolean) @constant

[(number) (signed_number)] @number

[(string) (character)] @string

(quoted_string "{" @string "}" @string) @string

(escape_sequence) @escape

(conversion_specification) @string.special

; Variables
;----------

[(value_name) (type_variable)] @variable

(value_pattern) @variable.parameter

; Properties
;-----------

[(label_name) (field_name) (instance_variable_name)] @property

; 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) @function.method

(application_expression
function: (value_path (value_name) @function))

(infix_expression
left: (value_path (value_name) @function)
operator: (concat_operator) @operator
(#eq? @operator "@@"))

(infix_expression
operator: (rel_operator) @operator
right: (value_path (value_name) @function)
(#eq? @operator "|>"))

(
(value_name) @function.builtin
(#match? @function.builtin "^(raise(_notrace)?|failwith|invalid_arg)$")
)

; Types
;------

[(class_name) (class_type_name) (type_constructor)] @type

(
(type_constructor) @type.builtin
(#match? @type.builtin "^(int|char|bytes|string|float|bool|unit|exn|array|list|option|int32|int64|nativeint|format6|lazy_t)$")
)

[(constructor_name) (tag)] @constructor

; Modules
;--------

[(module_name) (module_type_name)] @module

; Attributes
;-----------

(attribute_id) @tag

; Comments
;---------

[(comment) (line_number_directive) (directive) (shebang)] @comment
26 changes: 26 additions & 0 deletions languages/mlx/indents.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
; inherits: ocaml

[
(jsx_element_opening)
(jsx_element_self_closing)
(jsx_expression)
] @indent.begin

(jsx_element_opening
(jsx_tag) @indent.begin)

(jsx_element_closing
">" @indent.end)

(jsx_element_self_closing
"/>" @indent.end)

[
(jsx_element_closing)
">"
] @indent.branch

; <button
; />
(jsx_element_self_closing
"/>" @indent.branch)
24 changes: 24 additions & 0 deletions languages/mlx/locals.scm
Original file line number Diff line number Diff line change
@@ -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)
115 changes: 115 additions & 0 deletions languages/mlx/tags.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
; Modules
;--------

(
(comment)? @doc .
(module_definition (module_binding (module_name) @name) @definition.module)
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

(module_path (module_name) @name) @reference.module

; Module types
;--------------

(
(comment)? @doc .
(module_type_definition (module_type_name) @name) @definition.interface
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

(module_type_path (module_type_name) @name) @reference.implementation

; Functions
;----------

(
(comment)? @doc .
(value_definition
[
(let_binding
pattern: (value_name) @name
(parameter))
(let_binding
pattern: (value_name) @name
body: [(fun_expression) (function_expression)])
] @definition.function
)
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

(
(comment)? @doc .
(external (value_name) @name) @definition.function
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

(application_expression
function: (value_path (value_name) @name)) @reference.call

(infix_expression
left: (value_path (value_name) @name)
operator: (concat_operator) @reference.call
(#eq? @reference.call "@@"))

(infix_expression
operator: (rel_operator) @reference.call
right: (value_path (value_name) @name)
(#eq? @reference.call "|>"))

; Operator
;---------

(
(comment)? @doc .
(value_definition
(let_binding
pattern: (parenthesized_operator (_) @name)) @definition.function)
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

[
(prefix_operator)
(sign_operator)
(pow_operator)
(mult_operator)
(add_operator)
(concat_operator)
(rel_operator)
(and_operator)
(or_operator)
(assign_operator)
(hash_operator)
(indexing_operator)
(let_operator)
(let_and_operator)
(match_operator)
] @name @reference.call

; Classes
;--------

(
(comment)? @doc .
[
(class_definition (class_binding (class_name) @name) @definition.class)
(class_type_definition (class_type_binding (class_type_name) @name) @definition.class)
]
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

[
(class_path (class_name) @name)
(class_type_path (class_type_name) @name)
] @reference.class

; Methods
;--------

(
(comment)? @doc .
(method_definition (method_name) @name) @definition.method
(#strip! @doc "^\\(\\*\\*?\\s*|\\s\\*\\)$")
)

(method_invocation (method_name) @name) @reference.call