github-linguist 5.3.3 → 6.0.0

data/grammars/source.gnuplot.json

@@ -1,12 +1,6 @@
 {
-  "fileTypes": [
-    "gp",
-    "gnuplot",
-    "gnu",
-    "plot"
-  ],
-  "keyEquivalent": "^~G",
   "name": "gnuplot",
+  "scopeName": "source.gnuplot",
   "patterns": [
     {
       "include": "#number"
@@ -18,23 +12,9 @@
       "include": "#string_double"
     },
     {
+      "name": "meta.structure.iteration.gnuplot",
       "begin": "\\b(for)\\b\\s*(\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.iteration.gnuplot"
-        },
-        "2": {
-          "name": "punctuation.definition.range.begin.gnuplot"
-        }
-      },
-      "comment": "gnuplot iteration statement.\n\t\t\tThere are two forms:\n\t\t\t    numeric [n = 1:2{:inc}]\n\t\t\t    string based [str in \"x y z\"]\n\t\t\t    but both can also iterate over lists etc, so this is kept loose.",
       "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.range.end.gnuplot"
-        }
-      },
-      "name": "meta.structure.iteration.gnuplot",
       "patterns": [
         {
           "include": "#number"
@@ -49,34 +29,36 @@
           "include": "#string_single"
         },
         {
-          "match": ":",
-          "name": "punctuation.separator.range.gnuplot"
+          "name": "punctuation.separator.range.gnuplot",
+          "match": ":"
         },
         {
-          "match": "\\b([a-zA-Z]\\w*)\\b\\s*(=|in)",
-          "name": "variable-assignment.range.gnuplot"
+          "name": "variable-assignment.range.gnuplot",
+          "match": "\\b([a-zA-Z]\\w*)\\b\\s*(=|in)"
         },
         {
-          "match": "(?i:[^\\s(pi|e)\\]])",
-          "name": "invalid.illegal.expected-range-separator.gnuplot"
+          "name": "invalid.illegal.expected-range-separator.gnuplot",
+          "match": "(?i:[^\\s(pi|e)\\]])"
         }
-      ]
-    },
-    {
-      "begin": "\\[",
+      ],
       "beginCaptures": {
-        "0": {
+        "1": {
+          "name": "keyword.other.iteration.gnuplot"
+        },
+        "2": {
           "name": "punctuation.definition.range.begin.gnuplot"
         }
       },
-      "comment": "gnuplot range statement [a:b]. Lots of things are legal, still more make no sense!",
-      "end": "\\]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.range.end.gnuplot"
         }
-      },
+      }
+    },
+    {
       "name": "meta.structure.range.gnuplot",
+      "begin": "\\[",
+      "end": "\\]",
       "patterns": [
         {
           "include": "#number"
@@ -85,90 +67,103 @@
           "include": "#operator"
         },
         {
-          "match": ":",
-          "name": "punctuation.separator.range.gnuplot"
+          "name": "punctuation.separator.range.gnuplot",
+          "match": ":"
         },
         {
-          "match": "(?i:[^\\s(pi|e)\\]])",
-          "name": "invalid.illegal.expected-range-separator.gnuplot"
+          "name": "invalid.illegal.expected-range-separator.gnuplot",
+          "match": "(?i:[^\\s(pi|e)\\]])"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.range.begin.gnuplot"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.range.end.gnuplot"
+        }
+      }
     },
     {
-      "match": "\\\\.",
-      "name": "constant.character.escape.gnuplot"
+      "name": "constant.character.escape.gnuplot",
+      "match": "\\\\."
     },
     {
+      "name": "comment.line.number-sign.gnuplot",
+      "match": "(?\u003c!\\$)(#)(?!\\{).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.gnuplot"
         }
