fixed errors in &js[cript] (fixed #108)

intersystems-community · Apr 1, 2020 · 93cda6e · 93cda6e
1 parent 704a046
commit 93cda6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/providers/ObjectScriptDiagnosticProvider.ts b/src/providers/ObjectScriptDiagnosticProvider.ts
@@ -96,6 +96,8 @@ export class ObjectScriptDiagnosticProvider {
     let endingComma = false;
     let isCode = !isClass;
     let jsScript = false;
+    let js = false;
+    let jsParens = 0;
     let sql = false;
     let sqlParens = 0;
     for (let i = 0; i < document.lineCount; i++) {
@@ -108,6 +110,18 @@ export class ObjectScriptDiagnosticProvider {
         jsScript = true;
       }
 
+      if (text.match(/&js(cript)?/i)) {
+        js = true;
+        jsParens = 0;
+      }
+      if (js) {
+        jsParens = jsParens + (text.split("<").length - 1) - (text.split(">").length - 1);
+        if (jsParens <= 0) {
+          js = false;
+        }
+        continue;
+      }
+
       if (text.match(/&sql/i)) {
         sql = true;
         sqlParens = 0;

diff --git a/syntaxes/objectscript.tmLanguage.json b/syntaxes/objectscript.tmLanguage.json
@@ -60,7 +60,7 @@
     "embeddedSQL": {
       "patterns": [
         {
-          "begin": "(&sql)(\\()",
+          "begin": "(?i)(&sql)(\\()",
           "beginCaptures": {
             "1": { "name": "keyword.special.sql.objectscript" },
             "2": { "name": "punctuation.objectscript" }
@@ -74,7 +74,7 @@
     "embeddedJS": {
       "patterns": [
         {
-          "begin": "(&js)(<)",
+          "begin": "(?i)(&js(cript)?)(<)",
           "beginCaptures": {
             "1": { "name": "keyword.special.js.objectscript" },
             "2": { "name": "punctuation.objectscript" }