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
  1. checksums.yaml +4 -4
  2. data/bin/git-linguist +5 -2
  3. data/ext/linguist/linguist.c +18 -7
  4. data/grammars/annotation.liquidhaskell.haskell.json +969 -862
  5. data/grammars/config.xcompose.json +22 -25
  6. data/grammars/file.lasso.json +296 -309
  7. data/grammars/hint.haskell.json +867 -766
  8. data/grammars/hint.message.haskell.json +867 -766
  9. data/grammars/hint.type.haskell.json +867 -766
  10. data/grammars/objdump.x86asm.json +20 -24
  11. data/grammars/source.Kotlin.json +220 -225
  12. data/grammars/source.LS.json +36 -55
  13. data/grammars/source.MCPOST.json +24 -38
  14. data/grammars/source.MOD.json +26 -41
  15. data/grammars/source.SASLog.json +9 -16
  16. data/grammars/source.abap.json +48 -56
  17. data/grammars/source.abl.json +8 -14
  18. data/grammars/source.abnf.json +88 -98
  19. data/grammars/source.actionscript.3.json +398 -429
  20. data/grammars/source.acucobol.json +5 -8
  21. data/grammars/source.ada.json +46 -53
  22. data/grammars/source.afm.json +548 -554
  23. data/grammars/source.agc.json +34 -37
  24. data/grammars/source.agda.json +79 -91
  25. data/grammars/source.ahk.json +62 -66
  26. data/grammars/source.alloy.json +16 -20
  27. data/grammars/source.ampl.json +41 -47
  28. data/grammars/source.angelscript.json +71 -80
  29. data/grammars/source.antlr.json +131 -136
  30. data/grammars/source.apache-config.json +93 -99
  31. data/grammars/source.apache-config.mod_perl.json +19 -24
  32. data/grammars/source.apl.json +1038 -1029
  33. data/grammars/source.applescript.json +501 -523
  34. data/grammars/source.apt.json +9 -16
  35. data/grammars/source.asn.json +27 -31
  36. data/grammars/source.asp.json +61 -67
  37. data/grammars/source.aspectj.json +385 -391
  38. data/grammars/source.assembly.json +49 -55
  39. data/grammars/source.ats.json +45 -121
  40. data/grammars/source.autoit.json +64 -69
  41. data/grammars/source.awk.json +172 -176
  42. data/grammars/source.ballerina.json +48 -395
  43. data/grammars/source.batchfile.json +269 -269
  44. data/grammars/source.befunge.json +17 -21
  45. data/grammars/source.bf.json +5 -11
  46. data/grammars/source.bison.json +10 -14
  47. data/grammars/source.blitzmax.json +300 -305
  48. data/grammars/source.boo.json +189 -193
  49. data/grammars/source.brightauthorproject.json +8 -13
  50. data/grammars/source.brightscript.json +37 -47
  51. data/grammars/source.bro.json +134 -140
  52. data/grammars/source.bsl.json +152 -193
  53. data/grammars/source.bsv.json +96 -102
  54. data/grammars/source.c++.json +176 -193
  55. data/grammars/source.c++.qt.json +13 -21
  56. data/grammars/source.c.ec.json +15 -21
  57. data/grammars/source.c.json +237 -251
  58. data/grammars/source.c.platform.json +153 -159
  59. data/grammars/source.c2hs.json +3 -6
  60. data/grammars/source.cabal.json +17 -20
  61. data/grammars/source.cache.cmake.json +18 -23
  62. data/grammars/source.cake.json +4 -7
  63. data/grammars/source.camlp4.ocaml.json +24 -27
  64. data/grammars/source.capnp.json +33 -38
  65. data/grammars/source.ceylon.json +44 -50
  66. data/grammars/source.cfscript.cfc.json +78 -86
  67. data/grammars/source.cfscript.json +513 -520
  68. data/grammars/source.changelogs.rpm-spec.json +8 -16
  69. data/grammars/source.chapel.json +109 -87
  70. data/grammars/source.cirru.json +25 -30
  71. data/grammars/source.clarion.json +41 -54
  72. data/grammars/source.clean.json +90 -95
  73. data/grammars/source.click.json +25 -28
  74. data/grammars/source.clips.json +10 -23
  75. data/grammars/source.clojure.json +151 -168
  76. data/grammars/source.cm.json +14 -19
  77. data/grammars/source.cmake.json +53 -61
  78. data/grammars/source.cobol.json +165 -180
  79. data/grammars/source.coffee.json +454 -462
  80. data/grammars/source.cool.json +36 -43
  81. data/grammars/source.coq.json +17 -21
  82. data/grammars/source.crystal.json +889 -983
  83. data/grammars/source.cs.json +739 -740
  84. data/grammars/source.csound-document.json +69 -73
  85. data/grammars/source.csound-score.json +52 -55
  86. data/grammars/source.csound.json +167 -171
  87. data/grammars/source.css.json +683 -688
  88. data/grammars/source.css.less.json +211 -511
  89. data/grammars/source.css.mss.json +94 -101
  90. data/grammars/source.css.postcss.sugarss.json +260 -0
  91. data/grammars/source.csx.json +4 -7
  92. data/grammars/source.cuda-c++.json +47 -81
  93. data/grammars/source.cwl.json +103 -0
  94. data/grammars/source.cython.json +536 -582
  95. data/grammars/source.d.json +243 -252
  96. data/grammars/source.dart.json +161 -166
  97. data/grammars/source.data-weave.json +901 -905
  98. data/grammars/source.desktop.json +29 -33
  99. data/grammars/source.diff.json +43 -52
  100. data/grammars/source.disasm.json +15 -16
  101. data/grammars/source.ditroff.desc.json +73 -84
  102. data/grammars/source.ditroff.json +60 -61
  103. data/grammars/source.dm.json +202 -213
  104. data/grammars/source.dmf.json +44 -47
  105. data/grammars/source.dockerfile.json +29 -34
  106. data/grammars/source.dot.json +46 -55
  107. data/grammars/source.dylan.json +63 -68
  108. data/grammars/source.ebnf.json +55 -62
  109. data/grammars/source.eiffel.json +57 -62
  110. data/grammars/source.elixir.json +321 -366
  111. data/grammars/source.emacs.lisp.json +458 -249
  112. data/grammars/source.erazor.json +49 -57
  113. data/grammars/source.erlang.json +508 -515
  114. data/grammars/source.essl.json +17 -30
  115. data/grammars/source.factor.json +85 -91
  116. data/grammars/source.fan.json +92 -96
  117. data/grammars/source.fancy.json +93 -118
  118. data/grammars/source.fish.json +74 -98
  119. data/grammars/source.fontforge.json +142 -146
  120. data/grammars/source.forth.json +42 -57
  121. data/grammars/source.fortran.json +193 -231
  122. data/grammars/source.fortran.modern.json +77 -103
  123. data/grammars/source.fsharp.fsi.json +1 -6
  124. data/grammars/source.fsharp.fsl.json +1 -6
  125. data/grammars/source.fsharp.fsx.json +1 -6
  126. data/grammars/source.fsharp.json +148 -153
  127. data/grammars/source.gap.json +60 -70
  128. data/grammars/source.gcode.json +9 -16
  129. data/grammars/source.gdb.json +63 -79
  130. data/grammars/source.gdb.session.json +27 -28
  131. data/grammars/source.gdbregs.json +7 -8
  132. data/grammars/source.gdscript.json +92 -96
  133. data/grammars/source.gerber.json +38 -56
  134. data/grammars/source.gfm.json +447 -462
  135. data/grammars/source.glsl.json +58 -83
  136. data/grammars/source.gn.json +188 -193
  137. data/grammars/source.gnuplot.json +104 -120
  138. data/grammars/source.go.json +169 -181
  139. data/grammars/source.golo.json +82 -87
  140. data/grammars/source.gosu.2.json +58 -68
  141. data/grammars/source.grace.json +266 -270
  142. data/grammars/source.graphql.json +586 -596
  143. data/grammars/source.groovy.gradle.json +18 -22
  144. data/grammars/source.groovy.json +422 -433
  145. data/grammars/source.harbour.json +129 -173
  146. data/grammars/source.haskell.json +871 -772
  147. data/grammars/source.haxe.2.json +402 -413
  148. data/grammars/source.hlsl.json +6 -16
  149. data/grammars/source.hsc2hs.json +1 -4
  150. data/grammars/source.hsig.json +871 -770
  151. data/grammars/source.hss.1.json +122 -144
  152. data/grammars/source.httpspec.json +119 -123
  153. data/grammars/source.hxml.json +8 -15
  154. data/grammars/source.ideal.json +125 -125
  155. data/grammars/source.idl-dlm.json +25 -32
  156. data/grammars/source.idl.json +59 -80
  157. data/grammars/source.idris.json +171 -185
  158. data/grammars/source.inform7.json +117 -121
  159. data/grammars/source.ini.json +37 -43
  160. data/grammars/source.io.json +65 -73
  161. data/grammars/source.ioke.json +72 -78
  162. data/grammars/source.isabelle.root.json +26 -30
  163. data/grammars/source.isabelle.theory.json +46 -50
  164. data/grammars/source.j.json +18 -21
  165. data/grammars/source.jasmin.json +45 -50
  166. data/grammars/source.java-properties.json +31 -41
  167. data/grammars/source.java.json +333 -342
  168. data/grammars/source.jcl.json +15 -18
  169. data/grammars/source.jflex.json +166 -172
  170. data/grammars/source.jison.json +331 -334
  171. data/grammars/source.jisonlex-injection.json +1 -2
  172. data/grammars/source.jisonlex.json +148 -151
  173. data/grammars/source.jolie.json +37 -43
  174. data/grammars/source.jq.json +80 -87
  175. data/grammars/source.js.json +798 -818
  176. data/grammars/source.js.jsx.json +2115 -2225
  177. data/grammars/source.js.objj.json +167 -172
  178. data/grammars/source.js.regexp.json +50 -50
  179. data/grammars/source.js.regexp.replacement.json +7 -7
  180. data/grammars/source.jsdoc.json +94 -94
  181. data/grammars/source.json.json +61 -71
  182. data/grammars/source.julia.console.json +5 -6
  183. data/grammars/source.julia.json +237 -234
  184. data/grammars/source.lean.json +55 -67
  185. data/grammars/source.lid.json +6 -10
  186. data/grammars/source.lilypond.json +181 -195
  187. data/grammars/source.lisp.json +40 -50
  188. data/grammars/source.litcoffee.json +169 -183
  189. data/grammars/source.livescript.json +207 -220
  190. data/grammars/source.llvm.json +28 -38
  191. data/grammars/source.logos.json +7 -14
  192. data/grammars/source.logtalk.json +136 -141
  193. data/grammars/source.loomscript.json +77 -83
  194. data/grammars/source.lsl.json +90 -106
  195. data/grammars/source.lua.json +100 -109
  196. data/grammars/source.makefile.json +181 -188
  197. data/grammars/source.makegen.json +3 -7
  198. data/grammars/source.mask.json +260 -265
  199. data/grammars/source.mata.json +38 -46
  200. data/grammars/source.mathematica.json +155 -167
  201. data/grammars/source.matlab.json +407 -684
  202. data/grammars/source.maxscript.json +293 -281
  203. data/grammars/source.mercury.json +179 -184
  204. data/grammars/source.meson.json +52 -58
  205. data/grammars/source.meta-info.json +64 -74
  206. data/grammars/source.ml.json +107 -113
  207. data/grammars/source.modelica.json +51 -59
  208. data/grammars/source.modula2.json +33 -42
  209. data/grammars/source.monkey.json +234 -241
  210. data/grammars/source.moonscript.json +51 -56
  211. data/grammars/source.mql5.json +74 -101
  212. data/grammars/source.mupad.json +30 -72
  213. data/grammars/source.ncl.json +1 -14
  214. data/grammars/source.ne.json +39 -42
  215. data/grammars/source.nemerle.json +58 -63
  216. data/grammars/source.nesc.json +9 -15
  217. data/grammars/source.netlinx.erb.json +13 -25
  218. data/grammars/source.netlinx.json +231 -292
  219. data/grammars/source.nextflow-groovy.json +1360 -0
  220. data/grammars/source.nextflow.json +74 -0
  221. data/grammars/source.nginx.json +274 -287
  222. data/grammars/source.nim.json +442 -483
  223. data/grammars/source.nim_filter.json +6 -26
  224. data/grammars/source.nimcfg.json +38 -51
  225. data/grammars/source.ninja.json +64 -70
  226. data/grammars/source.nit.json +60 -64
  227. data/grammars/source.nix.json +269 -273
  228. data/grammars/source.nmml.json +31 -37
  229. data/grammars/source.nsis.json +66 -72
  230. data/grammars/source.nu.json +129 -139
  231. data/grammars/source.nut.json +129 -133
  232. data/grammars/source.objc++.json +3 -10
  233. data/grammars/source.objc.json +303 -314
  234. data/grammars/source.objc.platform.json +145 -151
  235. data/grammars/source.ocaml.json +506 -514
  236. data/grammars/source.ocamllex.json +108 -115
  237. data/grammars/source.ocamlyacc.json +116 -123
  238. data/grammars/source.ooc.json +148 -155
  239. data/grammars/source.opa.json +39 -49
  240. data/grammars/source.opal.json +84 -89
  241. data/grammars/source.opalsysdefs.json +9 -13
  242. data/grammars/source.opencobol.json +22 -25
  243. data/grammars/source.opentype.json +148 -152
  244. data/grammars/source.ox.json +36 -44
  245. data/grammars/source.oz.json +31 -38
  246. data/grammars/source.p4.json +49 -59
  247. data/grammars/source.pan.json +273 -278
  248. data/grammars/source.papyrus.skyrim.json +705 -781
  249. data/grammars/source.parrot.pir.json +59 -65
  250. data/grammars/source.pascal.json +54 -61
  251. data/grammars/source.pawn.json +835 -849
  252. data/grammars/source.pcb.board.json +153 -158
  253. data/grammars/source.pcb.schematic.json +134 -138
  254. data/grammars/source.pcb.sexp.json +64 -74
  255. data/grammars/source.pep8.json +28 -32
  256. data/grammars/source.perl.6.json +83 -92
  257. data/grammars/source.perl.json +711 -737
  258. data/grammars/source.perl6fe.json +1204 -1218
  259. data/grammars/source.php.zephir.json +80 -89
  260. data/grammars/source.pic.json +137 -142
  261. data/grammars/source.pig_latin.json +76 -80
  262. data/grammars/source.pike.json +23 -36
  263. data/grammars/source.po.json +74 -84
  264. data/grammars/source.pogoscript.json +23 -29
  265. data/grammars/source.pony.json +98 -108
  266. data/grammars/source.postcss.json +370 -0
  267. data/grammars/source.postscript.json +88 -97
  268. data/grammars/source.pov-ray sdl.json +36 -42
  269. data/grammars/source.powershell.json +175 -197
  270. data/grammars/source.processing.json +236 -249
  271. data/grammars/source.prolog.eclipse.json +33 -38
  272. data/grammars/source.prolog.json +66 -72
  273. data/grammars/source.protobuf.json +88 -94
  274. data/grammars/source.puppet.json +144 -151
  275. data/grammars/source.purescript.json +268 -289
  276. data/grammars/source.pyjade.json +256 -281
  277. data/grammars/source.python.django.json +13 -18
  278. data/grammars/source.python.json +3319 -3367
  279. data/grammars/source.python.salt.json +3 -7
  280. data/grammars/source.qmake.json +83 -90
  281. data/grammars/source.qml.json +57 -78
  282. data/grammars/source.quoting.perl6fe.json +666 -669
  283. data/grammars/source.r.json +75 -84
  284. data/grammars/source.racket.json +17 -38
  285. data/grammars/source.rascal.json +77 -80
  286. data/grammars/source.reason.hover.type.json +1 -1
  287. data/grammars/source.reason.json +1025 -1080
  288. data/grammars/source.rebol.json +167 -177
  289. data/grammars/source.red.json +169 -177
  290. data/grammars/source.regexp.babel.json +74 -77
  291. data/grammars/source.regexp.extended.json +4 -5
  292. data/grammars/source.regexp.json +260 -264
  293. data/grammars/source.regexp.perl6fe.json +108 -111
  294. data/grammars/source.regexp.python.json +210 -215
  295. data/grammars/source.regexp.spin.json +63 -72
  296. data/grammars/source.renpy.json +617 -687
  297. data/grammars/source.rexx.json +25 -32
  298. data/grammars/source.ring.json +84 -114
  299. data/grammars/source.rpm-spec.json +392 -401
  300. data/grammars/source.ruby.gemfile.json +9 -12
  301. data/grammars/source.ruby.json +862 -952
  302. data/grammars/source.ruby.rspec.cucumber.steps.json +90 -103
  303. data/grammars/source.rust.json +223 -281
  304. data/grammars/source.sas.json +88 -105
  305. data/grammars/source.sass.json +100 -108
  306. data/grammars/source.sbt.json +16 -23
  307. data/grammars/source.scad.json +60 -67
  308. data/grammars/source.scala.json +215 -228
  309. data/grammars/source.scaml.json +120 -135
  310. data/grammars/source.scheme.json +119 -136
  311. data/grammars/source.scilab.json +40 -47
  312. data/grammars/source.scss.json +369 -403
  313. data/grammars/source.sdbl.json +14 -25
  314. data/grammars/source.shaderlab.json +24 -27
  315. data/grammars/source.shell.json +409 -440
  316. data/grammars/source.shen.json +75 -94
  317. data/grammars/source.smali.json +232 -293
  318. data/grammars/source.smalltalk.json +60 -75
  319. data/grammars/source.smt.json +67 -82
  320. data/grammars/source.solidity.json +35 -54
  321. data/grammars/source.sp.json +40 -45
  322. data/grammars/source.sparql.json +3 -8
  323. data/grammars/source.spin.json +277 -297
  324. data/grammars/source.sqf.json +34 -44
  325. data/grammars/source.sql.json +142 -156
  326. data/grammars/source.stan.json +201 -160
  327. data/grammars/source.stata.json +57 -68
  328. data/grammars/source.strings.json +26 -30
  329. data/grammars/source.stylus.json +558 -565
  330. data/grammars/source.supercollider.json +33 -40
  331. data/grammars/source.swift.json +999 -1077
  332. data/grammars/source.systemverilog.json +351 -365
  333. data/grammars/source.tcl.json +77 -94
  334. data/grammars/source.tea.json +61 -67
  335. data/grammars/source.terra.json +25 -32
  336. data/grammars/source.terraform.json +68 -88
  337. data/grammars/source.thrift.json +300 -306
  338. data/grammars/source.tl.json +112 -117
  339. data/grammars/source.tla.json +65 -69
  340. data/grammars/source.toc.json +21 -25
  341. data/grammars/source.toml.json +117 -122
  342. data/grammars/source.ts.json +2838 -2774
  343. data/grammars/source.tsx.json +180 -184
  344. data/grammars/source.turing.json +970 -974
  345. data/grammars/source.turtle.json +124 -140
  346. data/grammars/source.txl.json +23 -37
  347. data/grammars/source.ucfconstraints.json +16 -21
  348. data/grammars/source.ur.json +15 -27
  349. data/grammars/source.vala.json +221 -235
  350. data/grammars/source.varnish.vcl.json +117 -129
  351. data/grammars/source.vbnet.json +69 -106
  352. data/grammars/source.verilog.json +101 -107
  353. data/grammars/source.vhdl.json +437 -445
  354. data/grammars/source.viml.json +540 -550
  355. data/grammars/source.wavefront.mtl.json +274 -277
  356. data/grammars/source.wavefront.obj.json +781 -784
  357. data/grammars/source.wdl.json +66 -46
  358. data/grammars/source.webassembly.json +97 -102
  359. data/grammars/source.webidl.json +311 -326
  360. data/grammars/source.x10.json +28 -32
  361. data/grammars/source.x86asm.json +21 -26
  362. data/grammars/source.xc.json +164 -172
  363. data/grammars/source.xq.json +81 -92
  364. data/grammars/source.xtend.json +199 -208
  365. data/grammars/source.yaml-ext.json +118 -124
  366. data/grammars/source.yaml.json +155 -174
  367. data/grammars/source.yaml.salt.json +113 -116
  368. data/grammars/source.yang.json +10 -13
  369. data/grammars/source.yara.json +98 -0
  370. data/grammars/text.bibtex.json +95 -100
  371. data/grammars/text.cfml.basic.json +403 -404
  372. data/grammars/text.elixir.json +18 -23
  373. data/grammars/text.error-list.json +15 -16
  374. data/grammars/text.find-refs.json +487 -488
  375. data/grammars/text.gherkin.feature.json +45 -53
  376. data/grammars/text.haml.json +176 -189
  377. data/grammars/text.hamlc.json +82 -88
  378. data/grammars/text.html.abl.json +16 -21
  379. data/grammars/text.html.asciidoc.json +139 -153
  380. data/grammars/text.html.asdoc.json +145 -155
  381. data/grammars/text.html.asp.json +23 -28
  382. data/grammars/text.html.basic.json +323 -338
  383. data/grammars/text.html.cfm.json +316 -325
  384. data/grammars/text.html.creole.json +177 -189
  385. data/grammars/text.html.django.json +27 -33
  386. data/grammars/text.html.ecr.json +21 -25
  387. data/grammars/text.html.elixir.json +3 -9
  388. data/grammars/text.html.erb.json +81 -85
  389. data/grammars/text.html.erlang.yaws.json +24 -29
  390. data/grammars/text.html.factor.json +5 -11
  391. data/grammars/text.html.ftl.json +16 -25
  392. data/grammars/text.html.handlebars.json +579 -598
  393. data/grammars/text.html.javadoc.json +426 -0
  394. data/grammars/text.html.js.json +11 -17
  395. data/grammars/text.html.jsp.json +377 -384
  396. data/grammars/text.html.liquid.json +8 -18
  397. data/grammars/text.html.mako.json +257 -275
  398. data/grammars/text.html.markdown.source.gfm.apib.json +419 -427
  399. data/grammars/text.html.markdown.source.gfm.mson.json +405 -414
  400. data/grammars/text.html.mediawiki.json +318 -344
  401. data/grammars/text.html.php.blade.json +2134 -2140
  402. data/grammars/text.html.php.json +980 -1013
  403. data/grammars/text.html.slash.json +101 -107
  404. data/grammars/text.html.smarty.json +75 -83
  405. data/grammars/text.html.soy.json +250 -253
  406. data/grammars/text.html.ssp.json +18 -24
  407. data/grammars/text.html.tcl.json +17 -24
  408. data/grammars/text.html.twig.json +712 -718
  409. data/grammars/text.idl-idldoc.json +5 -9
  410. data/grammars/text.jade.json +213 -235
  411. data/grammars/text.junit-test-report.json +25 -28
  412. data/grammars/text.log.latex.json +44 -46
  413. data/grammars/text.marko.json +370 -401
  414. data/grammars/text.python.console.json +3 -7
  415. data/grammars/text.python.traceback.json +2 -5
  416. data/grammars/text.rdoc.json +15 -19
  417. data/grammars/text.restructuredtext.clean.json +8 -11
  418. data/grammars/text.restructuredtext.json +886 -873
  419. data/grammars/text.robot.json +26 -36
  420. data/grammars/text.roff.json +2852 -2915
  421. data/grammars/text.runoff.json +56 -69
  422. data/grammars/text.sfd.json +151 -155
  423. data/grammars/text.shell-session.json +5 -8
  424. data/grammars/text.slim.json +184 -210
  425. data/grammars/text.srt.json +54 -57
  426. data/grammars/text.tex.json +98 -105
  427. data/grammars/text.tex.latex.beamer.json +14 -20
  428. data/grammars/text.tex.latex.haskell.json +883 -782
  429. data/grammars/text.tex.latex.json +281 -291
  430. data/grammars/text.tex.latex.memoir.json +39 -46
  431. data/grammars/text.tex.latex.rd.json +32 -38
  432. data/grammars/text.xml.ant.json +62 -69
  433. data/grammars/text.xml.flex-config.json +1009 -1013
  434. data/grammars/text.xml.genshi.json +10 -16
  435. data/grammars/text.xml.json +117 -130
  436. data/grammars/text.xml.pom.json +235 -240
  437. data/grammars/text.xml.xsl.json +31 -37
  438. data/grammars/text.zone_file.json +24 -29
  439. data/lib/linguist/blob.rb +10 -1
  440. data/lib/linguist/blob_helper.rb +4 -1
  441. data/lib/linguist/file_blob.rb +5 -0
  442. data/lib/linguist/generated.rb +16 -0
  443. data/lib/linguist/heuristics.rb +23 -11
  444. data/lib/linguist/language.rb +3 -6
  445. data/lib/linguist/languages.json +1 -1
  446. data/lib/linguist/languages.yml +74 -12
  447. data/lib/linguist/lazy_blob.rb +15 -1
  448. data/lib/linguist/linguist.bundle +0 -0
  449. data/lib/linguist/samples.json +1666 -3381
  450. data/lib/linguist/shebang.rb +2 -0
  451. data/lib/linguist/strategy/modeline.rb +2 -0
  452. data/lib/linguist/vendor.yml +5 -6
  453. data/lib/linguist/version.rb +1 -1
  454. metadata +12 -11
  455. data/grammars/source.elm.json +0 -381
  456. data/grammars/source.nant-build.json +0 -86
  457. data/grammars/source.octave.json +0 -451
  458. data/grammars/text.html.mediawiki.elm-build-output.json +0 -111
  459. data/grammars/text.html.mediawiki.elm-documentation.json +0 -22
  460. data/grammars/text.html.vue.json +0 -936
