github-linguist 4.8.8 → 4.8.9

data/grammars/source.c2hs.json

@@ -0,0 +1,27 @@
+{
+  "fileTypes": [
+    "chs"
+  ],
+  "name": "C2Hs",
+  "scopeName": "source.c2hs",
+  "patterns": [
+    {
+      "begin": "\\{#",
+      "end": "#\\}",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.preprocessor.begin.c2hs"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.preprocessor.end.c2hs"
+        }
+      },
+      "name": "meta.preprocessor.c2hs"
+    },
+    {
+      "include": "source.haskell"
+    }
+  ]
+}

data/grammars/source.cabal.json

@@ -0,0 +1,66 @@
+{
+  "scopeName": "source.cabal",
+  "fileTypes": [
+    "cabal"
+  ],
+  "name": "Cabal",
+  "patterns": [
+    {
+      "match": "(version)\\W*:\\W*([\\d.]+)",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
+        },
+        "2": {
+          "name": "constant.numeric"
+        }
+      },
+      "name": "version"
+    },
+    {
+      "match": "(\\S+):[^/]",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
+        }
+      },
+      "name": "cabal-keyword"
+    },
+    {
+      "match": "&&",
+      "name": "keyword.other"
+    },
+    {
+      "match": "([><=]+)\\s*([\\d.]+)",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
+        },
+        "2": {
+          "name": "constant.numeric"
+        }
+      },
+      "name": "cabal-keyword"
+    },
+    {
+      "match": "(benchmark|executable|flag|source-repository|test-suite)\\s+(\\S+)",
+      "captures": {
+        "1": {
+          "name": "entity.name.function"
+        },
+        "2": {
+          "name": "support.other"
+        }
+      },
+      "name": "module-type"
+    },
+    {
+      "match": "library",
+      "name": "entity.name.function"
+    },
+    {
+      "match": "--.*\\n",
+      "name": "comment"
+    }
+  ]
+}

data/grammars/source.coffee.json

