github-linguist 5.3.3 → 6.0.0

data/grammars/source.ditroff.json

@@ -1,53 +1,12 @@
 {
   "name": "Roff (Intermediate Output)",
   "scopeName": "source.ditroff",
-  "firstLineMatch": "^x\\s*T\\s+(dvi|html|lbp|lj4|ps|post|pdf|ascii|cp1047|latin1|utf8|X75|X75-12|X100|X100-12)(?=\\s|$)",
   "patterns": [
     {
       "include": "#main"
     }
   ],
   "repository": {
-    "main": {
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#deviceControl"
-        },
-        {
-          "include": "#colourMode"
-        },
-        {
-          "include": "#print"
-        },
-        {
-          "include": "#font"
-        },
-        {
-          "include": "#eol"
-        },
-        {
-          "include": "#move"
-        },
-        {
-          "include": "#size"
-        },
-        {
-          "include": "#page"
-        },
-        {
-          "include": "#graphics"
-        },
-        {
-          "include": "#movePrint"
-        },
-        {
-          "include": "#wordSpace"
-        }
-      ]
-    },
     "colourMode": {
       "patterns": [
         {
@@ -184,8 +143,15 @@
       "patterns": [
         {
           "name": "meta.custom.device-control.ditroff",
+          "contentName": "string.raw.unquoted.heredoc.ditroff",
           "begin": "(x)\\s*(X\\S*)",
           "end": "^(?!\\+)",
+          "patterns": [
+            {
+              "name": "keyword.operator.line-continuation.gnu.ditroff",
+              "match": "^\\+"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.other.ditroff"
@@ -193,24 +159,12 @@
             "2": {
               "name": "keyword.device.control.ditroff"
             }
-          },
-          "contentName": "string.raw.unquoted.heredoc.ditroff",
-          "patterns": [
-            {
-              "name": "keyword.operator.line-continuation.gnu.ditroff",
-              "match": "^\\+"
-            }
-          ]
+          }
         },
         {
           "name": "meta.device-control.ditroff",
           "begin": "(x)\\s*",
           "end": "(?=$|#)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.other.ditroff"
-            }
-          },
           "patterns": [
             {
               "name": "keyword.device.control.ditroff",
@@ -257,7 +211,7 @@
                   "patterns": [
                     {
                       "name": "support.constant.device-name.ditroff",
-                      "match": "(?<=\\s|^)(?:dvi|html|lbp|lj4|ps|pdf|ascii|cp1047|latin1|utf8|X75|X75-12|X100|X100-12)(?=\\s|$)"
+                      "match": "(?\u003c=\\s|^)(?:dvi|html|lbp|lj4|ps|pdf|ascii|cp1047|latin1|utf8|X75|X75-12|X100|X100-12)(?=\\s|$)"
                     }
                   ]
                 }
@@ -316,7 +270,12 @@
                 }
               }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.other.ditroff"
+            }
+          }
         }
       ]
     },
@@ -407,9 +366,9 @@
         },
         {
           "name": "meta.graphics.unknown-command.ditroff",
+          "contentName": "variable.parameter.ditroff",
           "begin": "^\\s*(D)\\s*([^\\s\\\\])",
           "end": "(?=$|#)",
-          "contentName": "variable.parameter.ditroff",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.ditroff"
@@ -421,6 +380,46 @@
         }
       ]
     },
+    "main": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#deviceControl"
+        },
+        {
+          "include": "#colourMode"
+        },
+        {
+          "include": "#print"
+        },
+        {
+          "include": "#font"
+        },
+        {
+          "include": "#eol"
+        },
+        {
+          "include": "#move"
+        },
+        {
+          "include": "#size"
+        },
+        {
+          "include": "#page"
+        },
+        {
+          "include": "#graphics"
+        },
+        {
+          "include": "#movePrint"
+        },
+        {
+          "include": "#wordSpace"
+        }
+      ]
+    },
     "move": {
       "name": "meta.move.ditroff",
       "match": "([HhVv])\\s*(-?\\d+)",
@@ -491,9 +490,9 @@
         },
         {
           "name": "meta.print-text.gnu.ditroff",
+          "contentName": "string.quoted.double.ditroff",
           "begin": "^\\s*(t)\\s*",
           "end": "(?=$)|\\s+(\\d*)",
-          "contentName": "string.quoted.double.ditroff",
           "beginCaptures": {
             "0": {
               "name": "entity.name.function.ditroff"
@@ -510,9 +509,9 @@
         },
         {
           "name": "meta.print-text.track-kerned.gnu.ditroff",
+          "contentName": "string.quoted.double.ditroff",
           "begin": "^\\s*(u)\\s*(-?\\d+)\\s*",
           "end": "(?=\\s|$)",
-          "contentName": "string.quoted.double.ditroff",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.ditroff"
@@ -537,7 +536,7 @@
     },
     "wordSpace": {
       "name": "entity.name.function.word-space.ditroff",
-      "match": "(?<=^|[\\s\\d])w"
+      "match": "(?\u003c=^|[\\s\\d])w"
     }
   }
-}
+}