-      },
-      "match": "(?<!\\$)(#)(?!\\{).*$\\n?",
-      "name": "comment.line.number-sign.gnuplot"
+      }
     },
     {
-      "comment": "introduce in gnuplot 4.3.",
-      "match": "for",
-      "name": "keyword.other.iteration.gnuplot"
+      "name": "keyword.other.iteration.gnuplot",
+      "match": "for"
     },
     {
-      "match": "\\b(angles|arrow|autoscale|bars|border|boxwidth|clabel|clip|cntrparam|colorbox|contour|decimalsign|dgrid3d|dummy|encoding|fit|format|grid|hidden3d|historysize|isosamples|key|label|locale|logscale|macros|bmargin|lmargin|rmargin|tmargin|mapping|mouse|multiplot|offsets|origin|output|palette|parametric|pm3d|pointsize|polar|print|rrange|trange|urange|vrange|samples|size|style|surface|tics|ticscale|ticslevel|timestamp|timefmt|title|view|xyplane|x2data|xdata|y2data|ydata|z2data|zdata|x2label|xlabel|y2label|ylabel|z2label|zlabel|x2range|xrange|y2range|yrange|z2range|zrange|mx2tics|mxtics|my2tics|mytics|mz2tics|mztics|nomx2tics|nomxtics|nomy2tics|nomytics|nomz2tics|nomztics|nox2tics|noxtics|noy2tics|noytics|noz2tics|noztics|x2tics|xtics|y2tics|ytics|z2tics|ztics|x2dtics|x2mtics|xdtics|xmtics|y2dtics|y2mtics|ydtics|ymtics|z2dtics|z2mtics|zdtics|zmtics|x2zeroaxis|xzeroaxis|y2zeroaxis|yzeroaxis|z2zeroaxis|zeroaxis|zzeroaxis|zero)\\b",
-      "name": "keyword.other.setting.gnuplot"
+      "name": "keyword.other.setting.gnuplot",
+      "match": "\\b(angles|arrow|autoscale|bars|border|boxwidth|clabel|clip|cntrparam|colorbox|contour|decimalsign|dgrid3d|dummy|encoding|fit|format|grid|hidden3d|historysize|isosamples|key|label|locale|logscale|macros|bmargin|lmargin|rmargin|tmargin|mapping|mouse|multiplot|offsets|origin|output|palette|parametric|pm3d|pointsize|polar|print|rrange|trange|urange|vrange|samples|size|style|surface|tics|ticscale|ticslevel|timestamp|timefmt|title|view|xyplane|x2data|xdata|y2data|ydata|z2data|zdata|x2label|xlabel|y2label|ylabel|z2label|zlabel|x2range|xrange|y2range|yrange|z2range|zrange|mx2tics|mxtics|my2tics|mytics|mz2tics|mztics|nomx2tics|nomxtics|nomy2tics|nomytics|nomz2tics|nomztics|nox2tics|noxtics|noy2tics|noytics|noz2tics|noztics|x2tics|xtics|y2tics|ytics|z2tics|ztics|x2dtics|x2mtics|xdtics|xmtics|y2dtics|y2mtics|ydtics|ymtics|z2dtics|z2mtics|zdtics|zmtics|x2zeroaxis|xzeroaxis|y2zeroaxis|yzeroaxis|z2zeroaxis|zeroaxis|zzeroaxis|zero)\\b"
     },
     {
-      "comment": "missuse of scopes alert! Just for pretty colours",
-      "match": "\\b(cd|call|clear|exit|unset|plot|splot|help|load|pause|quit|fit|replot|ifFIT_LIMIT|FIT_MAXITER|FIT_START_LAMBDA|FIT_LAMBDA_FACTOR|FIT_LOG|FIT_SCRIPT|print|pwd|reread|reset|save|show|test|!|functions|var)\\b",
-      "name": "keyword.other.command.gnuplot"
+      "name": "keyword.other.command.gnuplot",
+      "match": "\\b(cd|call|clear|exit|unset|plot|splot|help|load|pause|quit|fit|replot|ifFIT_LIMIT|FIT_MAXITER|FIT_START_LAMBDA|FIT_LAMBDA_FACTOR|FIT_LOG|FIT_SCRIPT|print|pwd|reread|reset|save|show|test|!|functions|var)\\b"
     },
     {
-      "match": "\\b(abs|acos|acosh|arg|asin|asinh|atan|atan2|atanh|besj0|besj1|besy0|besy1|ceil|cos|cosh|erf|erfc|exp|floor|gamma|ibeta|igamma|imag|int|inverf|invnorm|lambertw|lgamma|log|log10|norm|rand|real|sgn|sin|sinh|sqrt|tan|tanh)\\b",
-      "name": "support.function.gnuplot"
+      "name": "support.function.gnuplot",
+      "match": "\\b(abs|acos|acosh|arg|asin|asinh|atan|atan2|atanh|besj0|besj1|besy0|besy1|ceil|cos|cosh|erf|erfc|exp|floor|gamma|ibeta|igamma|imag|int|inverf|invnorm|lambertw|lgamma|log|log10|norm|rand|real|sgn|sin|sinh|sqrt|tan|tanh)\\b"
     },
     {
-      "match": "\\b(gprintf|sprintf|strlen|strstrt|substr|system|word|words)\\b",
-      "name": "support.function.string.gnuplot"
+      "name": "support.function.string.gnuplot",
+      "match": "\\b(gprintf|sprintf|strlen|strstrt|substr|system|word|words)\\b"
     },
     {
-      "match": "\\b(on|off|default|inside|outside|lmargin|rmargin|tmargin|bmargin|at|left|right|center|top|bottom|center|vertical|horizontal|Left|Right|noreverse|noinvert|samplen|spacing|width|height|noautotitle|columnheader|title|noenhanced|nobox|linestyle|ls|linetype|lt|linewidth|lw)\\b",
-      "name": "constant.other.type.gnuplot"
+      "name": "constant.other.type.gnuplot",
+      "match": "\\b(on|off|default|inside|outside|lmargin|rmargin|tmargin|bmargin|at|left|right|center|top|bottom|center|vertical|horizontal|Left|Right|noreverse|noinvert|samplen|spacing|width|height|noautotitle|columnheader|title|noenhanced|nobox|linestyle|ls|linetype|lt|linewidth|lw)\\b"
     },
     {
-      "comments": "These are the terminal types available on my system -- there are probably a lot more",
-      "match": "\\b(aed512|aed767|aifm|aqua|bitgraph|cgm|corel|dumb|dxf|eepic|emf|emtex|epslatex|epson_180dpi|epson_60dpi|epson_lx800|fig|gif|gpic|hp2623A|hp2648|hp500c|hpdj|hpgl|hpljii|hppj|imagen|jpeg|kc_tek40xx|km_tek40xx|latex|mf|mif|mp|nec_cp6|okidata|pbm|pcl5|pdf|png|postscript|pslatex|pstex|pstricks|qms|regis|selanar|starc|svg|tandy_60dpi|tek40xx|tek410x|texdraw|tgif|tkcanvas|tpic|unknown|vttek)\\b",
-      "name": "constant.other.terminal.gnuplot"
+      "name": "constant.other.terminal.gnuplot",
+      "match": "\\b(aed512|aed767|aifm|aqua|bitgraph|cgm|corel|dumb|dxf|eepic|emf|emtex|epslatex|epson_180dpi|epson_60dpi|epson_lx800|fig|gif|gpic|hp2623A|hp2648|hp500c|hpdj|hpgl|hpljii|hppj|imagen|jpeg|kc_tek40xx|km_tek40xx|latex|mf|mif|mp|nec_cp6|okidata|pbm|pcl5|pdf|png|postscript|pslatex|pstex|pstricks|qms|regis|selanar|starc|svg|tandy_60dpi|tek40xx|tek410x|texdraw|tgif|tkcanvas|tpic|unknown|vttek)\\b"
     },
     {
-      "match": "\\b(u(sing)?|t(it(le)?)?|notit(le)?|w(i(th)?)?|steps|fs(teps)?|notitle|l(i(nes)?)?|linespoints|via)\\b",
-      "name": "keyword.modifier.gnuplot"
+      "name": "keyword.modifier.gnuplot",
+      "match": "\\b(u(sing)?|t(it(le)?)?|notit(le)?|w(i(th)?)?|steps|fs(teps)?|notitle|l(i(nes)?)?|linespoints|via)\\b"
     },
     {
-      "comment": "user defined function / variable",
-      "match": "(?x:\n\t\t\t\t\\b # Start with a word boundary\n\t\t\t\t(?=\\b[\\w$]*(\\(|.*=))\t# Look-ahead for a bracket or equals\n\t\t\t\t(?![^(]*\\))\t# negative look ahead for a closing bracket without an opening one. This stops a from matching in f(a)\n\t\t\t\t(\t\t\t\t\t# Group variable name\n\t\t\t\t\t[A-Za-z] \t\t\t# A letter\n\t\t\t\t\t[\\w$]*\t \t\t# Any word chars or $\n\t\t\t\t)\t\t\t\t\t# That is it for the name.\n\t\t\t)",
-      "name": "variable.other.gnuplot"
+      "name": "variable.other.gnuplot",
+      "match": "(?x:\n\t\t\t\t\\b # Start with a word boundary\n\t\t\t\t(?=\\b[\\w$]*(\\(|.*=))\t# Look-ahead for a bracket or equals\n\t\t\t\t(?![^(]*\\))\t# negative look ahead for a closing bracket without an opening one. This stops a from matching in f(a)\n\t\t\t\t(\t\t\t\t\t# Group variable name\n\t\t\t\t\t[A-Za-z] \t\t\t# A letter\n\t\t\t\t\t[\\w$]*\t \t\t# Any word chars or $\n\t\t\t\t)\t\t\t\t\t# That is it for the name.\n\t\t\t)"
     },
     {
-      "match": "\\b(if)\\b",
-      "name": "keyword.control.gnuplot"
+      "name": "keyword.control.gnuplot",
+      "match": "\\b(if)\\b"
     },
     {
+      "name": "keyword.line.show.gnuplot",
+      "contentName": "keyword.line.show.gnuplot",
       "begin": "\\b(show)\\b",
+      "end": "(?!\\#)($\\n?)",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.command.gnuplot"
         }
