github-linguist 5.2.0 → 5.3.0

data/grammars/source.viml.json

@@ -1055,7 +1055,7 @@
     },
     "vimFuncName": {
       "name": "support.function.viml",
-      "match": "\\b(abs|acos|add|and|append|argc|argidx|arglistid|argv|asin|assert_equal|assert_exception|assert_fails|assert_false|assert_inrange|assert_match|assert_notequal|assert_notmatch|assert_true|atan|atan2|browse|browsedir|bufexists|buflisted|bufloaded|bufname|bufnr|bufwinid|bufwinnr|byte2line|byteidx|byteidxcomp|call|ceil|ch_close|ch_close_in|ch_evalexpr|ch_evalraw|ch_getbufnr|ch_getjob|ch_info|ch_log|ch_logfile|ch_open|ch_read|ch_readraw|ch_sendexpr|ch_sendraw|ch_setoptions|ch_status|changenr|char2nr|cindent|clearmatches|col|complete|complete_add|complete_check|confirm|copy|cos|cosh|count|cscope_connection|cursor|deepcopy|delete|did_filetype|diff_filler|diff_hlID|empty|escape|eval|eventhandler|executable|execute|exepath|exists|exp|expand|extend|feedkeys|filereadable|filewritable|filter|finddir|findfile|float2nr|floor|fmod|fnameescape|fnamemodify|foldclosed|foldclosedend|foldlevel|foldtext|foldtextresult|foreground|funcref|function|garbagecollect|get|getbufinfo|getbufline|getbufvar|getchar|getcharmod|getcharsearch|getcmdline|getcmdpos|getcmdtype|getcmdwintype|getcompletion|getcurpos|getcwd|getfontname|getfperm|getfsize|getftime|getftype|getline|getloclist|getmatches|getpid|getpos|getqflist|getreg|getregtype|gettabinfo|gettabvar|gettabwinvar|getwininfo|getwinposx|getwinposy|getwinvar|glob|glob2regpat|globpath|has|has_key|haslocaldir|hasmapto|histadd|histdel|histget|histnr|hlexists|hlID|hostname|iconv|indent|index|input|inputdialog|inputlist|inputrestore|inputsave|inputsecret|insert|invert|isdirectory|islocked|isnan|items|job_getchannel|job_info|job_setoptions|job_start|job_status|job_stop|join|js_decode|js_encode|json_decode|json_encode|keys|len|libcall|libcallnr|line|line2byte|lispindent|localtime|log|log10|luaeval|map|maparg|mapcheck|match|matchadd|matchaddpos|matcharg|matchdelete|matchend|matchlist|matchstr|matchstrpos|max|min|mkdir|mode|mzeval|nextnonblank|nr2char|or|pathshorten|perleval|pow|prevnonblank|printf|pumvisible|py3eval|pyeval|range|readfile|reltime|reltimefloat|reltimestr|remote_expr|remote_foreground|remote_peek|remote_read|remote_send|remove|rename|repeat|resolve|reverse|round|screenattr|screenchar|screencol|screenrow|search|searchdecl|searchpair|searchpairpos|searchpos|server2client|serverlist|setbufvar|setcharsearch|setcmdpos|setfperm|setline|setloclist|setmatches|setpos|setqflist|setreg|settabvar|settabwinvar|setwinvar|sha256|shellescape|shiftwidth|simplify|sin|sinh|sort|soundfold|spellbadword|spellsuggest|split|sqrt|str2float|str2nr|strcharpart|strchars|strdisplaywidth|strftime|strgetchar|stridx|string|strlen|strpart|strridx|strtrans|strwidth|submatch|substitute|synconcealed|synID|synIDattr|synIDtrans|synstack|system|systemlist|tabpagebuflist|tabpagenr|tabpagewinnr|tagfiles|taglist|tan|tanh|tempname|test_alloc_fail|test_autochdir|test_disable_char_avail|test_garbagecollect_now|test_null_channel|test_null_dict|test_null_job|test_null_list|test_null_partial|test_null_string|test_settime|timer_info|timer_pause|timer_start|timer_stop|timer_stopall|tolower|toupper|tr|trunc|type|undofile|undotree|uniq|values|virtcol|visualmode|wildmenumode|win_findbuf|win_getid|win_gotoid|win_id2tabwin|win_id2win|winbufnr|wincol|winheight|winline|winnr|winrestcmd|winrestview|winsaveview|winwidth|wordcount|writefile|xor)\\b"
+      "match": "\\b(abs|acos|add|and|append|argc|argidx|arglistid|argv|asin|assert_equal|assert_exception|assert_fails|assert_false|assert_inrange|assert_match|assert_notequal|assert_notmatch|assert_true|atan|atan2|browse|browsedir|bufexists|buflisted|bufloaded|bufname|bufnr|bufwinid|bufwinnr|byte2line|byteidx|byteidxcomp|call|ceil|ch_close|ch_close_in|ch_evalexpr|ch_evalraw|ch_getbufnr|ch_getjob|ch_info|ch_log|ch_logfile|ch_open|ch_read|ch_readraw|ch_sendexpr|ch_sendraw|ch_setoptions|ch_status|changenr|char2nr|cindent|clearmatches|col|complete|complete_add|complete_check|confirm|copy|cos|cosh|count|cscope_connection|cursor|deepcopy|delete|did_filetype|diff_filler|diff_hlID|empty|escape|eval|eventhandler|executable|execute|exepath|exists|exp|expand|extend|feedkeys|filereadable|filewritable|filter|finddir|findfile|float2nr|floor|fmod|fnameescape|fnamemodify|foldclosed|foldclosedend|foldlevel|foldtext|foldtextresult|foreground|funcref|function|garbagecollect|get|getbufinfo|getbufline|getbufvar|getchar|getcharmod|getcharsearch|getcmdline|getcmdpos|getcmdtype|getcmdwintype|getcompletion|getcurpos|getcwd|getfontname|getfperm|getfsize|getftime|getftype|getline|getloclist|getmatches|getpid|getpos|getqflist|getreg|getregtype|gettabinfo|gettabvar|gettabwinvar|getwininfo|getwinposx|getwinposy|getwinvar|glob|glob2regpat|globpath|has|has_key|haslocaldir|hasmapto|histadd|histdel|histget|histnr|hlexists|hlID|hostname|iconv|indent|index|input|inputdialog|inputlist|inputrestore|inputsave|inputsecret|insert|invert|isdirectory|islocked|isnan|items|job_getchannel|job_info|job_setoptions|job_start|job_status|job_stop|join|js_decode|js_encode|json_decode|json_encode|keys|len|libcall|libcallnr|line|line2byte|lispindent|localtime|log|log10|luaeval|map|maparg|mapcheck|match|matchadd|matchaddpos|matcharg|matchdelete|matchend|matchlist|matchstr|matchstrpos|max|min|mkdir|mode|mzeval|nextnonblank|nr2char|or|pathshorten|perleval|pow|prevnonblank|printf|pumvisible|py3eval|pyeval|range|readfile|reltime|reltimefloat|reltimestr|remote_expr|remote_foreground|remote_peek|remote_read|remote_send|remove|rename|repeat|resolve|reverse|round|screenattr|screenchar|screencol|screenrow|search|searchdecl|searchpair|searchpairpos|searchpos|server2client|serverlist|setbufline|setbufvar|setcharsearch|setcmdpos|setfperm|setline|setloclist|setmatches|setpos|setqflist|setreg|settabvar|settabwinvar|setwinvar|sha256|shellescape|shiftwidth|simplify|sin|sinh|sort|soundfold|spellbadword|spellsuggest|split|sqrt|str2float|str2nr|strcharpart|strchars|strdisplaywidth|strftime|strgetchar|stridx|string|strlen|strpart|strridx|strtrans|strwidth|submatch|substitute|synconcealed|synID|synIDattr|synIDtrans|synstack|system|systemlist|tabpagebuflist|tabpagenr|tabpagewinnr|tagfiles|taglist|tan|tanh|tempname|test_alloc_fail|test_autochdir|test_disable_char_avail|test_garbagecollect_now|test_null_channel|test_null_dict|test_null_job|test_null_list|test_null_partial|test_null_string|test_settime|timer_info|timer_pause|timer_start|timer_stop|timer_stopall|tolower|toupper|tr|trunc|type|undofile|undotree|uniq|values|virtcol|visualmode|wildmenumode|win_findbuf|win_getid|win_gotoid|win_id2tabwin|win_id2win|winbufnr|wincol|winheight|winline|winnr|winrestcmd|winrestview|winsaveview|winwidth|wordcount|writefile|xor)\\b"
     },
     "vimGroup": {
       "name": "support.type.group.viml",
@@ -1071,7 +1071,7 @@
     },
     "vimHiAttrib": {
       "name": "support.function.vimHiAttrib.viml",
-      "match": "\\b(bold|inverse|italic|none|reverse|standout|undercurl|underline)\\b"
+      "match": "\\b(bold|inverse|italic|nocombine|none|reverse|standout|undercurl|underline)\\b"
     },
     "vimHiClear": {
       "name": "support.function.vimHiClear.viml",

data/grammars/source.wdl.json

@@ -0,0 +1,200 @@
+{
+  "name": "WDL",
+  "scopeName": "source.wdl",
+  "fileTypes": [
+    "wdl"
+  ],
+  "uuid": "29cdcefa-8185-46f9-988a-2310d2244661",
+  "patterns": [
+    {
+      "name": "keyword.operator.assignment.wdl",
+      "match": "\\="
+    },
+    {
+      "name": "keyword.operator.comparison.wdl",
+      "match": "<\\=|>\\=|\\=\\=|<|>|\\!\\="
+    },
+    {
+      "name": "keyword.operator.assignment.augmented.wdl",
+      "match": "\\+\\=|-\\=|\\*\\=|/\\=|//\\=|%\\=|&\\=|\\|\\=|\\^\\=|>>\\=|<<\\=|\\*\\*\\="
+    },
+    {
+      "name": "keyword.operator.arithmetic.wdl",
+      "match": "\\+|\\-|\\*|\\*\\*|/|//|%|<<|>>|&|\\||\\^|~"
+    },
+    {
+      "name": "constant.language.wdl",
+      "match": "\\b(true|false)\\b"
+    },
+    {
+      "include": "#builtin_types"
+    },
+    {
+      "include": "#comments"
+    },
+    {
+      "include": "#input_output"
+    },
+    {
+      "include": "#keywords"
+    },
+    {
+      "include": "#string_quoted_single"
+    },
+    {
+      "include": "#string_quoted_double"
+    }
+  ],
+  "repository": {
+    "builtin_types": {
+      "name": "support.type.wdl",
+      "match": "(?<!\\.)\\b(Array|Boolean|File|Float|Int|Map|Object|String|Uri)\\b"
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.line.number-sign.wdl",
+          "match": "(#).*$\\n?",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.wdl"
+            }
+          }
+        }
+      ]
+    },
+    "constant_placeholder": {
+      "name": "constant.other.placeholder.wdl",
+      "match": "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])"
+    },
+    "escaped_char": {
+      "match": "(\\\\x[0-9a-fA-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+      "captures": {
+        "1": {
+          "name": "constant.character.escape.hex.wdl"
+        },
+        "2": {
+          "name": "constant.character.escape.octal.wdl"
+        },
+        "3": {
+          "name": "constant.character.escape.newline.wdl"
+        },
+        "4": {
+          "name": "constant.character.escape.backlash.wdl"
+        },
+        "5": {
+          "name": "constant.character.escape.double-quote.wdl"
+        },
+        "6": {
+          "name": "constant.character.escape.single-quote.wdl"
+        },
+        "7": {
+          "name": "constant.character.escape.bell.wdl"
+        },
+        "8": {
+          "name": "constant.character.escape.backspace.wdl"
+        },
+        "9": {
+          "name": "constant.character.escape.formfeed.wdl"
+        },
+        "10": {
+          "name": "constant.character.escape.linefeed.wdl"
+        },
+        "11": {
+          "name": "constant.character.escape.return.wdl"
+        },
+        "12": {
+          "name": "constant.character.escape.tab.wdl"
+        },
+        "13": {
+          "name": "constant.character.escape.vertical-tab.wdl"
+        }
+      }
+    },
+    "escaped_unicode_char": {
+      "match": "(\\\\U[0-9A-Fa-f]{8})|(\\\\u[0-9A-Fa-f]{4})|(\\\\N\\{[a-zA-Z0-9\\, ]+\\})",
+      "captures": {
+        "1": {
+          "name": "constant.character.escape.unicode.16-bit-hex.wdl"
+        },
+        "2": {
+          "name": "constant.character.escape.unicode.32-bit-hex.wdl"
+        },
+        "3": {
+          "name": "constant.character.escape.unicode.name.wdl"
+        }
+      }
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.other.wdl",
+          "match": "\\s*(call|command|output|runtime|task|workflow|if|then|else|import|as|input|output|meta|parameter_meta)\\s+"
+        }
+      ]
+    },
+    "string_quoted_double": {
+      "patterns": [
+        {
+          "comment": "double quoted string",
+          "name": "string.quoted.double.single-line.wdl",
+          "begin": "(\")",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.wdl"
+            }
+          },
+          "end": "(\")",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.wdl"
+            },
+            "2": {
+              "name": "invalid.illegal.unclosed-string.wdl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#constant_placeholder"
+            },
+            {
+              "include": "#escaped_char"
+            }
+          ]
+        }
+      ]
+    },
+    "string_quoted_single": {
+      "patterns": [
+        {
+          "comment": "single quoted string",
+          "name": "string.quoted.single.single-line.wdl",
+          "begin": "(')",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.wdl"
+            }
+          },
+          "end": "(')",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.wdl"
+            },
+            "2": {
+              "name": "invalid.illegal.unclosed-string.wdl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#constant_placeholder"
+            },
+            {
+              "include": "#escaped_char"
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "author": "Andrew Teixeira <teixeira@broadinstitute.org>"
+}

