github-linguist 5.3.3 → 6.0.0

data/grammars/source.ox.json

@@ -1,97 +1,89 @@
 {
-  "fileTypes": [
-    "ox"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? C -[*]-",
-  "foldingStartMarker": "(?x)\n\t\t /\\*\\*(?!\\*)\n\t\t|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))\n\t",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~C",
   "name": "Ox",
+  "scopeName": "source.ox",
   "patterns": [
     {
       "include": "#comments"
     },
     {
-      "match": "\\b(break|case|continue|default|delete|do|else|for|new|parallel for|foreach|goto|if|_Pragma|return|switch|switch_single|while)\\b",
-      "name": "keyword.control.ox"
+      "name": "keyword.control.ox",
+      "match": "\\b(break|case|continue|default|delete|do|else|for|new|parallel for|foreach|goto|if|_Pragma|return|switch|switch_single|while)\\b"
     },
     {
-      "match": "\\b(array|char|class|const|decl|double|enum|extern|int|matrix|static|serial|string|struct)\\b",
-      "name": "storage.type.ox"
+      "name": "storage.type.ox",
+      "match": "\\b(array|char|class|const|decl|double|enum|extern|int|matrix|static|serial|string|struct)\\b"
     },
     {
-      "match": "^\\s*.\\s*(.NaN|.Inf|TRUE|FALSE)\\b",
-      "name": "constant.language.ox"
+      "name": "constant.language.ox",
+      "match": "^\\s*.\\s*(.NaN|.Inf|TRUE|FALSE)\\b"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.ox"
+      "name": "constant.numeric.ox",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
+      "name": "string.quoted.double.ox",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#string_escaped_char"
+        },
+        {
+          "include": "#string_placeholder"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ox"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ox"
         }
-      },
-      "name": "string.quoted.double.ox",
-      "patterns": [
-        {
-          "include": "#string_escaped_char"
-        },
-        {
-          "include": "#string_placeholder"
-        }
-      ]
+      }
     },
     {
       "begin": "^\\s*#\\s*(include|import|pragma)\\b\\s+",
+      "end": "(?=(?://|/\\*))|$",
       "captures": {
         "1": {
           "name": "keyword.control.import.include.ox"
         }
-      },
-      "end": "(?=(?://|/\\*))|$"
+      }
     }
   ],
   "repository": {
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.ox",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.ox"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.ox"
+          }
         },
         {
+          "name": "comment.line.double-slash.ox",
           "begin": "//",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.ox"
-            }
-          },
           "end": "$\\n?",
-          "name": "comment.line.double-slash.ox",
           "patterns": [
             {
-              "match": "(?>\\\\\\s*\\n)",
-              "name": "punctuation.separator.continuation.ox"
+              "name": "punctuation.separator.continuation.ox",
+              "match": "(?\u003e\\\\\\s*\\n)"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.ox"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.ox",
-  "uuid": "967c730b-e53a-457c-8ca1-dbacc58ff292"
-}
+  }
+}

data/grammars/source.oz.json

