From fe98dc4252d2b45ad1ef4212ffb543d9dae01962 Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 1 Jun 2026 20:07:58 -0400 Subject: [PATCH] feat: update highlighting and to latest tree-sitter commit --- extension.toml | 6 +-- languages/objectscript/highlights.scm | 44 +++++++++---------- languages/objectscript/indents.scm | 5 --- languages/objectscript_routine/highlights.scm | 40 ++++++++--------- languages/objectscript_routine/indents.scm | 5 --- languages/objectscript_udl/highlights.scm | 42 +++++++++--------- languages/objectscript_udl/indents.scm | 5 --- 7 files changed, 66 insertions(+), 81 deletions(-) delete mode 100644 languages/objectscript/indents.scm delete mode 100644 languages/objectscript_routine/indents.scm delete mode 100644 languages/objectscript_udl/indents.scm diff --git a/extension.toml b/extension.toml index 0e1a0ba..812e1eb 100644 --- a/extension.toml +++ b/extension.toml @@ -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] diff --git a/languages/objectscript/highlights.scm b/languages/objectscript/highlights.scm index 8e93832..6f11b94 100644 --- a/languages/objectscript/highlights.scm +++ b/languages/objectscript/highlights.scm @@ -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 @@ -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) @@ -370,7 +370,7 @@ (typename) ] @type.builtin -; === END LOCAL === +; === END UDL === ; routine (routine_type) @type.builtin diff --git a/languages/objectscript/indents.scm b/languages/objectscript/indents.scm deleted file mode 100644 index be96f5e..0000000 --- a/languages/objectscript/indents.scm +++ /dev/null @@ -1,5 +0,0 @@ -("{" @indents.begin) -("}" @indents.end) - - - diff --git a/languages/objectscript_routine/highlights.scm b/languages/objectscript_routine/highlights.scm index fef43ca..55b10ef 100644 --- a/languages/objectscript_routine/highlights.scm +++ b/languages/objectscript_routine/highlights.scm @@ -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 @@ -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 diff --git a/languages/objectscript_routine/indents.scm b/languages/objectscript_routine/indents.scm deleted file mode 100644 index be96f5e..0000000 --- a/languages/objectscript_routine/indents.scm +++ /dev/null @@ -1,5 +0,0 @@ -("{" @indents.begin) -("}" @indents.end) - - - diff --git a/languages/objectscript_udl/highlights.scm b/languages/objectscript_udl/highlights.scm index cb68595..70e705b 100644 --- a/languages/objectscript_udl/highlights.scm +++ b/languages/objectscript_udl/highlights.scm @@ -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 @@ -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) diff --git a/languages/objectscript_udl/indents.scm b/languages/objectscript_udl/indents.scm deleted file mode 100644 index be96f5e..0000000 --- a/languages/objectscript_udl/indents.scm +++ /dev/null @@ -1,5 +0,0 @@ -("{" @indents.begin) -("}" @indents.end) - - -