github-linguist 5.3.3 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
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
data/grammars/source.apt.json CHANGED
@@ -1,25 +1,18 @@
1
1
  {
2
- "fileTypes": [
3
- ""
4
- ],
5
2
  "name": "APT",
3
+ "scopeName": "source.apt",
6
4
  "patterns": [
7
5
  {
8
- "comment": "Number",
9
- "match": "((-)?(\\d+)((.|,)\\d)?(%)?)",
10
- "name": "constant.numeric.apt"
6
+ "name": "constant.numeric.apt",
7
+ "match": "((-)?(\\d+)((.|,)\\d)?(%)?)"
11
8
  },
12
9
  {
13
- "comment": "Actions",
14
- "match": "(\\b)(AUTOPS|BSURF|CALL|CANNIN|CIRCLE|CLPRNT|CUT|CUTTER|DEBUG|DNTCUT|FINI|FROM|GO|GOBACK|GODLTA|GOFILE|GOFWD|GOLFT|GORGT|GOSUB|GOTO|IF|INDRIP|INDIRV|INPUT|INTOL|JUMPTO|LATHE|LINE|LOOPND|LOOPST|MACRO|MATRIX|NOPOST|OBTAIN|OUTTOL|PATERN|PLANE|POCKET|POINT|PRINT|PSIS|READ|REDEF|REMARK|RESERV|RETURN|SHAPE|SYN|TRMAC|THICK|TLLFT|TLOFPS|TLON|TLONPS|TLRGT|TOLER|TRACUT|TUNEUP|VECTOR|ZSURF|AAXIS|ABSF|ACOSF|ADJUST|ALL|ANGLF|ARC|ARROWS|ASINF|AT|ATAN2F|ATANF|ATANGL|AUTO|AVOID|BAKGRD|BAXIS|BEGIN|BLACK|BLKDEL|BLUE|BORE|BOTH|BRKCHP|BROWN|CAM|CANF|CAXIS|CCLW|CENTER|CHASE|CIRCUL|CLDATA|CLEAR|CLW|COARSE|COLLET|CONST|COSF|CROSS|CSINK|CTRLIN|CUTANG|CYAN|DARK|DASH|DECR||DEEP|DELTA|DELTAX|DELTAY|DELTAZ|DIAMTR|DISTF|DITTO|DMSF|DOTF|DOTTED|DOWN|DRAG|DRILL|DVALF|DWELL|DXF|ENDARC|FACE|FEDTO|FEED|FINE|FINISH|FLOOD|FRONT|GAGE|GEOMTY|GRAY|GREEN|GRID|HIGH|HOLDER|IN|INCR|INTENS|INTF|INTOF|INVERS|IPM|IPR|IVALF|JVALF|KVALF|LARGE|LAST|LAYER|LEAD|LEFT|LENGTH|LIGHT|LINCIR|LINEAR|LITE|LNTHF|LOCK|LOG10F|LOGF|LOW|MAGNTA|MAIN|MANUAL|MARK|MAXF|MAXIPM|MAXRPM|MED|MEDIUM|MILL|MINF|MINUS|MIRROR|MIST|MMPM|MMPR|MODIFY|MOTION|MULTRD|NEGX|NEGY|NEGZ|NEUTRL|NEXT|NIXIE|NOBACK|NOMORE|NORET|NORMAL|NOW|NOX|NOY|NOZ|NUMF|OFF|OMIT|ON|OPTION|ORIENT|OUT|PALLET|PARAB|PARLEL|PASS|PAST|PEN|PERPTO|PHANTM|PLUS|POSX|POSY|POSZ|QUILL|RADIUS|RANDOM|RANGE|RAPTO|REAM|REAR|RED|RETAIN|REV|RIGHT|ROTF|ROTREF|ROUGH|ROUNDF|RPM|RTHETA|RTRCTO|RVALF|SADDLE|SAME|SCALE|SCRIBE|SECNDS|SETANG|SETOOL|SFM|SIDE|SINF|SLOPE|SMALL|SMM|SOLID|SPLINE|SPRING|SQRTF|START|STEP|TABLE|TANF|TANTO|TAP|TAPKUL|THETAR|THRU|TILTF|TIMES|TO|TOOL|TPI|TRANSL|TRAV|TRFORM|TURN|TYPE|UNIT|UP|WAIT|WHITE|WINDOW|XAXIS|XCOORD|XFIRST|XLARGE|XSMALL|XVALF|XYPLAN|XYROT|XYVIEW|XYZ|YAXIS|YCOORD|YELLOW|YFIRST|YLARGE|YSMALL|YVALF|YZPLAN|YZROT|YZVIEW|ZAXIS|ZCOORD|ZIGZAG|ZLARGE|ZRAPID|ZSMALL|ZVALF|ZXPLAN|ZXROT|ZXVIEW||AIR|ARCSLP|ASLOPE|AUXFUN|BREAK|CAMERA|CHECK|CHUCK|CLAMP|CLEARP|CLRSRF|COMBIN|COOLNT|COPY|COUPLE|CUTCOM|CYCLE|DEBUGG|DELAY|DISPLY|DRAFT|DRESS|END|FEDRAT|GOHOME|HEAD|INDEX|INSERT|ISTOP|LEADER|LETTER|LINTOL|LOAD|LOADTL|LPRINT|MACHIN|MAXDPM|MAXVEL|MCHFIN|MCHTOL|MODE|NIBBLE|OPSKIP|OPSTOP|ORIGIN|OVPLOT|PARTNO|PENDWN|PENUP|PITCH|PIVOTZ|PLABEL|PLOT|PLUNGE|POSMAP|POSTN|PPLOT|PPRINT|PREFUN|PRFSEQ|RAPID|RESET|RETRCT|REVERS|REWIND|ROTABL|ROTATE|ROTHED|SAFETY|SELCTL|SELECT|SEQNO|SET|SLOWDN|SPINDL|STOP|SWITCH|THREAD|TMARK|TOOLNO|TRANS|TURRET|UNLOAD|VTLAXS|AUTOPS|CALL|CIRCLE|CLPRNT|COPY|CUT|CUTTER|DNTCUT|FINI|FROM|GO|GOBACK||GODLTA|GOFWD|GOLFT|GORGT|GOSUB|GOTO|IF|INDEX|INDIRP|INDIRV|INPUT|INTOL|JUMPTO|LINE|MACRO|MATRIX|NOPOST|OBTAIN|OUTTOL|PATERN|PLANE|POCKET|POINT|PRINT|PSSIS|READ|REDEF|REMARK|RESERV|RETURN|SYN|TERMAC|THICK|TLLFT|TLOFPS|TLON|TLONPS|TLRGT|TOLER|TRACUT|TUNEUP|VECTOR|ZSURF|UNITS|INCH|MCS|PERIMETER|MULTAX|OSETNO)(\\b)",
15
- "name": "keyword.control.apt"
10
+ "name": "keyword.control.apt",
11
+ "match": "(\\b)(AUTOPS|BSURF|CALL|CANNIN|CIRCLE|CLPRNT|CUT|CUTTER|DEBUG|DNTCUT|FINI|FROM|GO|GOBACK|GODLTA|GOFILE|GOFWD|GOLFT|GORGT|GOSUB|GOTO|IF|INDRIP|INDIRV|INPUT|INTOL|JUMPTO|LATHE|LINE|LOOPND|LOOPST|MACRO|MATRIX|NOPOST|OBTAIN|OUTTOL|PATERN|PLANE|POCKET|POINT|PRINT|PSIS|READ|REDEF|REMARK|RESERV|RETURN|SHAPE|SYN|TRMAC|THICK|TLLFT|TLOFPS|TLON|TLONPS|TLRGT|TOLER|TRACUT|TUNEUP|VECTOR|ZSURF|AAXIS|ABSF|ACOSF|ADJUST|ALL|ANGLF|ARC|ARROWS|ASINF|AT|ATAN2F|ATANF|ATANGL|AUTO|AVOID|BAKGRD|BAXIS|BEGIN|BLACK|BLKDEL|BLUE|BORE|BOTH|BRKCHP|BROWN|CAM|CANF|CAXIS|CCLW|CENTER|CHASE|CIRCUL|CLDATA|CLEAR|CLW|COARSE|COLLET|CONST|COSF|CROSS|CSINK|CTRLIN|CUTANG|CYAN|DARK|DASH|DECR||DEEP|DELTA|DELTAX|DELTAY|DELTAZ|DIAMTR|DISTF|DITTO|DMSF|DOTF|DOTTED|DOWN|DRAG|DRILL|DVALF|DWELL|DXF|ENDARC|FACE|FEDTO|FEED|FINE|FINISH|FLOOD|FRONT|GAGE|GEOMTY|GRAY|GREEN|GRID|HIGH|HOLDER|IN|INCR|INTENS|INTF|INTOF|INVERS|IPM|IPR|IVALF|JVALF|KVALF|LARGE|LAST|LAYER|LEAD|LEFT|LENGTH|LIGHT|LINCIR|LINEAR|LITE|LNTHF|LOCK|LOG10F|LOGF|LOW|MAGNTA|MAIN|MANUAL|MARK|MAXF|MAXIPM|MAXRPM|MED|MEDIUM|MILL|MINF|MINUS|MIRROR|MIST|MMPM|MMPR|MODIFY|MOTION|MULTRD|NEGX|NEGY|NEGZ|NEUTRL|NEXT|NIXIE|NOBACK|NOMORE|NORET|NORMAL|NOW|NOX|NOY|NOZ|NUMF|OFF|OMIT|ON|OPTION|ORIENT|OUT|PALLET|PARAB|PARLEL|PASS|PAST|PEN|PERPTO|PHANTM|PLUS|POSX|POSY|POSZ|QUILL|RADIUS|RANDOM|RANGE|RAPTO|REAM|REAR|RED|RETAIN|REV|RIGHT|ROTF|ROTREF|ROUGH|ROUNDF|RPM|RTHETA|RTRCTO|RVALF|SADDLE|SAME|SCALE|SCRIBE|SECNDS|SETANG|SETOOL|SFM|SIDE|SINF|SLOPE|SMALL|SMM|SOLID|SPLINE|SPRING|SQRTF|START|STEP|TABLE|TANF|TANTO|TAP|TAPKUL|THETAR|THRU|TILTF|TIMES|TO|TOOL|TPI|TRANSL|TRAV|TRFORM|TURN|TYPE|UNIT|UP|WAIT|WHITE|WINDOW|XAXIS|XCOORD|XFIRST|XLARGE|XSMALL|XVALF|XYPLAN|XYROT|XYVIEW|XYZ|YAXIS|YCOORD|YELLOW|YFIRST|YLARGE|YSMALL|YVALF|YZPLAN|YZROT|YZVIEW|ZAXIS|ZCOORD|ZIGZAG|ZLARGE|ZRAPID|ZSMALL|ZVALF|ZXPLAN|ZXROT|ZXVIEW||AIR|ARCSLP|ASLOPE|AUXFUN|BREAK|CAMERA|CHECK|CHUCK|CLAMP|CLEARP|CLRSRF|COMBIN|COOLNT|COPY|COUPLE|CUTCOM|CYCLE|DEBUGG|DELAY|DISPLY|DRAFT|DRESS|END|FEDRAT|GOHOME|HEAD|INDEX|INSERT|ISTOP|LEADER|LETTER|LINTOL|LOAD|LOADTL|LPRINT|MACHIN|MAXDPM|MAXVEL|MCHFIN|MCHTOL|MODE|NIBBLE|OPSKIP|OPSTOP|ORIGIN|OVPLOT|PARTNO|PENDWN|PENUP|PITCH|PIVOTZ|PLABEL|PLOT|PLUNGE|POSMAP|POSTN|PPLOT|PPRINT|PREFUN|PRFSEQ|RAPID|RESET|RETRCT|REVERS|REWIND|ROTABL|ROTATE|ROTHED|SAFETY|SELCTL|SELECT|SEQNO|SET|SLOWDN|SPINDL|STOP|SWITCH|THREAD|TMARK|TOOLNO|TRANS|TURRET|UNLOAD|VTLAXS|AUTOPS|CALL|CIRCLE|CLPRNT|COPY|CUT|CUTTER|DNTCUT|FINI|FROM|GO|GOBACK||GODLTA|GOFWD|GOLFT|GORGT|GOSUB|GOTO|IF|INDEX|INDIRP|INDIRV|INPUT|INTOL|JUMPTO|LINE|MACRO|MATRIX|NOPOST|OBTAIN|OUTTOL|PATERN|PLANE|POCKET|POINT|PRINT|PSSIS|READ|REDEF|REMARK|RESERV|RETURN|SYN|TERMAC|THICK|TLLFT|TLOFPS|TLON|TLONPS|TLRGT|TOLER|TRACUT|TUNEUP|VECTOR|ZSURF|UNITS|INCH|MCS|PERIMETER|MULTAX|OSETNO)(\\b)"
16
12
  },
17
13
  {
18
- "comment": "Comment",
19
- "match": "((\\$\\$).*$)",
20
- "name": "comment.number-sign.apt"
14
+ "name": "comment.number-sign.apt",
15
+ "match": "((\\$\\$).*$)"
21
16
  }
22
- ],
23
- "scopeName": "source.apt",
24
- "uuid": "8a0a1fb3-d2a7-4b0c-b2e9-f72d22abfe4a"
25
- }
17
+ ]
18
+ }
data/grammars/source.asn.json CHANGED
@@ -1,59 +1,55 @@
1
1
  {
2
- "fileTypes": [
3
- "asn",
4
- "asn1"
5
- ],
6
2
  "name": "Abstract Syntax Notation",
3
+ "scopeName": "source.asn",
7
4
  "patterns": [
8
5
  {
9
- "match": "--.*$",
10
- "name": "comment.line.asn"
6
+ "name": "comment.line.asn",
7
+ "match": "--.*$"
11
8
  },
12
9
  {
13
- "match": "::=",
14
- "name": "storage.type.asn"
10
+ "name": "storage.type.asn",
11
+ "match": "::="
15
12
  },
16
13
  {
17
- "match": "\\|",
18
- "name": "storage.type.asn"
14
+ "name": "storage.type.asn",
15
+ "match": "\\|"
19
16
  },
20
17
  {
21
- "match": "\\.\\.",
22
- "name": "keyword.operator.asn"
18
+ "name": "keyword.operator.asn",
19
+ "match": "\\.\\."
23
20
  },
24
21
  {
25
- "match": "(SEQUENCE|SET|CLASS|CHOICE|OF)",
26
- "name": "storage.type.asn"
22
+ "name": "storage.type.asn",
23
+ "match": "(SEQUENCE|SET|CLASS|CHOICE|OF)"
27
24
  },
28
25
  {
29
- "match": "(BOOLEAN|INTEGER|ENUMERATED|REAL|(BIT|OCTET) STRING|NULL|OBJECT IDENTIFIER|ANY|DATE|DATE-TIME|(Numeric|Printable|Teletex|IA5|Visible|Graphic|General)String|(Generalized|UTC)Time|EXTERNAL|Object Descriptor)",
30
- "name": "variable.language.asn"
26
+ "name": "variable.language.asn",
27
+ "match": "(BOOLEAN|INTEGER|ENUMERATED|REAL|(BIT|OCTET) STRING|NULL|OBJECT IDENTIFIER|ANY|DATE|DATE-TIME|(Numeric|Printable|Teletex|IA5|Visible|Graphic|General)String|(Generalized|UTC)Time|EXTERNAL|Object Descriptor)"
31
28
  },
32
29
  {
33
- "match": "([-+]?[0-9]+|[-+]?\\.[0-9]+)(?=\\)|\\.\\.)",
34
- "name": "constant.numeric.float.asn"
30
+ "name": "constant.numeric.float.asn",
31
+ "match": "([-+]?[0-9]+|[-+]?\\.[0-9]+)(?=\\)|\\.\\.)"
35
32
  },
36
33
  {
34
+ "name": "string.quoted.double.asn",
37
35
  "begin": "\"",
38
- "end": "\"",
39
- "name": "string.quoted.double.asn"
36
+ "end": "\""
40
37
  },
41
38
  {
42
- "match": "OPTIONAL|SIZE|\\^ FROM",
43
- "name": "storage.modifier.asn"
39
+ "name": "storage.modifier.asn",
40
+ "match": "OPTIONAL|SIZE|\\^ FROM"
44
41
  },
45
42
  {
46
- "match": "DEFINITIONS|AUTOMATIC TAGS|BEGIN|END",
47
- "name": "entity.name.type.class.asn"
43
+ "name": "entity.name.type.class.asn",
44
+ "match": "DEFINITIONS|AUTOMATIC TAGS|BEGIN|END"
48
45
  },
49
46
  {
50
- "match": "IMPORTS|FROM",
51
- "name": "support.constant.asn"
47
+ "name": "support.constant.asn",
48
+ "match": "IMPORTS|FROM"
52
49
  },
53
50
  {
54
- "match": "(IM|EX)PLICIT",
55
- "name": "constant.language.asn"
51
+ "name": "constant.language.asn",
52
+ "match": "(IM|EX)PLICIT"
56
53
  }
57
- ],
58
- "scopeName": "source.asn"
59
- }
54
+ ]
55
+ }
data/grammars/source.asp.json CHANGED
@@ -1,12 +1,10 @@
1
1
  {
2
- "comment": "ASP SCRIPTING DICTIONARY – By Rich Barton: Version 1.0 (based on PHP Scripting Dictionary by Justin French, Sune Foldager and Allan Odgaard) Note: .asp is handled by asp/html",
3
- "fileTypes": [
4
- "asa"
5
- ],
6
- "keyEquivalent": "^~A",
7
2
  "name": "ASP",
3
+ "scopeName": "source.asp",
8
4
  "patterns": [
9
5
  {
6
+ "name": "meta.function.asp",
7
+ "match": "^\\s*((?i:function|sub))\\s*([a-zA-Z_]\\w*)\\s*(\\()([^)]*)(\\)).*\\n?",
10
8
  "captures": {
11
9
  "1": {
12
10
  "name": "storage.type.function.asp"
@@ -23,135 +21,131 @@
23
21
  "5": {
24
22
  "name": "punctuation.definition.parameters.asp"
25
23
  }
26
- },
27
- "match": "^\\s*((?i:function|sub))\\s*([a-zA-Z_]\\w*)\\s*(\\()([^)]*)(\\)).*\\n?",
28
- "name": "meta.function.asp"
24
+ }
29
25
  },
30
26
  {
31
27
  "begin": "(^[ \\t]+)?(?=')",
32
- "beginCaptures": {
33
- "1": {
34
- "name": "punctuation.whitespace.comment.leading.asp"
35
- }
36
- },
37
28
  "end": "(?!\\G)",
38
29
  "patterns": [
39
30
  {
31
+ "name": "comment.line.apostrophe.asp",
40
32
  "begin": "'",
33
+ "end": "\\n",
41
34
  "beginCaptures": {
42
35
  "0": {
43
36
  "name": "punctuation.definition.comment.asp"
44
37
  }
45
- },
46
- "end": "\\n",
47
- "name": "comment.line.apostrophe.asp"
38
+ }
48
39
  }
49
- ]
50
- },
51
- {
52
- "begin": "(^[ \\t]+)?(?=REM )",
40
+ ],
53
41
  "beginCaptures": {
54
42
  "1": {
55
43
  "name": "punctuation.whitespace.comment.leading.asp"
56
44
  }
57
- },
45
+ }
46
+ },
47
+ {
48
+ "begin": "(^[ \\t]+)?(?=REM )",
58
49
  "end": "(?!\\G)",
59
50
  "patterns": [
60
51
  {
52
+ "name": "comment.line.rem.asp",
61
53
  "begin": "REM ",
54
+ "end": "\\n",
62
55
  "beginCaptures": {
63
56
  "0": {
64
57
  "name": "punctuation.definition.comment.asp"
65
58
  }
66
- },
67
- "end": "\\n",
68
- "name": "comment.line.rem.asp"
59
+ }
69
60
  }
70
- ]
61
+ ],
62
+ "beginCaptures": {
63
+ "1": {
64
+ "name": "punctuation.whitespace.comment.leading.asp"
65
+ }
66
+ }
71
67
  },
