github-linguist 5.3.3 → 6.0.0

data/grammars/source.fancy.json

@@ -1,16 +1,10 @@
 {
-  "fileTypes": [
-    "fy",
-    "fancypack",
-    "Fakefile"
-  ],
-  "firstLineMatch": "^#!/.*\\bfancy\\b",
-  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~F",
   "name": "Fancy",
+  "scopeName": "source.fancy",
   "patterns": [
     {
+      "name": "meta.class.fancy",
+      "match": "^\\s*(class)\\s+(([.a-zA-Z0-9_:]+(\\s*(:)\\s*[.a-zA-Z0-9_:\\s]+)?))",
       "captures": {
         "1": {
           "name": "keyword.control.class.fancy"
@@ -27,12 +21,20 @@
         "6": {
           "name": "variable.other.object.fancy"
         }
-      },
-      "match": "^\\s*(class)\\s+(([.a-zA-Z0-9_:]+(\\s*(:)\\s*[.a-zA-Z0-9_:\\s]+)?))",
-      "name": "meta.class.fancy"
+      }
     },
     {
-      "begin": "(?x)\n              (?=def\\b)                                                     # an optimization to help Oniguruma fail fast\n            (?<=^|\\s)(def)\\s+                                            # the def keyword\n            (self)\\s+                                                       # a method definition prefix in this case self\n            (([a-z]?\\w+[?!]?:?)\n            |===|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]|=\\?)\\s+       # the method name\n              ",
+      "name": "meta.function.method.fancy.self",
+      "begin": "(?x)\n              (?=def\\b)                                                     # an optimization to help Oniguruma fail fast\n            (?\u003c=^|\\s)(def)\\s+                                            # the def keyword\n            (self)\\s+                                                       # a method definition prefix in this case self\n            (([a-z]?\\w+[?!]?:?)\n            |===|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]|=\\?)\\s+       # the method name\n              ",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "$self"
+        },
+        {
+          "include": "#arg_name"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.fancy"
@@ -43,10 +45,12 @@
         "3": {
           "name": "entity.name.function.fancy"
         }
-      },
-      "comment": "fancy method definition, with self as prefix, this rule must be here",
+      }
+    },
+    {
+      "name": "meta.function.method.fancy",
+      "begin": "(?x)\n              (?=def\\b)                                     # an optimization to help Oniguruma fail fast\n              (?\u003c=^|\\s)(def)\\s+                          # the def keyword\n              (((?\u003e[A-Z_-]\\w*(?\u003e\\s+))?)+)              # a method definition prefix\n              (([a-z]?\\w+[?!]?:?)\n              |===|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]|=\\?)\\s+   # the method name\n              ",
       "end": "$",
-      "name": "meta.function.method.fancy.self",
       "patterns": [
         {
           "include": "$self"
@@ -54,10 +58,7 @@
         {
           "include": "#arg_name"
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n              (?=def\\b)                                     # an optimization to help Oniguruma fail fast\n              (?<=^|\\s)(def)\\s+                          # the def keyword\n              (((?>[A-Z_-]\\w*(?>\\s+))?)+)              # a method definition prefix\n              (([a-z]?\\w+[?!]?:?)\n              |===|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]|=\\?)\\s+   # the method name\n              ",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.fancy"
@@ -68,203 +69,177 @@
         "4": {
           "name": "entity.name.function.fancy"
         }
-      },
-      "comment": "same as the previous, but with other prefixes class and variable names",
-      "end": "$",
-      "name": "meta.function.method.fancy",
-      "patterns": [
-        {
-          "include": "$self"
-        },
-        {
-          "include": "#arg_name"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.require.fancy",
       "begin": "\\b(require:)",
-      "captures": {
-        "1": {
-          "name": "keyword.other.special-method.fancy"
-        }
-      },
       "end": "$|(?=#)",
-      "name": "meta.require.fancy",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(include:)",
+      ],
       "captures": {
         "1": {
           "name": "keyword.other.special-method.fancy"
         }
-      },
-      "end": "$|(?=#)",
+      }
+    },
+    {
       "name": "meta.include.fancy",
+      "begin": "\\b(include:)",
+      "end": "$|(?=#)",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.other.special-method.fancy"
+        }
+      }
     },
     {
-      "comment": "Control flow keywords that aren't regular messages.",
-      "match": "\\b(return|return_local|match|case|try|catch|finally|retry)\\b:?",
-      "name": "keyword.control.fancy"
+      "name": "keyword.control.fancy",
+      "match": "\\b(return|return_local|match|case|try|catch|finally|retry)\\b:?"
     },
     {
+      "name": "meta.message.fancy",
+      "match": "([a-z_-]\\w*[?!]?:)",
       "captures": {
         "0": {
           "name": "entity.name.function.fancy"
         }
-      },
-      "match": "([a-z_-]\\w*[?!]?:)",
-      "name": "meta.message.fancy"
+      }
     },
     {
-      "match": "\\b(false|nil|true)\\b(?![?!])",
-      "name": "constant.language.fancy"
+      "name": "constant.language.fancy",
+      "match": "\\b(false|nil|true)\\b(?![?!])"
     },
     {
+      "name": "constant.other.symbol.fancy",
+      "match": "'([^'\\s\\[\\]\\(\\)\\{\\},]+|\\[\\])",
       "captures": {
         "0": {
           "name": "punctuation.definition.constant.fancy"
         }
-      },
-      "comment": "Symbol literals",
-      "match": "'([^'\\s\\[\\]\\(\\)\\{\\},]+|\\[\\])",
-      "name": "constant.other.symbol.fancy"
+      }
     },
     {
+      "name": "constant.other.dynvar.fancy",
+      "match": "\\*[a-zA-Z0-9_-]+\\*",
       "captures": {
         "0": {
           "name": "punctuation.definition.constant.fancy"
         }
-      },
-      "comment": "Dynamic variable literals",
-      "match": "\\*[a-zA-Z0-9_-]+\\*",
-      "name": "constant.other.dynvar.fancy"
+      }
     },
     {
-      "comment": "Pseudo variables",
-      "match": "\\b(__(FILE|LINE)__|self|super)\\b(?![?!])",
-      "name": "constant.language.fancy"
+      "name": "constant.language.fancy",
+      "match": "\\b(__(FILE|LINE)__|self|super)\\b(?![?!])"
     },
     {
-      "comment": "Constant names like class names, constants",
-      "match": "\\b[A-Z]\\w*\\b",
-      "name": "variable.other.constant.fancy"
+      "name": "variable.other.constant.fancy",
+      "match": "\\b[A-Z]\\w*\\b"
     },
     {
+      "name": "variable.other.readwrite.instance.fancy",
+      "match": "(@)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.fancy"
         }