@@ -1,11 +1,11 @@
1
1
  {
2
- "fileTypes": [
3
-
4
- ],
5
2
  "name": "objdump C++",
3
+ "scopeName": "objdump.x86asm",
6
4
  "patterns": [
7
5
  {
6
+ "name": "meta.embedded.x86asm",
8
7
  "begin": "^(.*):\\s+file format (.*)$",
8
+ "end": "^",
9
9
  "beginCaptures": {
10
10
  "0": {
11
11
  "name": "comment.x86.assembly"
@@ -13,12 +13,12 @@
13
13
  "1": {
14
14
  "name": "entity.name.type.x86.assembly"
15
15
  }
16
- },
17
- "end": "^",
18
- "name": "meta.embedded.x86asm"
16
+ }
19
17
  },
20
18
  {
19
+ "name": "meta.embedded.x86asm",
21
20
  "begin": "^Disassembly of section (.*):$",
21
+ "end": "^",
22
22
  "beginCaptures": {
23
23
  "0": {
24
24
  "name": "comment.x86.assembly"
@@ -26,12 +26,12 @@
26
26
  "1": {
27
27
  "name": "entity.name.tag.x86.assembly"
28
28
  }
29
- },
30
- "end": "^",
31
- "name": "meta.embedded.x86asm"
29
+ }
32
30
  },
33
31
  {
34
- "begin": "^[0-9A-Za-z]+ <(.*)>:$",
32
+ "name": "meta.embedded.x86asm",
33
+ "begin": "^[0-9A-Za-z]+ \u003c(.*)\u003e:$",
34
+ "end": "^",
35
35
  "beginCaptures": {
36
36
  "0": {
37
37
  "name": "comment.x86.assembly"
@@ -39,24 +39,22 @@
39
39
  "1": {
40
40
  "name": "entity.name.function.x86.assembly"
41
41
  }
42
- },
43
- "end": "^",
44
- "name": "meta.embedded.x86asm"
42
+ }
45
43
  },
46
44
  {
45
+ "name": "meta.embedded.x86asm",
47
46
  "begin": "^\\s*[0-9A-Za-z]+:(?:\\t[0-9A-Za-z]{2}\\s+){0,1}(?:\\t|$)",
48
- "beginCaptures": {
49
- "0": {
50
- "name": "comment.x86.assembly"
51
- }
52
- },
53
47
  "end": "^",
54
- "name": "meta.embedded.x86asm",
55
48
  "patterns": [
56
49
  {
57
50
  "include": "source.x86asm"
58
51
  }
59
- ]
52
+ ],
53
+ "beginCaptures": {
54
+ "0": {
55
+ "name": "comment.x86.assembly"
56
+ }
57
+ }
60
58
  },
61
59
  {
62
60
  "include": "#special_block"
@@ -67,7 +65,5 @@
67
65
  {
68
66
  "include": "source.c++"
69
67
  }
70
- ],
71
- "scopeName": "objdump.x86asm",
72
- "uuid": "F8BE49A2-4FF5-4690-A960-D080EF4A7C48"
73
- }
68
+ ]
69
+ }
@@ -1,14 +1,12 @@
1
1
  {
2
- "fileTypes": [
3
- "kt",
4
- "kts"
5
- ],
6
2
  "name": "Kotlin",
3
+ "scopeName": "source.Kotlin",
7
4
  "patterns": [
8
5
  {
9
6
  "include": "#comments"
10
7
  },
11
8
  {
9
+ "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*)?",
12
10
  "captures": {
13
11
  "1": {
14
12
  "name": "keyword.other.kotlin"
@@ -16,8 +14,7 @@
16
14
  "2": {
17
15
  "name": "entity.name.package.kotlin"
18
16
  }
19
- },
20
- "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*)?"
17
+ }
21
18
  },
22
19
  {
23
20
  "include": "#imports"
@@ -33,26 +30,26 @@
33
30
  "patterns": [
34
31
  {
35
32
  "begin": "\\b(companion\\s*)?(class|object|interface)\\b",
36
- "beginCaptures": {
37
- "1": {
38
- "name": "keyword.other.kotlin"
39
- }
40
- },
41
- "end": "(?=<|{|\\(|:)",
33
+ "end": "(?=\u003c|{|\\(|:)",
42
34
  "patterns": [
43
35
  {
44
- "match": "\\b(object)\\b",
45
- "name": "keyword.other.kotlin"
36
+ "name": "keyword.other.kotlin",
37
+ "match": "\\b(object)\\b"
46
38
  },
47
39
  {
48
- "match": "\\w+",
49
- "name": "entity.name.type.class.kotlin"
40
+ "name": "entity.name.type.class.kotlin",
41
+ "match": "\\w+"
50
42
  }
51
- ]
43
+ ],
44
+ "beginCaptures": {
45
+ "1": {
46
+ "name": "keyword.other.kotlin"
47
+ }
48
+ }
52
49
  },
53
50
  {
54
- "begin": "<",
55
- "end": ">",
51
+ "begin": "\u003c",
52
+ "end": "\u003e",
56
53
  "patterns": [
57
54
  {
58
55
  "include": "#generics"
@@ -70,16 +67,11 @@
70
67
  },
71
68
  {
72
69
  "begin": "(:)",
73
- "beginCaptures": {
74
- "1": {
75
- "name": "keyword.operator.declaration.kotlin"
76
- }
77
- },
78
70
  "end": "(?={|$)",
79
71
  "patterns": [
80
72
  {
81
- "match": "\\w+",
82
- "name": "entity.other.inherited-class.kotlin"
73
+ "name": "entity.other.inherited-class.kotlin",
74
+ "match": "\\w+"
83
75
  },
84
76
  {
85
77
  "begin": "\\(",
@@ -90,7 +82,12 @@
90
82
  }
91
83
  ]
92
84
  }
93
- ]
85
+ ],
86
+ "beginCaptures": {
87
+ "1": {
88
+ "name": "keyword.operator.declaration.kotlin"
89
+ }
90
+ }
94
91
  },
95
92
  {
96
93
  "begin": "\\{",
@@ -106,16 +103,17 @@
106
103
  "comments": {
107
104
  "patterns": [
108
105
  {
106
+ "name": "comment.block.kotlin",
109
107
  "begin": "/\\*",
108
+ "end": "\\*/",
110
109
  "captures": {
111
110
  "0": {
112
111
  "name": "punctuation.definition.comment.kotlin"
113
112
  }
114
- },
115
- "end": "\\*/",
116
- "name": "comment.block.kotlin"
113
+ }
117
114
  },
118
115
  {
116
+ "match": "\\s*((//).*$\\n?)",
119
117
  "captures": {
120
118
  "1": {
121
119
  "name": "comment.line.double-slash.kotlin"
@@ -123,24 +121,23 @@
123
121
  "2": {
124
122
  "name": "punctuation.definition.comment.kotlin"
125
123
  }
126
- },
127
- "match": "\\s*((//).*$\\n?)"
124
+ }
128
125
  }
129
126
  ]
130
127
  },
131
128
  "constants": {
132
129
  "patterns": [
133
130
  {
134
- "match": "\\b(true|false|null|this|super)\\b",
135
- "name": "constant.language.kotlin"
131
+ "name": "constant.language.kotlin",
132
+ "match": "\\b(true|false|null|this|super)\\b"
136
133
  },
137
134
  {
138
- "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
139
- "name": "constant.numeric.kotlin"
135
+ "name": "constant.numeric.kotlin",
136
+ "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b"
140
137
  },
141
138
  {
142
- "match": "\\b([A-Z][A-Z0-9_]+)\\b",
143
- "name": "constant.other.kotlin"
139
+ "name": "constant.other.kotlin",
140
+ "match": "\\b([A-Z][A-Z0-9_]+)\\b"
144
141
  }
145
142
  ]
146
143
  },
@@ -178,16 +175,11 @@
178
175
  "patterns": [
179
176
  {
180
177
  "begin": "\\b(fun)\\b",
181
- "beginCaptures": {
182
- "1": {
183
- "name": "keyword.other.kotlin"
184
- }
185
- },
186
178
  "end": "(?=\\()",
187
179
  "patterns": [
188
180
  {
189
- "begin": "<",
190
- "end": ">",
181
+ "begin": "\u003c",
182
+ "end": "\u003e",
191
183
  "patterns": [
192
184
  {
193
185
  "include": "#generics"
@@ -195,14 +187,19 @@
195
187
  ]
196
188
  },
197
189
  {
190
+ "match": "([\\.\u003c\\?\u003e\\w]+\\.)?(\\w+)",
198
191
  "captures": {
199
192
  "2": {
200
193
  "name": "entity.name.function.kotlin"
201
194
  }
202
- },
203
- "match": "([\\.<\\?>\\w]+\\.)?(\\w+)"
195
+ }
204
196
  }
205
- ]
197
+ ],
198
+ "beginCaptures": {
199
+ "1": {
200
+ "name": "keyword.other.kotlin"
201
+ }
202
+ }
206
203
  },
207
204
  {
208
205
  "begin": "\\(",
@@ -215,17 +212,17 @@
215
212
  },
216
213
  {
217
214
  "begin": "(:)",
218
- "beginCaptures": {
219
- "1": {
220
- "name": "keyword.operator.declaration.kotlin"
221
- }
222
- },
223
215
  "end": "(?={|=|$)",
224
216
  "patterns": [
225
217
  {
226
218
  "include": "#types"
227
219
  }
228
- ]
220
+ ],
221
+ "beginCaptures": {
222
+ "1": {
223
+ "name": "keyword.operator.declaration.kotlin"
224
+ }
225
+ }
229
226
  },
230
227
  {
231
228
  "begin": "\\{",
@@ -238,17 +235,17 @@
238
235
  },
239
236
  {
240
237
  "begin": "(=)",
241
- "beginCaptures": {
242
- "1": {
243
- "name": "keyword.operator.assignment.kotlin"
244
- }
245
- },
246
238
  "end": "(?=$)",
247
239
  "patterns": [
248
240
  {
249
241
  "include": "#expressions"
250
242
  }
251
- ]
243
+ ],
244
+ "beginCaptures": {
245
+ "1": {
246
+ "name": "keyword.operator.assignment.kotlin"
247
+ }
248
+ }
252
249
  }