@@ -1,50 +1,47 @@
 {
-  "fileTypes": [
-    "oz"
-  ],
-  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~O",
   "name": "Oz",
+  "scopeName": "source.oz",
   "patterns": [
     {
-      "match": "(%).*$\\n?",
-      "name": "comment.line.percentage.oz"
+      "name": "comment.line.percentage.oz",
+      "match": "(%).*$\\n?"
     },
     {
+      "name": "comment.block.documentation.oz",
       "begin": "/\\*",
-      "end": "\\*/",
-      "name": "comment.block.documentation.oz"
+      "end": "\\*/"
     },
     {
-      "match": "(?x)\\b(\n                andthen|at|attr|case|catch|class|choice|cond|\n                declare|define|do|dis|else|elsecase|elseif|\n                end|export|feat|finally|for|from|fun|functor|\n                if|in|import|lex|local|lock|meth|mode|not|of|\n                or|orelse|parser|prepare|proc|prod|prop|raise|require|\n                scanner|skip|syn|then|thread|token|try)\\b\n            |\n                ^\\s*\\[\\]",
-      "name": "keyword.control.oz"
+      "name": "keyword.control.oz",
+      "match": "(?x)\\b(\n                andthen|at|attr|case|catch|class|choice|cond|\n                declare|define|do|dis|else|elsecase|elseif|\n                end|export|feat|finally|for|from|fun|functor|\n                if|in|import|lex|local|lock|meth|mode|not|of|\n                or|orelse|parser|prepare|proc|prod|prop|raise|require|\n                scanner|skip|syn|then|thread|token|try)\\b\n            |\n                ^\\s*\\[\\]"
     },
     {
-      "match": "=|:=",
-      "name": "keyword.operator.assignement.oz"
+      "name": "keyword.operator.assignement.oz",
+      "match": "=|:="
     },
     {
-      "match": "<|=<|==|\\\\=|>=|>",
-      "name": "keyword.operator.comparison.oz"
+      "name": "keyword.operator.comparison.oz",
+      "match": "\u003c|=\u003c|==|\\\\=|\u003e=|\u003e"
     },
     {
-      "match": "(\\*|\\+|\\-|/|~)|\\b(div|mod)\\b",
-      "name": "keyword.operator.arithmetic.oz"
+      "name": "keyword.operator.arithmetic.oz",
+      "match": "(\\*|\\+|\\-|/|~)|\\b(div|mod)\\b"
     },
     {
-      "match": "\\b(\\d+)\\b",
-      "name": "constant.numeric.oz"
+      "name": "constant.numeric.oz",
+      "match": "\\b(\\d+)\\b"
     },
     {
-      "match": "\\b(nil|true|false)\\b",
-      "name": "constant.language.oz"
+      "name": "constant.language.oz",
+      "match": "\\b(nil|true|false)\\b"
     },
     {
-      "match": "\\b\\|\\b",
-      "name": "keyword.operator.list.oz"
+      "name": "keyword.operator.list.oz",
+      "match": "\\b\\|\\b"
     },
     {
+      "name": "meta.function.oz",
+      "match": "(?x)\n\t\t\t         \\b(fun|proc)\\b\\s+\n\t\t\t         \\{(\\w+)\n\t\t\t            ((?:\\s\\w+)*)\n\t\t\t         \\}",
       "captures": {
         "1": {
           "name": "keyword.control.proc.oz"
@@ -55,30 +52,26 @@
         "3": {
           "name": "variable.parameter.function.oz"
         }
-      },
-      "match": "(?x)\n\t\t\t         \\b(fun|proc)\\b\\s+\n\t\t\t         \\{(\\w+)\n\t\t\t            ((?:\\s\\w+)*)\n\t\t\t         \\}",
-      "name": "meta.function.oz"
+      }
     },
     {
-      "match": "\\[|\\]",
-      "name": "punctuation.section.array.oz"
+      "name": "punctuation.section.array.oz",
+      "match": "\\[|\\]"
     },
     {
+      "name": "string.quoted.simple.oz",
       "begin": "'",
       "end": "'",
-      "name": "string.quoted.simple.oz",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.oz"
+          "name": "constant.character.escape.oz",
+          "match": "\\\\."
         }
       ]
     },
     {
-      "match": "(@)[A-Z]\\w*",
-      "name": "variable.other.readwrite.cell.oz"
+      "name": "variable.other.readwrite.cell.oz",
+      "match": "(@)[A-Z]\\w*"
     }
-  ],
-  "scopeName": "source.oz",
-  "uuid": "05EF5C4D-C314-43F7-80A6-7E255931EA2C"
-}
+  ]
+}

data/grammars/source.p4.json

@@ -1,132 +1,122 @@
 {
-  "scopeName": "source.p4",
   "name": "P4",
-  "fileTypes": [
-    "p4"
-  ],
+  "scopeName": "source.p4",
   "patterns": [
     {
+      "name": "comment.block.p4",
       "begin": "/\\*",
+      "end": "\\*/",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.block.begin.p4"
         }
       },
-      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.block.end.p4"
         }
-      },
-      "name": "comment.block.p4"
+      }
     },
     {
+      "name": "string.quoted.double.p4",
       "begin": "\"",
+      "end": "\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.p4"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.p4"
         }