@@ -118,13 +118,14 @@
       ]
     },
     {
-      "match": "(#).*$",
-      "name": "comment.line.number-sign.coffee",
-      "captures": {
-        "1": {
+      "begin": "#",
+      "beginCaptures": {
+        "0": {
           "name": "punctuation.definition.comment.coffee"
         }
-      }
+      },
+      "end": "$",
+      "name": "comment.line.number-sign.coffee"
     },
     {
       "begin": "/{3}",

data/grammars/source.crystal.json

@@ -1790,17 +1790,6 @@
       "match": "(?<!:)(:)(?>[$a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?|===?|<=>|>[>=]?|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?|@@?[a-zA-Z_]\\w*)",
       "name": "constant.other.symbol.crystal"
     },
-    {
-      "begin": "^=begin",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.crystal"
-        }
-      },
-      "comment": "multiline comments",
-      "end": "^=end",
-      "name": "comment.block.documentation.crystal"
-    },
     {
       "begin": "(^[ \\t]+)?(?=#)",
       "beginCaptures": {

data/grammars/source.csound-score.json

@@ -5,6 +5,9 @@
   ],
   "name": "Csound Score",
   "patterns": [
+    {
+      "include": "source.csound#preprocessorDirectives"
+    },
     {
       "include": "source.csound#commentsAndMacroCalls"
     },
@@ -33,9 +36,6 @@
   "repository": {
     "partialExpressions": {
       "patterns": [
-        {
-          "include": "source.csound#preprocessorDirectives"
-        },
         {
           "include": "source.csound#numbers"
         },

data/grammars/source.csound.json

@@ -173,7 +173,7 @@
     "labels": {
       "patterns": [
         {
-          "match": "^[ \\t]*(\\w+)(:)",
+          "match": "^[ \\t]*(\\w+)(:)(?:[ \\t]+|$)",
           "captures": {
             "1": {
               "name": "entity.name.label.csound"
@@ -189,7 +189,7 @@
       "patterns": [
         {
           "name": "entity.name.function.preprocessor.csound",
-          "match": "\\$\\w+(?:\\.|\\b)"
+          "match": "\\$[A-Z_a-z]\\w*(?:\\.|\\b)"
         }
       ]
     },
@@ -201,7 +201,7 @@
         },
         {
           "name": "constant.numeric.integer.hexadecimal.csound",
-          "match": "0[Xx][a-fA-F0-9]+"
+          "match": "0[Xx][0-9A-Fa-f]+"
         },
         {
           "name": "constant.numeric.integer.decimal.csound",
@@ -270,6 +270,36 @@
             }
           ]
         },
+        {
+          "name": "string.quoted.csound",
+          "begin": "\\b(printk?s)[ \\t]*(\")",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.csound"
+            },
+            "2": {
+              "name": "punctuation.definition.string.begin.csound"
+            }
+          },
+          "end": "\"",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.csound"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#macroCalls"
+            },
+            {
+              "name": "constant.character.escape.csound",
+              "match": "%(?:\\d*(?:\\.\\d+)?[cdhilouxX]|[!%nNrRtT])|[~^]"
+            },
+            {
+              "include": "#escapeSequences"
+            }
+          ]
+        },
         {
           "begin": "\\b(scoreline(?:_i)?)[ \\t]*(\\{\\{)",
           "beginCaptures": {
@@ -337,7 +367,7 @@
           ]
         },
         {
-          "begin": "\\blua_opdef",
+          "begin": "\\blua_opdef\\b",
           "beginCaptures": {
             "0": {
               "name": "support.function.csound"
@@ -374,12 +404,22 @@
           "match": "\\bp\\d+\\b"
         },
         {
-          "name": "support.function.csound",
-          "match": "\\b(ATS(?:add(?:(?:nz)?)|bufread|cross|in(?:fo|terpread)|partialtap|read(?:(?:nz)?)|sinnoi)|FL(?:b(?:ox|ut(?:Bank|ton))|c(?:loseButton|o(?:lor(?:(?:2)?)|unt))|execButton|g(?:etsnap|roup(?:(?:(?:E|_e)nd)?))|h(?:ide|vsBox(?:(?:SetValue)?))|joy|k(?:eyIn|nob)|l(?:abel|oadsnap)|mouse|p(?:a(?:ck(?:(?:(?:E|_e)nd)?)|nel(?:(?:(?:E|_e)nd)?))|rintk(?:(?:2)?))|r(?:oller|un)|s(?:avesnap|croll(?:(?:(?:E|_e)nd)?)|et(?:Align|Box|Color(?:(?:2)?)|Font|Position|S(?:ize|napGroup)|Text(?:(?:Color|(?:Siz|Typ)e)?)|Val(?:(?:(?:(?:_)?)i)?)|snap)|how|lid(?:Bnk(?:(?:2(?:(?:Set(?:(?:k)?))?)|GetHandle|Set(?:(?:k)?))?)|er))|t(?:abs(?:(?:(?:E|_e)nd)?)|ext)|update|v(?:alue|keybd|slidBnk(?:(?:2)?))|xyin)|Mixer(?:Clear|GetLevel|Receive|Se(?:nd|tLevel(?:(?:_i)?)))|OSC(?:init|listen|send)|a(?:bs|ctive|ds(?:r|yn(?:(?:t(?:(?:2)?))?))|ftouch|l(?:pass|wayson)|mp(?:db(?:(?:fs)?)|midi(?:(?:d)?))|r(?:eson(?:(?:k)?)|ray)|tone(?:(?:[kx])?))|b(?:a(?:bo|lance|mboo|rmodel)|bcut(?:[ms])|e(?:(?:tara|xpr)nd)|form(?:dec(?:(?:1)?)|enc(?:(?:1)?))|i(?:nit|quad(?:(?:a)?)|rnd)|qrez|u(?:chla|t(?:b(?:[pr])|hp|lp|t(?:er(?:b(?:[pr])|(?:[hl])p)|on))|zz))|c(?:2r|a(?:basa|uchy(?:(?:i)?))|e(?:il|ll|nt(?:(?:roid)?)|ps(?:(?:inv)?))|h(?:an(?:ctrl|ged(?:(?:2)?)|[io])|e(?:byshevpoly|ckbox)|n(?:_(?:[Sak])|clear|export|get|mix|params|set)|uap)|l(?:ear|filt|ip|ocko(?:ff|n))|mplxprod|o(?:m(?:b(?:(?:inv)?)|p(?:ile(?:csd|orc|str)|ress(?:(?:2)?)))|n(?:nect|trol|v(?:(?:l|olv)e))|py(?:a2ftab|f2array)|s(?:(?:h|inv|seg(?:(?:[br])?))?))|p(?:s(?:2pch|midi(?:(?:b|nn)?)|oct|pch|t(?:mid|un(?:(?:i)?))|xpch)|uprc)|r(?:oss(?:2|fm(?:(?:i|pm(?:(?:i)?))?)|pm(?:(?:i)?))|unch)|t(?:lchn|rl(?:14|21|7|init))|userrnd)|d(?:a(?:m|te(?:(?:s)?))|b(?:(?:(?:(?:fs)?)amp)?)|c(?:block(?:(?:2)?)|onv)|e(?:l(?:ay(?:(?:[1krw])?)|tap(?:(?:xw|[3inx])?))|norm)|i(?:ff|rectory|s(?:k(?:grain|in(?:(?:2)?))|p(?:fft|lay)|tort(?:(?:1)?))|vz)|o(?:ppler|wnsamp)|ripwater|u(?:mpk(?:(?:[234])?)|s(?:errnd|t(?:(?:2)?))))|e(?:nvlpx(?:(?:r)?)|phasor|qfil|v(?:alstr|ent(?:(?:_i)?))|x(?:citer|itnow|p(?:(?:curve|on|rand(?:(?:i)?)|seg(?:(?:ba|[abr])?))?)))|f(?:a(?:reylen(?:(?:i)?)|ust(?:audio|c(?:ompile|tl)|gen))|ft(?:(?:inv)?)|i(?:close|l(?:e(?:bit|len|nchnls|peak|s(?:cal|r)|valid)|larray|ter2)|n(?:(?:[ik])?)|open)|l(?:a(?:nger|shtxt)|oo(?:per(?:(?:2)?)|r)|uid(?:AllOut|C(?:C(?:[ik])|ontrol)|Engine|Load|Note|Out|ProgramSelect|SetInterpMethod))|m(?:b(?:3|ell)|metal|percfl|(?:rhod|voic|wurli)e)|o(?:f(?:2|ilter)|l(?:d|low(?:(?:2)?))|scil(?:(?:i)?)|ut(?:(?:ir|[ik])?)|[fg])|print(?:(?:(?:k)?)s)|r(?:a(?:c(?:(?:talnoise)?)|mebuffer)|eeverb)|t(?:c(?:hnls|onv|ps)|free|gen(?:(?:once|tmp)?)|l(?:en|oad(?:(?:k)?)|ptim)|morf|resize(?:(?:i)?)|s(?:a(?:mplebank|ve(?:(?:k)?))|r)))|g(?:a(?:in(?:(?:slider)?)|uss(?:(?:i|trig)?))|buzz|e(?:n(?:array(?:(?:_i)?)|dy(?:(?:[cx])?))|t(?:c(?:fg|ol)|row|seed))|ogobel|ra(?:in(?:(?:[23])?)|nule)|uiro)|h(?:armon(?:(?:[234])?)|df5(?:read|write)|ilbert|rtf(?:e(?:arly|r)|move(?:(?:2)?)|reverb|stat)|sboscil|vs(?:[123]))|i(?:hold|mage(?:create|free|getpixel|load|s(?:ave|etpixel|ize))|n(?:(?:32|ch|it(?:(?:c(?:14|21|7))?)|let(?:kid|[afkv])|rg|s(?:global|remot)|te(?:g|rp)|value|[hoqstxz])?))|j(?:itter(?:(?:2)?)|spline)|ktableseg|l(?:enarray|fo|i(?:mit|n(?:e(?:(?:n(?:(?:r)?)|to)?)|rand|seg(?:(?:[br])?)))|o(?:cs(?:end|ig)|g(?:(?:10|2|btwo|curve)?)|op(?:seg(?:(?:p)?)|(?:[tx])seg)|renz|scil(?:(?:[3x])?)|w(?:pass2|res(?:(?:x)?)))|p(?:f(?:18|orm|reson)|hasor|interp|oscil(?:(?:sa(?:(?:2)?)|[3a])?)|re(?:ad|son)|s(?:hold(?:(?:p)?)|lot))|ua_(?:exec|opdef))|m(?:a(?:ca|dsr|gs|nd(?:(?:[eo])l)|parray(?:(?:_i)?)|rimba|ssign|x(?:_k|a(?:bs(?:(?:accum)?)|ccum|lloc|rray))|[cx])|clock|delay|e(?:dian(?:(?:k)?)|tro)|i(?:d(?:global|i(?:c(?:14|21|7|h(?:annelaftertouch|n)|ontrolchange|trl)|default|filestatus|in|noteo(?:ff|n(?:cps|key|oct|pch))|o(?:n(?:(?:2)?)|ut)|p(?:gm|itchbend|olyaftertouch|rogramchange)|tempo)|remot)|n(?:(?:a(?:bs(?:(?:accum)?)|ccum|rray)|cer)?)|rror)|o(?:d(?:e|matrix)|nitor|og(?:(?:ladder(?:(?:2)?)|vcf(?:(?:2)?))?)|scil)|p(?:3(?:bitrate|in|len|nchnls|s(?:cal(?:(?:_(?:check|load(?:(?:2)?)|play(?:(?:2)?)))?)|r))|ulse)|rtmsg|u(?:ltitap|te)|vc(?:hpf|lpf(?:[1234]))|xadsr)|n(?:chnls_hw|estedap|l(?:alp|filt(?:(?:2)?))|o(?:ise|t(?:eo(?:ff|n(?:(?:dur(?:(?:2)?))?))|num))|r(?:everb|pn)|s(?:amp|t(?:ance|rnum))|trpol)|o(?:ct(?:ave|cps|midi(?:(?:b|nn)?)|pch)|labuffer|sc(?:bnk|il(?:(?:1i|ikt(?:(?:[ps])?)|[13insx])?))|ut(?:(?:32|ch|i(?:at|c(?:(?:14)?)|p(?:at|[bc]))|k(?:at|c(?:(?:14)?)|p(?:at|[bc]))|let(?:kid|[afkv])|q(?:[1234])|rg|s(?:[12])|value|[choqsxz])?))|p(?:a(?:n(?:(?:2)?)|r(?:eq|t(?:2txt|i(?:als|kkel(?:(?:get|s(?:et|ync))?))))|ssign|ulstretch)|c(?:auchy|h(?:bend|midi(?:(?:b|nn)?)|oct)|o(?:nvolve|unt))|d(?:clip|half(?:(?:y)?))|eak|gm(?:(?:assig|ch)n)|h(?:as(?:er(?:[12])|or(?:(?:bnk)?))|s)|i(?:n(?:dex|k(?:er|ish))|tch(?:(?:a(?:c|mdf))?))|l(?:a(?:net|terev)|(?:ltra|u)ck)|o(?:isson|l(?:2rect|y(?:aft|nomial))|p_f|rt(?:(?:k)?)|scil(?:(?:3)?)|w(?:ershape|oftwo)|[pw])|r(?:e(?:alloc|piano)|int(?:(?:_type|f_i|k(?:s2|[2s])|[fks])?)|oduct)|set|t(?:able(?:(?:iw|[3iw])?)|rack)|u(?:sh(?:(?:_f)?)|ts)|v(?:add|bufread|cross|interp|oc|read|s(?:2(?:array|tab)|a(?:dsyn|nal|rp)|b(?:and(?:[pr])|in|lur|uf(?:fer|read(?:(?:2)?)))|c(?:ale|e(?:nt|ps)|ross)|d(?:emix|is(?:kin|p))|envftw|f(?:ilter|r(?:e(?:ad|eze)|omarray)|t(?:[rw])|write)|g(?:ain|endy)|hift|i(?:fd|n(?:(?:fo|it)?))|lock|m(?:aska|ix|o(?:(?:ot|rp)h))|o(?:sc|ut)|pitch|t(?:(?:ana|enci)l)|voc|warp|ynth))|wd|y(?:assign(?:(?:[it])?)|call(?:(?:1(?:[it])|2(?:[it])|3(?:[it])|4(?:[it])|5(?:[it])|6(?:[it])|7(?:[it])|8(?:[it])|ni|[12345678int])?)|e(?:val(?:(?:[it])?)|xec(?:(?:[it])?))|init|l(?:assign(?:(?:[it])?)|call(?:(?:1(?:[it])|2(?:[it])|3(?:[it])|4(?:[it])|5(?:[it])|6(?:[it])|7(?:[it])|8(?:[it])|ni|[12345678int])?)|e(?:val(?:(?:[it])?)|xec(?:(?:[it])?))|run(?:(?:[it])?))|run(?:(?:[it])?)))|q(?:inf|nan)|r(?:2c|and(?:(?:om(?:(?:[hi])?)|[hi])?)|bjeq|e(?:ad(?:clock|fi|k(?:[234s])|sc(?:ore|ratch)|[fk])|ct2pol|init|lease|mo(?:teport|ve)|pluck|s(?:on(?:(?:xk|[krxyz])?)|yn)|verb(?:(?:2|sc)?)|windscore|zzy)|fft|ifft|ms|nd(?:(?:31)?)|ound|spline|tclock)|s(?:16b14|32b14|a(?:mphold|ndpaper)|c(?:a(?:le(?:(?:array)?)|n(?:hammer|table|[su]))|hed(?:kwhen(?:(?:named)?)|ule|when)|oreline(?:(?:_i)?))|e(?:ed|kere|mitone|nse(?:(?:key)?)|qtime(?:(?:2)?)|rial(?:Begin|End|Flush|Print|Read|Write(?:(?:_i)?))|t(?:c(?:(?:o|tr)l)|ksmps|row|scorepos))|f(?:i(?:list|nstr(?:(?:3m|[3m])?))|lo(?:ad|oper)|p(?:assign|l(?:ay(?:(?:3m|[3m])?)|ist)|reset))|h(?:aker|ift(?:in|out))|i(?:gn(?:alflowgraph|um)|n(?:(?:h|inv|syn)?))|l(?:eighbells|i(?:cearray|der(?:16(?:(?:f|table(?:(?:f)?))?)|32(?:(?:f|table(?:(?:f)?))?)|64(?:(?:f|table(?:(?:f)?))?)|8(?:(?:f|table(?:(?:f)?))?)|Kawai)))|nd(?:lo(?:ad|op)|warp(?:(?:st)?))|o(?:ck(?:recv(?:(?:s)?)|send(?:(?:s)?))|und(?:in|out(?:(?:s)?)))|p(?:a(?:ce|t3d(?:(?:[it])?))|dist|ec(?:addm|di(?:ff|sp)|filt|hist|ptrk|s(?:cal|um)|trum)|litrig|rintf(?:(?:k)?)|send)|qrt|t(?:a(?:ck|tevar)|ix|r(?:c(?:at(?:(?:k)?)|har(?:(?:k)?)|mp(?:(?:k)?)|py(?:(?:k)?))|e(?:cv|son)|fromurl|get|index(?:(?:k)?)|l(?:en(?:(?:k)?)|ower(?:(?:k)?))|rindex(?:(?:k)?)|s(?:et|ub(?:(?:k)?))|to(?:(?:[dl])k|[dl])|upper(?:(?:k)?))|send)|u(?:binstr(?:(?:init)?)|m(?:(?:array)?))|vfilter|y(?:nc(?:grain|loop|phasor)|stem(?:(?:_i)?)))|t(?:a(?:b(?:2pvs|_i|ifd|le(?:(?:3kt|copy|filter(?:(?:i)?)|gpw|i(?:copy|gpw|kt|mix|w)|kt|mix|ng|ra|s(?:eg|huffle(?:(?:i)?))|w(?:a|kt)|x(?:kt|seg)|[3iw])?)|morph(?:(?:ak|[ai])?)|play|rec|sum|w(?:(?:_i)?))|mbourine|n(?:h|inv(?:(?:2)?))|[bn])|b(?:0_init|1(?:(?:(?:[012345])?)_init|[012345])|2_init|3_init|4_init|5_init|6_init|7_init|8_init|9_init|vcf|[0123456789])|emp(?:est|o(?:(?:(?:sc|v)al)?))|i(?:me(?:dseq|inst(?:[ks])|[ks])|val)|lineto|one(?:(?:[kx])?)|r(?:a(?:dsyn|n(?:dom|seg(?:(?:[br])?)))|cross|filter|highest|i(?:g(?:ger|seq)|rand)|lowest|mix|s(?:cale|(?:hif|pli)t))|urno(?:ff(?:(?:2)?)|n))|u(?:n(?:irand|wrap)|psamp|r(?:andom|d))|v(?:a(?:ctrol|dd(?:(?:_i|v(?:(?:_i)?))?)|get|lpass|set)|bap(?:(?:16|4move|8move|gmove|lsinit|(?:(?:z)?)move|[48gz])?)|c(?:ella|o(?:(?:2(?:(?:(?:f|i(?:f|ni))t)?)|mb|py(?:(?:_i)?))?))|d(?:el(?:_k|ay(?:(?:x(?:w(?:[qs])|[qsw])|[3kx])?))|ivv(?:(?:_i)?))|e(?:cdelay|loc|xp(?:(?:_i|seg|v(?:(?:_i)?))?))|i(?:b(?:es|r(?:(?:ato)?))|ncr)|l(?:i(?:mit|nseg)|owres)|m(?:ap|irror|ult(?:(?:_i|v(?:(?:_i)?))?))|o(?:ice|sim)|p(?:haseseg|o(?:rt|w(?:(?:_i|v(?:(?:_i)?))?))|voc)|rand(?:[hi])|subv(?:(?:_i)?)|tab(?:le(?:1k|w(?:[aik])|[aik])|w(?:[aik])|[aik])|wrap)|w(?:aveset|eibull|g(?:b(?:ow(?:(?:edbar)?)|rass)|clar|flute|pluck(?:(?:2)?)|uide(?:[12]))|i(?:i(?:connect|data|range|send)|ndow)|r(?:ap|itescratch)|terrain)|x(?:adsr|in|out|scan(?:map|smap|[su])|tratim|yin)|z(?:a(?:cl|kinit|mod|rg|wm|[rw])|filter2|i(?:wm|[rw])|k(?:cl|mod|wm|[rw]))|[Saikp])\\b"
+          "match": "\\b(ATS(?:add(?:(?:nz)?)|bufread|cross|in(?:fo|terpread)|partialtap|read(?:(?:nz)?)|sinnoi)|FL(?:b(?:ox|ut(?:Bank|ton))|c(?:loseButton|o(?:lor(?:(?:2)?)|unt))|execButton|g(?:etsnap|roup(?:(?:(?:E|_e)nd)?))|h(?:ide|vsBox(?:(?:SetValue)?))|joy|k(?:eyIn|nob)|l(?:abel|oadsnap)|mouse|p(?:a(?:ck(?:(?:(?:E|_e)nd)?)|nel(?:(?:(?:E|_e)nd)?))|rintk(?:(?:2)?))|r(?:oller|un)|s(?:avesnap|croll(?:(?:(?:E|_e)nd)?)|et(?:Align|Box|Color(?:(?:2)?)|Font|Position|S(?:ize|napGroup)|Text(?:(?:Color|(?:Siz|Typ)e)?)|Val(?:(?:(?:(?:_)?)i)?)|snap)|how|lid(?:Bnk(?:(?:2(?:(?:Set(?:(?:k)?))?)|GetHandle|Set(?:(?:k)?))?)|er))|t(?:abs(?:(?:(?:E|_e)nd)?)|ext)|update|v(?:alue|keybd|slidBnk(?:(?:2)?))|xyin)|Mixer(?:Clear|GetLevel|Receive|Se(?:nd|tLevel(?:(?:_i)?)))|OSC(?:init|listen|send)|a(?:bs|ctive|ds(?:r|yn(?:(?:t(?:(?:2)?))?))|ftouch|l(?:pass|wayson)|mp(?:db(?:(?:fs)?)|midi(?:(?:d)?))|r(?:eson(?:(?:k)?)|ray)|tone(?:(?:[kx])?))|b(?:a(?:bo|lance|mboo|rmodel)|bcut(?:[ms])|e(?:(?:tara|xpr)nd)|form(?:dec(?:(?:1)?)|enc(?:(?:1)?))|i(?:nit|quad(?:(?:a)?)|rnd)|qrez|u(?:chla|t(?:b(?:[pr])|hp|lp|t(?:er(?:b(?:[pr])|(?:[hl])p)|on))|zz))|c(?:2r|a(?:basa|uchy(?:(?:i)?))|e(?:il|ll|nt(?:(?:roid)?)|ps(?:(?:inv)?))|h(?:an(?:ctrl|ged(?:(?:2)?)|[io])|e(?:byshevpoly|ckbox)|n(?:_(?:[Sak])|clear|export|get|mix|params|set)|uap)|l(?:ear|filt|ip|ocko(?:ff|n))|mplxprod|o(?:m(?:b(?:(?:inv)?)|p(?:ile(?:csd|orc|str)|ress(?:(?:2)?)))|n(?:nect|trol|v(?:(?:l|olv)e))|py(?:a2ftab|f2array)|s(?:(?:h|inv|seg(?:(?:[br])?))?))|p(?:s(?:2pch|midi(?:(?:b|nn)?)|oct|pch|t(?:mid|un(?:(?:i)?))|xpch)|uprc)|r(?:oss(?:2|fm(?:(?:i|pm(?:(?:i)?))?)|pm(?:(?:i)?))|unch)|t(?:lchn|rl(?:14|21|7|init))|userrnd)|d(?:a(?:m|te(?:(?:s)?))|b(?:(?:(?:(?:fs)?)amp)?)|c(?:block(?:(?:2)?)|onv)|e(?:l(?:ay(?:(?:[1krw])?)|tap(?:(?:xw|[3inx])?))|norm)|i(?:ff|rectory|s(?:k(?:grain|in(?:(?:2)?))|p(?:fft|lay)|tort(?:(?:1)?))|vz)|o(?:ppler|wnsamp)|ripwater|u(?:mpk(?:(?:[234])?)|s(?:errnd|t(?:(?:2)?))))|e(?:nvlpx(?:(?:r)?)|phasor|qfil|v(?:alstr|ent(?:(?:_i)?))|x(?:citer|itnow|p(?:(?:curve|on|rand(?:(?:i)?)|seg(?:(?:ba|[abr])?))?)))|f(?:a(?:reylen(?:(?:i)?)|ust(?:audio|c(?:ompile|tl)|gen))|ft(?:(?:inv)?)|i(?:close|l(?:e(?:bit|len|nchnls|peak|s(?:cal|r)|valid)|larray|ter2)|n(?:(?:[ik])?)|open)|l(?:a(?:nger|shtxt)|oo(?:per(?:(?:2)?)|r)|uid(?:AllOut|C(?:C(?:[ik])|ontrol)|Engine|Load|Note|Out|ProgramSelect|SetInterpMethod))|m(?:b(?:3|ell)|metal|percfl|(?:rhod|voic|wurli)e)|o(?:f(?:2|ilter)|l(?:d|low(?:(?:2)?))|scil(?:(?:i)?)|ut(?:(?:ir|[ik])?)|[fg])|print(?:(?:(?:k)?)s)|r(?:a(?:c(?:(?:talnoise)?)|mebuffer)|eeverb)|t(?:c(?:hnls|onv|ps)|free|gen(?:(?:once|tmp)?)|l(?:en|oad(?:(?:k)?)|ptim)|morf|resize(?:(?:i)?)|s(?:a(?:mplebank|ve(?:(?:k)?))|r)))|g(?:a(?:in(?:(?:slider)?)|uss(?:(?:i|trig)?))|buzz|e(?:n(?:array(?:(?:_i)?)|dy(?:(?:[cx])?))|t(?:c(?:fg|ol)|row|seed))|ogobel|ra(?:in(?:(?:[23])?)|nule)|uiro)|h(?:armon(?:(?:[234])?)|df5(?:read|write)|ilbert|rtf(?:e(?:arly|r)|move(?:(?:2)?)|reverb|stat)|sboscil|vs(?:[123]))|i(?:hold|mage(?:create|free|getpixel|load|s(?:ave|etpixel|ize))|n(?:(?:32|ch|it(?:(?:c(?:14|21|7))?)|let(?:kid|[afkv])|rg|s(?:global|remot)|te(?:g|rp)|value|[hoqstxz])?))|j(?:itter(?:(?:2)?)|spline)|ktableseg|l(?:enarray|fo|i(?:mit|n(?:e(?:(?:n(?:(?:r)?)|to)?)|rand|seg(?:(?:[br])?)))|o(?:cs(?:end|ig)|g(?:(?:10|2|btwo|curve)?)|op(?:seg(?:(?:p)?)|(?:[tx])seg)|renz|scil(?:(?:[3x])?)|w(?:pass2|res(?:(?:x)?)))|p(?:f(?:18|orm|reson)|hasor|interp|oscil(?:(?:sa(?:(?:2)?)|[3a])?)|re(?:ad|son)|s(?:hold(?:(?:p)?)|lot))|ua_(?:exec|opdef))|m(?:a(?:ca|dsr|gs|nd(?:(?:[eo])l)|parray(?:(?:_i)?)|rimba|ssign|x(?:_k|a(?:bs(?:(?:accum)?)|ccum|lloc|rray))|[cx])|clock|delay|e(?:dian(?:(?:k)?)|tro)|i(?:d(?:global|i(?:c(?:14|21|7|h(?:annelaftertouch|n)|ontrolchange|trl)|default|filestatus|in|noteo(?:ff|n(?:cps|key|oct|pch))|o(?:n(?:(?:2)?)|ut)|p(?:gm|itchbend|olyaftertouch|rogramchange)|tempo)|remot)|n(?:(?:a(?:bs(?:(?:accum)?)|ccum|rray)|cer)?)|rror)|o(?:d(?:e|matrix)|nitor|og(?:(?:ladder(?:(?:2)?)|vcf(?:(?:2)?))?)|scil)|p(?:3(?:bitrate|in|len|nchnls|s(?:cal(?:(?:_(?:check|load(?:(?:2)?)|play(?:(?:2)?)))?)|r))|ulse)|rtmsg|u(?:ltitap|te)|vc(?:hpf|lpf(?:[1234]))|xadsr)|n(?:chnls_hw|estedap|l(?:alp|filt(?:(?:2)?))|o(?:ise|t(?:eo(?:ff|n(?:(?:dur(?:(?:2)?))?))|num))|r(?:everb|pn)|s(?:amp|t(?:ance|rnum))|trpol)|o(?:ct(?:ave|cps|midi(?:(?:b|nn)?)|pch)|labuffer|sc(?:bnk|il(?:(?:1i|ikt(?:(?:[ps])?)|[13insx])?))|ut(?:(?:32|ch|i(?:at|c(?:(?:14)?)|p(?:at|[bc]))|k(?:at|c(?:(?:14)?)|p(?:at|[bc]))|let(?:kid|[afkv])|q(?:[1234])|rg|s(?:[12])|value|[choqsxz])?))|p(?:a(?:n(?:(?:2)?)|r(?:eq|t(?:2txt|i(?:als|kkel(?:(?:get|s(?:et|ync))?))))|ssign|ulstretch)|c(?:auchy|h(?:bend|midi(?:(?:b|nn)?)|oct)|o(?:nvolve|unt))|d(?:clip|half(?:(?:y)?))|eak|gm(?:(?:assig|ch)n)|h(?:as(?:er(?:[12])|or(?:(?:bnk)?))|s)|i(?:n(?:dex|k(?:er|ish))|tch(?:(?:a(?:c|mdf))?))|l(?:a(?:net|terev)|(?:ltra|u)ck)|o(?:isson|l(?:2rect|y(?:aft|nomial))|p_f|rt(?:(?:k)?)|scil(?:(?:3)?)|w(?:ershape|oftwo)|[pw])|r(?:e(?:alloc|piano)|int(?:(?:_type|f_i|k(?:s2|[2s])|[fks])?)|oduct)|set|t(?:able(?:(?:iw|[3iw])?)|rack)|u(?:sh(?:(?:_f)?)|ts)|v(?:add|bufread|cross|interp|oc|read|s(?:2(?:array|tab)|a(?:dsyn|nal|rp)|b(?:and(?:[pr])|in|lur|uf(?:fer|read(?:(?:2)?)))|c(?:ale|e(?:nt|ps)|ross)|d(?:emix|is(?:kin|p))|envftw|f(?:ilter|r(?:e(?:ad|eze)|omarray)|t(?:[rw])|write)|g(?:ain|endy)|hift|i(?:fd|n(?:(?:fo|it)?))|lock|m(?:aska|ix|o(?:(?:ot|rp)h))|o(?:sc|ut)|pitch|t(?:(?:ana|enci)l)|voc|warp|ynth))|wd|y(?:assign(?:(?:[it])?)|call(?:(?:1(?:[it])|2(?:[it])|3(?:[it])|4(?:[it])|5(?:[it])|6(?:[it])|7(?:[it])|8(?:[it])|ni|[12345678int])?)|e(?:val(?:(?:[it])?)|xec(?:(?:[it])?))|init|l(?:assign(?:(?:[it])?)|call(?:(?:1(?:[it])|2(?:[it])|3(?:[it])|4(?:[it])|5(?:[it])|6(?:[it])|7(?:[it])|8(?:[it])|ni|[12345678int])?)|e(?:val(?:(?:[it])?)|xec(?:(?:[it])?))|run(?:(?:[it])?))|run(?:(?:[it])?)))|q(?:inf|nan)|r(?:2c|and(?:(?:om(?:(?:[hi])?)|[hi])?)|bjeq|e(?:ad(?:clock|fi|k(?:[234s])|sc(?:ore|ratch)|[fk])|ct2pol|init|lease|mo(?:teport|ve)|pluck|s(?:on(?:(?:xk|[krxyz])?)|yn)|verb(?:(?:2|sc)?)|windscore|zzy)|fft|ifft|ms|nd(?:(?:31)?)|ound|spline|tclock)|s(?:16b14|32b14|a(?:mphold|ndpaper)|c(?:a(?:le(?:(?:array)?)|n(?:hammer|table|[su]))|hed(?:kwhen(?:(?:named)?)|ule|when)|oreline(?:(?:_i)?))|e(?:ed|kere|mitone|nse(?:(?:key)?)|qtime(?:(?:2)?)|rial(?:Begin|End|Flush|Print|Read|Write(?:(?:_i)?))|t(?:c(?:(?:o|tr)l)|ksmps|row|scorepos))|f(?:i(?:list|nstr(?:(?:3m|[3m])?))|lo(?:ad|oper)|p(?:assign|l(?:ay(?:(?:3m|[3m])?)|ist)|reset))|h(?:aker|ift(?:in|out))|i(?:gn(?:alflowgraph|um)|n(?:(?:h|inv|syn)?))|l(?:eighbells|i(?:cearray|der(?:16(?:(?:f|table(?:(?:f)?))?)|32(?:(?:f|table(?:(?:f)?))?)|64(?:(?:f|table(?:(?:f)?))?)|8(?:(?:f|table(?:(?:f)?))?)|Kawai)))|nd(?:lo(?:ad|op)|warp(?:(?:st)?))|o(?:ck(?:recv(?:(?:s)?)|send(?:(?:s)?))|und(?:in|out(?:(?:s)?)))|p(?:a(?:ce|t3d(?:(?:[it])?))|dist|ec(?:addm|di(?:ff|sp)|filt|hist|ptrk|s(?:cal|um)|trum)|litrig|rintf(?:(?:k)?)|send)|qrt|t(?:a(?:ck|tevar)|ix|r(?:c(?:at(?:(?:k)?)|har(?:(?:k)?)|mp(?:(?:k)?)|py(?:(?:k)?))|e(?:cv|son)|fromurl|get|index(?:(?:k)?)|l(?:en(?:(?:k)?)|ower(?:(?:k)?))|rindex(?:(?:k)?)|s(?:et|ub(?:(?:k)?))|to(?:(?:[dl])k|[dl])|upper(?:(?:k)?))|send)|u(?:binstr(?:(?:init)?)|m(?:(?:array)?))|vfilter|y(?:nc(?:grain|loop|phasor)|stem(?:(?:_i)?)))|t(?:a(?:b(?:2pvs|_i|ifd|le(?:(?:3kt|copy|filter(?:(?:i)?)|gpw|i(?:copy|gpw|kt|mix|w)|kt|mix|ng|ra|s(?:eg|huffle(?:(?:i)?))|w(?:a|kt)|x(?:kt|seg)|[3iw])?)|morph(?:(?:ak|[ai])?)|play|rec|sum|w(?:(?:_i)?))|mbourine|n(?:h|inv(?:(?:2)?))|[bn])|b(?:0_init|1(?:(?:(?:[012345])?)_init|[012345])|2_init|3_init|4_init|5_init|6_init|7_init|8_init|9_init|vcf|[0123456789])|emp(?:est|o(?:(?:(?:sc|v)al)?))|i(?:me(?:dseq|inst(?:[ks])|[ks])|val)|lineto|one(?:(?:[kx])?)|r(?:a(?:dsyn|n(?:dom|seg(?:(?:[br])?)))|cross|filter|highest|i(?:g(?:ger|seq)|rand)|lowest|mix|s(?:cale|(?:hif|pli)t))|urno(?:ff(?:(?:2)?)|n))|u(?:n(?:irand|wrap)|psamp|r(?:andom|d))|v(?:a(?:ctrol|dd(?:(?:_i|v(?:(?:_i)?))?)|get|lpass|set)|bap(?:(?:16|4move|8move|gmove|lsinit|(?:(?:z)?)move|[48gz])?)|c(?:ella|o(?:(?:2(?:(?:(?:f|i(?:f|ni))t)?)|mb|py(?:(?:_i)?))?))|d(?:el(?:_k|ay(?:(?:x(?:w(?:[qs])|[qsw])|[3kx])?))|ivv(?:(?:_i)?))|e(?:cdelay|loc|xp(?:(?:_i|seg|v(?:(?:_i)?))?))|i(?:b(?:es|r(?:(?:ato)?))|ncr)|l(?:i(?:mit|nseg)|owres)|m(?:ap|irror|ult(?:(?:_i|v(?:(?:_i)?))?))|o(?:ice|sim)|p(?:haseseg|o(?:rt|w(?:(?:_i|v(?:(?:_i)?))?))|voc)|rand(?:[hi])|subv(?:(?:_i)?)|tab(?:le(?:1k|w(?:[aik])|[aik])|w(?:[aik])|[aik])|wrap)|w(?:aveset|eibull|g(?:b(?:ow(?:(?:edbar)?)|rass)|clar|flute|pluck(?:(?:2)?)|uide(?:[12]))|i(?:i(?:connect|data|range|send)|ndow)|r(?:ap|itescratch)|terrain)|x(?:adsr|in|out|scan(?:map|smap|[su])|tratim|yin)|z(?:a(?:cl|kinit|mod|rg|wm|[rw])|filter2|i(?:wm|[rw])|k(?:cl|mod|wm|[rw]))|[Saikp])\\b(?:(\\:)([A-Za-z]))?",
+          "captures": {
+            "1": {
+              "name": "support.function.csound"
+            },
+            "2": {
+              "name": "punctuation.type-annotation.csound"
+            },
+            "3": {
+              "name": "type-annotation.storage.type.csound"
+            }
+          }
         },
         {
           "name": "meta.other.csound",
-          "match": "\\b[a-zA-Z_]\\w*\\b"
+          "match": "\\b[A-Z_a-z]\\w*\\b"
         }
       ]
     },
@@ -403,13 +443,13 @@
             },
             {
               "name": "string.quoted.include.csound",
-              "begin": "\"",
+              "begin": "([^ \\t])",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.csound"
                 }
               },