data/grammars/source.dm.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "dm",
-    "dme"
-  ],
-  "foldingStartMarker": "(?x)\n/\\*\\*(?!\\*)\n|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
   "name": "Dream Maker",
+  "scopeName": "source.dm",
   "patterns": [
     {
       "include": "#preprocessor-rule-enabled"
@@ -20,8 +15,8 @@
       "include": "#comments"
     },
     {
-      "match": "(?x)\n(var)[\\/ ]\n(?:(static|global|tmp|const)\\/)?\n(?:(datum|atom(?:\\/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)\\/)?\n(?:\n\t([a-zA-Z0-9_\\-$]*)\\/\n)*\n\n([A-Za-z0-9_$]*)\\b",
       "name": "meta.initialization.dm",
+      "match": "(?x)\n(var)[\\/ ]\n(?:(static|global|tmp|const)\\/)?\n(?:(datum|atom(?:\\/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)\\/)?\n(?:\n\t([a-zA-Z0-9_\\-$]*)\\/\n)*\n\n([A-Za-z0-9_$]*)\\b",
       "captures": {
         "1": {
           "name": "storage.type.dm"
@@ -38,55 +33,45 @@
       }
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-      "name": "constant.numeric.dm"
+      "name": "constant.numeric.dm",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
     },
     {
-      "match": "\\b(sleep|spawn|break|continue|do|else|for|goto|if|return|switch|while)\\b",
-      "name": "keyword.control.dm"
+      "name": "keyword.control.dm",
+      "match": "\\b(sleep|spawn|break|continue|do|else|for|goto|if|return|switch|while)\\b"
     },
     {
-      "match": "\\b(del|new)\\b",
-      "name": "keyword.other.dm"
+      "name": "keyword.other.dm",
+      "match": "\\b(del|new)\\b"
     },
     {
-      "match": "\\b(proc|verb|datum|atom(/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)\\b",
-      "name": "storage.type.dm"
+      "name": "storage.type.dm",
+      "match": "\\b(proc|verb|datum|atom(/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)\\b"
     },
     {
-      "match": "\\b(as|const|global|set|static|tmp)\\b",
-      "name": "storage.modifier.dm"
+      "name": "storage.modifier.dm",
+      "match": "\\b(as|const|global|set|static|tmp)\\b"
     },
     {
-      "match": "\\b(usr|world|src|args)\\b",
-      "name": "variable.language.dm"
+      "name": "variable.language.dm",
+      "match": "\\b(usr|world|src|args)\\b"
     },
     {
-      "match": "(\\?|(>|<)(=)?|\\.|:|/(=)?|~|\\+(\\+|=)?|-(-|=)?|\\*(\\*|=)?|%|>>|<<|=(=)?|!(=)?|<>|&|&&|\\^|\\||\\|\\||\\bto\\b|\\bin\\b|\\bstep\\b)",
-      "name": "keyword.operator.dm"
+      "name": "keyword.operator.dm",
+      "match": "(\\?|(\u003e|\u003c)(=)?|\\.|:|/(=)?|~|\\+(\\+|=)?|-(-|=)?|\\*(\\*|=)?|%|\u003e\u003e|\u003c\u003c|=(=)?|!(=)?|\u003c\u003e|\u0026|\u0026\u0026|\\^|\\||\\|\\||\\bto\\b|\\bin\\b|\\bstep\\b)"
     },
     {
-      "match": "\\b([A-Z_][A-Z_0-9]*)\\b",
-      "name": "constant.language.dm"
+      "name": "constant.language.dm",
+      "match": "\\b([A-Z_][A-Z_0-9]*)\\b"
     },
     {
-      "match": "\\bnull\\b",
-      "name": "constant.language.dm"
+      "name": "constant.language.dm",
+      "match": "\\bnull\\b"
     },
     {
+      "name": "string.quoted.triple.dm",
       "begin": "{\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.dm"
-        }
-      },
       "end": "\"}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.dm"
-        }
-      },
-      "name": "string.quoted.triple.dm",
       "patterns": [
         {
           "include": "#string_escaped_char"
@@ -94,22 +79,22 @@
         {
           "include": "#string_embedded_expression"
         }
-      ]
-    },
-    {
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.dm"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.dm"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.double.dm",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#string_escaped_char"
@@ -117,30 +102,47 @@
         {
           "include": "#string_embedded_expression"
         }
-      ]
-    },
-    {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.dm"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.dm"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.single.dm",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#string_escaped_char"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.dm"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.dm"
+        }
+      }
     },
     {
-      "begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+     # define\n((?<id>[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\n(?:\n\t(\\()\n\t\t(\n\t\t\t\\s* \\g<id> \\s*         # first argument\n\t\t\t((,) \\s* \\g<id> \\s*)*  # additional arguments\n\t\t\t(?:\\.\\.\\.)?            # varargs ellipsis?\n\t\t)\n\t(\\))\n)",
+      "name": "meta.preprocessor.macro.dm",
+      "begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+     # define\n((?\u003cid\u003e[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\n(?:\n\t(\\()\n\t\t(\n\t\t\t\\s* \\g\u003cid\u003e \\s*         # first argument\n\t\t\t((,) \\s* \\g\u003cid\u003e \\s*)*  # additional arguments\n\t\t\t(?:\\.\\.\\.)?            # varargs ellipsis?\n\t\t)\n\t(\\))\n)",
+      "end": "(?=(?://|/\\*))|(?\u003c!\\\\)(?=\\n)",
+      "patterns": [
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.dm"
@@ -163,17 +165,17 @@
         "9": {
           "name": "punctuation.definition.parameters.end.dm"
         }
-      },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      }
+    },
+    {
       "name": "meta.preprocessor.macro.dm",
+      "begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+     # define\n((?\u003cid\u003e[a-zA-Z_][a-zA-Z0-9_]*))  # macro name",
+      "end": "(?=(?://|/\\*))|(?\u003c!\\\\)(?=\\n)",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+     # define\n((?<id>[a-zA-Z_][a-zA-Z0-9_]*))  # macro name",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.dm"
@@ -184,33 +186,34 @@
         "3": {
           "name": "variable.other.preprocessor.dm"
         }
-      },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-      "name": "meta.preprocessor.macro.dm",
-      "patterns": [
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.preprocessor.diagnostic.dm",
       "begin": "^\\s*(#\\s*(error|warn))\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.control.import.error.dm"
-        }
-      },
       "end": "$",
