##sql syntax highlighting and skip in diagnostics, #70

Author: daimor

src/providers/ObjectScriptDiagnosticProvider.ts

@@ -130,7 +130,7 @@ export class ObjectScriptDiagnosticProvider {
         continue;
       }
 
-      if (text.match(/&sql/i)) {
+      if (text.match(/(?:&|##)sql/i)) {
         sql = true;
         sqlParens = 0;
       }

syntaxes/objectscript-macros.tmLanguage.json

@@ -8,7 +8,8 @@
     { "include": "#define" },
     { "include": "#def1arg" },
     { "include": "#ifdef" },
-    { "include": "#comment-line" }
+    { "include": "#comment-line" },
+    { "include": "#sql" }
   ],
 
   "repository": {
@@ -123,6 +124,20 @@
           "endCaptures": { "0": { "name": "punctuation.definition.objectscript" } }
         }
       ]
+    },
+    "sql": {
+      "patterns": [
+        {
+          "begin": "(?i)(##sql)(\\()",
+          "beginCaptures": {
+            "1": { "name": "keyword.special.sql.objectscript" },
+            "2": { "name": "punctuation.objectscript" }
+          },
+          "patterns": [{ "include": "source.sql" }],
+          "contentName": "meta.embedded.block.sql",
+          "end": "\\)"
+        }
+      ]
     }
   }
 }