72
68
  {
73
- "match": "(?i:\\b(If|Then|Else|ElseIf|End If|While|Wend|For|To|Each|In|Step|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub)\\b)",
74
- "name": "keyword.control.asp"
69
+ "name": "keyword.control.asp",
70
+ "match": "(?i:\\b(If|Then|Else|ElseIf|End If|While|Wend|For|To|Each|In|Step|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub)\\b)"
75
71
  },
76
72
  {
77
- "match": "=|>=|<|>|<|<>|\\+|-|\\*|\\^|&|\\b(?i:(Mod|And|Not|Or|Xor|Is))\\b",
78
- "name": "keyword.operator.asp"
73
+ "name": "keyword.operator.asp",
74
+ "match": "=|\u003e=|\u003c|\u003e|\u003c|\u003c\u003e|\\+|-|\\*|\\^|\u0026|\\b(?i:(Mod|And|Not|Or|Xor|Is))\\b"
79
75
  },
80
76
  {
81
- "match": "(?i:\\b(Call|Class|Const|Dim|Redim|Function|Sub|Property|End Property|End sub|End Function|Set|Let|Get|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo)\\b)",
82
- "name": "storage.type.asp"
77
+ "name": "storage.type.asp",
78
+ "match": "(?i:\\b(Call|Class|Const|Dim|Redim|Function|Sub|Property|End Property|End sub|End Function|Set|Let|Get|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo)\\b)"
83
79
  },