-      "name": "meta.preprocessor.diagnostic.dm",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.dm"
+          "name": "punctuation.separator.continuation.dm",
+          "match": "(?\u003e\\\\\\s*\\n)"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.import.error.dm"
+        }
+      }
     },
     {
+      "name": "meta.preprocessor.dm",
       "begin": "^\\s*(?:((#)\\s*(?:elif|else|if|ifdef|ifndef))|((#)\\s*(undef|include)))\\b",
+      "end": "(?=(?://|/\\*))|(?\u003c!\\\\)(?=\\n)",
+      "patterns": [
+        {
+          "name": "punctuation.separator.continuation.dm",
+          "match": "(?\u003e\\\\\\s*\\n)"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.conditional.dm"
@@ -224,34 +227,15 @@
         "4": {
           "name": "punctuation.definition.directive.dm"
         }
-      },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-      "name": "meta.preprocessor.dm",
-      "patterns": [
-        {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.dm"
-        }
-      ]
+      }
     },
     {
       "include": "#block"
     },
     {
-      "begin": "(?x)\n\t\t\t\t(?:  ^                                 # begin-of-line\n\t\t\t\t\t|\n\t\t\t\t\t\t (?: (?= \\s )           (?<!else|new|return) (?<=\\w)      #  or word + space before name\n\t\t\t\t\t\t\t | (?= \\s*[A-Za-z_] ) (?<!&&)       (?<=[*&>])   #  or type modifier before name\n\t\t\t\t\t\t )\n\t\t\t\t)\n\t\t\t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()\n\t\t\t\t(\n\t\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n\t\t\t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n\t\t\t\t)\n\t\t\t\t \\s*(?=\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.function.leading.dm"
-        },
-        "3": {
-          "name": "entity.name.function.dm"
-        },
-        "4": {
-          "name": "punctuation.definition.parameters.dm"
-        }
-      },
-      "end": "(?<=\\})|(?=#)|(;)?",
       "name": "meta.function.dm",
