github-linguist 5.3.3 → 6.0.0

data/grammars/source.json.json

@@ -1,9 +1,6 @@
 {
-  "fileTypes": [
-    "json"
-  ],
-  "keyEquivalent": "^~J",
   "name": "JSON",
+  "scopeName": "source.json",
   "patterns": [
     {
       "include": "#value"
@@ -11,120 +8,115 @@
   ],
   "repository": {
     "array": {
+      "name": "meta.structure.array.json",
       "begin": "\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.array.begin.json"
-        }
-      },
       "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.array.end.json"
-        }
-      },
-      "name": "meta.structure.array.json",
       "patterns": [
         {
           "include": "#value"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.array.json"
+          "name": "punctuation.separator.array.json",
+          "match": ","
         },
         {
-          "match": "[^\\s\\]]",
-          "name": "invalid.illegal.expected-array-separator.json"
+          "name": "invalid.illegal.expected-array-separator.json",
+          "match": "[^\\s\\]]"
         }
-      ]
-    },
-    "constant": {
-      "match": "\\b(?:true|false|null)\\b",
-      "name": "constant.language.json"
-    },
-    "number": {
-      "comment": "handles integer and decimal numbers",
-      "match": "(?x:         # turn on extended mode\n\t\t\t             -?         # an optional minus\n\t\t\t             (?:\n\t\t\t               0        # a zero\n\t\t\t               |        # ...or...\n\t\t\t               [1-9]    # a 1-9 character\n\t\t\t               \\d*      # followed by zero or more digits\n\t\t\t             )\n\t\t\t             (?:\n\t\t\t               (?:\n\t\t\t                 \\.     # a period\n\t\t\t                 \\d+    # followed by one or more digits\n\t\t\t               )?\n\t\t\t               (?:\n\t\t\t                 [eE]   # an e character\n\t\t\t                 [+-]?  # followed by an option +/-\n\t\t\t                 \\d+    # followed by one or more digits\n\t\t\t               )?       # make exponent optional\n\t\t\t             )?         # make decimal portion optional\n\t\t\t           )",
-      "name": "constant.numeric.json"
-    },
-    "object": {
-      "begin": "\\{",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.dictionary.begin.json"
+          "name": "punctuation.definition.array.begin.json"
         }
       },
-      "comment": "a JSON object",
-      "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.dictionary.end.json"
+          "name": "punctuation.definition.array.end.json"
         }
-      },
+      }
+    },
+    "constant": {
+      "name": "constant.language.json",
+      "match": "\\b(?:true|false|null)\\b"
+    },
+    "number": {
+      "name": "constant.numeric.json",
+      "match": "(?x:         # turn on extended mode\n\t\t\t             -?         # an optional minus\n\t\t\t             (?:\n\t\t\t               0        # a zero\n\t\t\t               |        # ...or...\n\t\t\t               [1-9]    # a 1-9 character\n\t\t\t               \\d*      # followed by zero or more digits\n\t\t\t             )\n\t\t\t             (?:\n\t\t\t               (?:\n\t\t\t                 \\.     # a period\n\t\t\t                 \\d+    # followed by one or more digits\n\t\t\t               )?\n\t\t\t               (?:\n\t\t\t                 [eE]   # an e character\n\t\t\t                 [+-]?  # followed by an option +/-\n\t\t\t                 \\d+    # followed by one or more digits\n\t\t\t               )?       # make exponent optional\n\t\t\t             )?         # make decimal portion optional\n\t\t\t           )"
+    },
+    "object": {
       "name": "meta.structure.dictionary.json",
+      "begin": "\\{",
+      "end": "\\}",
       "patterns": [
         {
-          "comment": "the JSON object key",
           "include": "#string"
         },
         {
+          "name": "meta.structure.dictionary.value.json",
           "begin": ":",
+          "end": "(,)|(?=\\})",
+          "patterns": [
+            {
+              "include": "#value"
+            },
+            {
+              "name": "invalid.illegal.expected-dictionary-separator.json",
+              "match": "[^\\s,]"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.separator.dictionary.key-value.json"
             }
           },
-          "end": "(,)|(?=\\})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.json"
             }
-          },
-          "name": "meta.structure.dictionary.value.json",
-          "patterns": [
-            {
-              "comment": "the JSON object value",
-              "include": "#value"
-            },
-            {
-              "match": "[^\\s,]",
-              "name": "invalid.illegal.expected-dictionary-separator.json"
-            }
-          ]
+          }
         },
         {
-          "match": "[^\\s\\}]",
-          "name": "invalid.illegal.expected-dictionary-separator.json"
+          "name": "invalid.illegal.expected-dictionary-separator.json",
+          "match": "[^\\s\\}]"
         }
