github-linguist 5.3.3 → 6.0.0

data/grammars/source.sdbl.json

@@ -1,12 +1,6 @@
 {
   "name": "1C (Query)",
   "scopeName": "source.sdbl",
-  "fileTypes": [
-    "sdbl",
-    "query"
-  ],
-  "firstLineMatch": "(?i)Выбрать|Select(\\s+Разрешенные|\\s+Allowed)?(\\s+Различные|\\s+Distinct)?(\\s+Первые|\\s+Top)?.*",
-  "uuid": "d94265d3-2270-4ff2-ba36-649fbb4160df",
   "patterns": [
     {
       "name": "comment.line.double-slash.sdbl",
@@ -34,23 +28,23 @@
     },
     {
       "name": "constant.language.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "name": "constant.numeric.sdbl",
-      "match": "(?<=[^\\wа-яё\\.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?\u003c=[^\\wа-яё\\.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "name": "keyword.control.conditional.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбор|Case|Когда|When|Тогда|Then|Иначе|Else|Конец|End)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Выбор|Case|Когда|When|Тогда|Then|Иначе|Else|Конец|End)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "name": "keyword.operator.logical.sdbl",
-      "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а-яё\\.]|$)"
+      "match": "(?i)(?\u003c!КАК\\s|AS\\s)(?\u003c=[^\\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",
-      "match": "<=|>=|=|<|>"
+      "match": "\u003c=|\u003e=|=|\u003c|\u003e"
     },
     {
       "name": "keyword.operator.arithmetic.sdbl",
@@ -62,40 +56,35 @@
     },
     {
       "name": "keyword.control.sdbl",
-      "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а-яё\\.]|$)"
+      "match": "(?i)(?\u003c=[^\\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": "Функции языка запросов",
       "name": "support.function.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Значение|Value|ДатаВремя|DateTime|Тип|Type)(?=\\()"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Значение|Value|ДатаВремя|DateTime|Тип|Type)(?=\\()"
     },
     {
-      "comment": "Функции работы со строками",
       "name": "support.function.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Подстрока|Substring)(?=\\()"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Подстрока|Substring)(?=\\()"
     },
     {
-      "comment": "Функции работы с датами",
       "name": "support.function.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Год|Year|Квартал|Quarter|Месяц|Month|ДеньГода|DayOfYear|День|Day|Неделя|Week|ДеньНедели|Weekday|Час|Hour|Минута|Minute|Секунда|Second|НачалоПериода|BeginOfPeriod|КонецПериода|EndOfPeriod|ДобавитьКДате|DateAdd|РазностьДат|DateDiff)(?=\\()"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Год|Year|Квартал|Quarter|Месяц|Month|ДеньГода|DayOfYear|День|Day|Неделя|Week|ДеньНедели|Weekday|Час|Hour|Минута|Minute|Секунда|Second|НачалоПериода|BeginOfPeriod|КонецПериода|EndOfPeriod|ДобавитьКДате|DateAdd|РазностьДат|DateDiff)(?=\\()"
     },
     {
-      "comment": "Агрегатные функции",
       "name": "support.function.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Сумма|Sum|Среднее|Avg|Минимум|Min|Максимум|Max|Количество|Count)(?=\\()"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(Сумма|Sum|Среднее|Avg|Минимум|Min|Максимум|Max|Количество|Count)(?=\\()"
     },
     {
-      "comment": "Прочие функции",
       "name": "support.function.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(ЕстьNULL|IsNULL|Представление|Presentation|ПредставлениеСсылки|RefPresentation|ТипЗначения|ValueType)(?=\\()"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.]|^)(ЕстьNULL|IsNULL|Представление|Presentation|ПредставлениеСсылки|RefPresentation|ТипЗначения|ValueType)(?=\\()"
     },
     {
       "name": "support.type.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.])(Число|Number|Строка|String|Дата|Date)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?\u003c=[^\\wа-яё\\.])(Число|Number|Строка|String|Дата|Date)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "name": "variable.parameter.sdbl",
-      "match": "(&[\\wа-яё]+)"
+      "match": "(\u0026[\\wа-яё]+)"
     }
   ]
-}
+}

data/grammars/source.shaderlab.json