-              "end": "\"",
+              "end": "\\1",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.end.csound"
@@ -432,7 +472,7 @@
             },
             {
               "name": "entity.name.function.preprocessor.csound",
-              "match": "[a-zA-Z_]\\w*"
+              "match": "[A-Z_a-z]\\w*"
             },
             {
               "begin": "\\(",
@@ -440,7 +480,7 @@
               "patterns": [
                 {
                   "name": "variable.parameter.preprocessor.csound",
-                  "match": "\\w+\\b"
+                  "match": "[A-Z_a-z]\\w*\\b"
                 }
               ]
             },
@@ -491,10 +531,6 @@
             {
               "include": "#macroCalls"
             },
-            {
-              "name": "constant.character.escape.csound",
-              "match": "%\\d*(\\.\\d+)?[cdhilouxX]"
-            },
             {
               "include": "#escapeSequences"
             }

data/grammars/source.css.json

@@ -447,7 +447,7 @@
       "name": "meta.selector.css",
       "patterns": [
         {
-          "match": "\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",
+          "match": "\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|main|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",
           "name": "entity.name.tag.css"
         },
         {

data/grammars/source.css.less.json

@@ -3,7 +3,11 @@
   "scopeName": "source.css.less",
   "fileTypes": [
     "less",
-    "less.erb"
+    "less.erb",
+    "rc",
+    "gtkrc",
+    "gtkrc-2.0",
+    "themerc"
   ],
   "patterns": [
     {
@@ -447,8 +451,8 @@
           "name": "string.quoted.double.css",
           "patterns": [
             {
-              "match": "\\\\(\\d{1,6}|.)",
-              "name": "constant.character.escaped.css"
+              "match": "\\\\(\\h{1,6}|.)",
+              "name": "constant.character.escape.css"
             },
             {
               "include": "#variable_interpolation"
@@ -471,8 +475,8 @@
           "name": "string.quoted.single.css",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escaped.css"
+              "match": "\\\\(\\h{1,6}|.)",
+              "name": "constant.character.escape.css"
             },
             {
               "include": "#variable_interpolation"

data/grammars/source.cython.json

@@ -1,23 +1,33 @@
 {
-  "bundleUUID": "E3BADC20-6B0E-11D9-9DC9-000D93589AF6",
+  "comment": "\n\ttodo:\n\t\tlist comprehension / generator comprehension scope.\n\t\t\n\t",
   "fileTypes": [
     "pyx",
-    "pxi",
-    "pxd"
+    "pxi"
   ],
-  "foldingStartMarker": "^\\s*((cp?)?def|class|property|struct|enum|union)\\s+([.a-zA-Z0-9_ <]+)\\s*(\\((.*)\\)|['\"]+.+['\"]+)?\\s*:|\\{\\s*$|\\(\\s*$|\\[\\s*$|^\\s*\"\"\"(?=.)(?!.*\"\"\")",
-  "foldingStopMarker": "^\\s*$|^\\s*\\}|^\\s*\\]|^\\s*\\)|^\\s*\"\"\"\\s*$",
+  "firstLineMatch": "^#!/.*\\bcython\\b",
   "keyEquivalent": "^~C",
   "name": "Cython",
   "patterns": [
     {
-      "captures": {
+      "begin": "(^[ \\t]+)?(?=#)",
+      "beginCaptures": {
         "1": {
-          "name": "punctuation.definition.comment.cython"
+          "name": "punctuation.whitespace.comment.leading.cython"
         }
       },
-      "match": "(#).*$\\n?",
-      "name": "comment.line.number-sign.cython"
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "begin": "#",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.cython"
+            }
+          },
+          "end": "\\n",
+          "name": "comment.line.number-sign.cython"
+        }
+      ]
     },
     {
       "match": "\\b(?i:(0x\\h*)L)",
@@ -65,7 +75,7 @@
           "name": "storage.modifier.global.cython"
         }
       },
-      "match": "\\b(global|readonly|public|api|nogil|gil)\\b"
+      "match": "\\b(global)\\b"
     },
     {
       "captures": {
@@ -76,21 +86,13 @@
           "name": "keyword.control.import.from.cython"
         }
       },
-      "match": "\\b(?:(c?import|include)|(from))\\b"
-    },
-    {
-      "match": "\\bexcept\\?",
-      "name": "keyword.control.flow.cython"
+      "match": "\\b(?:(import|include)|(from))\\b"
     },
     {
       "comment": "keywords that delimit flow blocks",
       "match": "\\b(elif|else|except|finally|for|if|try|while|with|IF|ELIF|ELSE)\\b",
       "name": "keyword.control.flow.cython"
     },
-    {
-      "match": "\\bDEF\\b",
-      "name": "keyword.control.define.cython"
-    },
     {
       "comment": "keywords that alter flow from within a block",
       "match": "\\b(break|continue|pass|raise|return|yield)\\b",
@@ -108,20 +110,11 @@
         }
       },
       "comment": "keywords that haven't fit into other groups (yet).",
-      "match": "\\b(as|assert|del|exec|print|by)\\b"
+      "match": "\\b(as|assert|del|exec|print)\\b"
     },
     {
-      "match": "\\b(extern|register|restrict|static|volatile|inline)\\b",
-      "name": "storage.modifier.cython"
-    },
-    {
-      "captures": {
-        "2": {
-          "name": "storage.type.cython"
-        }
-      },
-      "match": "(<)\\s*(([a-zA-Z_][a-zA-Z0-9_]*)(\\s+[a-zA-Z_][a-zA-Z0-9_]*)*[ *]*)\\s*\\??\\s*(>)",
-      "name": "operator.cast.cython"
+      "match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b",
+      "name": "storage.type.cython"
     },
     {
       "match": "<\\=|>\\=|\\=\\=|<|>|<>",
@@ -140,159 +133,46 @@
       "name": "keyword.operator.assignment.cython"
     },
     {
-      "begin": "^(cdef)\\s+(extern|import)\\s+(from)",
+      "begin": "^\\s*(class)\\s+(?=[a-zA-Z_][a-zA-Z_0-9]*\\s*\\:)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "2": {
-          "name": "keyword.control.import.cython"
-        },
-        "3": {
-          "name": "keyword.control.import.from.cython"
-        }
-      },
-      "end": ":",
-      "name": "meta.cextern.cython",
-      "patterns": [
-        {
-          "include": "#strings"
-        }
-      ]
-    },
-    {
-      "begin": "^\\s*(cp?def\\s+)?(?!(raise|return|yield|assert|del|print|exec|def|class|if|elif|for|while|except|with|IF|ELIF)\\b)(([a-zA-Z_][a-zA-Z0-9_]*)(\\s+[a-zA-Z_][a-zA-Z0-9_]*)*([ *]*))\\s*(\\b[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=\\(|'|\")(?=.*\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "3": {
-          "name": "storage.type.cython"
-        },
-        "7": {
-          "name": "entity.name.cfunction.cython"
-        },
-        "8": {
-          "name": "punctuation.definition.cfunction.cython"
+          "name": "storage.type.class.cython"
         }
       },
