chore: Bump to 1.1.0 with updated grammar

Author: davem-intersys

extension.toml

@@ -1,12 +1,12 @@
 id = "objectscript"
 name = "InterSystems ObjectScript"
-version = "1.0.1"
+version = "1.1.0"
 schema_version = 1
 authors = ["Dave McCaldon <davem@intersystems.com>"]
 description = "InterSystems IRIS ObjectScript Extension"
 repository = "https://github.com/intersystems/zed-objectscript"
 
-[grammars.objectscript_udl]
+[grammars.objectscript]
 repository = "https://github.com/intersystems/tree-sitter-objectscript"
-commit = "320a28654593428e5a7da76b034ce9d5a1cc528a"
+commit = "c0f4461e18d0ac9f4625cddebfeb34ef13f99f8a"
 path = "udl"

languages/objectscript_udl/config.toml

@@ -1,5 +1,5 @@
-name = "objectscript_udl"
-grammar = "objectscript_udl"
+name = "objectscript"
+grammar = "objectscript"
 path_suffixes = ["cls"]
 line_comments = ["// ", ";", ";;", "#;"]
 autoclose_before = ";:.,=}])>` \n\t\""

languages/objectscript_udl/highlights.scm

@@ -20,8 +20,7 @@
 
 ; Numeric literals
 ; e.g. 12345
-(integer_literal) @number
-(decimal_literal) @float
+(numeric_literal) @number
 
 ; System variable name
 ; e.g. $IO, $SY[SYTEM]

languages/objectscript_udl/indents.scm

@@ -0,0 +1,38 @@
+; Indentation rules for ObjectScript UDL (Zed)
+
+; --- Class Definition ---
+; Indent everything inside the class_body’s braces.
+(class_body "{" @start "}" @end) @indent
+
+; If individual class statements can wrap, indent their interior.
+(class_body (class_statement) @indent)
+
+; --- Command arguments that may wrap across lines ---
+(command_write (keyword_write) (write_argument) @indent)
+(command_set   (keyword_set)   (set_argument)   @indent)
+(command_do    (keyword_do)    (do_parameter)   @indent)
+(command_kill  (keyword_kill)  (kill_argument)  @indent)
+(command_lock  (keyword_lock)  (command_lock_argument) @indent)
+(command_read  (keyword_read)  (read_argument)  @indent)
+(command_open  (keyword_open)  (open_parameter) @indent)
+(command_close (keyword_close) (close_parameter) @indent)
+(command_use   (keyword_use)   (use_parameter)  @indent)
+
+; --- Block-style commands delimited by braces ---
+(command_while "{" @start "}" @end) @indent
+(command_for   "{" @start "}" @end) @indent
+(command_if    "{" @start "}" @end) @indent
+(elseif_block  "{" @start "}" @end) @indent
+(else_block    "{" @start "}" @end) @indent
+
+; --- Old-style FOR / IF / ELSE ---
+(command_for (for_parameter) @indent)
+(command_for (statement)     @indent)
+(command_if  (expression)    @indent)
+(command_if  (statement)     @indent)
+(command_else (statement)    @indent)
+
+; --- Generic fallbacks for braces/parentheses spanning multiple lines ---
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
+

languages/objectscript_udl/injections.scm

@@ -4,23 +4,31 @@
 (embedded_html
  (angled_bracket_fenced_text) @injection.content
  (#set! injection.language "html")
+ (#set! injection.include-children "false")
+ (#set! injection.combined "true")
 )
 
 (embedded_sql
   (_
     (paren_fenced_text) @injection.content
   )
  (#set! injection.language "sql")
+ (#set! injection.include-children "false")
+ (#set! injection.combined "true")
 )
 
 (embedded_js
  (angled_bracket_fenced_text) @injection.content
  (#set! injection.language "javascript")
+ (#set! injection.include-children "false")
+ (#set! injection.combined "true")
 )
 
 (embedded_xml
  (angled_bracket_fenced_text) @injection.content
  (#set! injection.language "xml")
+ (#set! injection.include-children "false")
+ (#set! injection.combined "true")
 )
 
 ([
@@ -61,14 +69,16 @@
 )
 
 ; XDATA blocks.  There's a MimeType keyword that defines the content-type
-; but we need to individually match each one so that we can specify the
-; name of the tree-sitter grammar to inject.
+; To prevent overlapping matches, we use a different body for the case where
+; no MimeType is given and default to XML, otherwise we extract the language
+; from the mimetype.
+
 (xdata
     keywords:
     (_
         (kw_MimeType rhs: _ @_mimetype (#eq? @_mimetype "\"text/markdown\""))
     )
-    body: (_) @injection.content
+    body: (xdata_body_content_any) @injection.content
     (#set! injection.language "markdown")
     (#set! injection.include-children "true")
 )
@@ -78,7 +88,8 @@
     (_
         (kw_MimeType rhs: _ @_mimetype (#eq? @_mimetype "\"text/xml\""))
     )
-    body: (_) @injection.content
+    ; NOTE: Since MimeType is given, we match xdata_body_content_any not xml
+    body: (xdata_body_content_any) @injection.content
     (#set! injection.language "xml")
     (#set! injection.include-children "true")
 )
@@ -88,7 +99,7 @@
     (_
         (kw_MimeType rhs: _ @_mimetype (#eq? @_mimetype "\"text/html\""))
     )
-    body: (_) @injection.content
+    body: (xdata_body_content_any) @injection.content
     (#set! injection.language "html")
     (#set! injection.include-children "true")
 )
@@ -98,7 +109,7 @@
     (_
         (kw_MimeType rhs: _ @_mimetype (#eq? @_mimetype "\"application/json\""))
     )
-    body: (_) @injection.content
+    body: (xdata_body_content_any) @injection.content
     (#set! injection.language "json")
     (#set! injection.include-children "true")
 )
@@ -108,14 +119,14 @@
     (_
         (kw_MimeType rhs: _ @_mimetype (#eq? @_mimetype "\"text/css\""))
     )
-    body: (_) @injection.content
+    body: (xdata_body_content_any) @injection.content
     (#set! injection.language "css")
     (#set! injection.include-children "true")
 )
 
-; Match other less specific XDATAs
+; Match an unspecified XDATA -- defaults to XML
 (xdata
-    body: (_) @injection.content
+    body: (xdata_body_content_xml) @injection.content
     (#set! injection.language "xml")
     (#set! injection.include-children "true")
 )