@@ -1,9 +1,6 @@
 {
-  "scopeName": "source.shaderlab",
   "name": "ShaderLab",
-  "fileTypes": [
-    "shader"
-  ],
+  "scopeName": "source.shaderlab",
   "patterns": [
     {
       "name": "comment.line.double-slash.shaderlab",
@@ -82,42 +79,42 @@
     {
       "name": "meta.cgblock",
       "begin": "\\b(CGPROGRAM|CGINCLUDE)\\b",
+      "end": "\\b(ENDCG)\\b",
+      "patterns": [
+        {
+          "include": "#hlsl-embedded"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
         }
       },
-      "end": "\\b(ENDCG)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.other"
         }
-      },
-      "patterns": [
-        {
-          "include": "#hlsl-embedded"
-        }
-      ]
+      }
     },
     {
       "name": "meta.hlslblock",
       "begin": "\\b(HLSLPROGRAM|HLSLINCLUDE)\\b",
+      "end": "\\b(ENDHLSL)\\b",
+      "patterns": [
+        {
+          "include": "#hlsl-embedded"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
         }
       },
-      "end": "\\b(ENDHLSL)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.other"
         }
-      },
-      "patterns": [
-        {
-          "include": "#hlsl-embedded"
-        }
-      ]
+      }
     },
     {
       "name": "string.quoted.double.shaderlab",
@@ -126,14 +123,6 @@
     }
   ],
   "repository": {
-    "numbers": {
-      "patterns": [
-        {
-          "name": "constant.numeric.shaderlab",
-          "match": "\\b([0-9]+\\.?[0-9]*)\\b"
-        }
-      ]
-    },
     "hlsl-embedded": {
       "patterns": [
         {
@@ -196,6 +185,14 @@
           "match": "\\b(SurfaceOutputStandardSpecular|SurfaceOutputStandard|SurfaceOutput|Input)\\b"
         }
       ]
+    },
+    "numbers": {
+      "patterns": [
+        {
+          "name": "constant.numeric.shaderlab",
+          "match": "\\b([0-9]+\\.?[0-9]*)\\b"
+        }
+      ]
     }
   }
-}
+}

data/grammars/source.shell.json

@@ -1,32 +1,6 @@
 {
-  "scopeName": "source.shell",
   "name": "Shell Script",
-  "fileTypes": [
-    "sh",
-    "bash",
-    "ksh",
-    "zsh",
-    "zsh-theme",
-    "zshenv",
-    "zlogin",
-    "zlogout",
-    "zprofile",
-    "zshrc",
-    "bashrc",
-    "bash_aliases",
-    "bash_profile",
-    "bash_login",
-    "profile",
-    "bash_logout",
-    ".textmate_init",
-    "npmrc",
-    "PKGBUILD",
-    "install",
-    "cygport",
-    "bats",
-    "ebuild"
-  ],
-  "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  (?:bash|zsh|sh|tcsh|ksh|dash|ash|csh|rc)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    (?:shell-script|sh)\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    sh\n  (?=\\s|:|$)\n)",
+  "scopeName": "source.shell",
   "patterns": [
     {
       "include": "#comment"
@@ -78,33 +52,18 @@
     "case-clause": {
       "patterns": [
         {
+          "name": "meta.scope.case-clause.shell",
           "begin": "(?=\\S)",
           "end": ";;",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.terminator.case-clause.shell"
-            }
-          },
-          "name": "meta.scope.case-clause.shell",
           "patterns": [
             {
+              "name": "meta.scope.case-pattern.shell",
               "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": [
                 {
-                  "match": "\\|",
-                  "name": "punctuation.separator.pipe-sign.shell"
+                  "name": "punctuation.separator.pipe-sign.shell",
+                  "match": "\\|"
                 },
                 {
                   "include": "#string"
@@ -118,144 +77,166 @@
                 {
                   "include": "#pathname"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.case-pattern.shell"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.case-pattern.shell"
+                }
+              }
             },
             {
-              "begin": "(?<=\\))",
-              "end": "(?=;;)",
               "name": "meta.scope.case-clause-body.shell",
+              "begin": "(?\u003c=\\))",
+              "end": "(?=;;)",
               "patterns": [
                 {
                   "include": "$self"
                 }
               ]
             }
-          ]
+          ],
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.terminator.case-clause.shell"
+            }
+          }
         }
       ]
     },
     "comment": {
-      "begin": "(^\\s+)?(?<=^|\\W)(?=#)(?!#{)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.shell"
-        }
-      },
+      "begin": "(^\\s+)?(?\u003c=^|\\W)(?=#)(?!#{)",
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.shebang.shell",
           "begin": "#!",