84
80
  {
85
- "match": "(?i:\\b(Private|Public|Default)\\b)",
86
- "name": "storage.modifier.asp"
81
+ "name": "storage.modifier.asp",
82
+ "match": "(?i:\\b(Private|Public|Default)\\b)"
87
83
  },
88
84
  {
89
- "match": "(?i:\\b(Empty|False|Nothing|Null|True)\\b)",
90
- "name": "constant.language.asp"
85
+ "name": "constant.language.asp",
86
+ "match": "(?i:\\b(Empty|False|Nothing|Null|True)\\b)"
91
87
  },
92
88
  {
89
+ "name": "string.quoted.double.asp",
93
90
  "begin": "\"",
91
+ "end": "\"(?!\")",
92
+ "patterns": [
93
+ {
94
+ "name": "constant.character.escape.apostrophe.asp",
95
+ "match": "\"\""
96
+ }
97
+ ],
94
98
  "beginCaptures": {
95
99
  "0": {
96
100
  "name": "punctuation.definition.string.begin.asp"
97
101
  }
98
102
  },
99
- "end": "\"(?!\")",
100
103
  "endCaptures": {
101
104
  "0": {
102
105
  "name": "punctuation.definition.string.end.asp"
103
106
  }
104
- },
105
- "name": "string.quoted.double.asp",
106
- "patterns": [
107
- {
108
- "match": "\"\"",
109
- "name": "constant.character.escape.apostrophe.asp"
110
- }
111
- ]
107
+ }
112
108
  },
113
109
  {
110
+ "name": "variable.other.asp",
111
+ "match": "(\\$)[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b",
114
112
  "captures": {
115
113
  "1": {
116
114
  "name": "punctuation.definition.variable.asp"
117
115
  }
118
- },
119
- "match": "(\\$)[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b",
120
- "name": "variable.other.asp"
116
+ }
121
117
  },
122
118
  {
123
- "match": "(?i:\\b(Application|ObjectContext|Request|Response|Server|Session)\\b)",
124
- "name": "support.class.asp"
119
+ "name": "support.class.asp",
120
+ "match": "(?i:\\b(Application|ObjectContext|Request|Response|Server|Session)\\b)"
125
121
  },
126
122
  {
127
- "match": "(?i:\\b(Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables)\\b)",
128
- "name": "support.class.collection.asp"
123
+ "name": "support.class.collection.asp",
124
+ "match": "(?i:\\b(Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables)\\b)"
129
125
  },