-      "end": "(\\)):?",
+      "contentName": "entity.name.type.class.cython",
+      "end": "\\s*(:)",
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.cfunction.cython"
+          "name": "punctuation.section.class.begin.cython"
         }
       },
-      "name": "meta.cfunction.cython",
+      "name": "meta.class.old-style.cython",
       "patterns": [
         {
-          "include": "#strings"
+          "include": "#entity_name_class"
         }
       ]
     },
     {
-      "captures": {
-        "1": {
-          "name": "storage.type.property.cython"
-        },
-        "2": {
-          "name": "entity.name.type.property.cython"
-        }
-      },
-      "match": "^\\s*(property)\\s+([a-zA-Z_][a-zA-Z_0-9]*)",
-      "name": "meta.property.cython"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "3": {
-          "name": "storage.modifier.cython"
-        },
-        "4": {
-          "name": "storage.type.struct.cython"
-        },
-        "5": {
-          "name": "entity.name.type.struct.cython"
-        }
-      },
-      "match": "^\\s*(cdef\\s+)?((extern|api|public)\\s+)?(struct)\\s+([a-zA-Z_][a-zA-Z_0-9]*)",
-      "name": "meta.struct.cython"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "3": {
-          "name": "storage.modifier.cython"
-        },
-        "4": {
-          "name": "storage.type.union.cython"
-        },
-        "5": {
-          "name": "entity.name.type.union.cython"
-        }
-      },
-      "match": "^\\s*(cdef\\s+)?((extern|api|public)\\s+)?(union)\\s+([a-zA-Z_][a-zA-Z_0-9]*)",
-      "name": "meta.union.cython"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "3": {
-          "name": "storage.modifier.cython"
-        },
-        "4": {
-          "name": "storage.type.enum.cython"
-        },
-        "5": {
-          "name": "entity.name.type.enum.cython"
-        }
-      },
-      "match": "^\\s*(cdef\\s+)?((extern|api|public)\\s+)?(enum)\\s+([a-zA-Z_][a-zA-Z_0-9]*)",
-      "name": "meta.enum.cython"
-    },
-    {
-      "match": "\\b(object|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|ctypedef|typedef|union|unsigned|void)\\b",
-      "name": "storage.type.cython"
-    },
-    {
-      "begin": "^\\s*(cdef\\s+)?(class)\\s+(?=[a-zA-Z_][a-zA-Z_0-9]*\\s*\\:)",
+      "begin": "^\\s*(property)\\s+(?=[a-zA-Z_][a-zA-Z_0-9]*\\s*\\:)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "2": {
-          "name": "storage.type.class.cython"
+          "name": "storage.type.property.cython"
         }
       },