-      ]
-    },
-    "string": {
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.json"
+          "name": "punctuation.definition.dictionary.begin.json"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.end.json"
+          "name": "punctuation.definition.dictionary.end.json"
         }
-      },
+      }
+    },
+    "string": {
       "name": "string.quoted.double.json",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
-          "match": "(?x:                # turn on extended mode\n                     \\\\                # a literal backslash\n                     (?:               # ...followed by...\n                       [\"\\\\/bfnrt]     # one of these characters\n                       |               # ...or...\n                       u               # a u\n                       [0-9a-fA-F]{4}  # and four hex digits\n                     )\n                   )",
-          "name": "constant.character.escape.json"
+          "name": "constant.character.escape.json",
+          "match": "(?x:                # turn on extended mode\n                     \\\\                # a literal backslash\n                     (?:               # ...followed by...\n                       [\"\\\\/bfnrt]     # one of these characters\n                       |               # ...or...\n                       u               # a u\n                       [0-9a-fA-F]{4}  # and four hex digits\n                     )\n                   )"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unrecognized-string-escape.json"
+          "name": "invalid.illegal.unrecognized-string-escape.json",
+          "match": "\\\\."
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.json"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.json"
+        }
+      }
     },
     "value": {
-      "comment": "the 'value' diagram at http://json.org",
       "patterns": [
         {
           "include": "#constant"
@@ -143,7 +135,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.json",
-  "uuid": "0C3868E4-F96B-4E55-B204-1DCB5A20748B"
-}
+  }
+}

data/grammars/source.julia.console.json