+      "begin": "(?x)\n\t\t\t\t(?:  ^                                 # begin-of-line\n\t\t\t\t\t|\n\t\t\t\t\t\t (?: (?= \\s )           (?\u003c!else|new|return) (?\u003c=\\w)      #  or word + space before name\n\t\t\t\t\t\t\t | (?= \\s*[A-Za-z_] ) (?\u003c!\u0026\u0026)       (?\u003c=[*\u0026\u003e])   #  or type modifier before name\n\t\t\t\t\t\t )\n\t\t\t\t)\n\t\t\t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()\n\t\t\t\t(\n\t\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n\t\t\t\t\t(?: (?\u003c=operator) (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n\t\t\t\t)\n\t\t\t\t \\s*(?=\\()",
+      "end": "(?\u003c=\\})|(?=#)|(;)?",
       "patterns": [
         {
           "include": "#comments"
@@ -260,24 +244,35 @@
           "include": "#parens"
         },
         {
-          "match": "\\bconst\\b",
-          "name": "storage.modifier.dm"
+          "name": "storage.modifier.dm",
+          "match": "\\bconst\\b"
         },
         {
           "include": "#block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.function.leading.dm"
+        },
+        "3": {
+          "name": "entity.name.function.dm"
+        },
+        "4": {
+          "name": "punctuation.definition.parameters.dm"
+        }
+      }
     }
   ],
   "repository": {
     "access": {
-      "match": "\\.[a-zA-Z_][a-zA-Z_0-9]*\\b(?!\\s*\\()",
-      "name": "variable.other.dot-access.dm"
+      "name": "variable.other.dot-access.dm",
+      "match": "\\.[a-zA-Z_][a-zA-Z_0-9]*\\b(?!\\s*\\()"
     },
     "block": {
+      "name": "meta.block.dm",
       "begin": "\\{",
       "end": "\\}",
-      "name": "meta.block.dm",
       "patterns": [
         {
           "include": "#block_innards"
@@ -299,6 +294,8 @@
           "include": "#access"
         },
         {
+          "name": "meta.function-call.dm",
+          "match": "(?x) (?: (?= \\s )  (?:(?\u003c=else|new|return) | (?\u003c!\\w)) (\\s+))?\n\t\t\t(\\b\n\t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n\t\t\t)\n\t\t\t \\s*(\\()",
           "captures": {
             "1": {
               "name": "punctuation.whitespace.function-call.leading.dm"
@@ -309,9 +306,7 @@
             "3": {
               "name": "punctuation.definition.parameters.dm"
             }
-          },
-          "match": "(?x) (?: (?= \\s )  (?:(?<=else|new|return) | (?<!\\w)) (\\s+))?\n\t\t\t(\\b\n\t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++                  # actual name\n\t\t\t)\n\t\t\t \\s*(\\()",
-          "name": "meta.function-call.dm"
+          }
         },
         {
           "include": "#block"
@@ -324,63 +319,62 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.dm",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.block.dm"
             }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.dm"
+          }
         },
         {
+          "name": "comment.block.dm",
           "begin": "/\\*",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.dm"
-            }
-          },
           "end": "\\*/",
-          "name": "comment.block.dm",
           "patterns": [
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.dm"
+            }
+          }
         },
         {
-          "match": "\\*/.*\\n",
-          "name": "invalid.illegal.stray-comment-end.dm"
+          "name": "invalid.illegal.stray-comment-end.dm",
+          "match": "\\*/.*\\n"
         },
         {
+          "name": "comment.line.banner.dm",
+          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.line.dm"
             }
-          },
-          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
-          "name": "comment.line.banner.dm"
+          }
         },
         {
+          "name": "comment.line.double-slash.dm",
           "begin": "//",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.dm"
-            }
-          },
           "end": "$\\n?",