-      "contentName": "entity.name.type.class.cython",
+      "contentName": "entity.name.type.property.cython",
       "end": "\\s*(:)",
       "endCaptures": {
         "1": {
-          "name": "punctuation.section.class.begin.cython"
+          "name": "punctuation.section.property.begin.cython"
         }
       },
-      "name": "meta.class.cython",
-      "patterns": [
-        {
-          "include": "#entity_name_class"
-        }
-      ]
+      "name": "meta.property.cython"
     },
     {
-      "begin": "^\\s*(cdef\\s+)?((extern|api|public)\\s+)?(class)\\s+(?=[a-zA-Z_][a-zA-Z_0-9]*\\s*\\()",
+      "begin": "^\\s*(class)\\s+(?=[a-zA-Z_][a-zA-Z_0-9]*\\s*\\()",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.cdef.cython"
-        },
-        "3": {
-          "name": "storage.modifier.cython"
-        },
-        "4": {
           "name": "storage.type.class.cython"
         }
       },
@@ -423,9 +303,6 @@
             {
               "include": "#keyword_arguments"
             },
-            {
-              "include": "#typed_arguments"
-            },
             {
               "captures": {
                 "1": {
@@ -719,14 +596,6 @@
       },
       "match": "\\b(class)\\b"
     },
-    {
-      "captures": {
-        "1": {
-          "name": "storage.type.cdef.cython"
-        }
-      },
-      "match": "\\b(cdef)\\b"
-    },
     {
       "include": "#line_continuation"
     },
@@ -885,16 +754,13 @@
       "name": "support.type.exception.cython"
     },
     "builtin_functions": {
-      "match": "(?x)\\b(\n                __import__|all|abs|any|apply|callable|chr|cmp|coerce|compile|delattr|dir|\n                divmod|eval|execfile|filter|getattr|globals|hasattr|hash|hex|id|\n                input|intern|isinstance|issubclass|iter|len|locals|map|max|min|oct|\n                ord|pow|range|raw_input|reduce|reload|repr|round|setattr|sorted|\n                sum|unichr|vars|zip|sizeof\n\t\t\t)\\b",
+      "match": "(?x)\\b(\n                __import__|all|abs|any|apply|callable|chr|cmp|coerce|compile|delattr|dir|\n                divmod|eval|execfile|filter|getattr|globals|hasattr|hash|hex|id|\n                input|intern|isinstance|issubclass|iter|len|locals|map|max|min|oct|\n                ord|pow|range|raw_input|reduce|reload|repr|round|setattr|sorted|\n                sum|unichr|vars|zip\n\t\t\t)\\b",
       "name": "support.function.builtin.cython"
     },
     "builtin_types": {
-      "match": "(?x)\\b(\n\t\t\t\tbasestring|bool|buffer|classmethod|complex|dict|enumerate|file|\n\t\t\t\tfloat|frozenset|int|list|long|open|reversed|set|\n\t\t\t\tslice|staticmethod|str|super|tuple|type|unicode|xrange\n\t\t\t)\\b",
+      "match": "(?x)\\b(\n\t\t\t\tbasestring|bool|buffer|classmethod|complex|dict|enumerate|file|\n\t\t\t\tfloat|frozenset|int|list|long|object|open|reversed|set|\n\t\t\t\tslice|staticmethod|str|super|tuple|type|unicode|xrange\n\t\t\t)\\b",
       "name": "support.type.cython"
     },