-      },
-      "name": "string.quoted.double.p4"
+      }
     },
     {
+      "name": "comment.line.p4",
       "begin": "//",
+      "end": "\\n",
       "beginCaptures": {
         "0": {
           "name": "comment.p4"
         }
-      },
-      "end": "\\n",
-      "name": "comment.line.p4"
+      }
     },
     {
-      "match": "\\b(header_type|header|metadata|field_list|field_list_calculation|parser|parser_exception|parser_value_set|counter|meter|register|action|action_profile|table|control|extern)\\b",
-      "name": "storage.type.object.p4"
+      "name": "storage.type.object.p4",
+      "match": "\\b(header_type|header|metadata|field_list|field_list_calculation|parser|parser_exception|parser_value_set|counter|meter|register|action|action_profile|table|control|extern)\\b"
     },
     {
-      "match": "\\b(bool|bit|varbit|int)\\b",
-      "name": "storage.data.type.p4"
+      "name": "storage.data.type.p4",
+      "match": "\\b(bool|bit|varbit|int)\\b"
     },
     {
-      "match": "\\b(hit|miss|latest|return|default)\\b",
-      "name": "variable.language.p4"
+      "name": "variable.language.p4",
+      "match": "\\b(hit|miss|latest|return|default)\\b"
     },
     {
-      "match": "\\b(if|else if|else|return|hit|miss|true|false)\\b",
-      "name": "keyword.control.p4"
+      "name": "keyword.control.p4",
+      "match": "\\b(if|else if|else|return|hit|miss|true|false)\\b"
     },
     {
-      "match": "\\b(and|or)\\b",
-      "name": "keyword.operator.p4"
+      "name": "keyword.operator.p4",
+      "match": "\\b(and|or)\\b"
     },
     {
-      "match": "\\b(exact|ternary|lpm|range|valid|mask)\\b",
-      "comment": "table field match type",
-      "name": "entity.name.type.p4"
+      "name": "entity.name.type.p4",
+      "match": "\\b(exact|ternary|lpm|range|valid|mask)\\b"
     },
     {
-      "match": "\\b(reads|actions|min_size|max_size|size|support_timeout|action_profile)\\b",
-      "comment": "table elements",
-      "name": "storage.type.p4"
+      "name": "storage.type.p4",
+      "match": "\\b(reads|actions|min_size|max_size|size|support_timeout|action_profile)\\b"
     },
     {
-      "match": "\\b(bytes|packets)\\b",
-      "comment": "counter/meter/register types",
-      "name": "storage.type.p4"
+      "name": "storage.type.p4",
+      "match": "\\b(bytes|packets)\\b"
     },
     {
-      "match": "\\b(width|layout|attributes|type|static|result|direct|instance_count|min_width|saturating)\\b",
-      "comment": "counter/meter/register fields",
-      "name": "entity.name.type.p4"
+      "name": "entity.name.type.p4",
+      "match": "\\b(width|layout|attributes|type|static|result|direct|instance_count|min_width|saturating)\\b"
     },
     {
-      "match": "\\b(length|fields|max_length)\\b",
-      "comment": "header fields",
-      "name": "entity.name.type.p4"
+      "name": "entity.name.type.p4",
+      "match": "\\b(length|fields|max_length)\\b"
     },
     {
-      "match": "\\#include",
-      "name": "meta.preprocessor.include.p4"
+      "name": "meta.preprocessor.include.p4",
+      "match": "\\#include"
     },
     {
-      "match": "\\#define",
-      "name": "meta.preprocessor.define.p4"
+      "name": "meta.preprocessor.define.p4",
+      "match": "\\#define"
     },
     {
-      "match": "\\b(apply|valid|select|current|extract|add_header|copy_header|remove_header|modify_field|add_to_field|add|set_field_to_hash_index|truncate|drop|no_op|push|pop|count|meter|generate_digest|resubmit|recirculate|clone_ingress_pkt_to_ingress|clone_egress_pkt_to_ingress|clone_ingress_pkt_to_egress|clone_egress_pkt_to_egress|register_write|register_read)\\b",
-      "comment": "primitive actions/builtin functions",
-      "name": "support.function.primitive.p4"
+      "name": "support.function.primitive.p4",
+      "match": "\\b(apply|valid|select|current|extract|add_header|copy_header|remove_header|modify_field|add_to_field|add|set_field_to_hash_index|truncate|drop|no_op|push|pop|count|meter|generate_digest|resubmit|recirculate|clone_ingress_pkt_to_ingress|clone_egress_pkt_to_ingress|clone_ingress_pkt_to_egress|clone_egress_pkt_to_egress|register_write|register_read)\\b"
     },
     {
-      "match": "[a-zA-Z_][0-9a-zA-Z_]*",
-      "name": "support.any-method.p4"
+      "name": "support.any-method.p4",
+      "match": "[a-zA-Z_][0-9a-zA-Z_]*"
     },
     {
-      "match": "[\\+|-]?[0-9]+'[0-9]+",
-      "comment": "const value",
-      "name": "constant.numeric.p4"
+      "name": "constant.numeric.p4",
+      "match": "[\\+|-]?[0-9]+'[0-9]+"
     },
     {
-      "match": "0(x|X)[0-9a-fA-F]+",
-      "name": "constant.numeric.p4"
+      "name": "constant.numeric.p4",
+      "match": "0(x|X)[0-9a-fA-F]+"
     },
     {
-      "match": "0(b|B)[01]+",
-      "name": "constant.numeric.p4"
+      "name": "constant.numeric.p4",
+      "match": "0(b|B)[01]+"
     },
     {
-      "match": "[0-9]+",
-      "name": "constant.numeric.p4"
+      "name": "constant.numeric.p4",
+      "match": "[0-9]+"
     },
     {
-      "match": "\\b(true|false)\\b",
-      "name": "constant.language.p4"
+      "name": "constant.language.p4",
+      "match": "\\b(true|false)\\b"
     }
   ]