+          "end": "$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.shebang.shell"
             }
-          },
-          "end": "$",
-          "name": "comment.line.number-sign.shebang.shell"
+          }
         },
         {
+          "name": "comment.line.number-sign.shell",
           "begin": "#",
+          "end": "$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.shell"
             }
-          },
-          "end": "$",
-          "name": "comment.line.number-sign.shell"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.shell"
+        }
+      }
     },
     "compound-command": {
       "patterns": [
         {
+          "name": "meta.scope.logical-expression.shell",
           "begin": "\\[{1,2}",
+          "end": "\\]{1,2}",
+          "patterns": [
+            {
+              "include": "#logical-expression"
+            },
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.logical-expression.shell"
             }
           },
-          "end": "\\]{1,2}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.logical-expression.shell"
             }
-          },
-          "name": "meta.scope.logical-expression.shell",
-          "patterns": [
-            {
-              "include": "#logical-expression"
-            },
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
+          "name": "string.other.math.shell",
           "begin": "\\({2}",
+          "end": "\\){2}",
+          "patterns": [
+            {
+              "include": "#math"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "\\){2}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
-          "name": "string.other.math.shell",
-          "patterns": [
-            {
-              "include": "#math"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.scope.subshell.shell",
           "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.subshell.shell"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.subshell.shell"
             }
-          },
-          "name": "meta.scope.subshell.shell",
+          }
+        },
+        {
+          "name": "meta.scope.group.shell",
+          "begin": "(?\u003c=\\s|^){(?=\\s|$)",
+          "end": "(?\u003c=^|;)\\s*(})",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=\\s|^){(?=\\s|$)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.shell"
             }
           },
-          "end": "(?<=^|;)\\s*(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.group.shell"
             }
-          },
-          "name": "meta.scope.group.shell",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "function-definition": {
       "patterns": [
         {
-          "begin": "(?<=^|;|&|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+          "name": "meta.function.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+          "end": ";|\u0026|$",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.shell"
@@ -267,21 +248,21 @@
               "name": "punctuation.definition.arguments.shell"
             }
           },
-          "end": ";|&|$",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.function.shell"
             }
-          },
+          }
+        },
+        {
           "name": "meta.function.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
+          "end": ";|\u0026|$",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=^|;|&|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.shell"
@@ -290,49 +271,26 @@
               "name": "punctuation.definition.arguments.shell"
             }
           },
-          "end": ";|&|$",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.function.shell"
             }
-          },
-          "name": "meta.function.shell",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "heredoc": {
       "patterns": [
         {
-          "begin": "(<<)-(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.heredoc.shell"
-            },
-            "3": {
-              "name": "keyword.control.heredoc-token.shell"
-            }
-          },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(RUBY)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(RUBY)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.ruby"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -341,22 +299,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(RUBY)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.ruby.shell",
           "contentName": "source.ruby.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(RUBY)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(RUBY)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.ruby"
             }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -365,22 +323,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(PYTHON)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(PYTHON)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.python"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -389,22 +347,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(PYTHON)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.python.shell",
           "contentName": "source.python.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(PYTHON)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(PYTHON)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.python"
             }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -413,22 +371,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(APPLESCRIPT)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.applescript"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -437,22 +395,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(APPLESCRIPT)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.applescript.shell",
           "contentName": "source.applescript.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(APPLESCRIPT)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.applescript"
             }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -461,22 +419,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(HTML)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(HTML)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "text.html.basic"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -485,22 +443,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(HTML)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.html.shell",
           "contentName": "text.html.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(HTML)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(HTML)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "text.html.basic"
             }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -509,22 +467,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(MARKDOWN)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(MARKDOWN)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
-              "include": "text.html.markdown"
+              "include": "source.gfm"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -533,22 +491,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(MARKDOWN)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.markdown.shell",
           "contentName": "text.html.markdown.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(MARKDOWN)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(MARKDOWN)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
-              "include": "text.html.markdown"
+              "include": "source.gfm"
             }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -557,22 +515,20 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(TEXTILE)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(TEXTILE)(?=\\s|;|\u0026|$)",
           "patterns": [
-            {
-              "include": "text.html.textile"
-            }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+            {}
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -581,22 +537,20 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(TEXTILE)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.textile.shell",
           "contentName": "text.html.textile.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(TEXTILE)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(TEXTILE)(?=\\s|;|\u0026|$)",
           "patterns": [
-            {
-              "include": "text.html.textile"
-            }
-          ]
-        },
-        {
-          "begin": "(<<)-(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+            {}
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -605,22 +559,22 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "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",
+          "contentName": "source.shell.embedded.shell",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*(SHELL)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^\\t*(\\3)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.shell"
             }