-      },
-      "contentName": "keyword.line.show.gnuplot",
+      }
+    },
+    {
+      "name": "keyword.line.set.terminal.gnuplot",
+      "begin": "\\b(set)\\b\\s*\\b(terminal)\\b",
       "end": "(?!\\#)($\\n?)",
-      "name": "keyword.line.show.gnuplot",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(set)\\b\\s*\\b(terminal)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.command.gnuplot"
@@ -176,17 +171,17 @@
         "2": {
           "name": "keyword.other.setting.gnuplot"
         }
-      },
+      }
+    },
+    {
+      "name": "keyword.line.set.key.gnuplot",
+      "begin": "\\b(set)\\b\\s*\\b(key)\\b",
       "end": "(?!\\#)($\\n?)",
-      "name": "keyword.line.set.terminal.gnuplot",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(set)\\b\\s*\\b(key)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.command.gnuplot"
@@ -194,17 +189,18 @@
         "2": {
           "name": "keyword.other.setting.gnuplot"
         }
-      },
+      }
+    },
+    {
+      "name": "keyword.line.set.gnuplot",
+      "contentName": "keyword.line.set.gnuplot",
+      "begin": "\\b(set)\\b\\s*(?!\\b(terminal|key|for)\\b)",
       "end": "(?!\\#)($\\n?)",
-      "name": "keyword.line.set.key.gnuplot",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(set)\\b\\s*(?!\\b(terminal|key|for)\\b)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.command.gnuplot"
@@ -212,65 +208,53 @@
         "2": {
           "name": "keyword.other.setting.gnuplot"
         }
-      },
-      "contentName": "keyword.line.set.gnuplot",
-      "end": "(?!\\#)($\\n?)",
-      "name": "keyword.line.set.gnuplot",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     }
   ],
   "repository": {
     "number": {
-      "comment": "borrowed from textmate book",
-      "match": "(?x:         # turn on extended mode\n                     -?         # an optional minus\n                     (?:\n                       0        # a zero\n                       |        # ...or...\n                       [1-9]    # a 1-9 character\n                       \\d*      # followed by zero or more digits\n                     )\n                     (?:\n                       \\.       # a period\n                       \\d+      # followed by one or more digits\n                       (?:\n                         [eE]   # an e character\n                         [+-]?  # followed by an option +/-\n                         \\d+    # followed by one or more digits\n                       )?       # make exponent optional\n                     )?         # make decimal portion optional\n                 )",
-      "name": "constant.numeric.gnuplot"
+      "name": "constant.numeric.gnuplot",
+      "match": "(?x:         # turn on extended mode\n                     -?         # an optional minus\n                     (?:\n                       0        # a zero\n                       |        # ...or...\n                       [1-9]    # a 1-9 character\n                       \\d*      # followed by zero or more digits\n                     )\n                     (?:\n                       \\.       # a period\n                       \\d+      # followed by one or more digits\n                       (?:\n                         [eE]   # an e character\n                         [+-]?  # followed by an option +/-\n                         \\d+    # followed by one or more digits\n                       )?       # make exponent optional\n                     )?         # make decimal portion optional\n                 )"
     },
     "operator": {
-      "comment": "Operator symbols",
-      "match": "\\s*(==|~=|>|>=|<|<=|&|&&|:|\\||\\|\\||\\+|-|\\*|\\.\\*|/|\\./|\\\\|\\.\\\\|\\^|\\.\\^)\\s*",
-      "name": "keyword.operator.symbols.matlab"
+      "name": "keyword.operator.symbols.matlab",
+      "match": "\\s*(==|~=|\u003e|\u003e=|\u003c|\u003c=|\u0026|\u0026\u0026|:|\\||\\|\\||\\+|-|\\*|\\.\\*|/|\\./|\\\\|\\.\\\\|\\^|\\.\\^)\\s*"
     },
     "string_double": {
+      "name": "string.quoted.double.gnuplot",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.gnuplot",
+          "match": "\\\\[\\$`\"\\\\\\n]"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.gnuplot"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.gnuplot"
         }
-      },
-      "name": "string.quoted.double.gnuplot",
-      "patterns": [
-        {
-          "match": "\\\\[\\$`\"\\\\\\n]",
-          "name": "constant.character.escape.gnuplot"
-        }
-      ]
+      }
     },
     "string_single": {
+      "name": "string.quoted.single.gnuplot",
       "begin": "'",
+      "end": "'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.gnuplot"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.gnuplot"
         }