130
126
  {
131
- "match": "(?i:\\b(TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute|IsClientConnected|PICS|Status|ScriptTimeout|CodePage|LCID|SessionID|Timeout)\\b)",
132
- "name": "support.constant.asp"
127
+ "name": "support.constant.asp",
128
+ "match": "(?i:\\b(TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute|IsClientConnected|PICS|Status|ScriptTimeout|CodePage|LCID|SessionID|Timeout)\\b)"
133
129
  },
134
130
  {
135
- "match": "(?i:\\b(Lock|Unlock|SetAbort|SetComplete|BianryRead|AddHeader|AppendToLog|BinaryWrite|Clear|End|Flush|Redirect|Write|CreateObject|HTMLEncode|MapPath|URLEncode|Abandon)\\b)",
136
- "name": "support.function.asp"
131
+ "name": "support.function.asp",
132
+ "match": "(?i:\\b(Lock|Unlock|SetAbort|SetComplete|BianryRead|AddHeader|AppendToLog|BinaryWrite|Clear|End|Flush|Redirect|Write|CreateObject|HTMLEncode|MapPath|URLEncode|Abandon)\\b)"
137
133
  },
138
134
  {
139
- "match": "(?i:\\b(Application_OnEnd|Application_OnStart|OnTransactionAbort|OnTransactionCommit|Session_OnEnd|Session_OnStart|Class_Initialize|Class_Terminate)\\b)",
140
- "name": "support.function.event.asp"
135
+ "name": "support.function.event.asp",
136
+ "match": "(?i:\\b(Application_OnEnd|Application_OnStart|OnTransactionAbort|OnTransactionCommit|Session_OnEnd|Session_OnStart|Class_Initialize|Class_Terminate)\\b)"
141
137
  },
142
138
  {
143
- "match": "(?i:\\b(Array|Add|Asc|Atn|CBool|CByte|CCur|CDate|CDbl|Chr|CInt|CLng|Conversions|Cos|CreateObject|CSng|CStr|Date|DateAdd|DateDiff|DatePart|DateSerial|DateValue|Day|Derived|Math|Escape|Eval|Exists|Exp|Filter|FormatCurrency|FormatDateTime|FormatNumber|FormatPercent|GetLocale|GetObject|GetRef|Hex|Hour|InputBox|InStr|InStrRev|Int|Fix|IsArray|IsDate|IsEmpty|IsNull|IsNumeric|IsObject|Item|Items|Join|Keys|LBound|LCase|Left|Len|LoadPicture|Log|LTrim|RTrim|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year)\\b)",
144
- "name": "support.function.vb.asp"
139
+ "name": "support.function.vb.asp",
140
+ "match": "(?i:\\b(Array|Add|Asc|Atn|CBool|CByte|CCur|CDate|CDbl|Chr|CInt|CLng|Conversions|Cos|CreateObject|CSng|CStr|Date|DateAdd|DateDiff|DatePart|DateSerial|DateValue|Day|Derived|Math|Escape|Eval|Exists|Exp|Filter|FormatCurrency|FormatDateTime|FormatNumber|FormatPercent|GetLocale|GetObject|GetRef|Hex|Hour|InputBox|InStr|InStrRev|Int|Fix|IsArray|IsDate|IsEmpty|IsNull|IsNumeric|IsObject|Item|Items|Join|Keys|LBound|LCase|Left|Len|LoadPicture|Log|LTrim|RTrim|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year)\\b)"
145
141
  },
146
142
  {
147
- "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\b",
148
- "name": "constant.numeric.asp"
143
+ "name": "constant.numeric.asp",
144
+ "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\b"
149
145
  },
150
146
  {
151
- "match": "(?i:\\b(vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant|vbDataObject|vbDecimal|vbByte|vbArray)\\b)",
152
- "name": "support.type.vb.asp"
147
+ "name": "support.type.vb.asp",
148
+ "match": "(?i:\\b(vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant|vbDataObject|vbDecimal|vbByte|vbArray)\\b)"
153
149
  }
154
- ],
155
- "scopeName": "source.asp",
156
- "uuid": "291022B4-6B1D-11D9-90EB-000D93589AF6"
157
- }
150
+ ]
151
+ }
data/grammars/source.aspectj.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
- "fileTypes": [
3
- "aj"
4
- ],
5
2
  "name": "AspectJ",
3
+ "scopeName": "source.aspectj",
6
4
  "patterns": [
7
5
  {
6
+ "name": "meta.package.java",
7
+ "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
8
8
  "captures": {
9
9
  "1": {
10
10
  "name": "keyword.other.package.java"
@@ -15,11 +15,11 @@
15
15
  "3": {
16
16
  "name": "punctuation.terminator.java"
17
17
  }
18
- },
19
- "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
20
- "name": "meta.package.java"
18
+ }
21
19
  },
22
20
  {
21
+ "name": "meta.import.java",
22
+ "match": "^\\s*(import)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
23
23
  "captures": {
24
24
  "1": {
25
25
  "name": "keyword.other.import.java"
@@ -30,15 +30,75 @@
30
30
  "3": {
31
31
  "name": "punctuation.terminator.java"
32
32
  }
33
- },
34
- "match": "^\\s*(import)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
35
- "name": "meta.import.java"
33
+ }
36
34
  },
37
35
  {
38
36
  "include": "#code"
39
37
  }
40
38
  ],