253
250
  ]
254
251
  },
@@ -256,24 +253,24 @@
256
253
  "patterns": [
257
254
  {
258
255
  "begin": "(:)",
259
- "beginCaptures": {
260
- "1": {
261
- "name": "keyword.operator.declaration.kotlin"
262
- }
263
- },
264
- "end": "(?=,|>)",
256
+ "end": "(?=,|\u003e)",
265
257
  "patterns": [
266
258
  {
267
259
  "include": "#types"
268
260
  }
269
- ]
261
+ ],
262
+ "beginCaptures": {
263
+ "1": {
264
+ "name": "keyword.operator.declaration.kotlin"
265
+ }
266
+ }
270
267
  },
271
268
  {
272
269
  "include": "#keywords"
273
270
  },
274
271
  {
275
- "match": "\\w+",
276
- "name": "storage.type.generic.kotlin"
272
+ "name": "storage.type.generic.kotlin",
273
+ "match": "\\w+"
277
274
  }
278
275
  ]
279
276
  },
@@ -281,26 +278,21 @@
281
278
  "patterns": [
282
279
  {
283
280
  "begin": "\\b(get)\\b\\s*\\(\\s*\\)",
284
- "beginCaptures": {
285
- "1": {
286
- "name": "entity.name.function.kotlin"
287
- }
288
- },
289
281
  "end": "\\}|(?=\\bset\\b)|$",
290
282
  "patterns": [
291
283
  {
292
284
  "begin": "(=)",
293
- "beginCaptures": {
294
- "1": {
295
- "name": "keyword.operator.assignment.kotlin"
296
- }
297
- },
298
285
  "end": "(?=$|\\bset\\b)",
299
286
  "patterns": [
300
287
  {
301
288
  "include": "#expressions"
302
289
  }
303
- ]
290
+ ],
291
+ "beginCaptures": {
292
+ "1": {
293
+ "name": "keyword.operator.assignment.kotlin"
294
+ }
295
+ }
304
296
  },
305
297
  {
306
298
  "begin": "\\{",
@@ -311,15 +303,15 @@
311
303
  }
312
304
  ]
313
305
  }