@@ -1,10 +1,9 @@
 {
-  "scopeName": "source.julia.console",
   "name": "Julia Console",
-  "comment": "Not sure what this will be used for... Maybe if we have a REPL someday",
+  "scopeName": "source.julia.console",
   "patterns": [
     {
-      "match": "^(julia>|\\.{3}|In \\[\\d+\\]:) (.+)$",
+      "match": "^(julia\u003e|\\.{3}|In \\[\\d+\\]:) (.+)$",
       "captures": {
         "1": {
           "name": "punctuation.separator.prompt.julia.console"
@@ -19,7 +18,7 @@
       }
     },
     {
-      "match": "^(shell>) (.+)$",
+      "match": "^(shell\u003e) (.+)$",
       "captures": {
         "1": {
           "name": "punctuation.separator.prompt.shell.julia.console"
@@ -34,7 +33,7 @@
       }
     },
     {
-      "match": "^(help\\?>) (.+)$",
+      "match": "^(help\\?\u003e) (.+)$",
       "captures": {
         "1": {
           "name": "punctuation.separator.prompt.help.julia.console"
@@ -49,4 +48,4 @@
       }
     }
   ]
-}
+}

data/grammars/source.julia.json

@@ -1,12 +1,6 @@
 {
-  "comment": "Reference to the Oniguruma Regex libraray:\n  https://github.com/kkos/oniguruma/blob/master/doc/RE\n\nTODO:\n* Once 0.4 is released, simplify type matches (no explicit 'Union', parens, etc.)\n* take out ::Type\n* Add more regex stuff.\n* Some in comments throughout the grammar\n",
-  "fileTypes": [
-    "jl"
-  ],
-  "firstLineMatch": "^#!.*\\bjulia\\s*$",
-  "foldingStartMarker": "^\\s*(?:if|while|for|begin|function|macro|module|baremodule|type|immutable|struct|try|let)\\b(?!.*\\bend\\b).*$",
-  "foldingStopMarker": "^\\s*(?:end)\\b.*$",
   "name": "Julia",
+  "scopeName": "source.julia",
   "patterns": [
     {
       "include": "#operator"
@@ -46,67 +40,81 @@
     "array": {
       "patterns": [
         {
+          "name": "meta.array.julia",
           "begin": "\\[",
           "end": "\\]((\\.)?'*)",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.operator.transpose.julia"
-            }
-          },
-          "name": "meta.array.julia",
           "patterns": [
             {
-              "match": "\\bend\\b",
-              "name": "constant.numeric.julia"
+              "name": "constant.numeric.julia",
+              "match": "\\bend\\b"
+            },
+            {
+              "name": "keyword.control.julia",
+              "match": "\\bfor\\b"
             },
             {
               "include": "$self"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.transpose.julia"
+            }
+          }
         }
       ]
     },
     "bracket": {
       "patterns": [
         {
-          "match": "(?:\\(|\\)|\\[|\\]|\\{|\\}|,)(?!('|(?:\\.'))*\\.?')",
-          "name": "meta.bracket.julia"
+          "name": "meta.bracket.julia",
+          "match": "(?:\\(|\\)|\\[|\\]|\\{|\\}|,)(?!('|(?:\\.'))*\\.?')"
         }
       ]
     },
     "comment": {
       "patterns": [
         {
+          "name": "comment.block.number-sign-equals.julia",
           "begin": "#=",
+          "end": "=#",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.julia"
             }
           },
-          "end": "=#",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.julia"
             }
-          },
-          "name": "comment.block.number-sign-equals.julia"
+          }
         },
         {
+          "name": "comment.line.number-sign.julia",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.julia"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.julia"
+          }
         }
       ]
     },
     "function_call": {
       "patterns": [
         {
-          "begin": "([[:alpha:]_][[:word:]⁺-ₜ!′]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\.?\\(",
+          "begin": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\.?\\(",
+          "end": "\\)(('|(\\.'))*\\.?')?",
+          "patterns": [
+            {
+              "name": "keyword.control.julia",
+              "match": "\\bfor\\b"
+            },
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.julia"
@@ -115,23 +123,18 @@
               "name": "support.type.julia"
             }
           },
-          "end": "\\)(('|(\\.'))*\\.?')?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.transposed-func.julia"
             }
-          },
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "function_decl": {
       "patterns": [
         {
+          "match": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\((?=.*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s*[^\\s]+)?\\s*?=(?![=\u003e]))",
           "captures": {
             "1": {
               "name": "entity.name.function.julia"
@@ -139,11 +142,10 @@
             "2": {
               "name": "support.type.julia"
             }
-          },
-          "match": "([[:alpha:]_][[:word:]⁺-ₜ!′]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\((?=.*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s*[^\\s]+)?\\s*?=(?![=>]))",
-          "comment": "This is different from the one in tpoisot's package"
+          }
         },
         {
+          "match": "\\b(function|macro)(?:\\s+(?:[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*(\\.))?([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?|\\s*)\\(",
           "captures": {
             "1": {
               "name": "keyword.other.julia"
@@ -157,84 +159,116 @@
             "4": {
               "name": "support.type.julia"
             }
-          },
-          "match": "\\b(function|macro)\\s+(?:[[:alpha:]_][[:word:]⁺-ₜ!′]*(\\.))?([[:alpha:]_][[:word:]⁺-ₜ!′]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\(",
-          "comment": "similar regex to previous, but with keyword not 1-line syntax"
+          }
         }
       ]
     },
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(?<![:_])(?:function|@generated|type|immutable|mutable|struct|macro|quote|abstract|bitstype|typealias|module|baremodule|new|where)\\b",
-          "name": "keyword.other.julia"
+          "name": "keyword.other.julia",
+          "match": "\\b(?\u003c![:_])(?:function|@generated|type|immutable|mutable|struct|macro|quote|abstract|bitstype|typealias|module|baremodule|new|where)\\b"
+        },
+        {
+          "begin": "\\b(for)\\b",
+          "end": "(?\u003c!,|\\s)(\\s*\\n)",
+          "patterns": [
+            {
+              "name": "keyword.other.julia",
+              "match": "\\bouter\\b"
+            },
+            {
+              "include": "$self"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.julia"
+            }
+          }
         },
         {
-          "match": "\\b(?<![:_])(?:if|else|elseif|while|for|begin|let|do|try|catch|finally|return|break|continue)\\b",
-          "name": "keyword.control.julia"
+          "name": "keyword.control.julia",
+          "match": "\\b(?\u003c![:_])(?:if|else|elseif|while|begin|let|do|try|catch|finally|return|break|continue)\\b"
         },
         {
-          "match": "\\b(?<![:_])end\\b",
-          "name": "keyword.control.end.julia"
+          "name": "keyword.control.end.julia",
+          "match": "\\b(?\u003c![:_])end\\b"
         },
         {
-          "match": "\\b(?<![:_])(?:global|local|const)\\b",
-          "name": "storage.modifier.variable.julia"
+          "name": "storage.modifier.variable.julia",
+          "match": "\\b(?\u003c![:_])(?:global|local|const)\\b"
         },
         {
-          "match": "\\b(?<![:_])(?:export)\\b",
-          "name": "keyword.control.export.julia"
+          "name": "keyword.control.export.julia",
+          "match": "\\b(?\u003c![:_])(?:export)\\b"
         },
         {
-          "match": "\\b(?<![:_])(?:import)\\b",
-          "name": "keyword.control.import.julia"
+          "name": "keyword.control.import.julia",
+          "match": "\\b(?\u003c![:_])(?:import)\\b"
         },
         {
-          "match": "\\b(?<![:_])(?:importall)\\b",
-          "name": "keyword.control.importall.julia"
+          "name": "keyword.control.importall.julia",
+          "match": "\\b(?\u003c![:_])(?:importall)\\b"
         },
         {
-          "match": "\\b(?<![:_])(?:using)\\b",
-          "name": "keyword.control.using.julia"
+          "name": "keyword.control.using.julia",
+          "match": "\\b(?\u003c![:_])(?:using)\\b"
         },
         {
-          "match": "(@[[:alpha:]_][[:word:]⁺-ₜ!′]*)",
-          "name": "support.function.macro.julia"
+          "name": "support.function.macro.julia",
+          "match": "(@(\\.|[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*))"
         },
         {
-          "match": "\\b(Argument|Assertion|Bounds|Divide|Domain|EOF|Inexact|Key|Load|Memory|Method|OutOfMemory|Overflow|Parse|StackOverflow|System|Type|UV|UndefRef|UndefVar)Error\\b",
-          "name": "support.type.exception.julia"
+          "name": "support.type.exception.julia",
+          "match": "\\b(Argument|Assertion|Bounds|Divide|Domain|EOF|Inexact|Key|Load|Memory|Method|OutOfMemory|Overflow|Parse|StackOverflow|System|Type|UV|UndefRef|UndefVar)Error\\b"
+        }
+      ]
+    },
+    "nest_parens_and_self": {
+      "patterns": [
+        {
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#nest_parens_and_self"
+            }
+          ]
+        },
+        {
+          "include": "$self"
         }
       ]
     },
     "number": {
       "patterns": [
         {
-          "match": "((\\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\\b0o[0-7](_?[0-7])*)|(\\b0b[0-1](_?[0-1])*)|((\\b[0-9](_?[0-9])*\\.?(_?[0-9]*))|(\\.[0-9](_?[0-9])*))([eE][+-]?[0-9](_?[0-9])*)?(im)?|\\bInf(32)?\\b|\\bNaN(32)?\\b)",
-          "name": "constant.numeric.julia"
+          "name": "constant.numeric.julia",
+          "match": "((\\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\\b0o[0-7](_?[0-7])*)|(\\b0b[0-1](_?[0-1])*)|((\\b[0-9](_?[0-9])*\\.?(_?[0-9]*))|(\\.[0-9](_?[0-9])*))([eE][+-]?[0-9](_?[0-9])*)?(im\\b)?|\\bInf(32)?\\b|\\bNaN(32)?\\b)"
         },
         {
-          "match": "\\btrue\\b|\\bfalse\\b|\\bnothing\\b",
-          "name": "constant.language.julia"
+          "name": "constant.language.julia",
+          "match": "\\btrue\\b|\\bfalse\\b|\\bnothing\\b"
         }
       ]
     },
     "operator": {
       "patterns": [
         {
-          "match": "(?:->|<-|-->|=>)",
-          "name": "keyword.operator.arrow.julia"
+          "name": "keyword.operator.arrow.julia",
+          "match": "(?:-\u003e|\u003c-|--\u003e|=\u003e)"
         },
         {
-          "match": "(?::=|\\+=|-=|\\*=|//=|/=|\\.//=|\\./=|\\.\\*=|\\\\=|\\.\\\\=|\\^=|\\.\\^=|%=|\\.%=|÷=|\\.÷=|\\|=|&=|\\$=|<<=|>>=|>>>=|=(?!=))",
-          "name": "keyword.operator.update.julia"
+          "name": "keyword.operator.update.julia",
+          "match": "(?::=|\\+=|-=|\\*=|//=|/=|\\.//=|\\./=|\\.\\*=|\\\\=|\\.\\\\=|\\^=|\\.\\^=|%=|\\.%=|÷=|\\.÷=|\\|=|\u0026=|\\$=|\u003c\u003c=|\u003e\u003e=|\u003e\u003e\u003e=|=(?!=))"
         },
         {
-          "match": "(?:<<|>>>|>>|\\.>>>|\\.>>|\\.<<)",
-          "name": "keyword.operator.shift.julia"
+          "name": "keyword.operator.shift.julia",
+          "match": "(?:\u003c\u003c|\u003e\u003e\u003e|\u003e\u003e|\\.\u003e\u003e\u003e|\\.\u003e\u003e|\\.\u003c\u003c)"
         },
         {
-          "match": "(?:\\s*(::|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_][[:word:]⁺-ₜ!′\\.]*(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?)))(?:\\.\\.\\.)?",
+          "match": "(?:\\s*(::|\u003e:|\u003c:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_][[:word:]⁺-ₜ!′\\.]*(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?)))(?:\\.\\.\\.)?",
           "captures": {
             "1": {
               "name": "keyword.operator.relation.julia"
@@ -245,54 +279,55 @@
           }
         },
         {
-          "match": "(?:===|(?<=\\s)in(?=\\s)|\\.==|!==|!=|\\.>=|\\.>|\\.<|==|\\.!=|\\.=|\\.!|<:|:>|(?<!>)>=|(?<!<)<=|\\.<=|>|<)",
-          "name": "keyword.operator.relation.julia"
+          "name": "keyword.operator.relation.julia",
+          "match": "(?:===|(?\u003c=\\s)in(?=\\s)|\\.==|!==|!=|\\.\u003e=|\\.\u003e|\\.\u003c=|\\.\u003c|==|\\.!=|\\.=|\\.!|\u003c:|\u003e:|:\u003e|(?\u003c!\u003e)\u003e=|(?\u003c!\u003c)\u003c=|\u003e|\u003c)"
         },
         {
-          "match": "(?:\\?:)",
-          "name": "keyword.operator.ternary.julia"
+          "name": "keyword.operator.ternary.julia",
+          "match": "(?:\\?:)"
         },
         {
-          "match": "(?:\\|\\||&&|(?<![[:word:]])!)",
-          "name": "keyword.operator.boolean.julia"
+          "name": "keyword.operator.boolean.julia",
+          "match": "(?:\\|\\||\u0026\u0026|(?\u003c![[:word:]])!)"
         },
         {
-          "match": "(?::)",
-          "name": "keyword.operator.range.julia"
+          "name": "keyword.operator.range.julia",
+          "match": "(?\u003c=[[:word:]⁺-ₜ!′∇\\)\\]\\}])(?::)"
         },
         {
-          "match": "(?:\\|>)",
-          "name": "keyword.operator.applies.julia"
+          "name": "keyword.operator.applies.julia",
+          "match": "(?:\\|\u003e)"
         },
         {
-          "match": "(?:\\||\\&|~)",
-          "name": "keyword.operator.bitwise.julia"
+          "name": "keyword.operator.bitwise.julia",
+          "match": "(?:\\||\\\u0026|~)"
         },
         {
-          "match": "(?:\\+\\+|--|\\+|\\.\\+|-|\\.\\-|\\*|\\.\\*|//(?!=)|\\.//(?!=)|/|\\./|%|\\.%|\\\\|\\.\\\\|\\^|\\.\\^)",
-          "name": "keyword.operator.arithmetic.julia"
+          "name": "keyword.operator.arithmetic.julia",
+          "match": "(?:\\+\\+|--|\\+|\\.\\+|-|\\.\\-|\\*|\\.\\*|//(?!=)|\\.//(?!=)|/|\\./|%|\\.%|\\\\|\\.\\\\|\\^|\\.\\^)"
         },
         {
-          "match": "(?:::|(?<=\\s)isa(?=\\s))",
-          "name": "keyword.operator.isa.julia"
+          "name": "keyword.operator.isa.julia",
+          "match": "(?:::|(?\u003c=\\s)isa(?=\\s))"
         },
         {
-          "match": "(?:\\.(?=(?:@|_|\\p{L}))|\\.\\.+)",
-          "name": "keyword.operator.dots.julia"
+          "name": "keyword.operator.dots.julia",
+          "match": "(?:\\.(?=(?:@|_|\\p{L}))|\\.\\.+)"
         },
         {
-          "match": "(?:\\$(?=.+))",
-          "name": "keyword.operator.interpolation.julia"
+          "name": "keyword.operator.interpolation.julia",
+          "match": "(?:\\$(?=.+))"
         },
         {
+          "match": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)(('|(\\.'))*\\.?')",
           "captures": {
             "2": {
               "name": "keyword.operator.transposed-variable.julia"
             }
-          },
-          "match": "([[:alpha:]_][[:word:]⁺-ₜ!′]*)(('|(\\.'))*\\.?')"
+          }
         },
         {
+          "match": "(\\])((?:'|(?:\\.'))*\\.?')",
           "captures": {
             "1": {
               "name": "bracket.end.julia"
@@ -300,10 +335,10 @@
             "2": {
               "name": "keyword.operator.transposed-matrix.julia"
             }
-          },
-          "match": "(\\])((?:'|(?:\\.'))*\\.?')"
+          }
         },
         {
+          "match": "(\\))((?:'|(?:\\.'))*\\.?')",
           "captures": {
             "1": {
               "name": "bracket.end.julia"
@@ -311,15 +346,24 @@
             "2": {
               "name": "keyword.operator.transposed-parens.julia"
             }
-          },
-          "match": "(\\))((?:'|(?:\\.'))*\\.?')"
+          }
         }
       ]
     },
     "string": {
       "patterns": [
         {
-          "begin": "(i?cxx)(\"\"\")",
+          "name": "string.docstring.julia",
+          "begin": "(?:(@doc)\\s((?:doc)?\"\"\")|(doc\"\"\"))",
+          "end": "(\"\"\") ?(-\u003e)?",
+          "patterns": [
+            {
+              "include": "#string_escaped_char"
+            },
+            {
+              "include": "#string_dollar_sign_interpolate"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.macro.julia"
@@ -328,116 +372,142 @@
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "\"\"\"",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "punctuation.definition.string.end.julia"
+            },
+            "2": {
+              "name": "keyword.operator.arrow.julia"
             }
-          },
+          }
+        },
+        {
           "name": "embed.cxx.julia",
           "contentName": "source.cpp",
+          "begin": "(i?cxx)(\"\"\")",
+          "end": "\"\"\"",
           "patterns": [
             {
-              "include": "source.cpp"
+              "include": "source.c++"
             },
             {
               "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "begin": "((i?cxxt?)|([rpv]cpp))(\")",
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.macro.julia"
             },
-            "4": {
+            "2": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "\"",
-          "name": "embed.cxx.julia",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.julia"
             }
-          },
+          }
+        },
+        {
+          "name": "embed.cxx.julia",
           "contentName": "source.cpp",
+          "begin": "((i?cxxt?)|([rpv]cpp))(\")",
+          "end": "\"",
           "patterns": [
             {
-              "include": "source.cpp"
+              "include": "source.c++"
             },
             {
               "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "begin": "^\\s?([[:alpha:]_][[:word:]⁺-ₜ!′]*)?(\"\"\")\\s?$",
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.macro.julia"
             },
-            "2": {
+            "4": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "\\s?^\\s*(\"\"\")\\s?",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.definition.string.end.julia"
             }
-          },
+          }
+        },
+        {
           "name": "string.docstring.julia",
-          "contentName": "source.gfm",
-          "comment": "This only matches docstrings that start and end with triple quotes on\ntheir own line in the void",
+          "begin": "^\\s?([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)?(\"\"\")\\s?$",
+          "end": "(\"\"\")",
           "patterns": [
-            {
-              "include": "source.gfm"
-            },
             {
               "include": "#string_escaped_char"
             },
             {
               "include": "#string_dollar_sign_interpolate"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.macro.julia"
+            },
+            "2": {
+              "name": "punctuation.definition.string.begin.julia"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.julia"
+            }
+          }
         },
         {
+          "name": "string.quoted.single.julia",
           "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "include": "#string_escaped_char"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.julia"
             }
-          },
-          "name": "string.quoted.single.julia",
+          }
+        },
+        {
+          "name": "string.quoted.triple.double.julia",
+          "begin": "\"\"\"",
+          "end": "\"\"\"",
           "patterns": [
             {
               "include": "#string_escaped_char"
+            },
+            {
+              "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "begin": "\"\"\"",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.multiline.begin.julia"
             }
           },
-          "end": "\"\"\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.multiline.end.julia"
             }