41
39
  "repository": {
40
+ "advice": {
41
+ "name": "meta.advice.aspectj",
42
+ "begin": "(?!new)(?!.*pointcut)(?=[^=:]+\\([^\\)]*\\)[^=]*:)",
43
+ "end": "}|(?=;)",
44
+ "patterns": [
45
+ {
46
+ "include": "#storage-modifiers"
47
+ },
48
+ {
49
+ "name": "meta.method.identifier.java",
50
+ "begin": "(around|after|before|throwing|returning)\\s*\\(",
51
+ "end": "\\)",
52
+ "patterns": [
53
+ {
54
+ "include": "#parameters"
55
+ }
56
+ ],
57
+ "beginCaptures": {
58
+ "1": {
59
+ "name": "keyword.other.advice.aspectj"
60
+ }
61
+ }
62
+ },
63
+ {
64
+ "name": "keyword.other.advice.aspectj",
65
+ "match": "(throwing|returning)(?=\\s*:)"
66
+ },
67
+ {
68
+ "name": "meta.advice.identifier.aspectj",
69
+ "begin": ":",
70
+ "end": "(?={)",
71
+ "patterns": [
72
+ {
73
+ "include": "#pointcut-definitions"
74
+ }
75
+ ]
76
+ },
77
+ {
78
+ "name": "meta.method.return-type.java",
79
+ "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
80
+ "end": "(?=\\w+\\s*\\()",
81
+ "patterns": [
82
+ {
83
+ "include": "#all-types"
84
+ }
85
+ ]
86
+ },
87
+ {
88
+ "include": "#throws"
89
+ },
90
+ {
91
+ "name": "meta.method.body.java",
92
+ "begin": "{",
93
+ "end": "(?=})",
94
+ "patterns": [
95
+ {
96
+ "include": "#code"
97
+ }
98
+ ]
99
+ }
100
+ ]
101
+ },
42
102
  "all-types": {
43
103
  "patterns": [
44
104
  {
@@ -55,24 +115,12 @@
55
115
  "annotations": {
56
116
  "patterns": [
57
117
  {
118
+ "name": "meta.declaration.annotation.java",
58
119
  "begin": "(@[^ (]+)(\\()",
59
- "beginCaptures": {
60
- "1": {
61
- "name": "storage.type.annotation.java"
62
- },
63
- "2": {
64
- "name": "punctuation.definition.annotation-arguments.begin.java"
65
- }
66
- },
67
120
  "end": "(\\))",
68
- "endCaptures": {
69
- "1": {
70
- "name": "punctuation.definition.annotation-arguments.end.java"
71
- }
72
- },
73
- "name": "meta.declaration.annotation.java",
74
121
  "patterns": [
75
122
  {
123
+ "match": "(\\w*)\\s*(=)",
76
124
  "captures": {
77
125
  "1": {
78
126
  "name": "constant.other.key.java"
@@ -80,40 +128,42 @@
80
128
  "2": {
81
129
  "name": "keyword.operator.assignment.java"
82
130
  }
83
- },
84
- "match": "(\\w*)\\s*(=)"
131
+ }
85
132
  },
86
133
  {
87
134
  "include": "#code"
88
135
  },
89
136
  {
90
- "match": ",",
91
- "name": "punctuation.seperator.property.java"
137
+ "name": "punctuation.seperator.property.java",
138
+ "match": ","
92
139
  }
93
- ]
140
+ ],
141
+ "beginCaptures": {
142
+ "1": {
143
+ "name": "storage.type.annotation.java"
144
+ },
145
+ "2": {
146
+ "name": "punctuation.definition.annotation-arguments.begin.java"
147
+ }
148
+ },
149
+ "endCaptures": {
150
+ "1": {
151
+ "name": "punctuation.definition.annotation-arguments.end.java"
152
+ }
153
+ }
94
154
  },
95
155
  {
96
- "match": "@\\w*",
97
- "name": "storage.type.annotation.java"
156
+ "name": "storage.type.annotation.java",
157
+ "match": "@\\w*"
98
158
  }
99
159
  ]
100
160
  },
101
161
  "anonymous-classes-and-new": {
102
162
  "begin": "\\bnew\\b",
103
- "beginCaptures": {
104
- "0": {
105
- "name": "keyword.control.new.java"
106
- }
107
- },
108
- "end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=;)",
163
+ "end": "(?\u003c=\\)|\\])(?!\\s*{)|(?\u003c=})|(?=;)",
109
164
  "patterns": [
110
165
  {
111
166
  "begin": "(\\w+)\\s*(?=\\[)",
112
- "beginCaptures": {
113
- "1": {
114
- "name": "storage.type.java"
115
- }
116
- },
117
167
  "end": "}|(?=;|\\))",
118
168
  "patterns": [
119
169
  {
@@ -134,75 +184,80 @@
134
184
  }
135
185
  ]
136
186
  }
137
- ]
187
+ ],
188
+ "beginCaptures": {
189
+ "1": {
190
+ "name": "storage.type.java"
191
+ }
192
+ }
138
193
  },
139
194
  {
140
195
  "begin": "(?=\\w.*\\()",
141
- "end": "(?<=\\))",
196
+ "end": "(?\u003c=\\))",
142
197
  "patterns": [
143
198
  {
144
199
  "include": "#object-types"
145
200
  },
146
201
  {
147
202
  "begin": "\\(",
148
- "beginCaptures": {
149
- "1": {
150
- "name": "storage.type.java"
151
- }
152
- },
153
203
  "end": "\\)",
154
204
  "patterns": [
155
205
  {
156
206
  "include": "#code"
157
207
  }
158
- ]
208
+ ],
209
+ "beginCaptures": {
210
+ "1": {
211
+ "name": "storage.type.java"
212
+ }
213
+ }
159
214
  }
160
215
  ]
161
216
  },
162
217
  {
218
+ "name": "meta.inner-class.java",
163
219
  "begin": "{",
164
220
  "end": "}",
165
- "name": "meta.inner-class.java",
166
221
  "patterns": [
167
222
  {
168
223
  "include": "#class-body"
169
224
  }
170
225
  ]
171
226
  }
172
- ]
227
+ ],
228
+ "beginCaptures": {
229
+ "0": {
230
+ "name": "keyword.control.new.java"
231
+ }
232
+ }
173
233
  },
174
234
  "assertions": {
175
235
  "patterns": [
176
236
  {
237
+ "name": "meta.declaration.assertion.java",
177
238
  "begin": "\\b(assert)\\s",
178
- "beginCaptures": {
179
- "1": {
180
- "name": "keyword.control.assert.java"
181
- }
182
- },
183
239
  "end": "$",
184
- "name": "meta.declaration.assertion.java",
185
240
  "patterns": [
186
241
  {
187
- "match": ":",
188
- "name": "keyword.operator.assert.expression-seperator.java"
242
+ "name": "keyword.operator.assert.expression-seperator.java",
243
+ "match": ":"
189
244
  },
190
245
  {
191
246
  "include": "#code"
192
247
  }
193
- ]
248
+ ],
249
+ "beginCaptures": {
250
+ "1": {
251
+ "name": "keyword.control.assert.java"
252
+ }
253
+ }
194
254
  }
195
255
  ]
196
256
  },
197
257
  "class": {
258
+ "name": "meta.class.aspectj",
198
259
  "begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum|aspect)\\s+\\w+)",
199
260
  "end": "}",
200
- "endCaptures": {
201
- "0": {
202
- "name": "punctuation.section.class.end.java"
203
- }
204
- },
205
- "name": "meta.class.aspectj",
206
261
  "patterns": [
207
262
  {
208
263
  "include": "#storage-modifiers"
@@ -211,6 +266,8 @@
211
266
  "include": "#comments"
212
267
  },
213
268
  {
269
+ "name": "meta.class.identifier.aspectj",
270
+ "match": "(class|(?:@)?interface|enum|aspect)\\s+(\\w+)",
214
271
  "captures": {
215
272
  "1": {
216
273
  "name": "storage.type.java"
@@ -218,19 +275,12 @@
218
275
  "2": {
219
276
  "name": "entity.name.type.class.java"
220
277
  }
221
- },
222
- "match": "(class|(?:@)?interface|enum|aspect)\\s+(\\w+)",
223
- "name": "meta.class.identifier.aspectj"
278
+ }
224
279
  },
225
280
  {
281
+ "name": "meta.definition.class.inherited.classes.java",
226
282
  "begin": "extends",
227
- "beginCaptures": {
228
- "0": {
229
- "name": "storage.modifier.extends.java"
230
- }
231
- },
232
283
  "end": "(?={|implements)",
233
- "name": "meta.definition.class.inherited.classes.java",
234
284
  "patterns": [
235
285
  {
236
286
  "include": "#object-types-inherited"
@@ -238,17 +288,17 @@
238
288
  {
239
289
  "include": "#comments"
240
290
  }
241
- ]
291
+ ],
292
+ "beginCaptures": {
293
+ "0": {
294
+ "name": "storage.modifier.extends.java"
295
+ }
296
+ }
242
297
  },
243
298
  {
299
+ "name": "meta.definition.class.implemented.interfaces.java",
244
300
  "begin": "(implements)\\s",
245
- "beginCaptures": {
246
- "1": {
247
- "name": "storage.modifier.implements.java"
248
- }
249
- },
250
301
  "end": "(?=\\s*extends|\\{)",
251
- "name": "meta.definition.class.implemented.interfaces.java",
252
302
  "patterns": [
253
303
  {
254
304
  "include": "#object-types-inherited"
@@ -256,19 +306,29 @@
256
306
  {
257
307
  "include": "#comments"
258
308
  }
259
- ]
309
+ ],
310
+ "beginCaptures": {
311
+ "1": {
312
+ "name": "storage.modifier.implements.java"
313
+ }
314
+ }
260
315
  },
261
316
  {
317
+ "name": "meta.class.body.java",
262
318
  "begin": "{",
263
319
  "end": "(?=})",
264
- "name": "meta.class.body.java",
265
320
  "patterns": [
266
321
  {
267
322
  "include": "#class-body"
268
323
  }
269
324
  ]
270
325
  }
271
- ]
326
+ ],
327
+ "endCaptures": {
328
+ "0": {
329
+ "name": "punctuation.section.class.end.java"
330
+ }
331
+ }
272
332
  },
273
333
  "class-body": {
274
334
  "patterns": [
@@ -355,21 +415,21 @@
355
415
  "include": "#all-types"
356
416
  },
357
417
  {
358
- "match": "\\b(proceed)\\b",
359
- "name": "support.function.builtin.aspectj"
418
+ "name": "support.function.builtin.aspectj",
419
+ "match": "\\b(proceed)\\b"
360
420
  }
361
421
  ]
362
422
  },
