Dependencies

.gitignore

@@ -10,7 +10,11 @@ Cargo.lock
 .tabnine/
 vscode/
 objectscript-lsp/objectscript-tests/local/
+objectscript-lsp/objectscript-tests/failing/
 objectscript-lsp/documentation/code-changes-AI
 objectscript-lsp/documentation/local
 objectscript-lsp/claude-code-objectscript-lsp/
 objectscript-lsp/.claude-plugin/
+.zed/
+objectscript-lsp/objectscript-tests/refactor-expected/test-large-dotted-statements-expected.mac
+objectscript-lsp/objectscript-tests/refactor-actual/test-large-dotted-statements-actual.mac

languages/objectscript/highlights.scm

@@ -230,9 +230,9 @@
   (keyword_xecute)
   (keyword_view)
   (keyword_zremove)
+  (keyword_zsave)
   (command_keyword)
   (keyword_zload)
-  (keyword_zsave)
   (keyword_for)
   (keyword_while)
   (keyword_continue)
@@ -337,7 +337,7 @@
   (class_keyword)
   (query_keyword)
   (trigger_keyword)
-  (method_keyword_external_language)
+  (keyword_external_language)
   (relationship_keyword)
   (foreignkey_keyword)
   (parameter_keyword)
@@ -359,7 +359,6 @@
   (xdata_name)
   (storage_name)
   (xml_identifier)
-  (column_name)
 ] @variant
 
 [

languages/objectscript/injections.scm

@@ -27,40 +27,45 @@
 ; Keywords, one of type language = "python", none of type codemode
 ; External method body injection based on [ Language = ... ]
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "tsql" "TSQL" "tSQL" "tSql" "TSql")
   (#set! injection.language "tsql"))
 
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "ispl" "ISPL" "ISpl" "iSpl")
   (#set! injection.language "ispl"))
 
 (trigger
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_trigger_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (trigger
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_trigger_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "tsql" "TSQL" "tSQL" "tSql" "TSql")
@@ -86,16 +91,36 @@
 ; text/markdown
 ;
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/markdown" "\"text/markdown\"")
   (#set! injection.language "markdown"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "text/javascript" "\"text/javascript\"")
+  (#set! injection.language "javascript"))
+
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "text/x-python" "\"text/x-python\"" "application/python" "\"application/python\"")
+  (#set! injection.language "python"))
+
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/x-python" "\"text/x-python\"" "application/python" "\"application/python\"")
@@ -110,37 +135,59 @@
   (#set! injection.language "xml"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/html" "\"text/html\"")
   (#set! injection.language "html"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "application/json" "\"application/json\"")
   (#set! injection.language "json"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/yaml" "\"text/yaml\"" "application/yaml" "\"application/yaml\"")
   (#set! injection.language "yaml"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/css" "\"text/css\"")
   (#set! injection.language "css"))
 
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "application/sql" "\"application/sql\"")
+  (#set! injection.language "sql"))
+
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "text/x-java-source" "\"text/x-java-source\"")
+  (#set! injection.language "java"))
+
 ; --------------------------------------------
 ; XDATA default (no MimeType header): XML fallback
 ; --------------------------------------------
@@ -168,4 +215,9 @@
 ] @injection.content
   (#set! injection.language "comment"))
 
+(clientmethod
+  (external_method_body_content) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.include-children "true"))
+
 ; === END LOCAL ===

languages/objectscript_udl/highlights.scm

@@ -342,7 +342,7 @@
   (class_keyword)
   (query_keyword)
   (trigger_keyword)
-  (method_keyword_external_language)
+  (keyword_external_language)
   (relationship_keyword)
   (foreignkey_keyword)
   (parameter_keyword)
@@ -364,7 +364,6 @@
   (xdata_name)
   (storage_name)
   (xml_identifier)
-  (column_name)
 ] @variant
 
 [