-}
+}

data/grammars/source.pan.json

@@ -1,10 +1,6 @@
 {
-  "scopeName": "source.pan",
   "name": "Pan Template",
-  "fileTypes": [
-    "pan"
-  ],
-  "firstLineMatch": "^s*(declaration|object|structure|unique)?s+templates",
+  "scopeName": "source.pan",
   "patterns": [
     {
       "include": "#comment"
@@ -50,31 +46,48 @@
     }
   ],
   "repository": {
-    "case-clause": {
+    "annotation": {
       "patterns": [
         {
-          "begin": "(?=\\S)",
-          "end": ";;",
-          "endCaptures": {
+          "name": "comment.block.documentation.annotation.pan",
+          "begin": "@(\\w*){",
+          "end": "(})",
+          "captures": {
             "0": {
-              "name": "punctuation.terminator.case-clause.pan"
+              "name": "punctuation.definition.comment.pan"
             }
           },
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.comment.annotation.token.pan"
+            },
+            "1": {
+              "name": "keyword.operator.comment.annotation.name.pan"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.annotation-token.pan"
+            }
+          }
+        }
+      ]
+    },
+    "case-clause": {
+      "patterns": [
+        {
           "name": "meta.scope.case-clause.pan",
+          "begin": "(?=\\S)",
+          "end": ";;",
           "patterns": [
             {
+              "name": "meta.scope.case-pattern.pan",
               "begin": "(\\(|(?=\\S))",
-              "captures": {
-                "0": {
-                  "name": "punctuation.definition.case-pattern.pan"
-                }
-              },
               "end": "\\)",
-              "name": "meta.scope.case-pattern.pan",
               "patterns": [
                 {
-                  "match": "\\|",
-                  "name": "punctuation.separator.pipe-sign.pan"
+                  "name": "punctuation.separator.pipe-sign.pan",
+                  "match": "\\|"
                 },
                 {
                   "include": "#string"
@@ -85,64 +98,69 @@
                 {
                   "include": "#pathname"
                 }
-              ]
+              ],
+              "captures": {
+                "0": {
+                  "name": "punctuation.definition.case-pattern.pan"
+                }
+              }
             },
             {
-              "begin": "(?<=\\))",
-              "end": "(?=;;)",
               "name": "meta.scope.case-clause-body.pan",
+              "begin": "(?\u003c=\\))",
+              "end": "(?=;;)",
               "patterns": [
                 {
                   "include": "$self"
                 }
               ]
             }
-          ]
+          ],
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.terminator.case-clause.pan"
+            }
+          }
         }
       ]
     },
     "comment": {
-      "begin": "(^\\s+)?(?<!\\S)(?=#)(?!#\\{)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.pan"
-        }
-      },
+      "begin": "(^\\s+)?(?\u003c!\\S)(?=#)(?!#\\{)",
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.shebang.pan",
           "begin": "#!",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.shebang.pan"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.shebang.pan"