363
423
  "comments": {
364
424
  "patterns": [
365
425
  {
426
+ "name": "comment.block.empty.java",
427
+ "match": "/\\*\\*/",
366
428
  "captures": {
367
429
  "0": {
368
430
  "name": "punctuation.definition.comment.java"
369
431
  }
370
- },
371
- "match": "/\\*\\*/",
372
- "name": "comment.block.empty.java"
432
+ }
373
433
  },
374
434
  {
375
435
  "include": "text.html.javadoc"
@@ -382,16 +442,17 @@
382
442
  "comments-inline": {
383
443
  "patterns": [
384
444
  {
445
+ "name": "comment.block.java",
385
446
  "begin": "/\\*",
447
+ "end": "\\*/",
386
448
  "captures": {
387
449
  "0": {
388
450
  "name": "punctuation.definition.comment.java"
389
451
  }
390
- },
391
- "end": "\\*/",
392
- "name": "comment.block.java"
452
+ }
393
453
  },
394
454
  {
455
+ "match": "\\s*((//).*$\\n?)",
395
456
  "captures": {
396
457
  "1": {
397
458
  "name": "comment.line.double-slash.java"
@@ -399,218 +460,88 @@
399
460
  "2": {
400
461
  "name": "punctuation.definition.comment.java"
401
462
  }
402
- },
403
- "match": "\\s*((//).*$\\n?)"
463
+ }
404
464
  }
405
465
  ]
406
466
  },
407
467
  "constants-and-special-vars": {
408
468
  "patterns": [
409
469
  {
410
- "match": "\\b(true|false|null)\\b",
411
- "name": "constant.language.java"
470
+ "name": "constant.language.java",
471
+ "match": "\\b(true|false|null)\\b"
412
472
  },
413
473
  {
414
- "match": "\\b(this|super)\\b",
415
- "name": "variable.language.java"
474
+ "name": "variable.language.java",
475
+ "match": "\\b(this|super)\\b"
416
476
  },
417
477
  {
418
- "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
419
- "name": "constant.numeric.java"
478
+ "name": "constant.numeric.java",
479
+ "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b"
420
480
  },
421
481
  {
482
+ "name": "constant.other.java",
483
+ "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!\u003c|\\.class|\\s*\\w+\\s*=)\\b",
422
484
  "captures": {
423
485
  "1": {
424
486
  "name": "keyword.operator.dereference.java"
425
487
  }
426
- },
427
- "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!<|\\.class|\\s*\\w+\\s*=)\\b",
428
- "name": "constant.other.java"
429
- }
430
- ]
431
- },
432
- "enums": {
433
- "begin": "^(?=\\s*[A-Z0-9_]+\\s*({|\\(|,))",
434
- "end": "(?=;|})",
435
- "patterns": [
436
- {
437
- "begin": "\\w+",
438
- "beginCaptures": {
439
- "0": {
440
- "name": "constant.other.enum.java"
441
- }
442
- },
443
- "end": "(?=,|;|})",
444
- "name": "meta.enum.java",
445
- "patterns": [
446
- {
447
- "include": "#parens"
448
- },
449
- {
450
- "begin": "{",
451
- "end": "}",
452
- "patterns": [
453
- {
454
- "include": "#class-body"
455
- }
456
- ]
457
- }
458
- ]
488
+ }
459
489
  }
460
490
  ]
461
491
  },