-          },
-          "name": "string.quoted.triple.double.julia",
-          "comment": "TODO: decide on a name for this scope",
+          }
+        },
+        {
+          "name": "string.quoted.double.julia",
+          "begin": "\"",
+          "end": "\"",
           "patterns": [
             {
               "include": "#string_escaped_char"
@@ -445,90 +515,65 @@
             {
               "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "name": "string.quoted.double.julia",
-          "begin": "\"",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.julia"
             }
-          },
-          "comment": "String with single pair of double quotes. Regex matches isolated double quote",
+          }
+        },
+        {
+          "name": "string.regexp.julia",
+          "begin": "r\"",
+          "end": "(\")([imsx]{0,4})?",
           "patterns": [
             {
               "include": "#string_escaped_char"
-            },
-            {
-              "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "begin": "r\"",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.regexp.begin.julia"
             }
           },
-          "end": "(\")([imsx]{0,4})?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.regexp.end.julia"
             },
             "2": {
-              "comment": "I took this scope name from python regex grammar",
               "name": "keyword.other.option-toggle.regexp.julia"
             }
-          },
-          "name": "string.regexp.julia",
-          "patterns": [
-            {
-              "include": "#string_escaped_char"
-            }
-          ]
+          }
         },
         {
-          "begin": "\\b[[:alpha:]_][[:word:]⁺-ₜ!′]*\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.julia"
-            }
-          },
-          "end": "\"([[:alpha:]_][[:word:]⁺-ₜ!′]*)?",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.julia"
-            }
-          },
           "name": "string.quoted.other.julia",