-      },
-      "name": "string.quoted.single.gnuplot"
+      }
     }
-  },
-  "scopeName": "source.gnuplot",
-  "uuid": "A27F93D4-2AE3-4950-851E-8FA19D3CF999"
-}
+  }
+}

data/grammars/source.go.json

@@ -1,11 +1,6 @@
 {
-  "comment": "Go allows any Unicode character to be used in identifiers, so our identifier regex is: \\b([[:alpha:]_]+[[:alnum:]_]*)\\b\n\tcf. The Go Programming Language Specification <http://golang.org/doc/go_spec.html>",
-  "fileTypes": [
-    "go"
-  ],
-  "firstLineMatch": "(?i)-[*]-\\s*(mode:)?\\s*go\\s*-[*]-",
-  "keyEquivalent": "^~G",
   "name": "Go",
+  "scopeName": "source.go",
   "patterns": [
     {
       "include": "#receiver_function_declaration"
@@ -20,31 +15,31 @@
       "include": "#exported_variables"
     },
     {
+      "name": "meta.preprocessor.go.import",
       "begin": "^[[:blank:]]*(import)\\b\\s+",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.import.go"
-        }
-      },
       "end": "(?=(?://|/\\*))|$",
-      "name": "meta.preprocessor.go.import",
       "patterns": [
         {
+          "name": "string.quoted.double.import.go",
           "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.go"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.go"
             }
-          },
-          "name": "string.quoted.double.import.go"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.import.go"
+        }
+      }
     },
     {
       "include": "#block"
@@ -58,8 +53,8 @@
   ],
   "repository": {
     "access": {
-      "match": "(?<=\\.)[[:alpha:]_][[:alnum:]_]*\\b(?!\\s*\\()",
-      "name": "variable.other.dot-access.go"
+      "name": "variable.other.dot-access.go",
+      "match": "(?\u003c=\\.)[[:alpha:]_][[:alnum:]_]*\\b(?!\\s*\\()"
     },
     "basic_things": {
       "patterns": [
@@ -81,24 +76,24 @@
       ]
     },
     "block": {
+      "name": "meta.block.go",
       "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#block_innards"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.block.begin.go"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.go"
         }
-      },
-      "name": "meta.block.go",
-      "patterns": [
-        {
-          "include": "#block_innards"
-        }
-      ]
+      }
     },
     "block_innards": {
       "patterns": [
@@ -113,29 +108,31 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.go",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.block.go"
             }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.go"
+          }
         },
         {
+          "name": "comment.block.go",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.go"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.go"
+          }
         },
         {
-          "match": "\\*/.*\\n",
-          "name": "invalid.illegal.stray-comment-end.go"
+          "name": "invalid.illegal.stray-comment-end.go",
+          "match": "\\*/.*\\n"
         },
         {
+          "name": "comment.line.double-slash.banner.go",
+          "match": "^(//) =(\\s*.*?)\\s*=\\s*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.go"
@@ -143,86 +140,83 @@
             "2": {
               "name": "meta.toc-list.banner.line.go"
             }
-          },
-          "match": "^(//) =(\\s*.*?)\\s*=\\s*$\\n?",
-          "name": "comment.line.double-slash.banner.go"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.go"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.go",
               "begin": "//",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.go"