462
- "keywords": {
492
+ "declare-constructs": {
493
+ "name": "meta.declare.construct.aspectj",
494
+ "begin": "(declare)\\s+(@(?:type|method|field|package|constructor))\\s*:",
495
+ "end": ";",
463
496
  "patterns": [
464
497
  {
465
- "match": "\\b(try|catch|finally|throw)\\b",
466
- "name": "keyword.control.catch-exception.java"
467
- },
468
- {
469
- "match": "\\?|:",
470
- "name": "keyword.control.java"
471
- },
472
- {
473
- "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b",
474
- "name": "keyword.control.java"
475
- },
476
- {
477
- "match": "\\b(instanceof)\\b",
478
- "name": "keyword.operator.java"
479
- },
480
- {
481
- "match": "(==|!=|<=|>=|<>|<|>)",
482
- "name": "keyword.operator.comparison.java"
483
- },
484
- {
485
- "match": "(=)",
486
- "name": "keyword.operator.assignment.java"
487
- },
488
- {
489
- "match": "(\\-\\-|\\+\\+)",
490
- "name": "keyword.operator.increment-decrement.java"
498
+ "include": "#keywords"
491
499
  },
492
500
  {
493
- "match": "(\\-|\\+|\\*|\\/|%)",
494
- "name": "keyword.operator.arithmetic.java"
501
+ "include": "#all-types"
495
502
  },
496
503
  {
497
- "match": "(!|&&|\\|\\|)",
498
- "name": "keyword.operator.logical.java"
504
+ "include": "#storage-modifiers"
499
505
  },
500
506
  {
501
- "match": "(?<=\\S)\\.(?=\\S)",
502
- "name": "keyword.operator.dereference.java"
507
+ "include": "#strings"
508
+ }
509
+ ],
510
+ "beginCaptures": {
511
+ "1": {
512
+ "name": "storage.type.declare.aspectj"
503
513
  },
504
- {
505
- "match": ";",
506
- "name": "punctuation.terminator.java"
514
+ "2": {
515
+ "name": "storage.type.declare.construct.aspectj"
507
516
  }
508
- ]
517
+ }
509
518
  },
510
- "methods": {
511
- "begin": "(?!new)(?!.*pointcut)(?=\\w[^=:]*\\s+)(?=[^=:]+\\()(?!.*:)",
512
- "end": "}|(?=;)",
513
- "name": "meta.method.java",
519
+ "declare-parents": {
520
+ "name": "meta.declare.precedence.aspectj",
521
+ "begin": "(declare)\\s+(parents)\\s*:",
522
+ "end": ";",
514
523
  "patterns": [
515
524
  {
516
- "include": "#storage-modifiers"
525
+ "include": "#keywords"
517
526
  },
518
527
  {
519
- "begin": "([\\w\\.]+)\\s*\\(",
520
- "beginCaptures": {
521
- "1": {
522
- "name": "entity.name.function.java"
523
- }
524
- },
525
- "end": "\\)",
526
- "name": "meta.method.identifier.java",
527
- "patterns": [
528
- {
529
- "include": "#parameters"
530
- }
531
- ]
532
- },
533
- {
534
- "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
535
- "end": "(?=\\w+\\s*\\()",
536
- "name": "meta.method.return-type.java",
537
- "patterns": [
538
- {
539
- "include": "#all-types"
540
- }
541
- ]
542
- },
543
- {
544
- "include": "#throws"
545
- },
546
- {
547
- "begin": "{",
548
- "end": "(?=})",
549
- "name": "meta.method.body.java",
550
- "patterns": [
551
- {
552
- "include": "#code"
553
- }
554
- ]
528
+ "name": "storage.modifier.class.aspectj",
529
+ "match": "\\b(implements|extends)\\b"
555
530
  }
556
- ]
557
- },
558
- "pointcut-definitions": {
559
- "patterns": [
560
- {
561
- "include": "#keywords"
562
- },
563
- {
564
- "include": "#all-types"
565
- },
566
- {
567
- "match": "(@annotation|\\b(get|set|adviceexecution|execution|call|target|args|within|withincode|handler|cflow|cflowbelow|this|if|preinitialization|staticinitialization|initialization)\\b)",
568
- "name": "support.function.builtin.aspectj"
569
- }
570
- ]
571
- },
572
- "pointcuts": {
573
- "begin": "(?=\\w?.*\\s+)(pointcut)(?=\\s+[^=]+\\()",
531
+ ],
574
532
  "beginCaptures": {
575
533
  "1": {
576
- "name": "storage.type.aspectj"
577
- }
578
- },
579
- "end": ";",
580
- "name": "meta.pointcut.aspectj",
581
- "patterns": [
582
- {
583
- "include": "#storage-modifiers"
584
- },
585
- {
586
- "begin": "(\\w+)\\s*\\(",
587
- "beginCaptures": {
588
- "1": {
589
- "name": "entity.name.function.aspectj"
590
- }
591
- },
592
- "end": "\\)",
593
- "name": "meta.pointcut.identifier.aspectj",
594
- "patterns": [
595
- {
596
- "include": "#parameters"
597
- }
598
- ]
534
+ "name": "storage.type.declare.aspectj"
599
535
  },
600
- {
601
- "begin": ":",
602
- "end": "(?=;)",
603
- "name": "meta.pointcut.body.aspectj",
604
- "patterns": [
605
- {
606
- "include": "#pointcut-definitions"
607
- }
608
- ]
536
+ "2": {
537
+ "name": "storage.type.declare.parents.aspectj"
609
538
  }
610
- ]
539
+ }
611
540
  },
612
541
  "declare-precedence": {
542
+ "name": "meta.declare.precedence.aspectj",
613
543
  "begin": "(declare)\\s+(precedence)\\s*:",
544
+ "end": ";",
614
545
  "beginCaptures": {
615
546
  "1": {
616
547
  "name": "storage.type.declare.aspectj"
@@ -618,121 +549,134 @@
618
549
  "2": {
619
550
  "name": "storage.type.declare.precedence.aspectj"
620
551
  }
621
- },
622
- "end": ";",
623
- "name": "meta.declare.precedence.aspectj"
552
+ }
624
553
  },
625
- "declare-parents": {
626
- "begin": "(declare)\\s+(parents)\\s*:",
627
- "beginCaptures": {
628
- "1": {
629
- "name": "storage.type.declare.aspectj"
630
- },
631
- "2": {
632
- "name": "storage.type.declare.parents.aspectj"
633
- }
634
- },
554
+ "declare-warnings-errors": {
555
+ "name": "meta.declare.alerts.aspectj",
556
+ "begin": "(declare)\\s+(warning|error)\\s*:",
635
557
  "end": ";",
636
- "name": "meta.declare.precedence.aspectj",
637
558
  "patterns": [
638
559
  {
639
- "include": "#keywords"
560
+ "include": "#pointcut-definitions"
640
561
  },
641
562
  {
642
- "match": "\\b(implements|extends)\\b",
643
- "name": "storage.modifier.class.aspectj"
563
+ "include": "#strings"
644
564
  }
645
- ]
646
- },
647
- "declare-constructs": {
648
- "begin": "(declare)\\s+(@(?:type|method|field|package|constructor))\\s*:",
565
+ ],
649
566
  "beginCaptures": {
650
567
  "1": {
651
568
  "name": "storage.type.declare.aspectj"
652
569
  },
653
570
  "2": {
654
- "name": "storage.type.declare.construct.aspectj"
571
+ "name": "storage.type.declare.alerts.aspectj"
655
572
  }
656
- },
657
- "end": ";",
658
- "name": "meta.declare.construct.aspectj",
573
+ }
574
+ },
575
+ "enums": {
576
+ "begin": "^(?=\\s*[A-Z0-9_]+\\s*({|\\(|,))",
577
+ "end": "(?=;|})",
659
578
  "patterns": [
660
579
  {
661
- "include": "#keywords"
580
+ "name": "meta.enum.java",
581
+ "begin": "\\w+",
582
+ "end": "(?=,|;|})",
583
+ "patterns": [
584
+ {
585
+ "include": "#parens"
586
+ },
587
+ {
588
+ "begin": "{",
589
+ "end": "}",
590
+ "patterns": [
591
+ {
592
+ "include": "#class-body"
593
+ }
594
+ ]
595
+ }
596
+ ],
597
+ "beginCaptures": {
598
+ "0": {
599
+ "name": "constant.other.enum.java"
600
+ }
601
+ }
602
+ }
603
+ ]
604
+ },
605
+ "keywords": {
606
+ "patterns": [
607
+ {
608
+ "name": "keyword.control.catch-exception.java",
609
+ "match": "\\b(try|catch|finally|throw)\\b"
662
610
  },
663
611
  {
664
- "include": "#all-types"
612
+ "name": "keyword.control.java",
613
+ "match": "\\?|:"
665
614
  },
666
615
  {
667
- "include": "#storage-modifiers"
616
+ "name": "keyword.control.java",
617
+ "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b"
668
618
  },
669
619
  {
670
- "include": "#strings"
671
- }
672
- ]
673
- },
674
- "declare-warnings-errors": {
675
- "begin": "(declare)\\s+(warning|error)\\s*:",
676
- "beginCaptures": {
677
- "1": {
678
- "name": "storage.type.declare.aspectj"
620
+ "name": "keyword.operator.java",
621
+ "match": "\\b(instanceof)\\b"
679
622
  },
680
- "2": {
681
- "name": "storage.type.declare.alerts.aspectj"
682
- }
683
- },
684
- "end": ";",
685
- "name": "meta.declare.alerts.aspectj",
686
- "patterns": [
687
623
  {
688
- "include": "#pointcut-definitions"
624
+ "name": "keyword.operator.comparison.java",
625
+ "match": "(==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
689
626
  },
690
627
  {
691
- "include": "#strings"
628
+ "name": "keyword.operator.assignment.java",
629
+ "match": "(=)"
630
+ },
631
+ {
632
+ "name": "keyword.operator.increment-decrement.java",
633
+ "match": "(\\-\\-|\\+\\+)"
634
+ },
635
+ {
636
+ "name": "keyword.operator.arithmetic.java",
637
+ "match": "(\\-|\\+|\\*|\\/|%)"
638
+ },
639
+ {
640
+ "name": "keyword.operator.logical.java",
641
+ "match": "(!|\u0026\u0026|\\|\\|)"
642
+ },
643
+ {
644
+ "name": "keyword.operator.dereference.java",
645
+ "match": "(?\u003c=\\S)\\.(?=\\S)"
646
+ },
647
+ {
648
+ "name": "punctuation.terminator.java",
649
+ "match": ";"
692
650
  }
693
651
  ]
694
652
  },