314
- ]
315
- },
316
- {
317
- "begin": "\\b(set)\\b\\s*(?=\\()",
306
+ ],
318
307
  "beginCaptures": {
319
308
  "1": {
320
309
  "name": "entity.name.function.kotlin"
321
310
  }
322
- },
311
+ }
312
+ },
313
+ {
314
+ "begin": "\\b(set)\\b\\s*(?=\\()",
323
315
  "end": "\\}|(?=\\bget\\b)|$",
324
316
  "patterns": [
325
317
  {
@@ -333,17 +325,17 @@
333
325
  },
334
326
  {
335
327
  "begin": "(=)",
336
- "beginCaptures": {
337
- "1": {
338
- "name": "keyword.operator.assignment.kotlin"
339
- }
340
- },
341
328
  "end": "(?=$|\\bset\\b)",
342
329
  "patterns": [
343
330
  {
344
331
  "include": "#expressions"
345
332
  }
346
- ]
333
+ ],
334
+ "beginCaptures": {
335
+ "1": {
336
+ "name": "keyword.operator.assignment.kotlin"
337
+ }
338
+ }
347
339
  },
348
340
  {
349
341
  "begin": "\\{",
@@ -354,13 +346,19 @@
354
346
  }
355
347
  ]
356
348
  }
357
- ]
349
+ ],
350
+ "beginCaptures": {
351
+ "1": {
352
+ "name": "entity.name.function.kotlin"
353
+ }
354
+ }
358
355
  }