-          ]
-        },
-        {
-          "begin": "(<<)(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -629,22 +583,40 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.unquoted.heredoc.shell.shell",
           "contentName": "source.shell.embedded.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*(SHELL)(?=\\s|;|\u0026|\u003c|\"|')\\2",
+          "end": "^(\\3)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "source.shell"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.heredoc.shell"
+            },
+            "3": {
+              "name": "keyword.control.heredoc-token.shell"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.heredoc-token.shell"
+            }
+          }
         },
         {
-          "begin": "(<<)-(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
+          "name": "string.unquoted.heredoc.no-indent.shell",
+          "begin": "(\u003c\u003c)-(\"|'|)\\s*\\\\?([^;\u0026\u003c\\s]+)\\2",
+          "end": "^\\t*(\\3)(?=\\s|;|\u0026|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -653,16 +625,16 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^\\t*(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
-          "name": "string.unquoted.heredoc.no-indent.shell"
+          }
         },
         {
-          "begin": "(<<)(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
+          "name": "string.unquoted.heredoc.shell",
+          "begin": "(\u003c\u003c)(\"|'|)\\s*\\\\?([^;\u0026\u003c\\s]+)\\2",
+          "end": "^(\\3)(?=\\s|;|\u0026|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -671,20 +643,21 @@
               "name": "keyword.control.heredoc-token.shell"
             }
           },
-          "end": "^(\\3)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.shell"
             }
-          },
-          "name": "string.unquoted.heredoc.shell"
+          }
         }
       ]
     },
     "herestring": {
       "patterns": [
         {
-          "begin": "(<<<)\\s*(('))",
+          "name": "meta.herestring.shell",
+          "contentName": "string.quoted.single.shell",
+          "begin": "(\u003c\u003c\u003c)\\s*(('))",
+          "end": "(')",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.herestring.shell"
@@ -696,7 +669,6 @@
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "(')",
           "endCaptures": {
             "0": {
               "name": "string.quoted.single.shell"
@@ -704,12 +676,13 @@
             "1": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
-          "name": "meta.herestring.shell",
-          "contentName": "string.quoted.single.shell"
+          }
         },
         {
-          "begin": "(<<<)\\s*((\"))",
+          "name": "meta.herestring.shell",
+          "contentName": "string.quoted.double.shell",
+          "begin": "(\u003c\u003c\u003c)\\s*((\"))",
+          "end": "(\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.herestring.shell"
@@ -721,7 +694,6 @@
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "(\")",
           "endCaptures": {
             "0": {
               "name": "string.quoted.double.shell"
@@ -729,11 +701,11 @@
             "1": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
-          "name": "meta.herestring.shell",
-          "contentName": "string.quoted.double.shell"
+          }
         },
         {
+          "name": "meta.herestring.shell",
+          "match": "(\u003c\u003c\u003c)\\s*(([^\\s)\\\\]|\\\\.)+)",
           "captures": {
             "1": {
               "name": "keyword.operator.herestring.shell"
@@ -746,158 +718,162 @@
                 }
               ]
             }
-          },
-          "match": "(<<<)\\s*(([^\\s\\\\]|\\\\.)+)",
-          "name": "meta.herestring.shell"
+          }
         }
       ]
     },
     "interpolation": {
       "patterns": [
         {
+          "name": "string.other.math.shell",
           "begin": "\\$\\({2}",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.shell"
-            }
-          },
           "end": "\\){2}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.shell"
-            }
-          },
-          "name": "string.other.math.shell",
           "patterns": [
             {
               "include": "#math"
             }
-          ]
-        },
-        {
-          "begin": "`",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.backtick.shell",
+          "begin": "`",
+          "end": "`",
           "patterns": [
             {
-              "match": "\\\\[`\\\\$]",
-              "name": "constant.character.escape.shell"
+              "name": "constant.character.escape.shell",
+              "match": "\\\\[`\\\\$]"
             },
             {
-              "begin": "(?<=\\W)(?=#)(?!#{)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.whitespace.comment.leading.shell"
-                }
-              },
+              "begin": "(?\u003c=\\W)(?=#)(?!#{)",
               "end": "(?!\\G)",
               "patterns": [
                 {
+                  "name": "comment.line.number-sign.shell",
                   "begin": "#",
+                  "end": "(?=`)",
                   "beginCaptures": {
                     "0": {
                       "name": "punctuation.definition.comment.shell"
                     }
-                  },
-                  "end": "(?=`)",
-                  "name": "comment.line.number-sign.shell"
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.whitespace.comment.leading.shell"
+                }
+              }
             },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "\\$\\(",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.dollar.shell",