+          }
         },
         {
+          "name": "comment.line.number-sign.pan",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.pan"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.pan"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.pan"
+        }
+      }
     },
     "compound-command": {
       "patterns": [
         {
+          "name": "meta.scope.logical-expression.pan",
           "begin": "(\\[{1,2})",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.logical-expression.pan"
-            }
-          },
           "end": "(\\]{1,2})",
-          "name": "meta.scope.logical-expression.pan",
           "patterns": [
             {
               "include": "#logical-expression"
@@ -150,64 +168,76 @@
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.logical-expression.pan"
+            }
+          }
         },
         {
+          "name": "string.other.math.pan",
           "begin": "(\\({2})",
+          "end": "(\\){2})",
+          "patterns": [
+            {
+              "include": "#math"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.pan"
             }
           },
-          "end": "(\\){2})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.pan"
             }
-          },
-          "name": "string.other.math.pan",
-          "patterns": [
-            {
-              "include": "#math"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.scope.subpan.pan",
           "begin": "(\\()",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.subpan.pan"
-            }
-          },
           "end": "(\\))",
-          "name": "meta.scope.subpan.pan",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<=\\s|^)(\\{)(?=\\s|$)",
+          ],
           "captures": {
             "1": {
-              "name": "punctuation.definition.group.pan"
+              "name": "punctuation.definition.subpan.pan"
             }
-          },
-          "end": "(?<=^|;)\\s*(\\})",
+          }
+        },
+        {
           "name": "meta.scope.group.pan",
+          "begin": "(?\u003c=\\s|^)(\\{)(?=\\s|$)",
+          "end": "(?\u003c=^|;)\\s*(\\})",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.group.pan"
+            }
+          }
         }
       ]
     },
     "function-definition": {
       "patterns": [
         {
+          "name": "meta.function.pan",
           "begin": "\\b(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+          "end": ";|\u0026|$",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.pan"
@@ -219,25 +249,25 @@
               "name": "punctuation.definition.arguments.pan"
             }
           },
-          "end": ";|&|$",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.function.pan"
             }
-          },
-          "name": "meta.function.pan",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "heredoc": {
       "patterns": [
         {
-          "begin": "(<<)(\"|'|)\\\\?(\\w+)\\2",
+          "name": "string.unquoted.heredoc.pan",
+          "begin": "(\u003c\u003c)(\"|'|)\\\\?(\\w+)\\2",
+          "end": "^(\\3)\\b",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.string.pan"
+            }
+          },
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.pan"
@@ -246,112 +276,80 @@
               "name": "keyword.control.heredoc-token.pan"
             }
           },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.string.pan"
