Add HTML syntax highlighting for mixed (HTML/iRev) code

Author: revig

grammars/irev.cson

@@ -5,43 +5,50 @@ fileTypes: [
 firstLineMatch: "^<\\?rev\\b|<\\?lc\\b|<\\?livecode\\b"
 foldingStartMarker: "(/\\*)|(^\\s*\\b(on|command|function|repeat|if|switch)\\s+(\\w+|\\(\\.*))|(^\\s+?try$)"
 foldingStopMarker: "(\\*/)|^\\s*\\b(end\\s+(?!if|repeat)\\w+|(end\\s+(repeat|if|switch|try)))"
-name: "iRev"
-patterns: [
-  {
-    begin: "<\\?rev"
-    end: "\\?>"
+injections:
+  "text.html.iRev":
     patterns: [
       {
-        include: "source.livecodescript"
+        begin: "<\\?rev"
+        end: "\\?>"
+        patterns: [
+         {
+           include: "#language"
+         }
+        ]
       }
       {
-        include: "#revigniter"
+        begin: "(((?<=\\?>)<)|<)\\?(?i:rev)?"
+        beginCaptures:
+          "0":
+            name: "punctuation.section.embedded.begin.iRev"
+          "2":
+            name: "meta.consecutive-tags.iRev"
+        comment: "Catches embeded irev code."
+        end: "(\\?)>"
+        endCaptures:
+          "0":
+            name: "punctuation.section.embedded.end.iRev"
+          "1":
+            name: "source.iRev"
+        name: "source.iRev.embedded.line.html"
+        patterns: [
+          {
+            include: "#language"
+          }
+        ]
       }
     ]
+name: "iRev"
+patterns: [
+  {
+    include: "text.html.basic"
   }
   {
-    begin: "(((?<=\\?>)<)|<)\\?(?i:rev)?"
-    beginCaptures:
-      "0":
-        name: "punctuation.section.embedded.begin.iRev"
-      "2":
-        name: "meta.consecutive-tags.iRev"
-    comment: "Catches embeded irev code."
-    end: "(\\?)>"
-    endCaptures:
-      "0":
-        name: "punctuation.section.embedded.end.iRev"
-      "1":
-        name: "source.iRev"
-    name: "source.iRev.embedded.line.html"
-    patterns: [
-      {
-        include: "source.livecodescript"
-      }
-      {
-        include: "#revigniter"
-      }
-    ]
+    include: "source.livecodescript"
+  }
+  {
+    include: "#revigniter"
   }
 ]
 repository:
@@ -56,4 +63,4 @@ repository:
         name: "support.function.iRev"
       }
     ]
-scopeName: "source.iRev"
+scopeName: "text.html.iRev"

snippets/livecode.cson

@@ -1,4 +1,4 @@
-".source.livecodescript":
+".source.livecodescript, .text.html.iRev":
   "COOKIE['...']":
     prefix: "$_"
     body: "$_COOKIE[\"${1:variable}\"]"

snippets/revigniter.cson

@@ -1,4 +1,4 @@
-".source.iRev":
+".text.html.iRev":
   "Accept Charset":
     prefix: "riagentcharset"
     body: "rigAcceptCharset()"