+          "begin": "\\$\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.shell"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.shell"
+            }
+          }
         }
       ]
     },
     "keyword": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
-          "name": "keyword.control.shell"
+          "name": "keyword.control.shell",
+          "match": "(?\u003c=^|;|\u0026|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|\u0026|$)"
         },
         {
-          "match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
-          "name": "storage.modifier.shell"
+          "name": "storage.modifier.shell",
+          "match": "(?\u003c=^|;|\u0026|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|\u0026|$)"
         }
       ]
     },
     "list": {
       "patterns": [
         {
-          "match": ";|&&|&|\\|\\|",
-          "name": "keyword.operator.list.shell"
+          "name": "keyword.operator.list.shell",
+          "match": ";|\u0026\u0026|\u0026|\\|\\|"
         }
       ]
     },
     "logical-expression": {
       "patterns": [
         {
-          "comment": "do we want a special rule for ( expr )?",
-          "match": "=[=~]?|!=?|<|>|&&|\\|\\|",
-          "name": "keyword.operator.logical.shell"
+          "name": "keyword.operator.logical.shell",
+          "match": "=[=~]?|!=?|\u003c|\u003e|\u0026\u0026|\\|\\|"
         },
         {
-          "match": "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])",
-          "name": "keyword.operator.logical.shell"
+          "name": "keyword.operator.logical.shell",
+          "match": "(?\u003c!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])"
         }
       ]
     },
     "loop": {
       "patterns": [
         {
-          "begin": "(?<=^|;|&|\\s)(for)\\s+(?=\\({2})",
+          "name": "meta.scope.for-loop.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)(for)\\s+(?=\\({2})",
+          "end": "(?\u003c=^|;|\u0026|\\s)done(?=\\s|;|\u0026|$)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
             }
-          },
-          "name": "meta.scope.for-loop.shell",
+          }
+        },
+        {
+          "name": "meta.scope.for-in-loop.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)(for)\\s+(.+?)\\s+(in)(?=\\s|;|\u0026|$)",
+          "end": "(?\u003c=^|;|\u0026|\\s)done(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=^|;|&|\\s)(for)\\s+(.+?)\\s+(in)(?=\\s|;|&|$)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -914,41 +890,41 @@
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
             }
-          },
-          "name": "meta.scope.for-in-loop.shell",
+          }
+        },
+        {
+          "name": "meta.scope.while-loop.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)(while|until)(?=\\s|;|\u0026|$)",
+          "end": "(?\u003c=^|;|\u0026|\\s)done(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=^|;|&|\\s)(while|until)(?=\\s|;|&|$)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
             }
-          },
-          "name": "meta.scope.while-loop.shell",
+          }
+        },
+        {
+          "name": "meta.scope.select-block.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)(select)\\s+((?:[^\\s\\\\]|\\\\.)+)(?=\\s|;|\u0026|$)",
+          "end": "(?\u003c=^|;|\u0026|\\s)(done)(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=^|;|&|\\s)(select)\\s+((?:[^\\s\\\\]|\\\\.)+)(?=\\s|;|&|$)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -957,43 +933,21 @@
               "name": "variable.other.loop.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
-          },
-          "name": "meta.scope.select-block.shell",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
-          "begin": "(?<=^|;|&|\\s)case(?=\\s|;|&|$)",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.shell"
-            }
-          },
-          "end": "(?<=^|;|&|\\s)esac(?=\\s|;|&|$)",
-          "endCaptures": {
-            "0": {
-              "name": "keyword.control.shell"
-            }
-          },
           "name": "meta.scope.case-block.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)case(?=\\s|;|\u0026|$)",