-      },
-      "comment": "Instance variables",
-      "match": "(@)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.instance.fancy"
+      }
     },
     {
+      "name": "variable.other.readwrite.class.fancy",
+      "match": "(@@)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.fancy"
         }
-      },
-      "comment": "Class variables",
-      "match": "(@@)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.class.fancy"
+      }
     },
     {
+      "name": "punctuation.section.hash.fancy",
+      "match": "(\u003c\\[|\\]\u003e)",
       "captures": {
         "1": {
           "name": "punctuation.section.array.fancy"
         }
-      },
-      "comment": "Hash literals, this should be here to take precedence over <> operators",
-      "match": "(<\\[|\\]>)",
-      "name": "punctuation.section.hash.fancy"
+      }
     },
     {
+      "name": "string.regexp.classic.fancy",
+      "match": "(/[^/]*/)",
       "captures": {
         "1": {
           "name": "string.regexp.classic.fancy"
         }
-      },
-      "comment": "Regexp literals",
-      "match": "(/[^/]*/)",
-      "name": "string.regexp.classic.fancy"
+      }
     },
     {
-      "comment": "Assingnment operators",
-      "match": "<<=|%=|&=|\\*=|\\*\\*=|\\+=|\\-=|\\^=|\\|{1,2}=|<<",
-      "name": "keyword.operator.assignment.augmented.fancy"
+      "name": "keyword.operator.assignment.augmented.fancy",
+      "match": "\u003c\u003c=|%=|\u0026=|\\*=|\\*\\*=|\\+=|\\-=|\\^=|\\|{1,2}=|\u003c\u003c"
     },
     {
-      "comment": "Comparison operators",
-      "match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
-      "name": "keyword.operator.comparison.fancy"
+      "name": "keyword.operator.comparison.fancy",
+      "match": "\u003c=\u003e|\u003c(?!\u003c|=)|\u003e(?!\u003c|=|\u003e)|\u003c=|\u003e=|===|==|=~|!=|!~|(?\u003c=[ \\t])\\?"
     },
     {
-      "comment": "Logical operators",
-      "match": "\\b(not|and|or)\\b:|(?<=[ \\t])!+|&&|\\|\\||\\^",
-      "name": "keyword.operator.logical.fancy"
+      "name": "keyword.operator.logical.fancy",
+      "match": "\\b(not|and|or)\\b:|(?\u003c=[ \\t])!+|\u0026\u0026|\\|\\||\\^"
     },
     {
-      "comment": "Arithmetic operators",
-      "match": "(%|&|\\*\\*|\\*|\\+|\\-|/)",
-      "name": "keyword.operator.arithmetic.fancy"
+      "name": "keyword.operator.arithmetic.fancy",
+      "match": "(%|\u0026|\\*\\*|\\*|\\+|\\-|/)"
     },
     {
-      "match": "=",
-      "name": "keyword.operator.assignment.fancy"
+      "name": "keyword.operator.assignment.fancy",
+      "match": "="
     },
     {
-      "match": "\\;",
-      "name": "punctuation.separator.statement.fancy"
+      "name": "punctuation.separator.statement.fancy",
+      "match": "\\;"
     },
     {
-      "match": ",",
-      "name": "punctuation.separator.object.fancy"
+      "name": "punctuation.separator.object.fancy",
+      "match": ","
     },
     {
-      "match": "\\s",
-      "name": "punctuation.separator.method.ruby"
+      "name": "punctuation.separator.method.ruby",
+      "match": "\\s"
     },
     {
-      "match": "\\[|\\]",
-      "name": "punctuation.section.array.fancy"
+      "name": "punctuation.section.array.fancy",
+      "match": "\\[|\\]"
     },
     {
+      "name": "string.quoted.double.fancy",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.fancy",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.fancy"
+          "name": "constant.character.escape.fancy",
+          "match": "\\\\."
         }
       ]
     },
     {
-      "match": "(?:^[ \\t]+)?(#).*$\\n?",
-      "name": "comment.line.number-sign.fancy"
+      "name": "comment.line.number-sign.fancy",
+      "match": "(?:^[ \\t]+)?(#).*$\\n?"
     },
     {
-      "match": "\\b(0[xX][0-9A-Fa-f](?>_?[0-9A-Fa-f])*|\\d(?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0[bB][01]+)\\b",
-      "name": "constant.numeric.fancy"
+      "name": "constant.numeric.fancy",
+      "match": "\\b(0[xX][0-9A-Fa-f](?\u003e_?[0-9A-Fa-f])*|\\d(?\u003e_?\\d)*(\\.(?![^[:space:][:digit:]])(?\u003e_?\\d)*)?([eE][-+]?\\d(?\u003e_?\\d)*)?|0[bB][01]+)\\b"
     }
   ],
   "repository": {
     "arg_name": {
-      "match": "([a-z_-]\\w*:)",
-      "name": "entity.name.function.fancy"
+      "name": "entity.name.function.fancy",
+      "match": "([a-z_-]\\w*:)"
     }
-  },
-  "scopeName": "source.fancy",
-  "uuid": "866B0ECA-ACF9-480B-A724-F20E966AA3BF"
-}
+  }
+}