-            }
-          },
-          "end": "^(\\3)\\b",
           "endCaptures": {
             "1": {
               "name": "keyword.control.heredoc-token.pan"
             }
-          },
-          "name": "string.unquoted.heredoc.pan"
+          }
         }
       ]
     },
     "keyword": {
       "patterns": [
         {
-          "match": "(?<!-)\\b(if|else|for|foreach|while|return)\\b(?!-)",
-          "name": "keyword.control.pan"
+          "name": "keyword.control.pan",
+          "match": "(?\u003c!-)\\b(if|else|for|foreach|while|return)\\b(?!-)"
         },
         {
-          "match": "\\b(include)\\b",
-          "name": "keyword.control.import.include.pan"
+          "name": "keyword.control.import.include.pan",
+          "match": "\\b(include)\\b"
         },
         {
-          "match": "\\b(final)\\b",
-          "name": "storage.modifier.final.pan"
+          "name": "storage.modifier.final.pan",
+          "match": "\\b(final)\\b"
         },
         {
-          "match": "\\b(bind)\\b",
-          "name": "storage.modifier.bind.pan"
-        }
-      ]
-    },
-    "support": {
-      "patterns": [
-        {
-          "match": "\\b(file_contents|file_exists|format|index|length|match|matches|replace|splice|split|substitute|substr|to_lowercase|to_uppercase)\\b",
-          "name": "support.function.pan.string"
-        },
-        {
-          "match": "\\b(debug|error|traceback|deprecated)\\b",
-          "name": "support.function.pan.debugging"
-        },
-        {
-          "match": "\\b(base64_decode|base64_encode|digest|escape|unescape)\\b",
-          "name": "support.function.pan.codec"
-        },
-        {
-          "match": "\\b(append|create|first|dict|key|length|list|merge|next|prepend|splice)\\b",
-          "name": "support.function.pan.resource"
-        },
-        {
-          "match": "\\b(is_boolean|is_defined|is_double|is_list|is_long|is_dict|is_null|is_number|is_property|is_resource|is_string)\\b",
-          "name": "support.function.pan.type.checking"
-        },
-        {
-          "match": "\\b(to_boolean|to_double|to_long|to_string|ip4_to_long|long_to_ip4)\\b",
-          "name": "support.function.pan.type.conversion"
-        },
-        {
-          "match": "\\b(clone|delete|exists|path_exists|if_exists|return|value)\\b",
-          "name": "support.function.pan.misc"
+          "name": "storage.modifier.bind.pan",
+          "match": "\\b(bind)\\b"
         }
       ]
     },
     "list": {
       "patterns": [
         {
-          "match": ";|&&|&|\\|\\|",
-          "name": "keyword.operator.list.pan"
+          "name": "keyword.operator.list.pan",
+          "match": ";|\u0026\u0026|\u0026|\\|\\|"
         }
       ]
     },
     "logical-expression": {
       "patterns": [
         {
-          "match": "&&|\\|\\||==|!=|>|>=|<|<=",
-          "name": "keyword.operator.logical.pan"
+          "name": "keyword.operator.logical.pan",
+          "match": "\u0026\u0026|\\|\\||==|!=|\u003e|\u003e=|\u003c|\u003c="
         },
         {
-          "match": "&|\\|^",
-          "name": "keyword.operator.bitwise.pan"
+          "name": "keyword.operator.bitwise.pan",
+          "match": "\u0026|\\|^"
         }
       ]
     },
     "loop": {
       "patterns": [
         {
+          "name": "meta.scope.for-loop.pan",
           "begin": "\\b(for)\\s+(?=\\({2})",
-          "captures": {
-            "1": {
-              "name": "keyword.control.pan"
-            }
-          },
           "end": "\\b(done)\\b",
-          "name": "meta.scope.for-loop.pan",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.pan"
+            }
+          }
         },
         {
+          "name": "meta.scope.for-in-loop.pan",
           "begin": "\\b(for)\\b\\s+(.+)\\s+\\b(in)\\b",
+          "end": "(?\u003c![-/])\\bdone\\b(?![-/])",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.pan"
@@ -368,36 +366,36 @@
               "name": "keyword.control.pan"
             }
           },
-          "end": "(?<![-/])\\bdone\\b(?![-/])",
           "endCaptures": {
             "0": {
               "name": "keyword.control.pan"
             }
-          },
-          "name": "meta.scope.for-in-loop.pan",
+          }
+        },
+        {
+          "name": "meta.scope.while-loop.pan",
+          "begin": "\\b(while|until)\\b",
+          "end": "\\b(done)\\b",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "\\b(while|until)\\b",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.pan"
             }
-          },
+          }
+        },
+        {
+          "name": "meta.scope.select-block.pan",
+          "begin": "\\b(select)\\s+((?:[^\\s\\\\]|\\\\.)+)\\b",
           "end": "\\b(done)\\b",
-          "name": "meta.scope.while-loop.pan",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "\\b(select)\\s+((?:[^\\s\\\\]|\\\\.)+)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.pan"
@@ -406,38 +404,21 @@
               "name": "variable.other.loop.pan"
             }
           },
-          "end": "\\b(done)\\b",
           "endCaptures": {
             "1": {
               "name": "keyword.control.pan"
             }
-          },
-          "name": "meta.scope.select-block.pan",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
-          "begin": "(?<!-)\\b(case)\\b(?!-)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.pan"
-            }
-          },
-          "end": "\\b(esac)\\b",
           "name": "meta.scope.case-block.pan",