359
356
  ]
360
357
  },
361
358
  "imports": {
362
359
  "patterns": [
363
360
  {
361
+ "match": "^\\s*(import)\\s+[^ $]+\\s+(as)?",
364
362
  "captures": {
365
363
  "1": {
366
364
  "name": "keyword.other.kotlin"
@@ -368,76 +366,75 @@
368
366
  "2": {
369
367
  "name": "keyword.other.kotlin"
370
368
  }
371
- },
372
- "match": "^\\s*(import)\\s+[^ $]+\\s+(as)?"
369
+ }
373
370
  }
374
371
  ]
375
372
  },
376
373
  "keywords": {
377
374
  "patterns": [
378
375
  {
379
- "match": "\\b(var|val|public|private|protected|abstract|final|enum|open|attribute|annotation|override|inline|var|val|vararg|lazy|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof)\\b",
380
- "name": "storage.modifier.kotlin"
376
+ "name": "storage.modifier.kotlin",
377
+ "match": "\\b(var|val|public|private|protected|abstract|final|enum|open|attribute|annotation|override|inline|var|val|vararg|lazy|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof)\\b"
381
378
  },
382
379
  {
383
- "match": "\\b(try|catch|finally|throw)\\b",
384
- "name": "keyword.control.catch-exception.kotlin"
380
+ "name": "keyword.control.catch-exception.kotlin",
381
+ "match": "\\b(try|catch|finally|throw)\\b"
385
382
  },
386
383
  {
387
- "match": "\\b(if|else|while|for|do|return|when|where|break|continue)\\b",
388
- "name": "keyword.control.kotlin"
384
+ "name": "keyword.control.kotlin",
385
+ "match": "\\b(if|else|while|for|do|return|when|where|break|continue)\\b"
389
386
  },
390
387
  {
391
- "match": "\\b(in|is|as|assert)\\b",
392
- "name": "keyword.operator.kotlin"
388
+ "name": "keyword.operator.kotlin",
389
+ "match": "\\b(in|is|as|assert)\\b"
393
390
  },
394
391
  {
395
- "match": "(==|!=|===|!==|<=|>=|<|>)",
396
- "name": "keyword.operator.comparison.kotlin"
392
+ "name": "keyword.operator.comparison.kotlin",
393
+ "match": "(==|!=|===|!==|\u003c=|\u003e=|\u003c|\u003e)"
397
394
  },
398
395
  {
399
- "match": "(=)",
400
- "name": "keyword.operator.assignment.kotlin"
396
+ "name": "keyword.operator.assignment.kotlin",
397
+ "match": "(=)"
401
398
  },
402
399
  {
403
- "match": "(:)",
404
- "name": "keyword.operator.declaration.kotlin"
400
+ "name": "keyword.operator.declaration.kotlin",
401
+ "match": "(:)"
405
402
  },
406
403
  {
407
- "match": "(\\.)",
408
- "name": "keyword.operator.dot.kotlin"
404
+ "name": "keyword.operator.dot.kotlin",
405
+ "match": "(\\.)"
409
406
  },
410
407
  {
411
- "match": "(\\-\\-|\\+\\+)",
412
- "name": "keyword.operator.increment-decrement.kotlin"
408
+ "name": "keyword.operator.increment-decrement.kotlin",
409
+ "match": "(\\-\\-|\\+\\+)"
413
410
  },
414
411
  {
415
- "match": "(\\-|\\+|\\*|\\/|%)",
416
- "name": "keyword.operator.arithmetic.kotlin"
412
+ "name": "keyword.operator.arithmetic.kotlin",
413
+ "match": "(\\-|\\+|\\*|\\/|%)"
417
414
  },
418
415
  {
419
- "match": "(\\+=|\\-=|\\*=|\\/=)",
420
- "name": "keyword.operator.arithmetic.assign.kotlin"
416
+ "name": "keyword.operator.arithmetic.assign.kotlin",
417
+ "match": "(\\+=|\\-=|\\*=|\\/=)"
421
418
  },
422
419
  {
423
- "match": "(!|&&|\\|\\|)",
424
- "name": "keyword.operator.logical.kotlin"
420
+ "name": "keyword.operator.logical.kotlin",
421
+ "match": "(!|\u0026\u0026|\\|\\|)"
425
422
  },
426
423
  {
427
- "match": "(\\.\\.)",
428
- "name": "keyword.operator.range.kotlin"
424
+ "name": "keyword.operator.range.kotlin",
425
+ "match": "(\\.\\.)"
429
426
  },
430
427
  {
431
- "match": "(;)",
432
- "name": "punctuation.terminator.kotlin"
428
+ "name": "punctuation.terminator.kotlin",
429
+ "match": "(;)"
433
430
  }
434
431
  ]
435
432
  },
