RubyGems - github-linguist - Versions diffs - 5.3.3 → 6.0.0 - Mend

github-linguist 5.3.3 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (460) hide show

checksums.yaml +4 -4
data/bin/git-linguist +5 -2
data/ext/linguist/linguist.c +18 -7
data/grammars/annotation.liquidhaskell.haskell.json +969 -862
data/grammars/config.xcompose.json +22 -25
data/grammars/file.lasso.json +296 -309
data/grammars/hint.haskell.json +867 -766
data/grammars/hint.message.haskell.json +867 -766
data/grammars/hint.type.haskell.json +867 -766
data/grammars/objdump.x86asm.json +20 -24
data/grammars/source.Kotlin.json +220 -225
data/grammars/source.LS.json +36 -55
data/grammars/source.MCPOST.json +24 -38
data/grammars/source.MOD.json +26 -41
data/grammars/source.SASLog.json +9 -16
data/grammars/source.abap.json +48 -56
data/grammars/source.abl.json +8 -14
data/grammars/source.abnf.json +88 -98
data/grammars/source.actionscript.3.json +398 -429
data/grammars/source.acucobol.json +5 -8
data/grammars/source.ada.json +46 -53
data/grammars/source.afm.json +548 -554
data/grammars/source.agc.json +34 -37
data/grammars/source.agda.json +79 -91
data/grammars/source.ahk.json +62 -66
data/grammars/source.alloy.json +16 -20
data/grammars/source.ampl.json +41 -47
data/grammars/source.angelscript.json +71 -80
data/grammars/source.antlr.json +131 -136
data/grammars/source.apache-config.json +93 -99
data/grammars/source.apache-config.mod_perl.json +19 -24
data/grammars/source.apl.json +1038 -1029
data/grammars/source.applescript.json +501 -523
data/grammars/source.apt.json +9 -16
data/grammars/source.asn.json +27 -31
data/grammars/source.asp.json +61 -67
data/grammars/source.aspectj.json +385 -391
data/grammars/source.assembly.json +49 -55
data/grammars/source.ats.json +45 -121
data/grammars/source.autoit.json +64 -69
data/grammars/source.awk.json +172 -176
data/grammars/source.ballerina.json +48 -395
data/grammars/source.batchfile.json +269 -269
data/grammars/source.befunge.json +17 -21
data/grammars/source.bf.json +5 -11
data/grammars/source.bison.json +10 -14
data/grammars/source.blitzmax.json +300 -305
data/grammars/source.boo.json +189 -193
data/grammars/source.brightauthorproject.json +8 -13
data/grammars/source.brightscript.json +37 -47
data/grammars/source.bro.json +134 -140
data/grammars/source.bsl.json +152 -193
data/grammars/source.bsv.json +96 -102
data/grammars/source.c++.json +176 -193
data/grammars/source.c++.qt.json +13 -21
data/grammars/source.c.ec.json +15 -21
data/grammars/source.c.json +237 -251
data/grammars/source.c.platform.json +153 -159
data/grammars/source.c2hs.json +3 -6
data/grammars/source.cabal.json +17 -20
data/grammars/source.cache.cmake.json +18 -23
data/grammars/source.cake.json +4 -7
data/grammars/source.camlp4.ocaml.json +24 -27
data/grammars/source.capnp.json +33 -38
data/grammars/source.ceylon.json +44 -50
data/grammars/source.cfscript.cfc.json +78 -86
data/grammars/source.cfscript.json +513 -520
data/grammars/source.changelogs.rpm-spec.json +8 -16
data/grammars/source.chapel.json +109 -87
data/grammars/source.cirru.json +25 -30
data/grammars/source.clarion.json +41 -54
data/grammars/source.clean.json +90 -95
data/grammars/source.click.json +25 -28
data/grammars/source.clips.json +10 -23
data/grammars/source.clojure.json +151 -168
data/grammars/source.cm.json +14 -19
data/grammars/source.cmake.json +53 -61
data/grammars/source.cobol.json +165 -180
data/grammars/source.coffee.json +454 -462
data/grammars/source.cool.json +36 -43
data/grammars/source.coq.json +17 -21
data/grammars/source.crystal.json +889 -983
data/grammars/source.cs.json +739 -740
data/grammars/source.csound-document.json +69 -73
data/grammars/source.csound-score.json +52 -55
data/grammars/source.csound.json +167 -171
data/grammars/source.css.json +683 -688
data/grammars/source.css.less.json +211 -511
data/grammars/source.css.mss.json +94 -101
data/grammars/source.css.postcss.sugarss.json +260 -0
data/grammars/source.csx.json +4 -7
data/grammars/source.cuda-c++.json +47 -81
data/grammars/source.cwl.json +103 -0
data/grammars/source.cython.json +536 -582
data/grammars/source.d.json +243 -252
data/grammars/source.dart.json +161 -166
data/grammars/source.data-weave.json +901 -905
data/grammars/source.desktop.json +29 -33
data/grammars/source.diff.json +43 -52
data/grammars/source.disasm.json +15 -16
data/grammars/source.ditroff.desc.json +73 -84
data/grammars/source.ditroff.json +60 -61
data/grammars/source.dm.json +202 -213
data/grammars/source.dmf.json +44 -47
data/grammars/source.dockerfile.json +29 -34
data/grammars/source.dot.json +46 -55
data/grammars/source.dylan.json +63 -68
data/grammars/source.ebnf.json +55 -62
data/grammars/source.eiffel.json +57 -62
data/grammars/source.elixir.json +321 -366
data/grammars/source.emacs.lisp.json +458 -249
data/grammars/source.erazor.json +49 -57
data/grammars/source.erlang.json +508 -515
data/grammars/source.essl.json +17 -30
data/grammars/source.factor.json +85 -91
data/grammars/source.fan.json +92 -96
data/grammars/source.fancy.json +93 -118
data/grammars/source.fish.json +74 -98
data/grammars/source.fontforge.json +142 -146
data/grammars/source.forth.json +42 -57
data/grammars/source.fortran.json +193 -231
data/grammars/source.fortran.modern.json +77 -103
data/grammars/source.fsharp.fsi.json +1 -6
data/grammars/source.fsharp.fsl.json +1 -6
data/grammars/source.fsharp.fsx.json +1 -6
data/grammars/source.fsharp.json +148 -153
data/grammars/source.gap.json +60 -70
data/grammars/source.gcode.json +9 -16
data/grammars/source.gdb.json +63 -79
data/grammars/source.gdb.session.json +27 -28
data/grammars/source.gdbregs.json +7 -8
data/grammars/source.gdscript.json +92 -96
data/grammars/source.gerber.json +38 -56
data/grammars/source.gfm.json +447 -462
data/grammars/source.glsl.json +58 -83
data/grammars/source.gn.json +188 -193
data/grammars/source.gnuplot.json +104 -120
data/grammars/source.go.json +169 -181
data/grammars/source.golo.json +82 -87
data/grammars/source.gosu.2.json +58 -68
data/grammars/source.grace.json +266 -270
data/grammars/source.graphql.json +586 -596
data/grammars/source.groovy.gradle.json +18 -22
data/grammars/source.groovy.json +422 -433
data/grammars/source.harbour.json +129 -173
data/grammars/source.haskell.json +871 -772
data/grammars/source.haxe.2.json +402 -413
data/grammars/source.hlsl.json +6 -16
data/grammars/source.hsc2hs.json +1 -4
data/grammars/source.hsig.json +871 -770
data/grammars/source.hss.1.json +122 -144
data/grammars/source.httpspec.json +119 -123
data/grammars/source.hxml.json +8 -15
data/grammars/source.ideal.json +125 -125
data/grammars/source.idl-dlm.json +25 -32
data/grammars/source.idl.json +59 -80
data/grammars/source.idris.json +171 -185
data/grammars/source.inform7.json +117 -121
data/grammars/source.ini.json +37 -43
data/grammars/source.io.json +65 -73
data/grammars/source.ioke.json +72 -78
data/grammars/source.isabelle.root.json +26 -30
data/grammars/source.isabelle.theory.json +46 -50
data/grammars/source.j.json +18 -21
data/grammars/source.jasmin.json +45 -50
data/grammars/source.java-properties.json +31 -41
data/grammars/source.java.json +333 -342
data/grammars/source.jcl.json +15 -18
data/grammars/source.jflex.json +166 -172
data/grammars/source.jison.json +331 -334
data/grammars/source.jisonlex-injection.json +1 -2
data/grammars/source.jisonlex.json +148 -151
data/grammars/source.jolie.json +37 -43
data/grammars/source.jq.json +80 -87
data/grammars/source.js.json +798 -818
data/grammars/source.js.jsx.json +2115 -2225
data/grammars/source.js.objj.json +167 -172
data/grammars/source.js.regexp.json +50 -50
data/grammars/source.js.regexp.replacement.json +7 -7
data/grammars/source.jsdoc.json +94 -94
data/grammars/source.json.json +61 -71
data/grammars/source.julia.console.json +5 -6
data/grammars/source.julia.json +237 -234
data/grammars/source.lean.json +55 -67
data/grammars/source.lid.json +6 -10
data/grammars/source.lilypond.json +181 -195
data/grammars/source.lisp.json +40 -50
data/grammars/source.litcoffee.json +169 -183
data/grammars/source.livescript.json +207 -220
data/grammars/source.llvm.json +28 -38
data/grammars/source.logos.json +7 -14
data/grammars/source.logtalk.json +136 -141
data/grammars/source.loomscript.json +77 -83
data/grammars/source.lsl.json +90 -106
data/grammars/source.lua.json +100 -109
data/grammars/source.makefile.json +181 -188
data/grammars/source.makegen.json +3 -7
data/grammars/source.mask.json +260 -265
data/grammars/source.mata.json +38 -46
data/grammars/source.mathematica.json +155 -167
data/grammars/source.matlab.json +407 -684
data/grammars/source.maxscript.json +293 -281
data/grammars/source.mercury.json +179 -184
data/grammars/source.meson.json +52 -58
data/grammars/source.meta-info.json +64 -74
data/grammars/source.ml.json +107 -113
data/grammars/source.modelica.json +51 -59
data/grammars/source.modula2.json +33 -42
data/grammars/source.monkey.json +234 -241
data/grammars/source.moonscript.json +51 -56
data/grammars/source.mql5.json +74 -101
data/grammars/source.mupad.json +30 -72
data/grammars/source.ncl.json +1 -14
data/grammars/source.ne.json +39 -42
data/grammars/source.nemerle.json +58 -63
data/grammars/source.nesc.json +9 -15
data/grammars/source.netlinx.erb.json +13 -25
data/grammars/source.netlinx.json +231 -292
data/grammars/source.nextflow-groovy.json +1360 -0
data/grammars/source.nextflow.json +74 -0
data/grammars/source.nginx.json +274 -287
data/grammars/source.nim.json +442 -483
data/grammars/source.nim_filter.json +6 -26
data/grammars/source.nimcfg.json +38 -51
data/grammars/source.ninja.json +64 -70
data/grammars/source.nit.json +60 -64
data/grammars/source.nix.json +269 -273
data/grammars/source.nmml.json +31 -37
data/grammars/source.nsis.json +66 -72
data/grammars/source.nu.json +129 -139
data/grammars/source.nut.json +129 -133
data/grammars/source.objc++.json +3 -10
data/grammars/source.objc.json +303 -314
data/grammars/source.objc.platform.json +145 -151
data/grammars/source.ocaml.json +506 -514
data/grammars/source.ocamllex.json +108 -115
data/grammars/source.ocamlyacc.json +116 -123
data/grammars/source.ooc.json +148 -155
data/grammars/source.opa.json +39 -49
data/grammars/source.opal.json +84 -89
data/grammars/source.opalsysdefs.json +9 -13
data/grammars/source.opencobol.json +22 -25
data/grammars/source.opentype.json +148 -152
data/grammars/source.ox.json +36 -44
data/grammars/source.oz.json +31 -38
data/grammars/source.p4.json +49 -59
data/grammars/source.pan.json +273 -278
data/grammars/source.papyrus.skyrim.json +705 -781
data/grammars/source.parrot.pir.json +59 -65
data/grammars/source.pascal.json +54 -61
data/grammars/source.pawn.json +835 -849
data/grammars/source.pcb.board.json +153 -158
data/grammars/source.pcb.schematic.json +134 -138
data/grammars/source.pcb.sexp.json +64 -74
data/grammars/source.pep8.json +28 -32
data/grammars/source.perl.6.json +83 -92
data/grammars/source.perl.json +711 -737
data/grammars/source.perl6fe.json +1204 -1218
data/grammars/source.php.zephir.json +80 -89
data/grammars/source.pic.json +137 -142
data/grammars/source.pig_latin.json +76 -80
data/grammars/source.pike.json +23 -36
data/grammars/source.po.json +74 -84
data/grammars/source.pogoscript.json +23 -29
data/grammars/source.pony.json +98 -108
data/grammars/source.postcss.json +370 -0
data/grammars/source.postscript.json +88 -97
data/grammars/source.pov-ray sdl.json +36 -42
data/grammars/source.powershell.json +175 -197
data/grammars/source.processing.json +236 -249
data/grammars/source.prolog.eclipse.json +33 -38
data/grammars/source.prolog.json +66 -72
data/grammars/source.protobuf.json +88 -94
data/grammars/source.puppet.json +144 -151
data/grammars/source.purescript.json +268 -289
data/grammars/source.pyjade.json +256 -281
data/grammars/source.python.django.json +13 -18
data/grammars/source.python.json +3319 -3367
data/grammars/source.python.salt.json +3 -7
data/grammars/source.qmake.json +83 -90
data/grammars/source.qml.json +57 -78
data/grammars/source.quoting.perl6fe.json +666 -669
data/grammars/source.r.json +75 -84
data/grammars/source.racket.json +17 -38
data/grammars/source.rascal.json +77 -80
data/grammars/source.reason.hover.type.json +1 -1
data/grammars/source.reason.json +1025 -1080
data/grammars/source.rebol.json +167 -177
data/grammars/source.red.json +169 -177
data/grammars/source.regexp.babel.json +74 -77
data/grammars/source.regexp.extended.json +4 -5
data/grammars/source.regexp.json +260 -264
data/grammars/source.regexp.perl6fe.json +108 -111
data/grammars/source.regexp.python.json +210 -215
data/grammars/source.regexp.spin.json +63 -72
data/grammars/source.renpy.json +617 -687
data/grammars/source.rexx.json +25 -32
data/grammars/source.ring.json +84 -114
data/grammars/source.rpm-spec.json +392 -401
data/grammars/source.ruby.gemfile.json +9 -12
data/grammars/source.ruby.json +862 -952
data/grammars/source.ruby.rspec.cucumber.steps.json +90 -103
data/grammars/source.rust.json +223 -281
data/grammars/source.sas.json +88 -105
data/grammars/source.sass.json +100 -108
data/grammars/source.sbt.json +16 -23
data/grammars/source.scad.json +60 -67
data/grammars/source.scala.json +215 -228
data/grammars/source.scaml.json +120 -135
data/grammars/source.scheme.json +119 -136
data/grammars/source.scilab.json +40 -47
data/grammars/source.scss.json +369 -403
data/grammars/source.sdbl.json +14 -25
data/grammars/source.shaderlab.json +24 -27
data/grammars/source.shell.json +409 -440
data/grammars/source.shen.json +75 -94
data/grammars/source.smali.json +232 -293
data/grammars/source.smalltalk.json +60 -75
data/grammars/source.smt.json +67 -82
data/grammars/source.solidity.json +35 -54
data/grammars/source.sp.json +40 -45
data/grammars/source.sparql.json +3 -8
data/grammars/source.spin.json +277 -297
data/grammars/source.sqf.json +34 -44
data/grammars/source.sql.json +142 -156
data/grammars/source.stan.json +201 -160
data/grammars/source.stata.json +57 -68
data/grammars/source.strings.json +26 -30
data/grammars/source.stylus.json +558 -565
data/grammars/source.supercollider.json +33 -40
data/grammars/source.swift.json +999 -1077
data/grammars/source.systemverilog.json +351 -365
data/grammars/source.tcl.json +77 -94
data/grammars/source.tea.json +61 -67
data/grammars/source.terra.json +25 -32
data/grammars/source.terraform.json +68 -88
data/grammars/source.thrift.json +300 -306
data/grammars/source.tl.json +112 -117
data/grammars/source.tla.json +65 -69
data/grammars/source.toc.json +21 -25
data/grammars/source.toml.json +117 -122
data/grammars/source.ts.json +2838 -2774
data/grammars/source.tsx.json +180 -184
data/grammars/source.turing.json +970 -974
data/grammars/source.turtle.json +124 -140
data/grammars/source.txl.json +23 -37
data/grammars/source.ucfconstraints.json +16 -21
data/grammars/source.ur.json +15 -27
data/grammars/source.vala.json +221 -235
data/grammars/source.varnish.vcl.json +117 -129
data/grammars/source.vbnet.json +69 -106
data/grammars/source.verilog.json +101 -107
data/grammars/source.vhdl.json +437 -445
data/grammars/source.viml.json +540 -550
data/grammars/source.wavefront.mtl.json +274 -277
data/grammars/source.wavefront.obj.json +781 -784
data/grammars/source.wdl.json +66 -46
data/grammars/source.webassembly.json +97 -102
data/grammars/source.webidl.json +311 -326
data/grammars/source.x10.json +28 -32
data/grammars/source.x86asm.json +21 -26
data/grammars/source.xc.json +164 -172
data/grammars/source.xq.json +81 -92
data/grammars/source.xtend.json +199 -208
data/grammars/source.yaml-ext.json +118 -124
data/grammars/source.yaml.json +155 -174
data/grammars/source.yaml.salt.json +113 -116
data/grammars/source.yang.json +10 -13
data/grammars/source.yara.json +98 -0
data/grammars/text.bibtex.json +95 -100
data/grammars/text.cfml.basic.json +403 -404
data/grammars/text.elixir.json +18 -23
data/grammars/text.error-list.json +15 -16
data/grammars/text.find-refs.json +487 -488
data/grammars/text.gherkin.feature.json +45 -53
data/grammars/text.haml.json +176 -189
data/grammars/text.hamlc.json +82 -88
data/grammars/text.html.abl.json +16 -21
data/grammars/text.html.asciidoc.json +139 -153
data/grammars/text.html.asdoc.json +145 -155
data/grammars/text.html.asp.json +23 -28
data/grammars/text.html.basic.json +323 -338
data/grammars/text.html.cfm.json +316 -325
data/grammars/text.html.creole.json +177 -189
data/grammars/text.html.django.json +27 -33
data/grammars/text.html.ecr.json +21 -25
data/grammars/text.html.elixir.json +3 -9
data/grammars/text.html.erb.json +81 -85
data/grammars/text.html.erlang.yaws.json +24 -29
data/grammars/text.html.factor.json +5 -11
data/grammars/text.html.ftl.json +16 -25
data/grammars/text.html.handlebars.json +579 -598
data/grammars/text.html.javadoc.json +426 -0
data/grammars/text.html.js.json +11 -17
data/grammars/text.html.jsp.json +377 -384
data/grammars/text.html.liquid.json +8 -18
data/grammars/text.html.mako.json +257 -275
data/grammars/text.html.markdown.source.gfm.apib.json +419 -427
data/grammars/text.html.markdown.source.gfm.mson.json +405 -414
data/grammars/text.html.mediawiki.json +318 -344
data/grammars/text.html.php.blade.json +2134 -2140
data/grammars/text.html.php.json +980 -1013
data/grammars/text.html.slash.json +101 -107
data/grammars/text.html.smarty.json +75 -83
data/grammars/text.html.soy.json +250 -253
data/grammars/text.html.ssp.json +18 -24
data/grammars/text.html.tcl.json +17 -24
data/grammars/text.html.twig.json +712 -718
data/grammars/text.idl-idldoc.json +5 -9
data/grammars/text.jade.json +213 -235
data/grammars/text.junit-test-report.json +25 -28
data/grammars/text.log.latex.json +44 -46
data/grammars/text.marko.json +370 -401
data/grammars/text.python.console.json +3 -7
data/grammars/text.python.traceback.json +2 -5
data/grammars/text.rdoc.json +15 -19
data/grammars/text.restructuredtext.clean.json +8 -11
data/grammars/text.restructuredtext.json +886 -873
data/grammars/text.robot.json +26 -36
data/grammars/text.roff.json +2852 -2915
data/grammars/text.runoff.json +56 -69
data/grammars/text.sfd.json +151 -155
data/grammars/text.shell-session.json +5 -8
data/grammars/text.slim.json +184 -210
data/grammars/text.srt.json +54 -57
data/grammars/text.tex.json +98 -105
data/grammars/text.tex.latex.beamer.json +14 -20
data/grammars/text.tex.latex.haskell.json +883 -782
data/grammars/text.tex.latex.json +281 -291
data/grammars/text.tex.latex.memoir.json +39 -46
data/grammars/text.tex.latex.rd.json +32 -38
data/grammars/text.xml.ant.json +62 -69
data/grammars/text.xml.flex-config.json +1009 -1013
data/grammars/text.xml.genshi.json +10 -16
data/grammars/text.xml.json +117 -130
data/grammars/text.xml.pom.json +235 -240
data/grammars/text.xml.xsl.json +31 -37
data/grammars/text.zone_file.json +24 -29
data/lib/linguist/blob.rb +10 -1
data/lib/linguist/blob_helper.rb +4 -1
data/lib/linguist/file_blob.rb +5 -0
data/lib/linguist/generated.rb +16 -0
data/lib/linguist/heuristics.rb +23 -11
data/lib/linguist/language.rb +3 -6
data/lib/linguist/languages.json +1 -1
data/lib/linguist/languages.yml +74 -12
data/lib/linguist/lazy_blob.rb +15 -1
data/lib/linguist/linguist.bundle +0 -0
data/lib/linguist/samples.json +1666 -3381
data/lib/linguist/shebang.rb +2 -0
data/lib/linguist/strategy/modeline.rb +2 -0
data/lib/linguist/vendor.yml +5 -6
data/lib/linguist/version.rb +1 -1
metadata +12 -11
data/grammars/source.elm.json +0 -381
data/grammars/source.nant-build.json +0 -86
data/grammars/source.octave.json +0 -451
data/grammars/text.html.mediawiki.elm-build-output.json +0 -111
data/grammars/text.html.mediawiki.elm-documentation.json +0 -22
data/grammars/text.html.vue.json +0 -936

data/grammars/source.gnuplot.json CHANGED

@@ -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 CHANGED

@@ -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"
-}
+  }
+}