github-linguist 5.0.0 → 5.0.2

data/grammars/source.sdbl.json

@@ -46,7 +46,7 @@
     },
     {
       "name": "keyword.operator.logical.sdbl",
-      "match": "(?i)(?<!КАК\\s|AS\\s)(?<=[^\\wа-яё\\.]|^)(НЕ|NOT|И|AND|ИЛИ|OR|В\\s+ИЕРАРХИИ|IN\\s+HIERARCHY|В|In|Между|Between|Есть\\sNULL|Is\\s+NULL|Ссылка|Refs|Подобно|Like)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?<!КАК\\s|AS\\s)(?<=[^\\wа-яё\\.]|^)(НЕ|NOT|И|AND|ИЛИ|OR|В\\s+ИЕРАРХИИ|IN\\s+HIERARCHY|В|In|Между|Between|Есть(\\s+НЕ)?\\s+NULL|Is(\\s+NOT)?\\s+NULL|Ссылка|Refs|Подобно|Like)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "name": "keyword.operator.comparison.sdbl",
@@ -62,7 +62,7 @@
     },
     {
       "name": "keyword.control.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EpmtyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее\\s+|Inner\\s+)?Соединение|Join)|Где|Where|(Сгруппировать\\s+По)|(Group\\s+By)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)?|(Только\\s+)?Иерархия|(Only\\s+)?Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\s+Update(\\s+Of)?)|Спецсимвол|Escape)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EpmtyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее|Inner)\\s+Соединение|Join)|Где|Where|(Сгруппировать\\s+По)|(Group\\s+By)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)?|(Только\\s+)?Иерархия|(Only\\s+)?Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\s+Update(\\s+Of)?)|Спецсимвол|Escape)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "comment": "Функции языка запросов",

data/grammars/source.shell.json

@@ -88,13 +88,18 @@
           "name": "meta.scope.case-clause.shell",
           "patterns": [
             {
-              "begin": "(\\(|(?=\\S))",
-              "captures": {
+              "begin": "\\(|(?=\\S)",
+              "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.case-pattern.shell"
                 }
               },
               "end": "\\)",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.case-pattern.shell"
+                }
+              },
               "name": "meta.scope.case-pattern.shell",
               "patterns": [
                 {
@@ -163,13 +168,18 @@
     "compound-command": {
       "patterns": [
         {
-          "begin": "(\\[{1,2})",
-          "captures": {
-            "1": {
+          "begin": "\\[{1,2}",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.logical-expression.shell"
+            }
+          },
+          "end": "\\]{1,2}",
+          "endCaptures": {
+            "0": {
               "name": "punctuation.definition.logical-expression.shell"
             }
           },
-          "end": "(\\]{1,2})",
           "name": "meta.scope.logical-expression.shell",
           "patterns": [
             {
@@ -181,13 +191,13 @@
           ]
         },
         {
-          "begin": "(\\({2})",
+          "begin": "\\({2}",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "(\\){2})",
+          "end": "\\){2}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
@@ -201,13 +211,18 @@
           ]
         },
         {
-          "begin": "(\\()",
-          "captures": {
-            "1": {
+          "begin": "\\(",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.subshell.shell"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
               "name": "punctuation.definition.subshell.shell"
             }
           },
-          "end": "(\\))",
           "name": "meta.scope.subshell.shell",
           "patterns": [
             {
@@ -216,13 +231,18 @@
           ]
         },
         {
-          "begin": "(?<=\\s|^)(\\{)(?=\\s|$)",
-          "captures": {
+          "begin": "(?<=\\s|^){(?=\\s|$)",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.group.shell"
+            }
+          },
+          "end": "(?<=^|;)\\s*(})",
+          "endCaptures": {
             "1": {
               "name": "punctuation.definition.group.shell"
             }
           },
-          "end": "(?<=^|;)\\s*(\\})",
           "name": "meta.scope.group.shell",
           "patterns": [
             {
@@ -235,7 +255,7 @@
     "function-definition": {
       "patterns": [
         {
-          "begin": "\\b(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+          "begin": "(?<=^|;|&|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.shell"
@@ -261,7 +281,7 @@
           ]
         },
         {
-          "begin": "\\b([^\\s\\\\=]+)\\s*(\\(\\))",
+          "begin": "(?<=^|;|&|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.shell"
@@ -297,19 +317,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.ruby.embedded.shell",
-          "end": "^\\t*(RUBY)\\b",
+          "end": "^\\t*(RUBY)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.ruby.shell",
+          "contentName": "source.ruby.embedded.shell",
           "patterns": [
             {
               "include": "source.ruby"
@@ -326,19 +341,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.ruby.embedded.shell",
-          "end": "^(RUBY)\\b",
+          "end": "^(RUBY)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.ruby.shell",
+          "contentName": "source.ruby.embedded.shell",
           "patterns": [
             {
               "include": "source.ruby"
@@ -355,19 +365,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.python.embedded.shell",
-          "end": "^\\t*(PYTHON)\\b",
+          "end": "^\\t*(PYTHON)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.python.shell",
+          "contentName": "source.python.embedded.shell",
           "patterns": [
             {
               "include": "source.python"
@@ -384,19 +389,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.python.embedded.shell",
-          "end": "^(PYTHON)\\b",
+          "end": "^(PYTHON)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.python.shell",
+          "contentName": "source.python.embedded.shell",
           "patterns": [
             {
               "include": "source.python"
@@ -413,19 +413,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.applescript.embedded.shell",
-          "end": "^\\t*(APPLESCRIPT)\\b",
+          "end": "^\\t*(APPLESCRIPT)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.applescript.shell",
+          "contentName": "source.applescript.embedded.shell",
           "patterns": [
             {
               "include": "source.applescript"
@@ -442,19 +437,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.applescript.embedded.shell",
-          "end": "^(APPLESCRIPT)\\b",
+          "end": "^(APPLESCRIPT)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.applescript.shell",
+          "contentName": "source.applescript.embedded.shell",
           "patterns": [
             {
               "include": "source.applescript"
@@ -471,19 +461,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.embedded.shell",
-          "end": "^\\t*(HTML)\\b",
+          "end": "^\\t*(HTML)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.html.shell",
+          "contentName": "text.html.embedded.shell",
           "patterns": [
             {
               "include": "text.html.basic"
@@ -500,19 +485,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.embedded.shell",
-          "end": "^(HTML)\\b",
+          "end": "^(HTML)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.html.shell",
+          "contentName": "text.html.embedded.shell",
           "patterns": [
             {
               "include": "text.html.basic"
@@ -529,19 +509,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.markdown.embedded.shell",
-          "end": "^\\t*(MARKDOWN)\\b",
+          "end": "^\\t*(MARKDOWN)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.markdown.shell",
+          "contentName": "text.html.markdown.embedded.shell",
           "patterns": [
             {
               "include": "text.html.markdown"
@@ -558,19 +533,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.markdown.embedded.shell",
-          "end": "^(MARKDOWN)\\b",
+          "end": "^(MARKDOWN)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.markdown.shell",
+          "contentName": "text.html.markdown.embedded.shell",
           "patterns": [
             {
               "include": "text.html.markdown"
@@ -587,19 +557,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.textile.embedded.shell",
-          "end": "^\\t*(TEXTILE)\\b",
+          "end": "^\\t*(TEXTILE)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.no-indent.textile.shell",
+          "contentName": "text.html.textile.embedded.shell",
           "patterns": [
             {
               "include": "text.html.textile"
@@ -616,19 +581,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "text.html.textile.embedded.shell",
-          "end": "^(TEXTILE)\\b",
+          "end": "^(TEXTILE)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.textile.shell",
+          "contentName": "text.html.textile.embedded.shell",
           "patterns": [
             {
               "include": "text.html.textile"
@@ -645,18 +605,13 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.shell.embedded.shell",
-          "end": "^\\t*(\\3)\\b",
+          "end": "^\\t*(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
+          "contentName": "source.shell.embedded.shell",
           "name": "string.unquoted.heredoc.no-indent.shell.shell",
           "patterns": [
             {
@@ -674,19 +629,14 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "contentName": "source.shell.embedded.shell",
-          "end": "^(\\3)\\b",
+          "end": "^(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
           },
           "name": "string.unquoted.heredoc.shell.shell",
+          "contentName": "source.shell.embedded.shell",
           "patterns": [
             {
               "include": "source.shell"
@@ -703,12 +653,7 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "end": "^\\t*(\\3)\\b",
+          "end": "^\\t*(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
@@ -726,12 +671,7 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.shell"
-            }
-          },
-          "end": "^(\\3)\\b",
+          "end": "^(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
@@ -744,7 +684,7 @@
     "herestring": {
       "patterns": [
         {
-          "begin": "(<<<)s*(('))",
+          "begin": "(<<<)\\s*(('))",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.herestring.shell"
@@ -769,7 +709,7 @@
           "contentName": "string.quoted.single.shell"
         },
         {
-          "begin": "(<<<)s*((\"))",
+          "begin": "(<<<)\\s*((\"))",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.herestring.shell"
@@ -899,11 +839,11 @@
     "keyword": {
       "patterns": [
         {
-          "match": "(?<!-)\\b(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)\\b(?!-)",
+          "match": "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
           "name": "keyword.control.shell"
         },
         {
-          "match": "(?<![-/])\\b(?:export|declare|typeset|local|readonly)\\b",
+          "match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
           "name": "storage.modifier.shell"
         }
       ]
@@ -932,13 +872,18 @@
     "loop": {
       "patterns": [
         {
-          "begin": "\\b(for)\\s+(?=\\({2})",
-          "captures": {
+          "begin": "(?<=^|;|&|\\s)(for)\\s+(?=\\({2})",
+          "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "\\b(done)\\b",
+          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          },
           "name": "meta.scope.for-loop.shell",
           "patterns": [
             {
@@ -947,7 +892,7 @@
           ]
         },
         {
-          "begin": "\\b(for)\\b\\s+(.+)\\s+\\b(in)\\b",
+          "begin": "(?<=^|;|&|\\s)(for)\\s+(.+?)\\s+(in)(?=\\s|;|&|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -964,7 +909,7 @@
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<![-/])\\bdone\\b(?![-/])",
+          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
@@ -978,13 +923,18 @@
           ]
         },
         {
-          "begin": "\\b(while|until)\\b",
-          "captures": {
+          "begin": "(?<=^|;|&|\\s)(while|until)(?=\\s|;|&|$)",
+          "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "\\b(done)\\b",
+          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          },
           "name": "meta.scope.while-loop.shell",
           "patterns": [
             {
@@ -993,7 +943,7 @@
           ]
         },
         {
-          "begin": "\\b(select)\\s+((?:[^\\s\\\\]|\\\\.)+)\\b",
+          "begin": "(?<=^|;|&|\\s)(select)\\s+((?:[^\\s\\\\]|\\\\.)+)(?=\\s|;|&|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -1002,7 +952,7 @@
               "name": "variable.other.loop.shell"
             }
           },
-          "end": "\\b(done)\\b",
+          "end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -1016,23 +966,28 @@
           ]
         },
         {
-          "begin": "(?<!-)\\b(case)\\b(?!-)",
-          "captures": {
-            "1": {
+          "begin": "(?<=^|;|&|\\s)case(?=\\s|;|&|$)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          },
+          "end": "(?<=^|;|&|\\s)esac(?=\\s|;|&|$)",
+          "endCaptures": {
+            "0": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "\\b(esac)\\b",
           "name": "meta.scope.case-block.shell",
           "patterns": [
             {
-              "begin": "\\b(?:in)\\b",
+              "begin": "(?<=^|;|&|\\s)in(?=\\s|;|&|$)",
               "beginCaptures": {
-                "1": {
+                "0": {
                   "name": "keyword.control.shell"
                 }
               },
-              "end": "(?=\\b(?:esac)\\b)",
+              "end": "(?<=^|;|&|\\s)(?=esac(\\s|;|&|$))",
               "name": "meta.scope.case-body.shell",
               "patterns": [
                 {
@@ -1052,13 +1007,18 @@
           ]
         },
         {
-          "begin": "(?<!-)\\b(if)\\b(?!-|\\s*=)",
-          "captures": {
-            "1": {
+          "begin": "(?<=^|;|&|\\s)if(?=\\s|;|&|$)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          },
+          "end": "(?<=^|;|&|\\s)fi(?=\\s|;|&|$)",
+          "endCaptures": {
+            "0": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "\\b(fi)\\b",
           "name": "meta.scope.if-block.shell",
           "patterns": [
             {
@@ -1115,9 +1075,9 @@
               "name": "punctuation.definition.extglob.shell"
             }
           },
-          "end": "(\\))",
+          "end": "\\)",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.definition.extglob.shell"
             }
           },
@@ -1133,7 +1093,7 @@
     "pipeline": {
       "patterns": [
         {
-          "match": "\\b(time)\\b",
+          "match": "(?<=^|;|&|\\s)(time)(?=\\s|;|&|$)",
           "name": "keyword.other.shell"
         },
         {
@@ -1165,7 +1125,6 @@
           ]
         },
         {
-          "comment": "valid: &>word >&word >word [n]>&[n] [n]<word [n]>word [n]>>word [n]<&word (last one is duplicate)",
           "match": "&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>",
           "name": "keyword.operator.redirect.shell"
         }
@@ -1257,11 +1216,11 @@
     "support": {
       "patterns": [
         {
-          "match": "(?<=^|\\s)(?::|\\.)(?=\\s|;|&|$)",
+          "match": "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
           "name": "support.function.builtin.shell"
         },
         {
-          "match": "(?<![-/])\\b(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)\\b(?![-/])",
+          "match": "(?<=^|;|&|\\s)(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)(?=\\s|;|&|$)",
           "name": "support.function.builtin.shell"
         }
       ]
@@ -1296,13 +1255,18 @@
           "name": "variable.other.positional.shell"
         },
         {
-          "begin": "\\$\\{",
-          "captures": {
+          "begin": "\\${",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.variable.shell"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
             "0": {
               "name": "punctuation.definition.variable.shell"
             }
           },
-          "end": "\\}",
           "name": "variable.other.bracket.shell",
           "patterns": [
             {