436
433
  "namespaces": {
437
434
  "patterns": [
438
435
  {
439
- "match": "\\b(namespace)\\b",
440
- "name": "keyword.other.kotlin"
436
+ "name": "keyword.other.kotlin",
437
+ "match": "\\b(namespace)\\b"
441
438
  },
442
439
  {
443
440
  "begin": "\\{",
@@ -454,38 +451,38 @@
454
451
  "patterns": [
455
452
  {
456
453
  "begin": "(:)",
457
- "beginCaptures": {
458
- "1": {
459
- "name": "keyword.operator.declaration.kotlin"
460
- }
461
- },
462
454
  "end": "(?=,|\\)|=)",
463
455
  "patterns": [
464
456
  {
465
457
  "include": "#types"
466
458
  }
467
- ]
468
- },
469
- {
470
- "begin": "(=)",
459
+ ],
471
460
  "beginCaptures": {
472
461
  "1": {
473
462
  "name": "keyword.operator.declaration.kotlin"
474
463
  }
475
- },
464
+ }
465
+ },
466
+ {
467
+ "begin": "(=)",
476
468
  "end": "(?=,|\\))",
477
469
  "patterns": [
478
470
  {
479
471
  "include": "#expressions"
480
472
  }
481
- ]
473
+ ],
474
+ "beginCaptures": {
475
+ "1": {
476
+ "name": "keyword.operator.declaration.kotlin"
477
+ }
478
+ }
482
479
  },
483
480
  {
484
481
  "include": "#keywords"
485
482
  },
486
483
  {
487
- "match": "\\w+",
488
- "name": "variable.parameter.function.kotlin"
484
+ "name": "variable.parameter.function.kotlin",
485
+ "match": "\\w+"
489
486
  }
490
487
  ]