-          "name": "comment.line.double-slash.dm",
           "patterns": [
             {
-              "match": "(?>\\\\\\s*\\n)",
-              "name": "punctuation.separator.continuation.dm"
+              "name": "punctuation.separator.continuation.dm",
+              "match": "(?\u003e\\\\\\s*\\n)"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.dm"
+            }
+          }
         }
       ]
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -389,9 +383,9 @@
       ]
     },
     "parens": {
+      "name": "meta.parens.dm",
       "begin": "\\(",
       "end": "\\)",
-      "name": "meta.parens.dm",
       "patterns": [
         {
           "include": "$base"
@@ -400,21 +394,16 @@
     },
     "preprocessor-rule-disabled": {
       "begin": "^\\s*(#(if)\\s+(0)\\b).*",
-      "captures": {
-        "1": {
-          "name": "meta.preprocessor.dm"
-        },
-        "2": {
-          "name": "keyword.control.import.if.dm"
-        },
-        "3": {
-          "name": "constant.numeric.preprocessor.dm"
-        }
-      },
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.dm"
@@ -422,28 +411,18 @@
             "2": {
               "name": "keyword.control.import.else.dm"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "name": "comment.block.preprocessor.if-branch",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
               "include": "#disabled"
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-disabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -454,11 +433,20 @@
         "3": {
           "name": "constant.numeric.preprocessor.dm"
         }
-      },
+      }
+    },
+    "preprocessor-rule-disabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "#block_innards"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.dm"
@@ -466,28 +454,18 @@
             "2": {
               "name": "keyword.control.import.else.dm"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "#block_innards"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "name": "comment.block.preprocessor.if-branch.in-block",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
               "include": "#disabled"
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -498,11 +476,21 @@
         "3": {
           "name": "constant.numeric.preprocessor.dm"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
+          "contentName": "comment.block.preprocessor.else-branch",
           "begin": "^\\s*(#\\s*(else)\\b).*",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "#disabled"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.dm"
@@ -510,17 +498,9 @@
             "2": {
               "name": "keyword.control.import.else.dm"
             }
-          },
-          "contentName": "comment.block.preprocessor.else-branch",
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "#disabled"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
@@ -528,10 +508,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -542,11 +519,21 @@
         "3": {
           "name": "constant.numeric.preprocessor.dm"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
+          "contentName": "comment.block.preprocessor.else-branch.in-block",
           "begin": "^\\s*(#\\s*(else)\\b).*",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "#disabled"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.dm"
@@ -554,17 +541,9 @@
             "2": {
               "name": "keyword.control.import.else.dm"
             }
-          },
-          "contentName": "comment.block.preprocessor.else-branch.in-block",
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "#disabled"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
@@ -572,27 +551,27 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-other": {
-      "begin": "^\\s*((#\\s*(if(n?def)?))\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
         },
         "2": {
-          "name": "keyword.control.import.dm"
+          "name": "keyword.control.import.if.dm"
+        },
+        "3": {
+          "name": "constant.numeric.preprocessor.dm"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other": {
+      "begin": "^\\s*((#\\s*(if(n?def)?))\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*((#\\s*(endif))\\b).*$",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    "preprocessor-rule-other-block": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -600,20 +579,31 @@
         "2": {
           "name": "keyword.control.import.dm"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other-block": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*$",
       "patterns": [
         {
           "include": "#block_innards"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.preprocessor.dm"
+        },
+        "2": {
+          "name": "keyword.control.import.dm"
+        }
+      }
     },
     "string_embedded_expression": {
       "patterns": [
         {
-          "begin": "(?<!\\\\)\\[",
-          "end": "\\]",
           "name": "string.interpolated.dm",
+          "begin": "(?\u003c!\\\\)\\[",
+          "end": "\\]",
           "patterns": [
             {
               "include": "$self"
@@ -625,15 +615,14 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "(?x)\n\\\\\n(\n\th(?:(?:er|im)self|ers|im)\n\t|([tTsS]?he) # Weird regex to match The, the, She, she and he at once.\n\t|He\n\t|[Hh]is\n\t|[aA]n?\n\t|(?:im)?proper\n\t|\\.\\.\\.\n\t|(?:icon|ref|[Rr]oman)(?=\\[) # Macros which need a [] after them.\n\t|[s<>\"n\\n \\[]\n)",
-          "name": "constant.character.escape.dm"
+          "name": "constant.character.escape.dm",
+          "match": "(?x)\n\\\\\n(\n\th(?:(?:er|im)self|ers|im)\n\t|([tTsS]?he) # Weird regex to match The, the, She, she and he at once.\n\t|He\n\t|[Hh]is\n\t|[aA]n?\n\t|(?:im)?proper\n\t|\\.\\.\\.\n\t|(?:icon|ref|[Rr]oman)(?=\\[) # Macros which need a [] after them.\n\t|[s\u003c\u003e\"n\\n \\[]\n)"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.dm"
+          "name": "invalid.illegal.unknown-escape.dm",
+          "match": "\\\\."
         }
       ]
     }
-  },
-  "scopeName": "source.dm"
-}
+  }
+}