+          "begin": "(?\u003c!-)\\b(case)\\b(?!-)",
+          "end": "\\b(esac)\\b",
           "patterns": [
             {
+              "name": "meta.scope.case-body.pan",
               "begin": "\\b(?:in)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.control.pan"
-                }
-              },
               "end": "(?=\\b(?:esac)\\b)",
-              "name": "meta.scope.case-body.pan",
               "patterns": [
                 {
                   "include": "#comment"
@@ -448,27 +429,37 @@
                 {
                   "include": "$self"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.control.pan"
+                }
+              }
             },
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(?<!-)\\b(if)\\b(?!-|\\s*=)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.pan"
             }
-          },
-          "end": "\\b(fi)\\b",
+          }
+        },
+        {
           "name": "meta.scope.if-block.pan",
+          "begin": "(?\u003c!-)\\b(if)\\b(?!-|\\s*=)",
+          "end": "\\b(fi)\\b",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.pan"
+            }
+          }
         }
       ]
     },
@@ -478,39 +469,46 @@
           "include": "#variable"
         },
         {
-          "match": "[-+*/%]",
-          "name": "keyword.operator.arithmetic.pan"
+          "name": "keyword.operator.arithmetic.pan",
+          "match": "[-+*/%]"
         },
         {
-          "match": "0[xX]\\h+",
-          "name": "constant.numeric.hex.pan"
+          "name": "constant.numeric.hex.pan",
+          "match": "0[xX][[:xdigit:]]+"
         },
         {
-          "match": "0\\d+",
-          "name": "constant.numeric.octal.pan"
+          "name": "constant.numeric.octal.pan",
+          "match": "0\\d+"
         },
         {
-          "match": "\\d{1,2}#[0-9a-zA-Z@_]+",
-          "name": "constant.numeric.other.pan"
+          "name": "constant.numeric.other.pan",
+          "match": "\\d{1,2}#[0-9a-zA-Z@_]+"
         },
         {
-          "match": "\\d+",
-          "name": "constant.numeric.integer.pan"
+          "name": "constant.numeric.integer.pan",
+          "match": "\\d+"
         }
       ]
     },
     "pathname": {
       "patterns": [
         {
-          "match": "(?<=\\s|:|=|^)~",
-          "name": "keyword.operator.tilde.pan"
+          "name": "keyword.operator.tilde.pan",
+          "match": "(?\u003c=\\s|:|=|^)~"
         },
         {
-          "match": "\\*|\\?",
-          "name": "keyword.operator.glob.pan"
+          "name": "keyword.operator.glob.pan",
+          "match": "\\*|\\?"
         },
         {
+          "name": "meta.structure.extglob.pan",
           "begin": "([?*+@!])(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.extglob.pan"
@@ -519,101 +517,83 @@
               "name": "punctuation.definition.extglob.pan"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.extglob.pan"
             }
-          },
-          "name": "meta.structure.extglob.pan",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "pipeline": {
       "patterns": [
         {
-          "match": "\\b(time)\\b",
-          "name": "keyword.other.pan"
+          "name": "keyword.other.pan",
+          "match": "\\b(time)\\b"
         },
         {
-          "match": "[|!]",
-          "name": "keyword.operator.pipe.pan"
+          "name": "keyword.operator.pipe.pan",
+          "match": "[|!]"
         }
       ]
     },
     "redirection": {
       "patterns": [
         {
-          "begin": "[><]\\(",
+          "name": "string.interpolated.process-substitution.pan",
+          "begin": "[\u003e\u003c]\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.pan"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.pan"
             }
-          },
-          "name": "string.interpolated.process-substitution.pan",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
-          "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.pan"
+          "name": "keyword.operator.redirect.pan",
+          "match": "\u0026\u003e|\\d*\u003e\u0026\\d*|\\d*(\u003e\u003e|\u003e|\u003c)|\\d*\u003c\u0026|\\d*\u003c\u003e"
         }
       ]
     },
     "string": {
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.pan"
+          "name": "constant.character.escape.pan",
+          "match": "\\\\."
         },
         {
+          "name": "string.quoted.single.pan",
           "begin": "'",
+          "end": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.pan"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.pan"
             }