-                }
-              },
               "end": "\\n",
-              "name": "comment.line.double-slash.go",
               "patterns": [
                 {
-                  "match": "(?>\\\\\\s*\\n)",
-                  "name": "punctuation.separator.continuation.go"
+                  "name": "punctuation.separator.continuation.go",
+                  "match": "(?\u003e\\\\\\s*\\n)"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.go"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.go"
+            }
+          }
         }
       ]
     },
     "exported_variables": {
-      "comment": "This is kinda hacky, in order to get the 'var' scoped the right way again.",
-      "match": "(?<=\\s|\\[\\])([[:upper:]][[:alnum:]_]*)(?=\\W+)",
-      "name": "variable.exported.go"
+      "name": "variable.exported.go",
+      "match": "(?\u003c=\\s|\\[\\])([[:upper:]][[:alnum:]_]*)(?=\\W+)"
     },
     "fn_parens": {
+      "name": "meta.parens.go",
       "begin": "\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#basic_things"
+        },
+        {
+          "include": "#function_calls"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.parens.begin.go"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.end.go"
         }
-      },
-      "name": "meta.parens.go",
-      "patterns": [
-        {
-          "include": "#basic_things"
-        },
-        {
-          "include": "#function_calls"
-        }
-      ]
+      }
     },
     "function_block": {
+      "name": "meta.block.go",
       "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#function_block_innards"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.function-block.begin.go"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.function-block.end.go"
         }