data/grammars/source.fish.json

@@ -1,57 +1,39 @@
 {
-  "fileTypes": [
-    "fish"
-  ],
-  "firstLineMatch": "^#!.*(fish)",
-  "foldingStartMarker": "^\\s*(function|while|if|switch|for)\\s.*$",
-  "foldingStopMarker": "^\\s*end\\s*$",
-  "keyEquivalent": "^~F",
   "name": "fish",
+  "scopeName": "source.fish",
   "patterns": [
     {
+      "name": "string.quoted.double.fish",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.fish"
-        }
-      },
-      "comment": "Single quoted string",
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.fish"
-        }
-      },
-      "name": "string.quoted.double.fish",
       "patterns": [
         {
-          "match": "\\\\\\\"|\\\\\\$|\\\\\\\\",
-          "name": "constant.character.escape.fish"
+          "name": "constant.character.escape.fish",
+          "match": "\\\\\\\"|\\\\\\$|\\\\\\\\"
         },
         {
           "include": "#variable"
         }
-      ]
-    },
-    {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.fish"
         }
       },
-      "comment": "single quoted string",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.fish"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.single.fish",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
-          "match": "\\\\'|\\\\",
-          "name": "constant.character.escape.fish"
+          "name": "constant.character.escape.fish",
+          "match": "\\\\'|\\\\"
         },
         {
           "include": "#variable"
@@ -59,67 +41,70 @@
         {
           "include": "#escape"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.fish"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.fish"
+        }
+      }
     },
     {
+      "name": "comment.line.number-sign.fish",
+      "match": "(?\u003c!\\$)(#)(?!\\{).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.fish"
         }