+          "end": "(?\u003c=^|;|\u0026|\\s)esac(?=\\s|;|\u0026|$)",
           "patterns": [
             {
-              "begin": "(?<=^|;|&|\\s)in(?=\\s|;|&|$)",
-              "beginCaptures": {
-                "0": {
-                  "name": "keyword.control.shell"
-                }
-              },
-              "end": "(?<=^|;|&|\\s)(?=esac(\\s|;|&|$))",
               "name": "meta.scope.case-body.shell",
+              "begin": "(?\u003c=^|;|\u0026|\\s)in(?=\\s|;|\u0026|$)",
+              "end": "(?\u003c=^|;|\u0026|\\s)(?=esac(\\s|;|\u0026|$))",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1004,32 +958,47 @@
                 {
                   "include": "$self"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword.control.shell"
+                }
+              }
             },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=^|;|&|\\s)if(?=\\s|;|&|$)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)fi(?=\\s|;|&|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
             }
-          },
+          }
+        },
+        {
           "name": "meta.scope.if-block.shell",
+          "begin": "(?\u003c=^|;|\u0026|\\s)if(?=\\s|;|\u0026|$)",
+          "end": "(?\u003c=^|;|\u0026|\\s)fi(?=\\s|;|\u0026|$)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.shell"
+            }
+          }
         }
       ]
     },
@@ -1039,39 +1008,46 @@
           "include": "#variable"
         },
         {
-          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
-          "name": "keyword.operator.arithmetic.shell"
+          "name": "keyword.operator.arithmetic.shell",
+          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|\u003c[\u003c=]?|\u003e[\u003e=]?|==|!=|^|\\|{1,2}|\u0026{1,2}|\\?|\\:|,|=|[*/%+\\-\u0026^|]=|\u003c\u003c=|\u003e\u003e="
         },
         {
-          "match": "0[xX][0-9A-Fa-f]+",
-          "name": "constant.numeric.hex.shell"
+          "name": "constant.numeric.hex.shell",
+          "match": "0[xX][0-9A-Fa-f]+"
         },
         {
-          "match": "0\\d+",
-          "name": "constant.numeric.octal.shell"
+          "name": "constant.numeric.octal.shell",
+          "match": "0\\d+"
         },
         {
-          "match": "\\d{1,2}#[0-9a-zA-Z@_]+",
-          "name": "constant.numeric.other.shell"
+          "name": "constant.numeric.other.shell",
+          "match": "\\d{1,2}#[0-9a-zA-Z@_]+"
         },
         {
-          "match": "\\d+",
-          "name": "constant.numeric.integer.shell"
+          "name": "constant.numeric.integer.shell",
+          "match": "\\d+"
         }
       ]
     },
     "pathname": {
       "patterns": [
         {
-          "match": "(?<=\\s|:|=|^)~",
-          "name": "keyword.operator.tilde.shell"
+          "name": "keyword.operator.tilde.shell",
+          "match": "(?\u003c=\\s|:|=|^)~"
         },
         {
-          "match": "\\*|\\?",
-          "name": "keyword.operator.glob.shell"
+          "name": "keyword.operator.glob.shell",
+          "match": "\\*|\\?"
         },
         {
+          "name": "meta.structure.extglob.shell",
           "begin": "([?*+@!])(\\()",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.extglob.shell"
@@ -1080,100 +1056,83 @@
               "name": "punctuation.definition.extglob.shell"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.extglob.shell"
             }
-          },
-          "name": "meta.structure.extglob.shell",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "pipeline": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(time)(?=\\s|;|&|$)",
-          "name": "keyword.other.shell"
+          "name": "keyword.other.shell",
+          "match": "(?\u003c=^|;|\u0026|\\s)(time)(?=\\s|;|\u0026|$)"
         },
         {
-          "match": "[|!]",
-          "name": "keyword.operator.pipe.shell"
+          "name": "keyword.operator.pipe.shell",
+          "match": "[|!]"
         }
       ]
     },
     "redirection": {
       "patterns": [
         {
-          "begin": "[><]\\(",
+          "name": "string.interpolated.process-substitution.shell",
+          "begin": "[\u003e\u003c]\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
-          "name": "string.interpolated.process-substitution.shell",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
-          "match": "(?<![<>])(&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>)(?![<>])",
-          "name": "keyword.operator.redirect.shell"
+          "name": "keyword.operator.redirect.shell",
+          "match": "(?\u003c![\u003c\u003e])(\u0026\u003e|\\d*\u003e\u0026\\d*|\\d*(\u003e\u003e|\u003e|\u003c)|\\d*\u003c\u0026|\\d*\u003c\u003e)(?![\u003c\u003e])"
         }
       ]
     },
     "string": {
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.shell"
+          "name": "constant.character.escape.shell",
+          "match": "\\\\."
         },
         {
+          "name": "string.quoted.single.shell",
           "begin": "'",
+          "end": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
-          "name": "string.quoted.single.shell"
+          }
         },
         {
+          "name": "string.quoted.double.shell",
           "begin": "\\$?\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.shell"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.shell"
-            }
-          },
-          "name": "string.quoted.double.shell",
           "patterns": [
             {
-              "match": "\\\\[\\$`\"\\\\\\n]",
-              "name": "constant.character.escape.shell"
+              "name": "constant.character.escape.shell",
+              "match": "\\\\[\\$`\"\\\\\\n]"
             },
             {
               "include": "#variable"
@@ -1181,104 +1140,105 @@
             {
               "include": "#interpolation"
             }
-          ]
-        },
-        {
-          "begin": "\\$'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.shell"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.shell"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.dollar.shell",
+          "begin": "\\$'",
+          "end": "'",
           "patterns": [
             {
-              "match": "\\\\(a|b|e|f|n|r|t|v|\\\\|')",
-              "name": "constant.character.escape.ansi-c.shell"
+              "name": "constant.character.escape.ansi-c.shell",
+              "match": "\\\\(a|b|e|f|n|r|t|v|\\\\|')"
             },
             {
-              "match": "\\\\[0-9]{3}",
-              "name": "constant.character.escape.octal.shell"
+              "name": "constant.character.escape.octal.shell",
+              "match": "\\\\[0-9]{3}"
             },
             {
-              "match": "\\\\x[0-9a-fA-F]{2}",
-              "name": "constant.character.escape.hex.shell"
+              "name": "constant.character.escape.hex.shell",
+              "match": "\\\\x[0-9a-fA-F]{2}"
             },
             {
-              "match": "\\\\c.",
-              "name": "constant.character.escape.control-char.shell"
+              "name": "constant.character.escape.control-char.shell",
+              "match": "\\\\c."
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.shell"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.shell"
+            }
+          }
         }
       ]
     },
     "support": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