-      },
-      "name": "meta.block.go",
-      "patterns": [
-        {
-          "include": "#function_block_innards"
-        }
-      ]
+      }
     },
     "function_block_innards": {
       "patterns": [
@@ -230,6 +224,7 @@
           "include": "#basic_things"
         },
         {
+          "match": "(\\s*)\\b(new|c(lose|ap)|p(anic|rint(ln)?)|len|make|append)(?:\\b|\\()",
           "captures": {
             "1": {
               "name": "punctuation.whitespace.support.function.leading.go"
@@ -237,8 +232,7 @@
             "2": {
               "name": "support.function.builtin.go"
             }
-          },
-          "match": "(\\s*)\\b(new|c(lose|ap)|p(anic|rint(ln)?)|len|make|append)(?:\\b|\\()"
+          }
         },
         {
           "include": "#function_block"
@@ -252,6 +246,8 @@
       ]
     },
     "function_calls": {
+      "name": "meta.function-call.go",
+      "match": "(?x)\n                (?: (?= \\s ) (?:(?\u003c=else|new|return) | (?\u003c!\\w)) (\\s+) )?\n                (\\b\n                    (?!(for|if|else|switch|return)\\s*\\()\n                    (?:[[:alpha:]_][[:alnum:]_]*+\\b)            # method name\n                )\n                \\s*(\\()\n            ",
       "captures": {
         "1": {
           "name": "punctuation.whitespace.function-call.leading.go"
@@ -262,13 +258,13 @@
         "3": {
           "name": "punctuation.definition.parameters.go"
         }
-      },
-      "match": "(?x)\n                (?: (?= \\s ) (?:(?<=else|new|return) | (?<!\\w)) (\\s+) )?\n                (\\b\n                    (?!(for|if|else|switch|return)\\s*\\()\n                    (?:[[:alpha:]_][[:alnum:]_]*+\\b)            # method name\n                )\n                \\s*(\\()\n            ",
-      "name": "meta.function-call.go"
+      }
     },
     "initializers": {
       "patterns": [
         {
+          "name": "meta.initialization.explicit.go",
+          "match": "^[[:blank:]]*(var)\\s+((?:[[:alpha:]_][[:alnum:]_]*)(?:,\\s+[[:alpha:]_][[:alnum:]_]*)*)",
           "captures": {
             "1": {
               "name": "keyword.control.go"
@@ -276,66 +272,78 @@
             "2": {
               "patterns": [
                 {
-                  "match": "[[:alpha:]_][[:alnum:]_]*",
-                  "name": "variable.other.go"
+                  "name": "variable.other.go",
+                  "match": "[[:alpha:]_][[:alnum:]_]*"
                 }
               ]
             }
-          },
-          "comment": "This matches the 'var x' style of variable declaration.",
-          "match": "^[[:blank:]]*(var)\\s+((?:[[:alpha:]_][[:alnum:]_]*)(?:,\\s+[[:alpha:]_][[:alnum:]_]*)*)",
-          "name": "meta.initialization.explicit.go"
+          }
         },
         {
+          "name": "meta.initialization.short.go",
+          "match": "((?:[[:alpha:]_][[:alnum:]_]*)(?:\\s*,\\s+[[:alpha:]_][[:alnum:]_]*)*)\\s*(:=)",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "match": "[[:alpha:]_][[:alnum:]_]*",
-                  "name": "variable.other.go"
+                  "name": "variable.other.go",
+                  "match": "[[:alpha:]_][[:alnum:]_]*"
                 }
               ]
             },
             "2": {
               "name": "keyword.operator.go"
             }
