From ec6e5f77e6a0e68eaf2bc0c7fdb8b51fb02c673d Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 15 Jun 2026 13:23:29 -0400 Subject: [PATCH] feat: update to newest commit and update highlighting to reflect changes --- extension.toml | 8 ++++---- languages/objectscript/highlights.scm | 18 ++++++++---------- languages/objectscript_routine/highlights.scm | 17 ++++++----------- languages/objectscript_udl/highlights.scm | 17 +++++++---------- 4 files changed, 25 insertions(+), 35 deletions(-) diff --git a/extension.toml b/extension.toml index 812e1eb..ddf6f86 100644 --- a/extension.toml +++ b/extension.toml @@ -1,6 +1,6 @@ id = "objectscript" name = "InterSystems ObjectScript" -version = "1.4.0" +version = "1.5.0" schema_version = 1 authors = ["Dave McCaldon ","Hannah Kimura "] description = "InterSystems IRIS ObjectScript Extension" @@ -8,17 +8,17 @@ repository = "https://github.com/intersystems/zed-objectscript" [grammars.objectscript_udl] repository = "https://github.com/intersystems/tree-sitter-objectscript" -commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5" +commit = "a7ffcdf2de8e40d9ebcf1d6a58437ba838226899" path = "udl" [grammars.objectscript_routine] repository = "https://github.com/intersystems/tree-sitter-objectscript" -commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5" +commit = "a7ffcdf2de8e40d9ebcf1d6a58437ba838226899" path = "objectscript_routine" [grammars.objectscript] repository = "https://github.com/intersystems/tree-sitter-objectscript" -commit = "ce29cca45e01ff3be4894204f681b0aecf9409a5" +commit = "a7ffcdf2de8e40d9ebcf1d6a58437ba838226899" path = "objectscript" [grammars.xml] diff --git a/languages/objectscript/highlights.scm b/languages/objectscript/highlights.scm index 6f11b94..f7ff9ac 100644 --- a/languages/objectscript/highlights.scm +++ b/languages/objectscript/highlights.scm @@ -29,6 +29,12 @@ (system_defined_function) @constant.builtin +(bracket) @constant.builtin +[ + "(" + ")" +] @constant.builtin + ; this is because . is grouped into system_defined_function ; and I want the dots to be the same color (class_method_call @@ -129,8 +135,6 @@ "?" ] @operator -(bracket) @punctuation.bracket - ; === END EXPR === ; === BEGIN CORE === (macro_arg) @variant @@ -139,11 +143,6 @@ (macro_def) @preproc -[ - "(" - ")" -] @punctuation.bracket - [ (keyword_pound_define) (keyword_pound_def1arg) @@ -289,13 +288,12 @@ (elseif_block_dotted "." @string.special.symbol) -(catch_block_dotted - "." @string.special.symbol) + (variable_datatype "." @constant.builtin) -(instance_method_call +(method_call "." @constant.builtin) ; === END CORE === diff --git a/languages/objectscript_routine/highlights.scm b/languages/objectscript_routine/highlights.scm index 55b10ef..fa08278 100644 --- a/languages/objectscript_routine/highlights.scm +++ b/languages/objectscript_routine/highlights.scm @@ -28,6 +28,11 @@ ] @keyword (system_defined_function) @constant.builtin +(bracket) @constant.builtin +[ + "(" + ")" +] @constant.builtin ; this is because . is grouped into system_defined_function ; and I want the dots to be the same color @@ -129,8 +134,6 @@ "?" ] @operator -(bracket) @punctuation.bracket - ; === END EXPR === ; === BEGIN CORE === (macro_arg) @variant @@ -139,11 +142,6 @@ (macro_def) @preproc -[ - "(" - ")" -] @punctuation.bracket - [ (keyword_pound_define) (keyword_pound_def1arg) @@ -289,13 +287,10 @@ (elseif_block_dotted "." @string.special.symbol) -(catch_block_dotted - "." @string.special.symbol) - (variable_datatype "." @constant.builtin) -(instance_method_call +(method_call "." @constant.builtin) (routine_type) @type.builtin diff --git a/languages/objectscript_udl/highlights.scm b/languages/objectscript_udl/highlights.scm index 70e705b..e3f7434 100644 --- a/languages/objectscript_udl/highlights.scm +++ b/languages/objectscript_udl/highlights.scm @@ -28,6 +28,11 @@ ] @keyword (system_defined_function) @constant.builtin +(bracket) @constant.builtin +[ + "(" + ")" +] @constant.builtin ; this is because . is grouped into system_defined_function ; and I want the dots to be the same color @@ -129,8 +134,6 @@ "?" ] @operator -(bracket) @punctuation.bracket - ; === END EXPR === ; === BEGIN CORE === (macro_arg) @variant @@ -139,11 +142,6 @@ (macro_def) @preproc -[ - "(" - ")" -] @punctuation.bracket - [ (keyword_pound_define) (keyword_pound_def1arg) @@ -289,13 +287,12 @@ (elseif_block_dotted "." @string.special.symbol) -(catch_block_dotted - "." @string.special.symbol) + (variable_datatype "." @constant.builtin) -(instance_method_call +(method_call "." @constant.builtin) ; === END CORE ===