-          "name": "support.function.builtin.shell"
+          "name": "support.function.builtin.shell",
+          "match": "(?\u003c=^|;|\u0026|\\s)(?::|\\.)(?=\\s|;|\u0026|$)"
         },
         {
-          "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"
+          "name": "support.function.builtin.shell",
+          "match": "(?\u003c=^|;|\u0026|\\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|;|\u0026|$)"
         }
       ]
     },
     "variable": {
       "patterns": [
         {
+          "name": "variable.other.normal.shell",
+          "match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.shell"
             }
-          },
-          "match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
-          "name": "variable.other.normal.shell"
+          }
         },
         {
+          "name": "variable.other.special.shell",
+          "match": "(\\$)[-*@#?$!0_]",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.shell"
             }
-          },
-          "match": "(\\$)[-*@#?$!0_]",
-          "name": "variable.other.special.shell"
+          }
         },
         {
+          "name": "variable.other.positional.shell",
+          "match": "(\\$)[1-9]",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.shell"
             }
-          },
-          "match": "(\\$)[1-9]",
-          "name": "variable.other.positional.shell"
+          }
         },
         {
+          "name": "variable.other.bracket.shell",
           "begin": "\\${",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.variable.shell"
-            }
-          },
           "end": "}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.variable.shell"
-            }
-          },
-          "name": "variable.other.bracket.shell",
           "patterns": [
             {
-              "match": "!|:[-=?]?|\\*|@|#{1,2}|%{1,2}|/",
-              "name": "keyword.operator.expansion.shell"
+              "name": "keyword.operator.expansion.shell",
+              "match": "!|:[-=?]?|\\*|@|#{1,2}|%{1,2}|/"
             },
             {
+              "match": "(\\[)([^\\]]+)(\\])",
               "captures": {
                 "1": {
                   "name": "punctuation.section.array.shell"
@@ -1286,8 +1246,7 @@
                 "3": {
                   "name": "punctuation.section.array.shell"
                 }
-              },
-              "match": "(\\[)([^\\]]+)(\\])"
+              }
             },
             {
               "include": "#variable"
@@ -1295,9 +1254,19 @@
             {
               "include": "#string"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.variable.shell"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.variable.shell"
+            }
+          }
         }
       ]
     }
   }
-}
+}