Merge pull request #220 from thennothinghappened/syntax-highlighting-…

…update

Further syntax highlighting improvements

Manual/contents/assets/scripts/gml.js

@@ -439,6 +439,7 @@ export default function(hljs) {
     "iap_storeload_failed",
     "iap_storeload_ok",
     "iap_unavailable",
+    "infinity",
     "input_type",
     "kbv_autocapitalize_characters",
     "kbv_autocapitalize_none",
@@ -964,24 +965,88 @@ export default function(hljs) {
    * supported in the engine.)
    */
   const DOT_ACCESSOR_REG = /\b\.\b/;
+
+  /**
+   * Expressions, which form part of a valid statement.
+   */
+  const EXPRESSION = [];
+
+  /**
+   * A template string substitution. `contains` is filled in after `EXPRESSION` is defined due to
+   * nesting.
+   */
+  const STRING_SUBSTITUTION = {
+    begin: /{/,
+    end: /}/,
+    beginScope: "literal",
+    endScope: "literal",
+    contains: EXPRESSION
+  };
+
+  /**
+   * A template string substitution for use with the older `string()` optional args with `"{0}"`,
+   * etc.
+   */
+  const STRING_NUMERICAL_SUBSTITUTION = {
+    match: /{[0-9]+}/,
+    scope: "literal"
+  };
+
+  /**
+   * An escape sequence in a string.
+   */
+  const STRING_ESCAPE = {
+    scope: "literal",
+    variants: [
+      { match: /\\u[a-fA-F0-9]{1,6}/ },
+      { match: /\\[^\n]/ }
+    ]
+  };
+
   /**
    * Various types of strings supported in the engine.
    */
   const STRING = {
     variants: [
-      hljs.QUOTE_STRING_MODE,
+      {
+        begin: /\$"/,
+        end: "\"",
+        beginScope: "string",
+        endScope: "string",
+        contains: [
+          STRING_ESCAPE,
+          STRING_SUBSTITUTION,
+          {
+            match: /[^\n"{]/,
+            scope: "string"
+          }
+        ]
+      },
       {
         scope: "string",
         begin: "@'",
-        end: "'"
+        end: "'",
+        contains: [STRING_NUMERICAL_SUBSTITUTION]
       },
       {
         scope: "string",
         begin: "@\"",
-        end: "\""
+        end: "\"",
+        contains: [STRING_NUMERICAL_SUBSTITUTION]
+      },
+      {
+        scope: "string",
+        begin: /"/,
+        end: /"/,
+        illegal: "\\n",
+        contains: [
+          STRING_ESCAPE, 
+          STRING_NUMERICAL_SUBSTITUTION
+        ]
       }
     ]
   };
+
   /**
    * Various representations of numbers
    */
@@ -995,6 +1060,7 @@ export default function(hljs) {
       { match: /\b[0-9][0-9_.]*/ }
     ]
   };
+
   /**
    * Pre-processor modes for macro definitions and regions.
    */
@@ -1035,10 +1101,12 @@ export default function(hljs) {
       },
     ]
   };
+
   /**
    * A single-line comment.
    */
   const COMMENT_LINE = hljs.COMMENT('//', /\$|\n/);
+
   /**
    * Modes for the types of comments supported in GML.
    */
@@ -1048,6 +1116,7 @@ export default function(hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
     ]
   };
+
   /**
    * Dot accessor usage with a special highlighting case for `global`.
    */
@@ -1083,6 +1152,7 @@ export default function(hljs) {
       }
     },
   ];
+
   /**
    * Function call sites, just looking for `<ident>(`. This creates false positives
    * for keywords such as `if (<condition>)`, so has lower priority in the mode `contains` list.
@@ -1097,6 +1167,7 @@ export default function(hljs) {
       1: "function"
     }
   };
+
   /**
    * The manual likes using `obj_` and such to define assets. Sneaky trick to make it look nicer :P
    */
@@ -1108,16 +1179,17 @@ export default function(hljs) {
       { begin: "obj_" },
     ]
   };
+
   /**
-   * Expressions, which form part of a valid statement.
+   * A ternary expression, matching partial ternary as `? <EXPRESSION> :`.
+   * Effectively exists to prevent {@link STRUCT_LITERAL_MEMBER} from stealing `<EXPRESSION> :`.
    */
-  const EXPRESSION = [
-    STRING,
-    PROP_ACCESS,
-    NUMBER,
-    FUNCTION_CALL,
-    USER_ASSET_CONSTANT
-  ];
+  const TERNARY = {
+    begin: /\?/,
+    end: /:/,
+    contains: EXPRESSION
+  };
+
   const SWITCH_CASE = {
     begin: [
       /case/,
@@ -1129,6 +1201,7 @@ export default function(hljs) {
     },
     contains: EXPRESSION
   };
+
   /**
    * A struct variable declaration, of `<ident>:`
    */
@@ -1142,6 +1215,7 @@ export default function(hljs) {
       2: "variable-instance"
     },
   };
+
   /**
    * A function declaration matching for:
    * ```gml
@@ -1160,6 +1234,7 @@ export default function(hljs) {
       3: "function"
     }
   };
+
   /**
    * An enum definition in the form:
    * ```gml
@@ -1199,6 +1274,16 @@ export default function(hljs) {
       }
     ]
   };
+
+  EXPRESSION.push(
+    STRING,
+    TERNARY,
+    PROP_ACCESS,
+    NUMBER,
+    FUNCTION_CALL,
+    USER_ASSET_CONSTANT
+  );
+
   return {
     name: 'GML',
     case_insensitive: false, // language is case-sensitive
@@ -1218,6 +1303,7 @@ export default function(hljs) {
         // Prevent keywords being taken by function calls.
         beginKeywords: KEYWORDS.join(" ")
       },
+      TERNARY,
       STRUCT_LITERAL_MEMBER,
       FUNCTION_DECLARATION,
       FUNCTION_CALL,