-      },
-      "comment": "line comment",
-      "match": "(?<!\\$)(#)(?!\\{).*$\\n?",
-      "name": "comment.line.number-sign.fish"
+      }
     },
     {
-      "comment": "control structures requiring an end",
-      "match": "(?<!\\.)\\b(function|while|if|else|switch|for|in|end)\\b(?![?!])",
-      "name": "keyword.control.fish"
+      "name": "keyword.control.fish",
+      "match": "(?\u003c!\\.)\\b(function|while|if|else|switch|for|in|end)\\b(?![?!])"
     },
     {
-      "match": "(?<!\\.)\\bfunction\\b(?![?!])",
-      "name": "storage.type.fish"
+      "name": "storage.type.fish",
+      "match": "(?\u003c!\\.)\\bfunction\\b(?![?!])"
     },
     {
-      "match": "\\|",
-      "name": "keyword.operator.pipe.fish"
+      "name": "keyword.operator.pipe.fish",
+      "match": "\\|"
     },
     {
-      "comment": "IO Redirection",
-      "match": "(?x:\n\t\t\t<|\t\t\t\t# Standard Input\n\t\t\t(>|\\^|>>|\\^\\^)(&[012\\-])?| # Redirection of stdout/stderr\n\t\t\t[012](<|>|>>)(&[012\\-])? # Redirect input/output of file descriptors\n\t\t\t)",
-      "name": "keyword.operator.redirect.fish"
+      "name": "keyword.operator.redirect.fish",
+      "match": "(?x:\n\t\t\t\u003c|\t\t\t\t# Standard Input\n\t\t\t(\u003e|\\^|\u003e\u003e|\\^\\^)(\u0026[012\\-])?| # Redirection of stdout/stderr\n\t\t\t[012](\u003c|\u003e|\u003e\u003e)(\u0026[012\\-])? # Redirect input/output of file descriptors\n\t\t\t)"
     },
     {
-      "match": "&",
-      "name": "keyword.operator.background.fish"
+      "name": "keyword.operator.background.fish",
+      "match": "\u0026"
     },
     {
-      "match": "\\*\\*|\\*|\\?",
-      "name": "keyword.operator.glob.fish"
+      "name": "keyword.operator.glob.fish",
+      "match": "\\*\\*|\\*|\\?"
     },
     {
+      "match": "\\s(-{1,2}[a-zA-Z_\\-0-9]+|-\\w)\\b",
       "captures": {
         "1": {
           "name": "string.other.option.fish"
         }
-      },
-      "comment": "command short/long options",
-      "match": "\\s(-{1,2}[a-zA-Z_\\-0-9]+|-\\w)\\b"
+      }
     },
     {
-      "comment": "builtin shellscript functions",
-      "match": "(?x)\\b(\n\t\t\t_|__fish_append|__fish_bind_test1|__fish_bind_test2|__fish_commandline_test|\n\t\t\t__fish_complete_ant_targets|__fish_complete_bittorrent|__fish_complete_cd|\n\t\t\t__fish_complete_command|__fish_complete_directories|__fish_complete_file_url|\n\t\t\t__fish_complete_groups|__fish_complete_ls|__fish_complete_man|\n\t\t\t__fish_complete_mime|__fish_complete_pids|__fish_complete_ssh|\n\t\t\t__fish_complete_subcommand|__fish_complete_subcommand_root|\n\t\t\t__fish_complete_suffix|__fish_complete_tar|__fish_complete_tex|\n\t\t\t__fish_complete_unrar|__fish_complete_users|__fish_complete_vi|\n\t\t\t__fish_config_interactive|__fish_contains_opt|__fish_crux_packages|\n\t\t\t__fish_describe_command|__fish_filter_ant_targets|__fish_filter_mime|\n\t\t\t__fish_gnu_complete|__fish_is_first_token|__fish_list_current_token|\n\t\t\t__fish_move_last|__fish_no_arguments|__fish_not_contain_opt|__fish_paginate|\n\t\t\t__fish_ports_dirs|__fish_print_addresses|__fish_print_encodings|\n\t\t\t__fish_print_filesystems|__fish_print_function_prototypes|__fish_print_help|\n\t\t\t__fish_print_hostnames|__fish_print_interfaces|__fish_print_make_targets|\n\t\t\t__fish_print_packages|__fish_print_users|__fish_prt_no_subcommand|\n\t\t\t__fish_prt_packages|__fish_prt_ports|__fish_prt_use_package|\n\t\t\t__fish_prt_use_port|__fish_reload_key_bindings|__fish_repaint|\n\t\t\t__fish_repaint_root|__fish_seen_subcommand_from|__fish_test_arg|\n\t\t\t__fish_use_subcommand|__fish_winch_handler|alias|cd|delete-or-exit|dirh|\n\t\t\tdirs|down-or-search|eval|fish_default_key_bindings|fish_on_exit|\n\t\t\tfish_prompt|fish_sigtrap_handler|funced|funcsave|grep|help|isatty|la|ll|\n\t\t\tls|math|N_|nextd|nextd-or-forward-word|open|popd|prevd|\n\t\t\tprevd-or-backward-word|prompt_pwd|psub|pushd|pwd|setenv|sgrep|trap|type|\n\t\t\tumask|up-or-search|vared\n\t\t\t)\\b",
-      "name": "support.function.script.fish"
+      "name": "support.function.script.fish",
+      "match": "(?x)\\b(\n\t\t\t_|__fish_append|__fish_bind_test1|__fish_bind_test2|__fish_commandline_test|\n\t\t\t__fish_complete_ant_targets|__fish_complete_bittorrent|__fish_complete_cd|\n\t\t\t__fish_complete_command|__fish_complete_directories|__fish_complete_file_url|\n\t\t\t__fish_complete_groups|__fish_complete_ls|__fish_complete_man|\n\t\t\t__fish_complete_mime|__fish_complete_pids|__fish_complete_ssh|\n\t\t\t__fish_complete_subcommand|__fish_complete_subcommand_root|\n\t\t\t__fish_complete_suffix|__fish_complete_tar|__fish_complete_tex|\n\t\t\t__fish_complete_unrar|__fish_complete_users|__fish_complete_vi|\n\t\t\t__fish_config_interactive|__fish_contains_opt|__fish_crux_packages|\n\t\t\t__fish_describe_command|__fish_filter_ant_targets|__fish_filter_mime|\n\t\t\t__fish_gnu_complete|__fish_is_first_token|__fish_list_current_token|\n\t\t\t__fish_move_last|__fish_no_arguments|__fish_not_contain_opt|__fish_paginate|\n\t\t\t__fish_ports_dirs|__fish_print_addresses|__fish_print_encodings|\n\t\t\t__fish_print_filesystems|__fish_print_function_prototypes|__fish_print_help|\n\t\t\t__fish_print_hostnames|__fish_print_interfaces|__fish_print_make_targets|\n\t\t\t__fish_print_packages|__fish_print_users|__fish_prt_no_subcommand|\n\t\t\t__fish_prt_packages|__fish_prt_ports|__fish_prt_use_package|\n\t\t\t__fish_prt_use_port|__fish_reload_key_bindings|__fish_repaint|\n\t\t\t__fish_repaint_root|__fish_seen_subcommand_from|__fish_test_arg|\n\t\t\t__fish_use_subcommand|__fish_winch_handler|alias|cd|delete-or-exit|dirh|\n\t\t\tdirs|down-or-search|eval|fish_default_key_bindings|fish_on_exit|\n\t\t\tfish_prompt|fish_sigtrap_handler|funced|funcsave|grep|help|isatty|la|ll|\n\t\t\tls|math|N_|nextd|nextd-or-forward-word|open|popd|prevd|\n\t\t\tprevd-or-backward-word|prompt_pwd|psub|pushd|pwd|setenv|sgrep|trap|type|\n\t\t\tumask|up-or-search|vared\n\t\t\t)\\b"
     },
     {
-      "comment": "builtin commands listed by builtin -n",
-      "match": "(?x)\\b(\n\t\t\t\\s\\.\\s|and|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|\n\t\t\tcommandline|complete|contains|continue|count|else|emit|end|exec|exit|\n\t\t\tfg|for|function|functions|if|jobs|not|or|random|read|return|set|\n\t\t\tstatus|switch|ulimit|while\n\t\t\t)\\b",
-      "name": "support.function.builtin.fish"
+      "name": "support.function.builtin.fish",
+      "match": "(?x)\\b(\n\t\t\t\\s\\.\\s|and|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|\n\t\t\tcommandline|complete|contains|continue|count|else|emit|end|exec|exit|\n\t\t\tfg|for|function|functions|if|jobs|not|or|random|read|return|set|\n\t\t\tstatus|switch|ulimit|while\n\t\t\t)\\b"
     },
     {
-      "comment": "standard Unix utilities as specified in IEEE Std 1003.1 (2004 edition)",
-      "match": "(?x)\\b(\n\t\t\tadmin|alias|ar|asa|at|awk|basename|batch|bc|bg|break|c99|cal|cat|\n\t\t\tcd|cflow|chgrp|chmod|chown|cksum|cmp|colon|comm|command|compress|\n\t\t\tcontinue|cp|crontab|csplit|ctags|cut|cxref|date|dd|delta|df|diff|\n\t\t\tdirname|dot|du|echo|ed|env|eval|ex|exec|exit|expand|export|expr|\n\t\t\tfalse|fc|fg|file|find|fold|fort77|fuser|gencat|get|getconf|getopts|\n\t\t\tgrep|hash|head|iconv|id|ipcrm|ipcs|jobs|join|kill|lex|link|ln|\n\t\t\tlocale|localedef|logger|logname|lp|ls|m4|mailx|make|man|mesg|mkdir|\n\t\t\tmkfifo|more|mv|newgrp|nice|nl|nm|nohup|od|paste|patch|pathchk|pax|\n\t\t\tpr|printf|prs|ps|pwd|qalter|qdel|qhold|qmove|qmsg|qrerun|qrls|\n\t\t\tqselect|qsig|qstat|qsub|read|readonly|renice|return|rm|rmdel|rmdir|\n\t\t\tsact|sccs|sed|set|sh|shift|sleep|sort|split|strings|strip|stty|tabs|\n\t\t\ttail|talk|tee|test|time|times|touch|tput|tr|trap|true|tsort|tty|\n\t\t\ttype|ulimit|umask|unalias|uname|uncompress|unexpand|unget|uniq|unlink|\n\t\t\tunset|uucp|uudecode|uuencode|uustat|uux|val|vi|wait|wc|what|who|\n\t\t\twrite|xargs|yacc|zcat\n\t\t\t)\\b",
-      "name": "support.function.unix.fish"
+      "name": "support.function.unix.fish",
+      "match": "(?x)\\b(\n\t\t\tadmin|alias|ar|asa|at|awk|basename|batch|bc|bg|break|c99|cal|cat|\n\t\t\tcd|cflow|chgrp|chmod|chown|cksum|cmp|colon|comm|command|compress|\n\t\t\tcontinue|cp|crontab|csplit|ctags|cut|cxref|date|dd|delta|df|diff|\n\t\t\tdirname|dot|du|echo|ed|env|eval|ex|exec|exit|expand|export|expr|\n\t\t\tfalse|fc|fg|file|find|fold|fort77|fuser|gencat|get|getconf|getopts|\n\t\t\tgrep|hash|head|iconv|id|ipcrm|ipcs|jobs|join|kill|lex|link|ln|\n\t\t\tlocale|localedef|logger|logname|lp|ls|m4|mailx|make|man|mesg|mkdir|\n\t\t\tmkfifo|more|mv|newgrp|nice|nl|nm|nohup|od|paste|patch|pathchk|pax|\n\t\t\tpr|printf|prs|ps|pwd|qalter|qdel|qhold|qmove|qmsg|qrerun|qrls|\n\t\t\tqselect|qsig|qstat|qsub|read|readonly|renice|return|rm|rmdel|rmdir|\n\t\t\tsact|sccs|sed|set|sh|shift|sleep|sort|split|strings|strip|stty|tabs|\n\t\t\ttail|talk|tee|test|time|times|touch|tput|tr|trap|true|tsort|tty|\n\t\t\ttype|ulimit|umask|unalias|uname|uncompress|unexpand|unget|uniq|unlink|\n\t\t\tunset|uucp|uudecode|uuencode|uustat|uux|val|vi|wait|wc|what|who|\n\t\t\twrite|xargs|yacc|zcat\n\t\t\t)\\b"
     },
     {
       "include": "#variable"
@@ -132,83 +117,74 @@
     "escape": {
       "patterns": [
         {
-          "comment": "single character character escape sequences",
-          "match": "\\\\(a|b|e|f|n|r|t|v|\\s|\\$|\\\\|\\*|\\?|~|\\%|#|(|)|{|}|\\[|\\]|<|>|\\^)",
-          "name": "constant.character.escape.single.fish"
+          "name": "constant.character.escape.single.fish",
+          "match": "\\\\(a|b|e|f|n|r|t|v|\\s|\\$|\\\\|\\*|\\?|~|\\%|#|(|)|{|}|\\[|\\]|\u003c|\u003e|\\^)"
         },
         {
-          "comment": "escapes the ascii character with the specified value (hexadecimal)",
-          "match": "\\\\x[0-9a-fA-F]{2}",
-          "name": "constant.character.escape.hex-ascii.fish"
+          "name": "constant.character.escape.hex-ascii.fish",
+          "match": "\\\\x[0-9a-fA-F]{2}"
         },
         {
-          "comment": "escapes a byte of data with the specified value (hexadecimal). \n\t\t\t\t\tIf you are using a mutibyte encoding, this can be used to enter invalid strings. \n\t\t\t\t\tOnly use this if you know what you are doing.",
-          "match": "\\\\X[0-9a-fA-F]{2}",
-          "name": "constant.character.escape.hex-byte.fish"
+          "name": "constant.character.escape.hex-byte.fish",
+          "match": "\\\\X[0-9a-fA-F]{2}"
         },
         {
-          "comment": "escapes the ascii character with the specified value (octal)",
-          "match": "\\\\[0-9]{3}",
-          "name": "constant.character.escape.octal.fish"
+          "name": "constant.character.escape.octal.fish",
+          "match": "\\\\[0-9]{3}"
         },
         {
-          "comment": "escapes the 16-bit unicode character with the specified value (hexadecimal)",
-          "match": "\\\\u[0-9a-fA-F]{4}",
-          "name": "constant.character.escape.unicode-16-bit.fish"
+          "name": "constant.character.escape.unicode-16-bit.fish",
+          "match": "\\\\u[0-9a-fA-F]{4}"
         },
         {
-          "comment": "escapes the 32-bit unicode character with the specified value (hexadecimal)",
-          "match": "\\\\U[0-9a-fA-F]{8}",
-          "name": "constant.character.escape.unicode-32-bit.fish"
+          "name": "constant.character.escape.unicode-32-bit.fish",
+          "match": "\\\\U[0-9a-fA-F]{8}"
         },
         {
-          "comment": "escapes the control sequence generated by pressing the control key and the specified letter",
-          "match": "\\\\c[a-zA-Z]",
-          "name": "constant.character.escape.control.fish"
+          "name": "constant.character.escape.control.fish",
+          "match": "\\\\c[a-zA-Z]"
         }
       ]
     },
     "variable": {
       "patterns": [
         {
+          "name": "variable.other.special.fish",
+          "match": "(?x)(\\$)(BROWSER|CDPATH|fish_greeting|LANG|LC_ALL|LC_COLLATE|\n\t\t\t\t\t\t\t\t\tLC_CTYPE|LC_MESSAGES|LC_MONETARY|LC_NUMERIC|LC_TIME|PATH|\n\t\t\t\t\t\t\t\t\tumask|fish_color_command|fish_color_comment|fish_color_cwd|fish_color_cwd_root|\n\t\t\t\t\t\t\t\t\tfish_color_error|fish_color_escape|fish_color_history_current|\n\t\t\t\t\t\t\t\t\tfish_color_match|fish_color_normal|fish_color_operator|fish_color_quote|\n\t\t\t\t\t\t\t\t\tfish_color_redirection|fish_color_search_match|fish_color_valid_path|\n\t\t\t\t\t\t\t\t\tfish_complete_path|fish_function_path|fish_greeting|fish_key_bindings|\n\t\t\t\t\t\t\t\t\tfish_pager_color_completion|fish_pager_color_description|\n\t\t\t\t\t\t\t\t\tfish_pager_color_prefix|fish_pager_color_progress)",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.fish"
             }
-          },
-          "match": "(?x)(\\$)(BROWSER|CDPATH|fish_greeting|LANG|LC_ALL|LC_COLLATE|\n\t\t\t\t\t\t\t\t\tLC_CTYPE|LC_MESSAGES|LC_MONETARY|LC_NUMERIC|LC_TIME|PATH|\n\t\t\t\t\t\t\t\t\tumask|fish_color_command|fish_color_comment|fish_color_cwd|fish_color_cwd_root|\n\t\t\t\t\t\t\t\t\tfish_color_error|fish_color_escape|fish_color_history_current|\n\t\t\t\t\t\t\t\t\tfish_color_match|fish_color_normal|fish_color_operator|fish_color_quote|\n\t\t\t\t\t\t\t\t\tfish_color_redirection|fish_color_search_match|fish_color_valid_path|\n\t\t\t\t\t\t\t\t\tfish_complete_path|fish_function_path|fish_greeting|fish_key_bindings|\n\t\t\t\t\t\t\t\t\tfish_pager_color_completion|fish_pager_color_description|\n\t\t\t\t\t\t\t\t\tfish_pager_color_prefix|fish_pager_color_progress)",
-          "name": "variable.other.special.fish"
+          }
         },
         {
+          "name": "variable.other.fixed.fish",
+          "match": "(\\$)(_|argv|history|HOME|PWD|status|USER)",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.fish"
             }
-          },
-          "match": "(\\$)(_|argv|history|HOME|PWD|status|USER)",
-          "name": "variable.other.fixed.fish"
+          }
         },
         {
+          "name": "variable.other.fish.fish",
+          "match": "(\\$)__(fish|FISH)[a-zA-Z_][a-zA-Z0-9_]*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.fish"
             }
-          },
-          "match": "(\\$)__(fish|FISH)[a-zA-Z_][a-zA-Z0-9_]*",
-          "name": "variable.other.fish.fish"
+          }
         },
         {
+          "name": "variable.other.normal.fish",
+          "match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.fish"
             }
-          },
-          "match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
-          "name": "variable.other.normal.fish"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.fish",
-  "uuid": "9CA6DB6F-A16F-4836-A058-617C7378775D"
-}
+  }
+}