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/text.gherkin.feature.json CHANGED

@@ -1,12 +1,6 @@
 {
-  "fileTypes": [
-    "feature"
-  ],
-  "firstLineMatch": "기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Свойство|Особина|Могућност|Özellik|Właściwość|Tính năng|Trajto|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalitéit|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Funcţionalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Eiginleiki|Egenskap|Egenskab|Crikey|Característica|Arwedd|Ahoy matey!(.*)",
-  "foldingStartMarker": "^\\s*\\b(예|시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|例子|例|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|サンプル|سيناريو مخطط|سيناريو|امثلة|الخلفية|תרחיש|תבנית תרחיש|רקע|דוגמאות|Тарих|Сценарій|Сценарији|Сценарио|Сценарий структураси|Сценарий|Структура сценарію|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Примеры|Примери|Пример|Приклади|Предыстория|Предистория|Позадина|Передумова|Основа|Мисоллар|Концепт|Контекст|Örnekler|Założenia|Yo-ho-ho|Wharrimean is|Voorbeelden|Variantai|Tình huống|The thing of it is|Tausta|Taust|Tapausaihio|Tapaus|Tapaukset|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Skenario|Situācija|Shiver me timbers|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenaro|Scenariusz|Scenariu|Scenarios|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenariji|Scenarijaus šablonas|Scenarijai|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Příklady|Példák|Príklady|Przykłady|Primjeri|Primeri|Primer|Pozadí|Pozadina|Pozadie|Plang vum Szenario|Plan du scénario|Plan du Scénario|Piemēri|Pavyzdžiai|Paraugs|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Lýsing Dæma|Lýsing Atburðarásar|Kịch bản|Konturo de la scenaro|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Juhtumid|Háttér|Heave to|Hannergrond|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Fono|Exemplos|Exemples|Exemple|Exempel|Examples|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esempi|Escenario|Escenari|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|EXAMPLZ|Dữ liệu|Dæmi|Dis is what went down|Dead men tell no tales|Dasar|Contoh|Contexto|Contexte|Context|Contesto|Cobber|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Beispiller|Beispiele|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Atburðarásir|Atburðarás|Antecedents|Antecedentes|All y'all|Achtergrond|Abstrakt Scenario|Abstract Scenario)",
-  "foldingStopMarker": "^\\s*$",
-  "keyEquivalent": "^~C",
   "name": "Gherkin",
+  "scopeName": "text.gherkin.feature",
   "patterns": [
     {
       "include": "#feature_element_keyword"
@@ -41,25 +35,26 @@
   ],
   "repository": {
     "comments": {
+      "match": "\\s*(#.*)",
       "captures": {
         "0": {
           "name": "comment.line.number-sign"
         }
-      },
-      "match": "\\s*(#.*)"
+      }
     },
-    "table": {
-      "begin": "^\\s*\\|",
-      "end": "\\|\\s*$",
-      "name": "keyword.control.cucumber.table",
-      "patterns": [
-        {
-          "match": "\\w",
-          "name": "source"
+    "feature_element_keyword": {
+      "match": "^\\s*(예|시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|例子|例|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|サンプル|سيناريو مخطط|سيناريو|امثلة|الخلفية|תרחיש|תבנית תרחיש|רקע|דוגמאות|Тарих|Сценарій|Сценарији|Сценарио|Сценарий структураси|Сценарий|Структура сценарію|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Примеры|Примери|Пример|Приклади|Предыстория|Предистория|Позадина|Передумова|Основа|Мисоллар|Концепт|Контекст|Örnekler|Założenia|Yo-ho-ho|Wharrimean is|Voorbeelden|Variantai|Tình huống|The thing of it is|Tausta|Taust|Tapausaihio|Tapaus|Tapaukset|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Skenario|Situācija|Shiver me timbers|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenaro|Scenariusz|Scenariu|Scenarios|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenariji|Scenarijaus šablonas|Scenarijai|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Příklady|Példák|Príklady|Przykłady|Primjeri|Primeri|Primer|Pozadí|Pozadina|Pozadie|Plang vum Szenario|Plan du scénario|Plan du Scénario|Piemēri|Pavyzdžiai|Paraugs|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Lýsing Dæma|Lýsing Atburðarásar|Kịch bản|Konturo de la scenaro|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Juhtumid|Háttér|Heave to|Hannergrond|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Fono|Exemplos|Exemples|Exemple|Exempel|Examples|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esempi|Escenario|Escenari|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|EXAMPLZ|Dữ liệu|Dæmi|Dis is what went down|Dead men tell no tales|Dasar|Contoh|Contexto|Contexte|Context|Contesto|Cobber|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Beispiller|Beispiele|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Atburðarásir|Atburðarás|Antecedents|Antecedentes|All y'all|Achtergrond|Abstrakt Scenario|Abstract Scenario):(.*)",
+      "captures": {
+        "1": {
+          "name": "keyword.language.gherkin.feature.scenario"
+        },
+        "2": {
+          "name": "string.language.gherkin.scenario.title.title"
         }
-      ]
+      }
     },
     "feature_keyword": {
+      "match": "^\\s*(기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Свойство|Особина|Могућност|Özellik|Właściwość|Tính năng|Trajto|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalitéit|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Funcţionalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Eiginleiki|Egenskap|Egenskab|Crikey|Característica|Arwedd|Ahoy matey!):(.*)\\b",
       "captures": {
         "1": {
           "name": "keyword.language.gherkin.feature"
@@ -67,69 +62,66 @@
         "2": {
           "name": "string.language.gherkin.feature.title"
         }
-      },
-      "match": "^\\s*(기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Свойство|Особина|Могућност|Özellik|Właściwość|Tính năng|Trajto|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalitéit|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Funcţionalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Eiginleiki|Egenskap|Egenskab|Crikey|Característica|Arwedd|Ahoy matey!):(.*)\\b"
+      }
+    },
+    "scenario_outline_variable": {
+      "name": "variable.other",
+      "begin": "\u003c",
+      "end": "\u003e"
     },
     "step_keyword": {
+      "match": "^\\s*(하지만|조건|먼저|만일|만약|단|그리고|그러면|那麼|那么|而且|當|当|前提|假設|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|و |متى |لكن |عندما |ثم |بفرض |اذاً |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Унда |Тоді |Тогда |То |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Лекин |Коли |Когда |Когато |Када |Кад |К тому же |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Ва |Бирок |Аммо |Али |Але |Агар |А також |А |І |Și |Şi |Þá |Þegar |Étant donnés |Étant données |Étant donnée |Étant donné |És |wann |ugeholl |mä |dann |awer |an |a |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Youse know when youse got |Youse know like when |Yna |Ya know how |Ya gotta |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |Và |Ve |Und |Un |Thì |Then y'all |Then |Tapi |Tak |Tada |Tad |Så |Stel |Soit |Siis |Si |Sed |Se |Quando |Quand |Quan |Pryd |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Når |När |Niin |Nhưng |N |Mutta |Men |Mas |Maka |Mając |Majd |Mais |Maar |Ma |Lorsque |Lorsqu'|Let go and haul |Kun |Kuid |Kui |Khi |Keď |Ketika |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben sei |Gangway! |Fakat |Eğer ki |Etant donnés |Etant données |Etant donnée |Etant donné |Et |Então |Entonces |Entao |En |Ef |Eeldades |E |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Dengan |Den youse gotta |De |Dați fiind |Daţi fiind |Dato |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |Dan |Dados |Dado |Dadas |Dada |DEN |Când |Cuando |Cho |Cept |Cand |Cal |But y'all |But |Buh |Blimey! |Biết |Bet |BUT |Aye |Avast! |Atès |Atunci |Atesa |Anrhegedig a |Angenommen |And y'all |And |An |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Adott |Aber |AN |A také |A |\\* )",
       "captures": {
         "1": {
           "name": "keyword.language.gherkin.feature.step"
         }
-      },
-      "match": "^\\s*(하지만|조건|먼저|만일|만약|단|그리고|그러면|那麼|那么|而且|當|当|前提|假設|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|و |متى |لكن |عندما |ثم |بفرض |اذاً |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Унда |Тоді |Тогда |То |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Лекин |Коли |Когда |Когато |Када |Кад |К тому же |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Ва |Бирок |Аммо |Али |Але |Агар |А також |А |І |Și |Şi |Þá |Þegar |Étant donnés |Étant données |Étant donnée |Étant donné |És |wann |ugeholl |mä |dann |awer |an |a |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Youse know when youse got |Youse know like when |Yna |Ya know how |Ya gotta |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |Và |Ve |Und |Un |Thì |Then y'all |Then |Tapi |Tak |Tada |Tad |Så |Stel |Soit |Siis |Si |Sed |Se |Quando |Quand |Quan |Pryd |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Når |När |Niin |Nhưng |N |Mutta |Men |Mas |Maka |Mając |Majd |Mais |Maar |Ma |Lorsque |Lorsqu'|Let go and haul |Kun |Kuid |Kui |Khi |Keď |Ketika |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben sei |Gangway! |Fakat |Eğer ki |Etant donnés |Etant données |Etant donnée |Etant donné |Et |Então |Entonces |Entao |En |Ef |Eeldades |E |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Dengan |Den youse gotta |De |Dați fiind |Daţi fiind |Dato |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |Dan |Dados |Dado |Dadas |Dada |DEN |Când |Cuando |Cho |Cept |Cand |Cal |But y'all |But |Buh |Blimey! |Biết |Bet |BUT |Aye |Avast! |Atès |Atunci |Atesa |Anrhegedig a |Angenommen |And y'all |And |An |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Adott |Aber |AN |A také |A |\\* )"
-    },
-    "feature_element_keyword": {
-      "captures": {
-        "1": {
-          "name": "keyword.language.gherkin.feature.scenario"
-        },
-        "2": {
-          "name": "string.language.gherkin.scenario.title.title"
-        }
-      },
-      "match": "^\\s*(예|시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|例子|例|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|サンプル|سيناريو مخطط|سيناريو|امثلة|الخلفية|תרחיש|תבנית תרחיש|רקע|דוגמאות|Тарих|Сценарій|Сценарији|Сценарио|Сценарий структураси|Сценарий|Структура сценарію|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Примеры|Примери|Пример|Приклади|Предыстория|Предистория|Позадина|Передумова|Основа|Мисоллар|Концепт|Контекст|Örnekler|Założenia|Yo-ho-ho|Wharrimean is|Voorbeelden|Variantai|Tình huống|The thing of it is|Tausta|Taust|Tapausaihio|Tapaus|Tapaukset|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Skenario|Situācija|Shiver me timbers|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenaro|Scenariusz|Scenariu|Scenarios|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenariji|Scenarijaus šablonas|Scenarijai|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Příklady|Példák|Príklady|Przykłady|Primjeri|Primeri|Primer|Pozadí|Pozadina|Pozadie|Plang vum Szenario|Plan du scénario|Plan du Scénario|Piemēri|Pavyzdžiai|Paraugs|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Lýsing Dæma|Lýsing Atburðarásar|Kịch bản|Konturo de la scenaro|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Juhtumid|Háttér|Heave to|Hannergrond|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Fono|Exemplos|Exemples|Exemple|Exempel|Examples|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esempi|Escenario|Escenari|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|EXAMPLZ|Dữ liệu|Dæmi|Dis is what went down|Dead men tell no tales|Dasar|Contoh|Contexto|Contexte|Context|Contesto|Cobber|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Beispiller|Beispiele|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Atburðarásir|Atburðarás|Antecedents|Antecedentes|All y'all|Achtergrond|Abstrakt Scenario|Abstract Scenario):(.*)"
-    },
-    "scenario_outline_variable": {
-      "begin": "<",
-      "end": ">",
-      "name": "variable.other"
+      }
     },
     "strings_double_quote": {
+      "name": "string.quoted.double",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.untitled"
+          "name": "constant.character.escape.untitled",
+          "match": "\\\\."
         }
       ]
     },
     "strings_single_quote": {
-      "begin": "(?<![a-zA-Z\"])'",
-      "end": "'(?![a-zA-Z])",
       "name": "string.quoted.single",
+      "begin": "(?\u003c![a-zA-Z\"])'",
+      "end": "'(?![a-zA-Z])",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape"
+          "name": "constant.character.escape",
+          "match": "\\\\."
         }
       ]
     },
     "strings_triple_quote": {
+      "name": "string.quoted.single",
       "begin": "\"\"\"",
-      "end": "\"\"\"",
-      "name": "string.quoted.single"
+      "end": "\"\"\""
+    },
+    "table": {
+      "name": "keyword.control.cucumber.table",
+      "begin": "^\\s*\\|",
+      "end": "\\|\\s*$",
+      "patterns": [
+        {
+          "name": "source",
+          "match": "\\w"
+        }
+      ]
     },
     "tags": {
+      "match": "(@[^@\\r\\n\\t ]+)",
       "captures": {
         "0": {
           "name": "storage.type.tag.cucumber"
         }
-      },
-      "match": "(@[^@\\r\\n\\t ]+)"
+      }
     }