data/grammars/source.yaml.json

@@ -14,7 +14,8 @@
     "sls",
     "stylelintrc",
     "sublime-syntax",
-    "Boxfile"
+    "Boxfile",
+    "ksy"
   ],
   "firstLineMatch": "^(#cloud-config|---)",
   "patterns": [
@@ -37,7 +38,7 @@
       "name": "punctuation.definition.document.end.yaml"
     },
     {
-      "begin": "^(\\s*)(?!-\\s*)(.*\\S)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      "begin": "^(\\s*)(?!-\\s*)([^!@#%&*>,][^#]*\\S)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
       "beginCaptures": {
         "2": {
           "name": "entity.name.tag.yaml"
@@ -52,9 +53,18 @@
           "name": "punctuation.definition.tag.local.yaml"
         }
       },
-      "end": "^(((?!$)(?!\\1\\s+))|(?=\\1\\s*(-|[^!@#%&*>,].*:\\s+)))",
+      "end": "^(?!$)(?!\\1\\s+)",
       "contentName": "string.unquoted.block.yaml",
       "patterns": [
+        {
+          "begin": "\\G",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#comment"
+            }
+          ]
+        },
         {
           "include": "#constants"
         },
@@ -64,7 +74,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(?:(-)|(?:(?:(-)\\s*)?(.*\\S)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      "begin": "^(\\s*)(?:(-)|(?:(?:(-)(\\s*))?([^!@#%&*>,][^#]*\\S)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -72,22 +82,31 @@
         "3": {
           "name": "punctuation.definition.entry.yaml"
         },
-        "4": {
+        "5": {
           "name": "entity.name.tag.yaml"
         },
-        "5": {
+        "6": {
           "name": "punctuation.separator.key-value.yaml"
         },
-        "6": {
+        "7": {
           "name": "keyword.other.tag.local.yaml"
         },
-        "7": {
+        "8": {
           "name": "punctuation.definition.tag.local.yaml"
         }
       },
-      "end": "^(((?!$)(?!\\1\\s+))|(?=\\1\\s*(-|[^!@#%&*>,].*:\\s+)))",
+      "end": "^((?!$)(?!\\1\\s+)|(?=\\s\\4(-|[^\\s!@#%&*>,].*:\\s+)))",
       "contentName": "string.unquoted.block.yaml",
       "patterns": [
+        {
+          "begin": "\\G",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#comment"
+            }
+          ]
+        },
         {
           "include": "#constants"
         },
@@ -222,15 +241,14 @@
   ],
   "repository": {
     "comment": {
-      "match": "(?<=^|\\s)((#(?!{)).*)",
-      "captures": {
-        "1": {
-          "name": "comment.line.number-sign.yaml"
-        },
-        "2": {
+      "begin": "(?<=^|\\s)#(?!{)",
+      "beginCaptures": {
+        "0": {
           "name": "punctuation.definition.comment.yaml"
         }
-      }
+      },
+      "end": "$",
+      "name": "comment.line.number-sign.yaml"
     },
     "constants": {
       "match": "(?<=\\s)(true|false|null|True|False|Null|TRUE|FALSE|NULL|~)(?=\\s*$)",

data/grammars/text.find-refs.json

@@ -691,15 +691,15 @@
     },
     "relational-operator": {
       "name": "keyword.operator.ts",
-      "match": "===|==|=|!=|!==|<=|>=|<>|<|>"
+      "match": "===|!==|==|!=|<=|>=|<>|=|<|>"
     },
     "assignment-operator": {
       "name": "keyword.operator.ts",
-      "match": "<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
+      "match": "<<=|>>>=|>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
     },
     "logic-operator": {
       "name": "keyword.operator.ts",
-      "match": "\\!|&|~|\\||&&|\\|\\|"
+      "match": "\\!|&&|&|~|\\|\\||\\|"
     },
     "storage-keyword": {
       "name": "storage.type.ts",

data/grammars/text.haml.json

@@ -100,7 +100,7 @@
         },
         {
           "begin": "(?<!\\#)\\{(?=.+(,|(do)|\\{|\\}|\\||(\\#.*))\\s*)",
-          "end": "\\s*\\}",
+          "end": "\\s*\\}(?!,)",
           "name": "meta.section.attributes.haml",
           "patterns": [
             {

data/grammars/text.html.abl.json

@@ -1,12 +1,15 @@
 {
+  "name": "HTML (ABL)",
+  "scopeName": "text.html.abl",
   "fileTypes": [
     "w",
     "html"
   ],
-  "name": "HTML (ABL)",
+  "uuid": "043f4cd2-a6ba-49fc-b269-0fbf41acb7e5",
   "patterns": [
     {
       "begin": ".*(<)(script) (language)(=)(\"SpeedScript\")(>)",
+      "end": ".*(</)(script)(>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -27,7 +30,6 @@
           "name": "punctuation.definition.tag.end.html"
         }
       },
-      "end": ".*(</)(script)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -48,12 +50,12 @@
     },
     {
       "begin": "\\`",
+      "end": "\\`",
       "beginCaptures": {
         "0": {
           "name": "string.double.quoted.html"
         }
       },
-      "end": "\\`",
       "endCaptures": {
         "0": {
           "name": "string.double.quoted.html"
@@ -69,7 +71,5 @@
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.abl",
-  "uuid": "043f4cd2-a6ba-49fc-b269-0fbf41acb7e5"
+  ]
 }

data/grammars/text.html.erb.json

@@ -1,11 +1,12 @@
 {
+  "name": "HTML (Ruby - ERB)",
+  "scopeName": "text.html.erb",
   "fileTypes": [
-    "erb",
     "rhtml",
     "html.erb"
   ],
   "injections": {
-    "text.html.erb - (meta.embedded.block.erb | meta.embedded.line.erb | comment)": {
+    "text.html.erb - (meta.embedded.block.erb | meta.embedded.line.erb | meta.tag | comment), meta.tag string.quoted": {
       "patterns": [
         {
           "begin": "(^\\s*)(?=<%+#(?![^%]*%>))",
@@ -54,8 +55,6 @@
       ]
     }
   },
-  "keyEquivalent": "^~H",
-  "name": "HTML (Ruby - ERB)",
   "patterns": [
     {
       "include": "text.html.basic"
@@ -90,8 +89,8 @@
               "name": "punctuation.section.embedded.begin.erb"
             }
           },
-          "contentName": "source.ruby",
-          "end": "(-?%)>",
+          "contentName": "source.ruby.embedded.erb",
+          "end": "-?%>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.erb"
@@ -123,8 +122,8 @@
               "name": "punctuation.section.embedded.begin.erb"
             }
           },
-          "contentName": "source.ruby",
-          "end": "(-?%)>",
+          "contentName": "source.ruby.embedded.erb",
+          "end": "-?%>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.erb"
@@ -151,7 +150,5 @@
         }
       ]
     }
-  },
-  "scopeName": "text.html.erb",
-  "uuid": "13FF9439-15D0-4E74-9A8E-83ABF0BAA5E7"
+  }
 }