Skip to content
Merged
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
6 changes: 3 additions & 3 deletions extension.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ repository = "https://github.com/intersystems/zed-objectscript"

[grammars.objectscript_udl]
repository = "https://github.com/intersystems/tree-sitter-objectscript"
commit = "8d1c5370c657548d3e843061462e72f8bc1e9e7b"
commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5"
path = "udl"

[grammars.objectscript_routine]
repository = "https://github.com/intersystems/tree-sitter-objectscript"
commit = "8d1c5370c657548d3e843061462e72f8bc1e9e7b"
commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5"
path = "objectscript_routine"

[grammars.objectscript]
repository = "https://github.com/intersystems/tree-sitter-objectscript"
commit = "8d1c5370c657548d3e843061462e72f8bc1e9e7b"
commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5"
path = "objectscript"

[grammars.xml]
Expand Down
44 changes: 22 additions & 22 deletions languages/objectscript/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
(keyword_pound_pound_class)
] @keyword

(system_defined_function) @function.builtin
(system_defined_function) @constant.builtin

; this is because . is grouped into system_defined_function
; and I want the dots to be the same color
(class_method_call
"." @function.builtin)
"." @constant.builtin)

(byref_arg
"." @function.builtin)
"." @constant.builtin)

(oref_chain_segment
"." @function.builtin)
"." @constant.builtin)

(sql_field_modifier) @keyword

Expand Down Expand Up @@ -257,50 +257,50 @@
(block_comment)
(inline_comment)
(argumentless_inline_comment)
] @comment

(tag) @label

[
(pound_if_special_case_else)
(pound_if_special_case)
] @comment.inactive
] @comment

(tag) @function

"--" @operator

(command_if_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_for_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_while_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_dowhile_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_trycatch_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(dotted_statement
"." @punctuation.special.dots)
"." @string.special.symbol)

(else_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(elseif_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(catch_block_dotted
"." @string.special.symbol)

(variable_datatype
"." @function.builtin)
"." @constant.builtin)

(instance_method_call
"." @function.builtin)
"." @constant.builtin)

; === END CORE ===
; === BEGIN LOCAL ===
(iris_username) @keyword.directive
(iris_username) @preproc

[
(keyword_import)
Expand Down Expand Up @@ -370,7 +370,7 @@
(typename)
] @type.builtin

; === END LOCAL ===
; === END UDL ===
; routine
(routine_type) @type.builtin

Expand Down
5 changes: 0 additions & 5 deletions languages/objectscript/indents.scm

This file was deleted.

40 changes: 20 additions & 20 deletions languages/objectscript_routine/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
(keyword_pound_pound_class)
] @keyword

(system_defined_function) @function.builtin
(system_defined_function) @constant.builtin

; this is because . is grouped into system_defined_function
; and I want the dots to be the same color
(class_method_call
"." @function.builtin)
"." @constant.builtin)

(byref_arg
"." @function.builtin)
"." @constant.builtin)

(oref_chain_segment
"." @function.builtin)
"." @constant.builtin)

(sql_field_modifier) @keyword

Expand Down Expand Up @@ -257,46 +257,46 @@
(block_comment)
(inline_comment)
(argumentless_inline_comment)
] @comment

(tag) @label

[
(pound_if_special_case_else)
(pound_if_special_case)
] @comment.inactive
] @comment

(tag) @function

"--" @operator

(command_if_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_for_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_while_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_dowhile_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_trycatch_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(dotted_statement
"." @punctuation.special.dots)
"." @string.special.symbol)

(else_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(elseif_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(catch_block_dotted
"." @string.special.symbol)

(variable_datatype
"." @function.builtin)
"." @constant.builtin)

(instance_method_call
"." @function.builtin)
"." @constant.builtin)

(routine_type) @type.builtin

Expand Down
5 changes: 0 additions & 5 deletions languages/objectscript_routine/indents.scm

This file was deleted.

42 changes: 21 additions & 21 deletions languages/objectscript_udl/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
(keyword_pound_pound_class)
] @keyword

(system_defined_function) @function.builtin
(system_defined_function) @constant.builtin

; this is because . is grouped into system_defined_function
; and I want the dots to be the same color
(class_method_call
"." @function.builtin)
"." @constant.builtin)

(byref_arg
"." @function.builtin)
"." @constant.builtin)

(oref_chain_segment
"." @function.builtin)
"." @constant.builtin)

(sql_field_modifier) @keyword

Expand Down Expand Up @@ -257,50 +257,50 @@
(block_comment)
(inline_comment)
(argumentless_inline_comment)
] @comment

(tag) @label

[
(pound_if_special_case_else)
(pound_if_special_case)
] @comment.inactive
] @comment

(tag) @function

"--" @operator

(command_if_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_for_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_while_dotted_block
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_dowhile_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(command_trycatch_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(dotted_statement
"." @punctuation.special.dots)
"." @string.special.symbol)

(else_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(elseif_block_dotted
"." @punctuation.special.dots)
"." @string.special.symbol)

(catch_block_dotted
"." @string.special.symbol)

(variable_datatype
"." @function.builtin)
"." @constant.builtin)

(instance_method_call
"." @function.builtin)
"." @constant.builtin)

; === END CORE ===
; === BEGIN LOCAL ===
(iris_username) @keyword.directive
(iris_username) @preproc

[
(keyword_import)
Expand Down
5 changes: 0 additions & 5 deletions languages/objectscript_udl/indents.scm

This file was deleted.