-  },
-  "scopeName": "text.gherkin.feature",
-  "uuid": "85E2C52C-9B16-4A54-81E7-6D8D3ADAEFA8"
-}
+  }
+}

data/grammars/text.haml.json CHANGED

@@ -1,31 +1,27 @@
 {
-  "fileTypes": [
-    "haml"
-  ],
-  "foldingStartMarker": "^\\s*([-%#\\:\\.\\w\\=].*)\\s$",
-  "foldingStopMarker": "^\\s*$",
   "name": "Ruby Haml",
+  "scopeName": "text.haml",
   "patterns": [
     {
       "begin": "^\\s*==",
       "end": "$\\n?",
-      "captures": {
-        "1": {
-          "name": "string.quoted.double.ruby"
-        }
-      },
       "patterns": [
         {
           "include": "#interpolated_ruby"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "string.quoted.double.ruby"
+        }
+      }
     },
     {
       "include": "#continuation"
     },
     {
-      "match": "^(!!!)($|\\s.*)",
       "name": "meta.prolog.haml",
+      "match": "^(!!!)($|\\s.*)",
       "captures": {
         "1": {
           "name": "punctuation.definition.prolog.haml"
@@ -33,21 +29,19 @@
       }
     },
     {
-      "match": "(?<=\\#\\{)([^#]+)(?=\\})",
       "name": "meta.embedded.ruby",
+      "match": "(?\u003c=\\#\\{)([^#]+)(?=\\})",
       "captures": {
         "1": {
           "patterns": [
-            {
-              "include": "source.ruby.rails"
-            }
+            {}
           ]
         }
       }
     },
     {
-      "match": "^(\\s*)(\\/\\[[^\\]].*?$\\n?)",
       "name": "comment.line.slash.haml",
+      "match": "^(\\s*)(\\/\\[[^\\]].*?$\\n?)",
       "captures": {
         "1": {
           "name": "punctuation.section.comment.haml"
@@ -55,9 +49,9 @@
       }
     },
     {
+      "name": "comment.line.slash.haml",
       "begin": "^(\\s*)(\\-\\#|\\/|\\-\\s*\\/\\*+)",
       "end": "^(?!\\1\\s+|$\\n?)",
-      "name": "comment.line.slash.haml",
       "captures": {
         "2": {
           "name": "punctuation.section.comment.haml"
@@ -66,24 +60,13 @@
     },
     {
       "begin": "^\\s*(?:((%)([-\\w:]+))|(?=\\.|#))",
-      "end": "$|(?!\\.|#|\\{|\\(|\\[|&amp;|=|-|~|!=|&=|/)",
-      "captures": {
-        "1": {
-          "name": "meta.tag.haml"
-        },
-        "2": {
-          "name": "punctuation.definition.tag.haml"
-        },
-        "3": {
-          "name": "entity.name.tag.haml"
-        }
-      },
+      "end": "$|(?!\\.|#|\\{|\\(|\\[|\u0026amp;|=|-|~|!=|\u0026=|/)",
       "patterns": [
         {
-          "begin": "==",
-          "end": "$\\n?",
           "name": "string.quoted.double.ruby",
           "contentName": "string.quoted.double.ruby",
+          "begin": "==",
+          "end": "$\\n?",
           "patterns": [
             {
               "include": "#interpolated_ruby"
@@ -91,53 +74,51 @@
           ]
         },
         {
-          "match": "\\.[\\w-]+",
-          "name": "entity.name.tag.class.haml"
+          "name": "entity.name.tag.class.haml",
+          "match": "\\.[\\w-]+"
         },
         {
-          "match": "#[\\w-]+",
-          "name": "entity.name.tag.id.haml"
+          "name": "entity.name.tag.id.haml",
+          "match": "#[\\w-]+"
         },
         {
-          "begin": "(?<!\\#)\\{(?=.+(,|(do)|\\{|\\}|\\||(\\#.*))\\s*)",
-          "end": "\\s*\\}(?!,)",
           "name": "meta.section.attributes.haml",
+          "begin": "(?\u003c!\\#)\\{(?=.+(,|(do)|\\{|\\}|\\||(\\#.*))\\s*)",
+          "end": "\\s*\\}(?!,)",
           "patterns": [
             {
               "include": "#continuation"
             },
-            {
-              "include": "source.ruby.rails"
-            },
+            {},
             {
               "include": "#rubyline"
             }
           ]
         },
         {
+          "name": "meta.section.attributes.haml",
           "begin": "\\(",
           "end": "\\)",
-          "name": "meta.section.attributes.haml",
           "patterns": [
             {
-              "match": "([\\w-]+)",
-              "name": "constant.other.symbol.ruby"
+              "name": "constant.other.symbol.ruby",
+              "match": "([\\w-]+)"
             },
             {
-              "match": "\\=",
-              "name": "punctuation"
+              "name": "punctuation",
+              "match": "\\="
             },
             {
               "include": "#variables"
             },
             {
+              "name": "string.quoted.double.ruby",
               "begin": "\"",
               "end": "\"",
-              "name": "string.quoted.double.ruby",
               "patterns": [
                 {
-                  "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-                  "name": "constant.character.escape.ruby"
+                  "name": "constant.character.escape.ruby",
+                  "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
                 },
                 {
                   "include": "#interpolated_ruby"
@@ -145,13 +126,13 @@
               ]
             },
             {
+              "name": "string.quoted.double.ruby",
               "begin": "'",
               "end": "'",
-              "name": "string.quoted.double.ruby",
               "patterns": [
                 {
-                  "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-                  "name": "constant.character.escape.ruby"
+                  "name": "constant.character.escape.ruby",
+                  "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
                 },
                 {
                   "include": "#interpolated_ruby"
@@ -164,16 +145,14 @@
           ]
         },
         {
+          "name": "meta.section.object.haml",
           "begin": "\\[(?=.+(,|\\[|\\]|\\||(\\#.*))\\s*)",
           "end": "\\s*\\](?!.*(?!\\#\\[)\\])",
-          "name": "meta.section.object.haml",
           "patterns": [
             {
               "include": "#continuation"
             },
-            {
-              "include": "source.ruby.rails"
-            },
+            {},
             {
               "include": "#rubyline"
             }
@@ -183,10 +162,21 @@
           "include": "#rubyline"
         },
         {
-          "match": "/",
-          "name": "punctuation.terminator.tag.haml"
+          "name": "punctuation.terminator.tag.haml",
+          "match": "/"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.tag.haml"
+        },
+        "2": {
+          "name": "punctuation.definition.tag.haml"
+        },
+        "3": {
+          "name": "entity.name.tag.haml"
+        }
+      }
     },
     {
       "match": "^\\s*(\\.)",
@@ -197,7 +187,7 @@
       }
     },
     {
-      "begin": "^\\s*(?==|-|~|!=|&=)",
+      "begin": "^\\s*(?==|-|~|!=|\u0026=)",
       "end": "$",
       "patterns": [
         {
@@ -206,124 +196,124 @@
       ]
     },
     {
+      "name": "meta.embedded.php",
       "begin": "^(\\s*)(:php)$",
       "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.php",
-      "captures": {
-        "2": {
-          "name": "entity.name.tag.haml"
-        }
-      },
       "patterns": [
         {
           "include": "text.html.php#language"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:ruby)$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.ruby",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.ruby",
+      "begin": "^(\\s*)(:ruby)$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.ruby"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:markdown)$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.markdown",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.markdown",
+      "begin": "^(\\s*)(:markdown)$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.gfm"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:coffee(script)?)$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.coffee",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.coffee",
+      "begin": "^(\\s*)(:coffee(script)?)$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.coffee"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:(javascript|es6))$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.js",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.js",
+      "begin": "^(\\s*)(:(javascript|es6))$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.js"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:(css|styles?))$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.css",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.css",
+      "begin": "^(\\s*)(:(css|styles?))$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.css"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(:sass)$",
-      "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.sass",
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
+      }
+    },
+    {
+      "name": "meta.embedded.sass",
+      "begin": "^(\\s*)(:sass)$",
+      "end": "^(?!\\1\\s+|\\n)",
       "patterns": [
         {
           "include": "source.sass"
         }
-      ]
+      ],
+      "captures": {
+        "2": {
+          "name": "entity.name.tag.haml"
+        }
+      }
     },
     {
+      "name": "meta.embedded.scss",
       "begin": "^(\\s*)(:scss)$",
       "end": "^(?!\\1\\s+|\\n)",
-      "name": "meta.embedded.scss",
+      "patterns": [
+        {
+          "include": "source.scss"
+        }
+      ],
       "captures": {
         "2": {
           "name": "entity.name.tag.haml"
         }
-      },
-      "patterns": [
-        {
-          "include": "source.css.scss"
-        }
-      ]
+      }
     }
   ],
   "repository": {
@@ -338,14 +328,9 @@
     "interpolated_ruby": {
       "patterns": [
         {
+          "name": "meta.section.object.haml",
           "begin": "\\#\\{",
           "end": "\\}",
-          "name": "meta.section.object.haml",
-          "captures": {
-            "1": {
-              "name": "punctuation.section.embedded.ruby"
-            }
-          },
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -353,7 +338,12 @@
             {
               "include": "source.ruby"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.section.embedded.ruby"
+            }
+          }
         },
         {
           "include": "#variables"
@@ -363,14 +353,9 @@
     "nest_curly_and_self": {
       "patterns": [
         {
+          "name": "meta.section.object.haml",
           "begin": "\\{",
           "end": "\\}",
-          "name": "meta.section.object.haml",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.scope.ruby"
-            }
-          },
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -378,54 +363,20 @@
             {
               "include": "source.ruby"
             }
-          ]
-        }
-      ]
-    },
-    "variables": {
-      "patterns": [
-        {
-          "match": "(@)[a-zA-Z_]\\w+",
-          "name": "variable.other.readwrite.instance.ruby",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.ruby"
-            }
-          }
-        },
-        {
-          "match": "(@@)[a-zA-Z_]\\w+",
-          "name": "variable.other.readwrite.class.ruby",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.ruby"
-            }
-          }
-        },
-        {
-          "match": "(\\$)[a-zA-Z_]\\w+",
-          "name": "variable.other.readwrite.global.ruby",
+          ],
           "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.ruby"
+            "0": {
+              "name": "punctuation.section.scope.ruby"
             }
           }
         }
       ]
     },
     "rubyline": {
-      "begin": "(&amp|!)?(=|-|~)",
-      "end": "((do|\\{)( \\|[.*]+\\|)?)$|$|^(?!.*\\|\\s*)$\\n?",
       "name": "meta.line.ruby.haml",
       "contentName": "source.ruby.embedded.haml",
-      "endCaptures": {
-        "1": {
-          "name": "source.ruby.embedded.haml"
-        },
-        "2": {
-          "name": "keyword.control.ruby.start-block"
-        }
-      },
+      "begin": "(\u0026amp|!)?(=|-|~)",
+      "end": "((do|\\{)( \\|[.*]+\\|)?)$|$|^(?!.*\\|\\s*)$\\n?",
       "patterns": [
         {
           "match": "\\s+((elseif|foreach|switch|declare|default|use))(?=\\s|\\()",
@@ -444,8 +395,8 @@
           }
         },
         {
-          "match": "\\s+(catch|try|throw|exception|finally|die)(?=\\s|\\(|\\n)",
-          "name": "keyword.control.exception.php"
+          "name": "keyword.control.exception.php",
+          "match": "\\s+(catch|try|throw|exception|finally|die)(?=\\s|\\(|\\n)"
         },
         {
           "match": "\\s+(function\\s*)((?=\\())",
@@ -464,31 +415,31 @@
           }
         },
         {
+          "name": "string.quoted.double.ruby",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "source.ruby#interpolated_ruby"
+            },
+            {
+              "include": "source.ruby#escaped_char"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
-          "name": "string.quoted.double.ruby",
-          "patterns": [
-            {
-              "include": "source.ruby#interpolated_ruby"
-            },
-            {
-              "include": "source.ruby#escaped_char"
-            }
-          ]
+          }
         },
         {
-          "match": "(\\||,|<|do|\\{)\\s*(\\#.*)?$\\n?",
           "name": "source.ruby",
+          "match": "(\\||,|\u003c|do|\\{)\\s*(\\#.*)?$\\n?",
           "captures": {
             "0": {
               "patterns": [
@@ -500,17 +451,53 @@
           }
         },
         {
-          "match": "#.*$",
-          "name": "comment.line.number-sign.ruby"
+          "name": "comment.line.number-sign.ruby",
+          "match": "#.*$"
+        },
+        {},
+        {
+          "include": "#continuation"
+        }
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "source.ruby.embedded.haml"
+        },
+        "2": {
+          "name": "keyword.control.ruby.start-block"
+        }
+      }
+    },
+    "variables": {
+      "patterns": [
+        {
+          "name": "variable.other.readwrite.instance.ruby",
+          "match": "(@)[a-zA-Z_]\\w+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.ruby"
+            }
+          }
         },
         {
-          "include": "source.ruby.rails"
+          "name": "variable.other.readwrite.class.ruby",
+          "match": "(@@)[a-zA-Z_]\\w+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.ruby"
+            }
+          }
         },
         {
-          "include": "#continuation"
+          "name": "variable.other.readwrite.global.ruby",
+          "match": "(\\$)[a-zA-Z_]\\w+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.ruby"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "text.haml"
-}
+  }
+}