-          },
-          "comment": "This matches the 'x :=' style of variable declaration.",
-          "match": "((?:[[:alpha:]_][[:alnum:]_]*)(?:\\s*,\\s+[[:alpha:]_][[:alnum:]_]*)*)\\s*(:=)",
-          "name": "meta.initialization.short.go"
+          }
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(s(elect|witch)|c(ontinue|ase)|type|i(nterface|f|mport)|def(er|ault)|package|else|var|f(or|unc|allthrough)|r(eturn|ange)|go(to)?|break)\\b",
-          "name": "keyword.control.go"
+          "name": "keyword.control.go",
+          "match": "\\b(s(elect|witch)|c(ontinue|ase)|type|i(nterface|f|mport)|def(er|ault)|package|else|var|f(or|unc|allthrough)|r(eturn|ange)|go(to)?|break)\\b"
         },
         {
-          "match": "(\\b|(?<=\\]))(int(16|8|32|64)?|uint(16|8|32|64|ptr)?|float(32|64)|complex(64|128)|b(yte|ool)|string|error|struct)\\b",
-          "name": "storage.type.go"
+          "name": "storage.type.go",
+          "match": "(\\b|(?\u003c=\\]))(int(16|8|32|64)?|uint(16|8|32|64|ptr)?|float(32|64)|complex(64|128)|b(yte|ool)|string|error|struct)\\b"
         },
         {
-          "match": "\\b(c(onst|han)|map)\\b",
-          "name": "storage.modifier.go"
+          "name": "storage.modifier.go",
+          "match": "\\b(c(onst|han)|map)\\b"
         },
         {
-          "match": "\\b(nil|true|false|iota)\\b",
-          "name": "constant.language.go"
+          "name": "constant.language.go",
+          "match": "\\b(nil|true|false|iota)\\b"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-          "name": "constant.numeric.go"
+          "name": "constant.numeric.go",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
         },
         {
-          "match": "\\<\\-",
-          "name": "keyword.operator.channel.go"
+          "name": "keyword.operator.channel.go",
+          "match": "\\\u003c\\-"
         }
       ]
     },
     "plain_function_declaration": {
-      "begin": "(?x)\n    \t            (^[[:blank:]]*(func)\\s*\n    \t             (?: ([[:alpha:]_][[:alnum:]_]*)? )          # name of function is optional\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s\\/,._*&<>-]|(?:interface\\{\\}))*)? \\) )             # required braces for parameters (even if empty)\n    \t             \\s*\n    \t             (?: \\(? ((?:[\\[\\]\\w\\d\\s,._*&<>-]|(?:interface\\{\\}))*) \\)? )?             # optional return types, optionally within braces\n                    )\n    \t    ",
+      "name": "meta.function.plain.go",
+      "begin": "(?x)\n    \t            (^[[:blank:]]*(func)\\s*\n    \t             (?: ([[:alpha:]_][[:alnum:]_]*)? )          # name of function is optional\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s\\/,._*\u0026\u003c\u003e-]|(?:interface\\{\\}))*)? \\) )             # required braces for parameters (even if empty)\n    \t             \\s*\n    \t             (?: \\(? ((?:[\\[\\]\\w\\d\\s,._*\u0026\u003c\u003e-]|(?:interface\\{\\}))*) \\)? )?             # optional return types, optionally within braces\n                    )\n    \t    ",
+      "end": "(?\u003c=\\})",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#storage_type"
+        },
+        {
+          "include": "#storage_modifier"
+        },
+        {
+          "include": "#function_block"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.function.declaration.go"
@@ -349,23 +357,25 @@
         "4": {
           "patterns": [
             {
-              "match": "[[:alpha:]_][[:alnum:]_]*",
-              "name": "variable.parameters.go"
+              "name": "variable.parameters.go",
+              "match": "[[:alpha:]_][[:alnum:]_]*"
             }
           ]
         },
         "5": {
           "patterns": [
             {
-              "match": "[[:alpha:]_][[:alnum:]_]*",
-              "name": "variable.return-types.go"
+              "name": "variable.return-types.go",
+              "match": "[[:alpha:]_][[:alnum:]_]*"
             }
           ]
         }
-      },
-      "comment": "We scope all parenthesized alpha-numeric text as variable.parameters.go and variable.return-types.go, which is a bit lazy, as some of it is storage.type.",
-      "end": "(?<=\\})",
-      "name": "meta.function.plain.go",
+      }
+    },
+    "receiver_function_declaration": {
+      "name": "meta.function.receiver.go",
+      "begin": "(?x)\n    \t            (\n                     (func)\\s*\n    \t             (\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s,._*\u0026\u003c\u003e-]|(?:interface\\{\\}))*) \\)\\s+ )                # receiver variable declarations, in brackets\n    \t             (?: ([[:alpha:]_][[:alnum:]_]*)? )          # name of function is optional\n    \t             )\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s,._*\u0026\u003c\u003e-]|(?:interface\\{\\}))*)? \\) )               # required braces for parameters (even if empty)\n    \t             \\s*\n    \t             (?: \\(? ((?:[\\[\\]\\w\\d\\s,._*\u0026\u003c\u003e-]|(?:interface\\{\\}))*) \\)? )?             # optional return types, optionally within braces\n                    )\n    \t    ",
+      "end": "(?\u003c=\\})",
       "patterns": [
         {
           "include": "#comments"
@@ -379,10 +389,7 @@
         {
           "include": "#function_block"
         }
-      ]
-    },
-    "receiver_function_declaration": {
-      "begin": "(?x)\n    \t            (\n                     (func)\\s*\n    \t             (\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s,._*&<>-]|(?:interface\\{\\}))*) \\)\\s+ )                # receiver variable declarations, in brackets\n    \t             (?: ([[:alpha:]_][[:alnum:]_]*)? )          # name of function is optional\n    \t             )\n    \t             (?: \\( ((?:[\\[\\]\\w\\d\\s,._*&<>-]|(?:interface\\{\\}))*)? \\) )               # required braces for parameters (even if empty)\n    \t             \\s*\n    \t             (?: \\(? ((?:[\\[\\]\\w\\d\\s,._*&<>-]|(?:interface\\{\\}))*) \\)? )?             # optional return types, optionally within braces\n                    )\n    \t    ",
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.function.receiver.declaration.go"
@@ -396,8 +403,8 @@
         "4": {
           "patterns": [
             {
-              "match": "[[:alpha:]_][[:alnum:]_]*",
-              "name": "variable.receiver.go"
+              "name": "variable.receiver.go",
+              "match": "[[:alpha:]_][[:alnum:]_]*"
             }
           ]
         },
@@ -407,47 +414,25 @@
         "6": {
           "patterns": [
             {
-              "match": "[[:alpha:]_][[:alnum:]_]*",
-              "name": "variable.parameters.go"
+              "name": "variable.parameters.go",
+              "match": "[[:alpha:]_][[:alnum:]_]*"
             }
           ]
         },
         "7": {
           "patterns": [
             {
-              "match": "[[:alpha:]_][[:alnum:]_]*",
-              "name": "variable.return-types.go"
+              "name": "variable.return-types.go",
+              "match": "[[:alpha:]_][[:alnum:]_]*"
             }
           ]
         }
-      },
-      "comment": "Version of above with support for declaring a receiver variable.",
-      "end": "(?<=\\})",
-      "name": "meta.function.receiver.go",
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#storage_type"
-        },
-        {
-          "include": "#storage_modifier"
-        },
-        {
-          "include": "#function_block"
-        }
-      ]
+      }
     },
     "root_parens": {
-      "begin": "\\(",
-      "end": "(?<=\\()(\\))?|(?:\\))",
-      "endCaptures": {
-        "1": {
-          "name": "meta.parens.empty.go"
-        }
-      },
       "name": "meta.parens.go",
+      "begin": "\\(",
+      "end": "(?\u003c=\\()(\\))?|(?:\\))",
       "patterns": [
         {
           "include": "#basic_things"
@@ -458,48 +443,43 @@
         {
           "include": "#function_calls"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "meta.parens.empty.go"
+        }
+      }
     },
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abfnrutv'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|[0-7]{3})",
-          "name": "constant.character.escape.go"
+          "name": "constant.character.escape.go",
+          "match": "\\\\(\\\\|[abfnrutv'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|[0-7]{3})"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.go"
+          "name": "invalid.illegal.unknown-escape.go",
+          "match": "\\\\."
         }
       ]
     },
     "string_placeholder": {
       "patterns": [
         {
-          "match": "(?x)%\n                        (\\d+\\$)?                                    # field (argument #)\n                        [#0\\- +']*                                  # flags\n                        [,;:_]?                                     # separator character (AltiVec)\n                        ((-?\\d+)|\\*(-?\\d+\\$)?)?                     # minimum field width\n                        (\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?                # precision\n                        [diouxXDOUeEfFgGaAcCsSpnvtTbyYhHmMzZq%]      # conversion type\n                    ",
-          "name": "constant.other.placeholder.go"
+          "name": "constant.other.placeholder.go",
+          "match": "(?x)%\n                        (\\d+\\$)?                                    # field (argument #)\n                        [#0\\- +']*                                  # flags\n                        [,;:_]?                                     # separator character (AltiVec)\n                        ((-?\\d+)|\\*(-?\\d+\\$)?)?                     # minimum field width\n                        (\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?                # precision\n                        [diouxXDOUeEfFgGaAcCsSpnvtTbyYhHmMzZq%]      # conversion type\n                    "
         },
         {
-          "match": "%",
-          "name": "invalid.illegal.placeholder.go"
+          "name": "invalid.illegal.placeholder.go",
+          "match": "%"
         }
       ]
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.go",
           "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.go"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.go"
-            }
-          },
-          "name": "string.quoted.double.go",
           "patterns": [
             {
               "include": "#string_placeholder"
@@ -507,46 +487,54 @@
             {
               "include": "#string_escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.go"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.go"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.go",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
               "include": "#string_escaped_char"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.go"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.go"
+            }
+          }
         },
         {
+          "name": "string.quoted.raw.go",
           "begin": "`",
+          "end": "`",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.go"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.go"
             }
-          },
-          "name": "string.quoted.raw.go"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.go",
-  "uuid": "33100200-8916-4F78-8522-4362628C6889"
-}
+  }
+}