-    "c_type": {
-      "match": "([a-zA-Z_][a-zA-Z0-9_]*)(\\s+[a-zA-Z_][a-zA-Z0-9_]*)*([ *]*)"
-    },
     "constant_placeholder": {
       "match": "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])",
       "name": "constant.other.placeholder.cython"
@@ -1088,15 +954,12 @@
       "name": "invalid.illegal.name.cython"
     },
     "keyword_arguments": {
-      "begin": "\\b(([a-zA-Z_][a-zA-Z0-9_]*)(\\s+[a-zA-Z_][a-zA-Z0-9_]*)*([ *]+))?([a-zA-Z_][a-zA-Z_0-9]*)\\s*(=)(?!=)",
+      "begin": "\\b([a-zA-Z_][a-zA-Z_0-9]*)\\s*(=)(?!=)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.cython"
-        },
-        "5": {
           "name": "variable.parameter.function.cython"
         },
-        "6": {
+        "2": {
           "name": "keyword.operator.assignment.cython"
         }
       },
@@ -1129,7 +992,7 @@
     },
     "magic_function_names": {
       "comment": "these methods have magic interpretation by cython and are generally called indirectly through syntactic constructs",
-      "match": "(?x)\\b(__(?:\n\t\t\t\t\t\tabs|add|and|call|cmp|coerce|complex|contains|del|delattr|\n\t\t\t\t\t\tdelete|delitem|delslice|div|divmod|enter|exit|float|\n\t\t\t\t\t\tfloordiv|get|getattr|getattribute|getitem|getslice|\n\t\t\t\t\t\thash|hex|iadd|iand|idiv|ifloordiv|ilshift|imod|imul|init|\n\t\t\t\t\t\tint|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|len|\n\t\t\t\t\t\tlong|lshift|mod|mul|neg|new|nonzero|oct|or|pos|pow|\n\t\t\t\t\t\tradd|rand|rdiv|rdivmod|repr|rfloordiv|rlshift|rmod|rmul|ror|\n\t\t\t\t\t\trpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|\n\t\t\t\t\t\tsetslice|str|sub|truediv|unicode|xor|cinit|dealloc|richcmp|\n\t\t\t\t\t\tnext|index|getreadbuffer|getwritebuffer|getsegcount|getcharbuffer\n\t\t\t\t\t)__)\\b",
+      "match": "(?x)\\b(__(?:\n\t\t\t\t\t\tabs|add|and|call|cmp|coerce|complex|contains|del|delattr|\n\t\t\t\t\t\tdelete|delitem|delslice|div|divmod|enter|eq|exit|float|\n\t\t\t\t\t\tfloordiv|ge|get|getattr|getattribute|getitem|getslice|gt|\n\t\t\t\t\t\thash|hex|iadd|iand|idiv|ifloordiv|ilshift|imod|imul|init|\n\t\t\t\t\t\tint|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|\n\t\t\t\t\t\tlong|lshift|lt|mod|mul|ne|neg|new|nonzero|oct|or|pos|pow|\n\t\t\t\t\t\tradd|rand|rdiv|rdivmod|repr|rfloordiv|rlshift|rmod|rmul|ror|\n\t\t\t\t\t\trpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|\n\t\t\t\t\t\tsetslice|str|sub|truediv|unicode|xor\n\t\t\t\t\t)__)\\b",
       "name": "support.function.magic.cython"
     },
     "magic_variable_names": {
@@ -2087,20 +1950,6 @@
           "include": "#string_quoted_single"
         }
       ]
-    },
-    "typed_arguments": {
-      "captures": {
-        "1": {
-          "name": "storage.type.cython"
-        },
-        "6": {
-          "name": "variable.parameter.function.cython"
-        },
-        "7": {
-          "name": "storage.type.conditional.cython"
-        }
-      },
-      "match": "(([a-zA-Z_][a-zA-Z0-9_]*)(\\s+[a-zA-Z_][a-zA-Z0-9_]*)*([ *]+))(?!(not|None)\\b)([a-zA-Z_][a-zA-Z0-9_]*)(\\s+not\\s*None)?"
     }
   },
   "scopeName": "source.cython",