491
488
  },
@@ -517,90 +514,90 @@
517
514
  "strings": {
518
515
  "patterns": [
519
516
  {
517
+ "name": "string.quoted.third.kotlin",
520
518
  "begin": "\"\"\"",
519
+ "end": "\"\"\"",
520
+ "patterns": [
521
+ {
522
+ "name": "variable.parameter.template.kotlin",
523
+ "match": "(\\$\\w+|\\$\\{[^\\}]+\\})"
524
+ },
525
+ {
526
+ "name": "constant.character.escape.kotlin",
527
+ "match": "\\\\."
528
+ }
529
+ ],
521
530
  "beginCaptures": {
522
531
  "0": {
523
532
  "name": "punctuation.definition.string.begin.kotlin"
524
533
  }
525
534
  },
526
- "end": "\"\"\"",
527
535
  "endCaptures": {
528
536
  "0": {
529
537
  "name": "punctuation.definition.string.end.kotlin"
530
538
  }
531
- },
532
- "name": "string.quoted.third.kotlin",
539
+ }
540
+ },
541
+ {
542
+ "name": "string.quoted.double.kotlin",
543
+ "begin": "\"",
544
+ "end": "\"",
533
545
  "patterns": [
534
546
  {
535
- "match": "(\\$\\w+|\\$\\{[^\\}]+\\})",
536
- "name": "variable.parameter.template.kotlin"
547
+ "name": "variable.parameter.template.kotlin",
548
+ "match": "(\\$\\w+|\\$\\{[^\\}]+\\})"
537
549
  },
538
550
  {
539
- "match": "\\\\.",
540
- "name": "constant.character.escape.kotlin"
551
+ "name": "constant.character.escape.kotlin",
552
+ "match": "\\\\."
541
553
  }
542
- ]
543
- },
544
- {
545
- "begin": "\"",
554
+ ],
546
555
  "beginCaptures": {
547
556
  "0": {
548
557
  "name": "punctuation.definition.string.begin.kotlin"
549
558
  }
550
559
  },
551
- "end": "\"",
552
560
  "endCaptures": {
553
561
  "0": {
554
562
  "name": "punctuation.definition.string.end.kotlin"
555
563
  }
556
- },
557
- "name": "string.quoted.double.kotlin",
558
- "patterns": [
559
- {
560
- "match": "(\\$\\w+|\\$\\{[^\\}]+\\})",
561
- "name": "variable.parameter.template.kotlin"
562
- },
563
- {
564
- "match": "\\\\.",
565
- "name": "constant.character.escape.kotlin"
566
- }
567
- ]
564
+ }
568
565
  },