-          },
-          "name": "string.quoted.single.pan"
+          }
         },
         {
+          "name": "string.quoted.double.pan",
           "begin": "\\$?\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.pan"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.pan"
-            }
-          },
-          "name": "string.quoted.double.pan",
           "patterns": [
             {
-              "match": "\\\\[\\$`\"\\\\\\n]",
-              "name": "constant.character.escape.pan"
+              "name": "constant.character.escape.pan",
+              "match": "\\\\[\\$`\"\\\\\\n]"
             },
             {
               "include": "#variable"
@@ -621,53 +601,95 @@
             {
               "include": "#interpolation"
             }
-          ]
-        },
-        {
-          "begin": "\\$'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.pan"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.pan"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.dollar.pan",
+          "begin": "\\$'",
+          "end": "'",
           "patterns": [
             {
-              "match": "\\\\(a|b|e|f|n|r|t|v|\\\\|')",
-              "name": "constant.character.escape.ansi-c.pan"
+              "name": "constant.character.escape.ansi-c.pan",
+              "match": "\\\\(a|b|e|f|n|r|t|v|\\\\|')"
             },
             {
-              "match": "\\\\[0-9]{3}",
-              "name": "constant.character.escape.octal.pan"
+              "name": "constant.character.escape.octal.pan",
+              "match": "\\\\[0-9]{3}"
             },
             {
-              "match": "\\\\x[0-9a-fA-F]{2}",
-              "name": "constant.character.escape.hex.pan"
+              "name": "constant.character.escape.hex.pan",
+              "match": "\\\\x[0-9a-fA-F]{2}"
             },
             {
-              "match": "\\\\c.",
-              "name": "constant.character.escape.control-char.pan"
+              "name": "constant.character.escape.control-char.pan",
+              "match": "\\\\c."
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.pan"
             }
-          ]
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.pan"
+            }
+          }
+        }
+      ]
+    },
+    "support": {
+      "patterns": [
+        {
+          "name": "support.function.pan.string",
+          "match": "\\b(file_contents|file_exists|format|index|length|match|matches|replace|splice|split|substitute|substr|to_lowercase|to_uppercase)\\b"
+        },
+        {
+          "name": "support.function.pan.debugging",
+          "match": "\\b(debug|error|traceback|deprecated)\\b"
+        },
+        {
+          "name": "support.function.pan.codec",
+          "match": "\\b(base64_decode|base64_encode|digest|escape|unescape)\\b"
+        },
+        {
+          "name": "support.function.pan.resource",
+          "match": "\\b(append|create|first|dict|key|length|list|merge|next|prepend|splice)\\b"
+        },
+        {
+          "name": "support.function.pan.type.checking",
+          "match": "\\b(is_boolean|is_defined|is_double|is_list|is_long|is_dict|is_null|is_number|is_property|is_resource|is_string)\\b"
+        },
+        {
+          "name": "support.function.pan.type.conversion",
+          "match": "\\b(to_boolean|to_double|to_long|to_string|ip4_to_long|long_to_ip4)\\b"
+        },
+        {
+          "name": "support.function.pan.misc",
+          "match": "\\b(clone|delete|exists|path_exists|if_exists|return|value)\\b"
         }
       ]
     },
     "variable": {
       "patterns": [
         {
+          "name": "variable.other.pan",
+          "match": "\\b(variable)\\s+(\\w+)\\b",
           "captures": {
             "1": {
               "name": "storage.type.var.pan"
             }
-          },
-          "match": "\\b(variable)\\s+(\\w+)\\b",
-          "name": "variable.other.pan"
+          }
         },
         {
           "name": "storage.type.class.pan",
@@ -679,33 +701,6 @@
           }
         }
       ]
-    },
-    "annotation": {
-      "patterns": [
-        {
-          "begin": "@(\\w+){",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.operator.comment.annotation.token.pan"
-            },
-            "1": {
-              "name": "keyword.operator.comment.annotation.name.pan"
-            }
-          },
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.pan"
-            }
-          },
-          "end": "(})",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.control.annotation-token.pan"
-            }
-          },
-          "name": "comment.block.documentation.annotation.pan"
-        }
-      ]
     }
   }
-}
+}