+          "begin": "\\b[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*\"",
+          "end": "\"([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)?",
           "patterns": [
             {
               "include": "#string_escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "`",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.julia"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.backtick.julia",
+          "begin": "`",
+          "end": "`",
           "patterns": [
             {
               "include": "#string_escaped_char"
@@ -536,62 +581,30 @@
             {
               "include": "#string_dollar_sign_interpolate"
             }
-          ]
-        },
-        {
-          "begin": "(@doc) ((?:doc)?\"\"\")",
+          ],
           "beginCaptures": {
-            "1": {
-              "name": "support.function.macro.julia"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "end": "(\"\"\") ?(->)?",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.definition.string.end.julia"
-            },
-            "2": {
-              "name": "keyword.operator.arrow.julia"
             }
-          },
-          "name": "string.docstring.julia",
-          "contentName": "source.gfm",
-          "patterns": [
-            {
-              "include": "#string_escaped_char"
-            },
-            {
-              "include": "source.gfm"
-            },
-            {
-              "include": "#string_dollar_sign_interpolate"
-            }
-          ]
-        }
-      ]
-    },
-    "string_escaped_char": {
-      "patterns": [
-        {
-          "match": "\\\\(\\\\|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8}|.)",
-          "name": "constant.character.escape.julia"
+          }
         }
       ]
     },
     "string_dollar_sign_interpolate": {
       "patterns": [
         {
-          "match": "\\$[[:alpha:]_][[:word:]⁺-ₜ!′]*",
-          "name": "variable.interpolation.julia"
+          "name": "variable.interpolation.julia",
+          "match": "\\$[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*"
         },
         {
+          "name": "variable.interpolation.julia",
           "begin": "\\$\\(",
           "end": "\\)",
-          "name": "variable.interpolation.julia",
-          "comment": "`punctuation.section.embedded`, `constant.escape`,\n& `meta.embedded.line` were considered but appear to have even spottier\nsupport among popular syntaxes.",
           "patterns": [
             {
               "include": "#nest_parens_and_self"
@@ -603,34 +616,27 @@
         }
       ]
     },
-    "nest_parens_and_self": {
+    "string_escaped_char": {
       "patterns": [
         {
-          "begin": "\\(",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#nest_parens_and_self"
-            }
-          ]
-        },
-        {
-          "include": "$self"
+          "name": "constant.character.escape.julia",
+          "match": "\\\\(\\\\|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8}|.)"
         }
       ]
     },
     "symbol": {
       "patterns": [
         {
-          "match": "(?<![a-zA-Z0-9:<]:)(?<=:)[[:alpha:]_][[:word:]⁺-ₜ!′]*",
           "name": "constant.other.symbol.julia",
-          "comment": "This is string.quoted.symbol.julia in tpoisot's package"
+          "match": "(?\u003c![[:word:]⁺-ₜ!′∇\\)\\]\\}]):(?:[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)"
         }
       ]
     },
     "type_decl": {
       "patterns": [
         {
+          "name": "meta.type.julia",
+          "match": "(?\u003e!:_)(?:type|immutable|struct)\\s+([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)(\\s*(\u003c:)\\s*[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*(?:{.*})?)?",
           "captures": {
             "1": {
               "name": "entity.name.type.julia"
@@ -641,12 +647,9 @@
             "3": {
               "name": "punctuation.separator.inheritance.julia"
             }
-          },
-          "match": "(?>!:_)(?:type|immutable|struct)\\s+([[:alpha:]_][[:word:]⁺-ₜ!′]*)(\\s*(<:)\\s*[[:alpha:]_][[:word:]⁺-ₜ!′]*(?:{.*})?)?",
-          "name": "meta.type.julia"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.julia"
-}
+  }
+}