695
- "advice": {
696
- "begin": "(?!new)(?!.*pointcut)(?=[^=:]+\\([^\\)]*\\)[^=]*:)",
653
+ "methods": {
654
+ "name": "meta.method.java",
655
+ "begin": "(?!new)(?!.*pointcut)(?=\\w[^=:]*\\s+)(?=[^=:]+\\()(?!.*:)",
697
656
  "end": "}|(?=;)",
698
- "name": "meta.advice.aspectj",
699
657
  "patterns": [
700
658
  {
701
659
  "include": "#storage-modifiers"
702
660
  },
703
661
  {
704
- "begin": "(around|after|before|throwing|returning)\\s*\\(",
705
- "beginCaptures": {
706
- "1": {
707
- "name": "keyword.other.advice.aspectj"
708
- }
709
- },
710
- "end": "\\)",
711
662
  "name": "meta.method.identifier.java",
663
+ "begin": "([\\w\\.]+)\\s*\\(",
664
+ "end": "\\)",
712
665
  "patterns": [
713
666
  {
714
667
  "include": "#parameters"
715
668
  }
716
- ]
717
- },
718
- {
719
- "match": "(throwing|returning)(?=\\s*:)",
720
- "name": "keyword.other.advice.aspectj"
721
- },
722
- {
723
- "begin": ":",
724
- "end": "(?={)",
725
- "name": "meta.advice.identifier.aspectj",
726
- "patterns": [
727
- {
728
- "include": "#pointcut-definitions"
669
+ ],
670
+ "beginCaptures": {
671
+ "1": {
672
+ "name": "entity.name.function.java"
729
673
  }
730
- ]
674
+ }
731
675
  },
732
676
  {
677
+ "name": "meta.method.return-type.java",
733
678
  "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
734
679
  "end": "(?=\\w+\\s*\\()",
735
- "name": "meta.method.return-type.java",
736
680
  "patterns": [
737
681
  {
738
682
  "include": "#all-types"
@@ -743,9 +687,9 @@
743
687
  "include": "#throws"
744
688
  },
745
689
  {
690
+ "name": "meta.method.body.java",
746
691
  "begin": "{",
747
692
  "end": "(?=})",
748
- "name": "meta.method.body.java",
749
693
  "patterns": [
750
694
  {
751
695
  "include": "#code"
@@ -757,25 +701,24 @@
757
701
  "object-types": {
758
702
  "patterns": [
759
703
  {
760
- "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
761
- "end": ">|[^\\w\\s,\\?<\\[\\]]",
762
704
  "name": "storage.type.generic.java",
705
+ "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
706
+ "end": "\u003e|[^\\w\\s,\\?\u003c\\[\\]]",
763
707
  "patterns": [
764
708
  {
765
709
  "include": "#object-types"
766
710
  },
767
711
  {
768
- "begin": "<",
769
- "comment": "This is just to support <>'s with no actual type prefix",
770
- "end": ">|[^\\w\\s,\\[\\]<]",
771
- "name": "storage.type.generic.java"
712
+ "name": "storage.type.generic.java",
713
+ "begin": "\u003c",
714
+ "end": "\u003e|[^\\w\\s,\\[\\]\u003c]"
772
715
  }
773
716
  ]
774
717
  },
775
718
  {
719
+ "name": "storage.type.object.array.java",
776
720
  "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
777
721
  "end": "(?=[^\\]\\s])",
778
- "name": "storage.type.object.array.java",
779
722
  "patterns": [
780
723
  {
781
724
  "begin": "\\[",
@@ -789,50 +732,49 @@
789
732
  ]
790
733
  },
791
734
  {
735
+ "name": "storage.type.java",
736
+ "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
792
737
  "captures": {
793
738
  "1": {
794
739
  "name": "keyword.operator.dereference.java"
795
740
  }
796
- },
797
- "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
798
- "name": "storage.type.java"
741
+ }
799
742
  }
800
743
  ]
801
744
  },
802
745
  "object-types-inherited": {
803
746
  "patterns": [
804
747
  {
805
- "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
806
- "end": ">|[^\\w\\s,<]",
807
748
  "name": "entity.other.inherited-class.java",
749
+ "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
750
+ "end": "\u003e|[^\\w\\s,\u003c]",
808
751
  "patterns": [
809
752
  {
810
753
  "include": "#object-types"
811
754
  },
812
755
  {
813
- "begin": "<",
814
- "comment": "This is just to support <>'s with no actual type prefix",
815
- "end": ">|[^\\w\\s,<]",
816
- "name": "storage.type.generic.java"
756
+ "name": "storage.type.generic.java",
757
+ "begin": "\u003c",
758
+ "end": "\u003e|[^\\w\\s,\u003c]"
817
759
  }
818
760
  ]
819
761
  },
820
762
  {
763
+ "name": "entity.other.inherited-class.java",
764
+ "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
821
765
  "captures": {
822
766
  "1": {
823
767
  "name": "keyword.operator.dereference.java"
824
768
  }
825
- },
826
- "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
827
- "name": "entity.other.inherited-class.java"
769
+ }
828
770
  }
829
771
  ]
830
772
  },
831
773
  "parameters": {
832
774
  "patterns": [
833
775
  {
834
- "match": "final",
835
- "name": "storage.modifier.java"
776
+ "name": "storage.modifier.java",
777
+ "match": "final"
836
778
  },
837
779
  {
838
780
  "include": "#primitive-arrays"
@@ -844,8 +786,8 @@
844
786
  "include": "#object-types"
845
787
  },
846
788
  {
847
- "match": "\\w+",
848
- "name": "variable.parameter.java"
789
+ "name": "variable.parameter.java",
790
+ "match": "\\w+"
849
791
  }
850
792
  ]
851
793
  },
@@ -858,19 +800,73 @@
858
800
  }
859
801
  ]
860
802
  },
803
+ "pointcut-definitions": {
804
+ "patterns": [
805
+ {
806
+ "include": "#keywords"
807
+ },
808
+ {
809
+ "include": "#all-types"
810
+ },
811
+ {
812
+ "name": "support.function.builtin.aspectj",
813
+ "match": "(@annotation|\\b(get|set|adviceexecution|execution|call|target|args|within|withincode|handler|cflow|cflowbelow|this|if|preinitialization|staticinitialization|initialization)\\b)"
814
+ }
815
+ ]
816
+ },
817
+ "pointcuts": {
818
+ "name": "meta.pointcut.aspectj",
819
+ "begin": "(?=\\w?.*\\s+)(pointcut)(?=\\s+[^=]+\\()",
820
+ "end": ";",
821
+ "patterns": [
822
+ {
823
+ "include": "#storage-modifiers"
824
+ },
825
+ {
826
+ "name": "meta.pointcut.identifier.aspectj",
827
+ "begin": "(\\w+)\\s*\\(",
828
+ "end": "\\)",
829
+ "patterns": [
830
+ {
831
+ "include": "#parameters"
832
+ }
833
+ ],
834
+ "beginCaptures": {
835
+ "1": {
836
+ "name": "entity.name.function.aspectj"
837
+ }
838
+ }
839
+ },
840
+ {
841
+ "name": "meta.pointcut.body.aspectj",
842
+ "begin": ":",
843
+ "end": "(?=;)",
844
+ "patterns": [
845
+ {
846
+ "include": "#pointcut-definitions"
847
+ }
848
+ ]
849
+ }
850
+ ],
851
+ "beginCaptures": {
852
+ "1": {
853
+ "name": "storage.type.aspectj"
854
+ }
855
+ }
856
+ },
861
857
  "primitive-arrays": {
862
858
  "patterns": [
863
859
  {
864
- "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
865
- "name": "storage.type.primitive.array.java"
860
+ "name": "storage.type.primitive.array.java",
861
+ "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b"
866
862
  }
867
863
  ]
868
864
  },
869
865
  "primitive-types": {
870
866
  "patterns": [
871
867
  {
872
- "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b",
873
- "name": "storage.type.primitive.java"
868
+ "name": "storage.type.primitive.java",
869
+ "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b"
874
870
  }
875
871
  ]
876
872
  },
@@ -889,63 +885,63 @@
889
885
  "strings": {
890
886
  "patterns": [
891
887
  {
888
+ "name": "string.quoted.double.java",
892
889
  "begin": "\"",
890
+ "end": "\"",
891
+ "patterns": [
892
+ {
893
+ "name": "constant.character.escape.java",
894
+ "match": "\\\\."
895
+ }
896
+ ],
893
897
  "beginCaptures": {
894
898
  "0": {
895
899
  "name": "punctuation.definition.string.begin.java"
896
900
  }
897
901
  },
898
- "end": "\"",
899
902
  "endCaptures": {
900
903
  "0": {
901
904
  "name": "punctuation.definition.string.end.java"
902
905
  }
903
- },
904
- "name": "string.quoted.double.java",
905
- "patterns": [
906
- {
907
- "match": "\\\\.",
908
- "name": "constant.character.escape.java"
909
- }
910
- ]
906
+ }
911
907
  },
912
908
  {
909
+ "name": "string.quoted.single.java",
913
910
  "begin": "'",
911
+ "end": "'",
912
+ "patterns": [
913
+ {
914
+ "name": "constant.character.escape.java",
915
+ "match": "\\\\."
916
+ }
917
+ ],
914
918
  "beginCaptures": {
915
919
  "0": {
916
920
  "name": "punctuation.definition.string.begin.java"
917
921
  }
918
922
  },
919
- "end": "'",
920
923
  "endCaptures": {
921
924
  "0": {
922
925
  "name": "punctuation.definition.string.end.java"
923
926
  }
924
- },
925
- "name": "string.quoted.single.java",
926
- "patterns": [
927
- {
928
- "match": "\\\\.",
929
- "name": "constant.character.escape.java"
930
- }
931
- ]
927
+ }
932
928
  }
933
929
  ]
934
930
  },
935
931
  "throws": {
932
+ "name": "meta.throwables.java",
936
933
  "begin": "throws",
937
- "beginCaptures": {
938
- "0": {
939
- "name": "storage.modifier.java"
940
- }
941
- },
942
934
  "end": "(?={|;)",
943
- "name": "meta.throwables.java",
944
935
  "patterns": [
945
936
  {
946
937
  "include": "#object-types"
947
938
  }
948
- ]
939
+ ],
940
+ "beginCaptures": {
941
+ "0": {
942
+ "name": "storage.modifier.java"
943
+ }
944
+ }
949
945
  },
950
946
  "values": {
951
947
  "patterns": [
@@ -960,7 +956,5 @@
960
956
  }
961
957
  ]
962
958
  }
963
- },
964
- "scopeName": "source.aspectj",
965
- "uuid": "8ace1709-b6d3-4b3c-8b59-262545406403"
966
- }
959
+ }
960
+ }