569
566
  {
567
+ "name": "string.quoted.single.kotlin",
570
568
  "begin": "'",
569
+ "end": "'",
570
+ "patterns": [
571
+ {
572
+ "name": "constant.character.escape.kotlin",
573
+ "match": "\\\\."
574
+ }
575
+ ],
571
576
  "beginCaptures": {
572
577
  "0": {
573
578
  "name": "punctuation.definition.string.begin.kotlin"
574
579
  }
575
580
  },
576
- "end": "'",
577
581
  "endCaptures": {
578
582
  "0": {
579
583
  "name": "punctuation.definition.string.end.kotlin"
580
584
  }
581
- },
582
- "name": "string.quoted.single.kotlin",
583
- "patterns": [
584
- {
585
- "match": "\\\\.",
586
- "name": "constant.character.escape.kotlin"
587
- }
588
- ]
585
+ }
589
586
  },
590
587
  {
588
+ "name": "string.quoted.single.kotlin",
591
589
  "begin": "`",
590
+ "end": "`",
592
591
  "beginCaptures": {
593
592
  "0": {
594
593
  "name": "punctuation.definition.string.begin.kotlin"
595
594
  }
596
595
  },
597
- "end": "`",
598
596
  "endCaptures": {
599
597
  "0": {
600
598
  "name": "punctuation.definition.string.end.kotlin"
601
599
  }
602
- },
603
- "name": "string.quoted.single.kotlin"
600
+ }
604
601
  }
605
602
  ]
606
603
  },
@@ -609,12 +606,12 @@
609
606
  "end": "(?=$)",
610
607
  "patterns": [
611
608
  {
612
- "match": "\\b(type)\\b",
613
- "name": "keyword.other.kotlin"
609
+ "name": "keyword.other.kotlin",
610
+ "match": "\\b(type)\\b"
614
611
  },
615
612
  {
616
- "begin": "<",
617
- "end": ">",
613
+ "begin": "\u003c",
614
+ "end": "\u003e",
618
615
  "patterns": [
619
616
  {
620
617
  "include": "#generics"
@@ -629,21 +626,16 @@
629
626
  "types": {
630
627
  "patterns": [
631
628
  {
632
- "match": "\\b(Any|Unit|String|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\\b",
633
- "name": "storage.type.buildin.kotlin"
629
+ "name": "storage.type.buildin.kotlin",
630
+ "match": "\\b(Any|Unit|String|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\\b"
634
631
  },
635
632
  {
636
- "match": "\\b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\\b",
637
- "name": "storage.type.buildin.array.kotlin"
633
+ "name": "storage.type.buildin.array.kotlin",
634
+ "match": "\\b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\\b"
638
635
  },
639
636
  {
640
- "begin": "\\b(Array|List|Map)<\\b",
641
- "beginCaptures": {
642
- "1": {
643
- "name": "storage.type.buildin.collection.kotlin"
644
- }
645
- },
646
- "end": ">",
637
+ "begin": "\\b(Array|List|Map)\u003c\\b",
638
+ "end": "\u003e",
647
639
  "patterns": [
648
640
  {
649
641
  "include": "#types"
@@ -651,11 +643,16 @@
651
643
  {
652
644
  "include": "#keywords"
653
645
  }
654
- ]
646
+ ],
647
+ "beginCaptures": {
648
+ "1": {
649
+ "name": "storage.type.buildin.collection.kotlin"
650
+ }
651
+ }
655
652
  },
656
653
  {
657
- "begin": "\\w+<",
658
- "end": ">",
654
+ "begin": "\\w+\u003c",
655
+ "end": "\u003e",
659
656
  "patterns": [
660
657
  {
661
658
  "include": "#types"
@@ -667,17 +664,17 @@
667
664
  },
668
665
  {
669
666
  "begin": "(#)\\(",
670
- "beginCaptures": {
671
- "1": {
672
- "name": "keyword.operator.tuple.kotlin"
673
- }
674
- },
675
667
  "end": "\\)",
676
668
  "patterns": [
677
669
  {
678
670
  "include": "#expressions"
679
671
  }
680
- ]
672
+ ],
673
+ "beginCaptures": {
674
+ "1": {
675
+ "name": "keyword.operator.tuple.kotlin"
676
+ }
677
+ }
681
678
  },
682
679
  {
683
680
  "begin": "\\{",
@@ -698,8 +695,8 @@
698
695
  ]
699
696
  },
700
697
  {
701
- "match": "(->)",
702
- "name": "keyword.operator.declaration.kotlin"
698
+ "name": "keyword.operator.declaration.kotlin",
699
+ "match": "(-\u003e)"
703
700
  }
704
701
  ]
705
702
  },
@@ -709,16 +706,11 @@
709
706
  "patterns": [
710
707
  {
711
708
  "begin": "\\b(var|val)\\b",
712
- "beginCaptures": {
713
- "1": {
714
- "name": "keyword.other.kotlin"
715
- }
716
- },
717
709
  "end": "(?=:|=|$)",
718
710
  "patterns": [
719
711
  {
720
- "begin": "<",
721
- "end": ">",
712
+ "begin": "\u003c",
713
+ "end": "\u003e",
722
714
  "patterns": [
723
715
  {
724
716
  "include": "#generics"
@@ -726,22 +718,22 @@
726
718
  ]
727
719
  },
728
720
  {
721
+ "match": "([\\.\u003c\\?\u003e\\w]+\\.)?(\\w+)",
729
722
  "captures": {
730
723
  "2": {
731
724
  "name": "entity.name.variable.kotlin"
732
725
  }
733
- },
734
- "match": "([\\.<\\?>\\w]+\\.)?(\\w+)"
726
+ }
735
727
  }
736
- ]
737
- },
738
- {
739
- "begin": "(:)",
728
+ ],
740
729
  "beginCaptures": {
741
730
  "1": {
742
- "name": "keyword.operator.declaration.kotlin"
731
+ "name": "keyword.other.kotlin"
743
732
  }
744
- },
733
+ }
734
+ },
735
+ {
736
+ "begin": "(:)",
745
737
  "end": "(?==|$)",
746
738
  "patterns": [
747
739
  {
@@ -750,15 +742,15 @@
750
742
  {
751
743
  "include": "#getters-and-setters"
752
744
  }
753
- ]
754
- },
755
- {
756
- "begin": "(=)",
745
+ ],
757
746
  "beginCaptures": {
758
747
  "1": {
759
- "name": "keyword.operator.assignment.kotlin"
748
+ "name": "keyword.operator.declaration.kotlin"
760
749
  }
761
- },
750
+ }
751
+ },
752
+ {
753
+ "begin": "(=)",
762
754
  "end": "(?=$)",
763
755
  "patterns": [
764
756
  {
@@ -767,11 +759,14 @@
767
759
  {
768
760
  "include": "#getters-and-setters"
769
761
  }
770
- ]
762
+ ],
763
+ "beginCaptures": {
764
+ "1": {
765
+ "name": "keyword.operator.assignment.kotlin"
766
+ }
767
+ }
771
768
  }
772
769
  ]
773
770
  }
774
- },
775
- "scopeName": "source.Kotlin",
776
- "uuid": "d508c059-a938-4779-b2bc-ff43a5078907"
777
- }
771
+ }
772
+ }