github-linguist 5.3.3 → 6.0.0

data/grammars/source.verilog.json

@@ -1,10 +1,6 @@
 {
-  "fileTypes": [
-    "v",
-    "vh"
-  ],
-  "keyEquivalent": "^~V",
   "name": "Verilog",
+  "scopeName": "source.verilog",
   "patterns": [
     {
       "include": "#comments"
@@ -30,39 +26,41 @@
       "patterns": [
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.verilog"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.verilog",
               "begin": "//",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.verilog"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-slash.verilog"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.verilog"
+            }
+          }
         },
         {
+          "name": "comment.block.c-style.verilog",
           "begin": "/\\*",
-          "end": "\\*/",
-          "name": "comment.block.c-style.verilog"
+          "end": "\\*/"
         }
       ]
     },
     "constants": {
       "patterns": [
         {
-          "match": "\\b[0-9]+'[bBoOdDhH][a-fA-F0-9_xXzZ]+\\b",
-          "name": "constant.numeric.sized_integer.verilog"
+          "name": "constant.numeric.sized_integer.verilog",
+          "match": "\\b[0-9]+'[bBoOdDhH][a-fA-F0-9_xXzZ]+\\b"
         },
         {
+          "name": "meta.block.numeric.range.verilog",
+          "match": "\\b(\\d+)(:)(\\d+)\\b",
           "captures": {
             "1": {
               "name": "constant.numeric.integer.verilog"
@@ -73,25 +71,23 @@
             "3": {
               "name": "constant.numeric.integer.verilog"
             }
-          },
-          "match": "\\b(\\d+)(:)(\\d+)\\b",
-          "name": "meta.block.numeric.range.verilog"
+          }
         },
         {
-          "match": "\\b\\d+(?i:e\\d+)?\\b",
-          "name": "constant.numeric.integer.verilog"
+          "name": "constant.numeric.integer.verilog",
+          "match": "\\b\\d+(?i:e\\d+)?\\b"
         },
         {
-          "match": "\\b\\d+\\.\\d+(?i:e\\d+)?\\b",
-          "name": "constant.numeric.real.verilog"
+          "name": "constant.numeric.real.verilog",
+          "match": "\\b\\d+\\.\\d+(?i:e\\d+)?\\b"
         },
         {
-          "match": "#\\d+",
-          "name": "constant.numeric.delay.verilog"
+          "name": "constant.numeric.delay.verilog",
+          "match": "#\\d+"
         },
         {
-          "match": "\\b[01xXzZ]+\\b",
-          "name": "constant.numeric.logic.verilog"
+          "name": "constant.numeric.logic.verilog",
+          "match": "\\b[01xXzZ]+\\b"
         }
       ]
     },
@@ -101,22 +97,9 @@
           "include": "#keywords"
         },
         {
-          "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)\\s+([a-zA-Z][a-zA-Z0-9_]*)(?<!begin|if)\\s*(?=\\(|$)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.tag.module.reference.verilog"
-            },
-            "2": {
-              "name": "entity.name.tag.module.identifier.verilog"
-            }
-          },
-          "end": ";",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.terminator.expression.verilog"
-            }
-          },
           "name": "meta.block.instantiation.parameterless.verilog",
+          "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)\\s+([a-zA-Z][a-zA-Z0-9_]*)(?\u003c!begin|if)\\s*(?=\\(|$)",
+          "end": ";",
           "patterns": [
             {
               "include": "#comments"
@@ -127,93 +110,93 @@
             {
               "include": "#strings"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)\\s*(#)(?=\\s*\\()",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.module.reference.verilog"
+            },
+            "2": {
+              "name": "entity.name.tag.module.identifier.verilog"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.expression.verilog"
             }
-          },
+          }
+        },
+        {
           "name": "meta.block.instantiation.with.parameters.verilog",
+          "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)\\s*(#)(?=\\s*\\()",
+          "end": ";",
           "patterns": [
             {
               "include": "#parenthetical_list"
             },
             {
-              "match": "[a-zA-Z][a-zA-Z0-9_]*",
-              "name": "entity.name.tag.module.identifier.verilog"
+              "name": "entity.name.tag.module.identifier.verilog",
+              "match": "[a-zA-Z][a-zA-Z0-9_]*"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.tag.module.reference.verilog"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.terminator.expression.verilog"
+            }
+          }
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(always|and|assign|attribute|begin|buf|bufif0|bufif1|case(xz)?|cmos|deassign|default|defparam|disable|edge|else|end(attribute|case|function|generate|module|primitive|specify|table|task)?|event|for|force|forever|fork|function|generate|genvar|highz(01)|if(none)?|initial|inout|input|integer|join|localparam|medium|module|large|macromodule|nand|negedge|nmos|nor|not|notif(01)|or|output|parameter|pmos|posedge|primitive|pull0|pull1|pulldown|pullup|rcmos|real|realtime|reg|release|repeat|rnmos|rpmos|rtran|rtranif(01)|scalared|signed|small|specify|specparam|strength|strong0|strong1|supply0|supply1|table|task|time|tran|tranif(01)|tri(01)?|tri(and|or|reg)|unsigned|vectored|wait|wand|weak(01)|while|wire|wor|xnor|xor)\\b",
-          "name": "keyword.other.verilog"
+          "name": "keyword.other.verilog",
+          "match": "\\b(always|and|assign|attribute|begin|buf|bufif0|bufif1|case(xz)?|cmos|deassign|default|defparam|disable|edge|else|end(attribute|case|function|generate|module|primitive|specify|table|task)?|event|for|force|forever|fork|function|generate|genvar|highz(01)|if(none)?|initial|inout|input|integer|join|localparam|medium|module|large|macromodule|nand|negedge|nmos|nor|not|notif(01)|or|output|parameter|pmos|posedge|primitive|pull0|pull1|pulldown|pullup|rcmos|real|realtime|reg|release|repeat|rnmos|rpmos|rtran|rtranif(01)|scalared|signed|small|specify|specparam|strength|strong0|strong1|supply0|supply1|table|task|time|tran|tranif(01)|tri(01)?|tri(and|or|reg)|unsigned|vectored|wait|wand|weak(01)|while|wire|wor|xnor|xor)\\b"
         },
         {
-          "match": "^\\s*`((cell)?define|default_(decay_time|nettype|trireg_strength)|delay_mode_(path|unit|zero)|ifdef|include|end(if|celldefine)|else|(no)?unconnected_drive|resetall|timescale|undef)\\b",
-          "name": "keyword.other.compiler.directive.verilog"
+          "name": "keyword.other.compiler.directive.verilog",
+          "match": "^\\s*`((cell)?define|default_(decay_time|nettype|trireg_strength)|delay_mode_(path|unit|zero)|ifdef|include|end(if|celldefine)|else|(no)?unconnected_drive|resetall|timescale|undef)\\b"
         },
         {
-          "match": "\\$(f(open|close)|readmem(b|h)|timeformat|printtimescale|stop|finish|(s|real)?time|realtobits|bitstoreal|rtoi|itor|(f)?(display|write(h|b)))\\b",
-          "name": "support.function.system.console.tasks.verilog"
+          "name": "support.function.system.console.tasks.verilog",
+          "match": "\\$(f(open|close)|readmem(b|h)|timeformat|printtimescale|stop|finish|(s|real)?time|realtobits|bitstoreal|rtoi|itor|(f)?(display|write(h|b)))\\b"
         },
         {
-          "match": "\\$(random|dist_(chi_square|erlang|exponential|normal|poisson|t|uniform))\\b",
-          "name": "support.function.system.random_number.tasks.verilog"
+          "name": "support.function.system.random_number.tasks.verilog",
+          "match": "\\$(random|dist_(chi_square|erlang|exponential|normal|poisson|t|uniform))\\b"
         },
         {
-          "match": "\\$((a)?sync\\$((n)?and|(n)or)\\$(array|plane))\\b",
-          "name": "support.function.system.pld_modeling.tasks.verilog"
+          "name": "support.function.system.pld_modeling.tasks.verilog",
+          "match": "\\$((a)?sync\\$((n)?and|(n)or)\\$(array|plane))\\b"
         },
         {
-          "match": "\\$(q_(initialize|add|remove|full|exam))\\b",
-          "name": "support.function.system.stochastic.tasks.verilog"
+          "name": "support.function.system.stochastic.tasks.verilog",
+          "match": "\\$(q_(initialize|add|remove|full|exam))\\b"
         },
         {
-          "match": "\\$(hold|nochange|period|recovery|setup(hold)?|skew|width)\\b",
-          "name": "support.function.system.timing.tasks.verilog"
+          "name": "support.function.system.timing.tasks.verilog",
+          "match": "\\$(hold|nochange|period|recovery|setup(hold)?|skew|width)\\b"
         },
         {
-          "match": "\\$(dump(file|vars|off|on|all|limit|flush))\\b",
-          "name": "support.function.system.vcd.tasks.verilog"
+          "name": "support.function.system.vcd.tasks.verilog",
+          "match": "\\$(dump(file|vars|off|on|all|limit|flush))\\b"
         },
         {
-          "match": "\\$(countdrivers|list|input|scope|showscopes|(no)?(key|log)|reset(_count|_value)?|(inc)?save|restart|showvars|getpattern|sreadmem(b|h)|scale)",
-          "name": "support.function.non-standard.tasks.verilog"
+          "name": "support.function.non-standard.tasks.verilog",
+          "match": "\\$(countdrivers|list|input|scope|showscopes|(no)?(key|log)|reset(_count|_value)?|(inc)?save|restart|showvars|getpattern|sreadmem(b|h)|scale)"
         }
       ]
     },
     "module_pattern": {
       "patterns": [
         {
+          "name": "meta.block.module.verilog",
           "begin": "\\b(module)\\s+([a-zA-Z][a-zA-Z0-9_]*)",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.module.verilog"
-            },
-            "2": {
-              "name": "entity.name.type.module.verilog"
-            }
-          },
           "end": "\\bendmodule\\b",
-          "endCaptures": {
-            "0": {
-              "name": "storage.type.module.verilog"
-            }
-          },
-          "name": "meta.block.module.verilog",
           "patterns": [
             {
               "include": "#comments"
@@ -233,34 +216,37 @@
             {
               "include": "#operators"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.module.verilog"
+            },
+            "2": {
+              "name": "entity.name.type.module.verilog"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "storage.type.module.verilog"
+            }
+          }
         }
       ]
     },
     "operators": {
       "patterns": [
         {
-          "match": "\\+|-|\\*|/|%|(<|>)=?|(!|=)?==?|!|&&?|\\|\\|?|\\^?~|~\\^?",
-          "name": "keyword.operator.verilog"
+          "name": "keyword.operator.verilog",
+          "match": "\\+|-|\\*|/|%|(\u003c|\u003e)=?|(!|=)?==?|!|\u0026\u0026?|\\|\\|?|\\^?~|~\\^?"
         }
       ]
     },
     "parenthetical_list": {
       "patterns": [
         {
+          "name": "meta.block.parenthetical_list.verilog",
           "begin": "\\(",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.list.verilog"
-            }
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.section.list.verilog"
-            }
-          },
-          "name": "meta.block.parenthetical_list.verilog",
           "patterns": [
             {
               "include": "#parenthetical_list"
@@ -277,26 +263,34 @@
             {
               "include": "#strings"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.list.verilog"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.list.verilog"
+            }
+          }
         }
       ]
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.verilog",
           "begin": "\"",
           "end": "\"",
-          "name": "string.quoted.double.verilog",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.verilog"
+              "name": "constant.character.escape.verilog",
+              "match": "\\\\."
             }
           ]
         }
       ]
     }
-  },
-  "scopeName": "source.verilog",
-  "uuid": "7F4396B3-A33E-44F0-8502-98CA6C25971F"
-}
+  }
+}

data/grammars/source.vhdl.json

@@ -1,12 +1,6 @@
 {
-  "comment": "VHDL Bundle by Brian Padalino (ocnqnyvab@tznvy.pbz)",
-  "fileTypes": [
-    "vhd",
-    "vhdl",
-    "vho"
-  ],
-  "keyEquivalent": "^~V",
   "name": "VHDL",
+  "scopeName": "source.vhdl",
   "patterns": [
     {
       "include": "#block_processing"
@@ -19,43 +13,9 @@
     "architecture_pattern": {
       "patterns": [
         {
+          "name": "meta.block.architecture",
           "begin": "(?x)\n\n\t\t\t\t\t\t# The word architecture $1\n\t\t\t\t\t\t\\b((?i:architecture))\\s+\n\t\t\t\t\t\t\n\t\t\t\t\t\t# Followed up by a valid $3 or invalid identifier $4\n\t\t\t\t\t\t(([a-zA-z][a-zA-z0-9_]*)|(.+))(?=\\s)\\s+\n\n\t\t\t\t\t\t# The word of $5\n\t\t\t\t\t\t((?i:of))\\s+\n\n\t\t\t\t\t\t# Followed by a valid $7 or invalid identifier $8\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))(?=\\s*(?i:is))\\b\n\t\t\t\t\t",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.architecture.vhdl"
-            },
-            "3": {
-              "name": "entity.name.type.architecture.begin.vhdl"
-            },
-            "4": {
-              "name": "invalid.illegal.invalid.identifier.vhdl"
-            },
-            "5": {
-              "name": "keyword.control.of.vhdl"
-            },
-            "7": {
-              "name": "entity.name.type.entity.reference.vhdl"
-            },
-            "8": {
-              "name": "invalid.illegal.invalid.identifier.vhdl"
-            }
-          },
           "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\n\n\t\t\t\t\t\t# Optional word architecture $3\n\t\t\t\t\t\t(\\s+((?i:architecture)))?\n\n\t\t\t\t\t\t# Optional same identifier $6 or illegal identifier $7\n\t\t\t\t\t\t(\\s+((\\3)|(.+?)))?\n\n\t\t\t\t\t\t# This will cause the previous to capture until just before the ; or $\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.control.end.vhdl"
-            },
-            "3": {
-              "name": "storage.type.architecture.vhdl"
-            },
-            "6": {
-              "name": "entity.name.type.architecture.end.vhdl"
-            },
-            "7": {
-              "name": "invalid.illegal.mismatched.identifier.vhdl"
-            }
-          },
-          "name": "meta.block.architecture",
           "patterns": [
             {
               "include": "#function_definition_pattern"
@@ -90,34 +50,68 @@
             {
               "include": "#cleanup"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.architecture.vhdl"
+            },
+            "3": {
+              "name": "entity.name.type.architecture.begin.vhdl"
+            },
+            "4": {
+              "name": "invalid.illegal.invalid.identifier.vhdl"
+            },
+            "5": {
+              "name": "keyword.control.of.vhdl"
+            },
+            "7": {
+              "name": "entity.name.type.entity.reference.vhdl"
+            },
+            "8": {
+              "name": "invalid.illegal.invalid.identifier.vhdl"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.vhdl"
+            },
+            "3": {
+              "name": "storage.type.architecture.vhdl"
+            },
+            "6": {
+              "name": "entity.name.type.architecture.end.vhdl"
+            },
+            "7": {
+              "name": "invalid.illegal.mismatched.identifier.vhdl"
+            }
+          }
         }
       ]
     },
     "attribute_list": {
       "patterns": [
         {
+          "name": "meta.block.attribute_list",
           "begin": "'\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.attribute_list.begin.vhdl"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.attribute_list.end.vhdl"
             }
-          },
-          "name": "meta.block.attribute_list",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
@@ -140,7 +134,17 @@
     "case_pattern": {
       "patterns": [
         {
+          "name": "meta.block.case.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# Beginning of line ...\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# Optional identifier ... $3 or invalid identifier $4\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z0-9_]*)\n\t\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\\s*:\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# The word case $5\n\t\t\t\t\t\t\\b((?i:case))\\b\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s*\n\n\t\t\t\t\t\t# The word case $4 or invalid word $5\n\t\t\t\t\t\t(\\s+(((?i:case))|(.*?)))\n\n\t\t\t\t\t\t# Optional identifier from before $8 or illegal $9\n\t\t\t\t\t\t(\\s+((\\2)|(.*?)))?\n\n\t\t\t\t\t\t# Ending with a semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "3": {
               "name": "entity.name.tag.case.begin.vhdl"
@@ -152,7 +156,6 @@
               "name": "keyword.control.case.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s*\n\n\t\t\t\t\t\t# The word case $4 or invalid word $5\n\t\t\t\t\t\t(\\s+(((?i:case))|(.*?)))\n\n\t\t\t\t\t\t# Optional identifier from before $8 or illegal $9\n\t\t\t\t\t\t(\\s+((\\2)|(.*?)))?\n\n\t\t\t\t\t\t# Ending with a semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -169,16 +172,7 @@
             "9": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.case.vhdl",
-          "patterns": [
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
@@ -205,31 +199,41 @@
       "patterns": [
         {
           "begin": "(^[ \\t]+)?(?=--)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.vhdl"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-dash.vhdl",
               "begin": "--",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.vhdl"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-dash.vhdl"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.vhdl"
+            }
+          }
         }
       ]
     },
     "component_instantiation_pattern": {
       "patterns": [
         {
+          "name": "meta.block.component_instantiation.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line ...\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# Match a valid identifier $1\n\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t# Colon! $2\n\t\t\t\t\t\t\\s*(:)\\s*\n\n\t\t\t\t\t\t# Another valid identifier $3\n\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\\b\n\n\t\t\t\t\t\t# Make sure we are just the other word, or the beginning of\n\t\t\t\t\t\t# a generic or port mapping\n\t\t\t\t\t\t(?=\\s*($|generic|port))\n\t\t\t\t\t",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.section.component_instantiation.vhdl"
@@ -241,28 +245,31 @@
               "name": "entity.name.tag.component.reference.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.component_instantiation.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "component_pattern": {
       "patterns": [
         {
+          "name": "meta.block.component.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line ...\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word component $1\n\t\t\t\t\t\t\\b((?i:component))\\s+\n\n\t\t\t\t\t\t# A valid identifier $3 or invalid identifier $4\n\t\t\t\t\t\t(([a-zA-Z_][a-zA-Z0-9_]*)\\s*|(.+?))(?=\\b(?i:is|port)\\b|$|--)\n\n\t\t\t\t\t\t# Optional word is $6\n\t\t\t\t\t\t(\\b((?i:is\\b)))?\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?:end))\\s+\n\n\t\t\t\t\t\t# The word component $3 or illegal word $4\n\t\t\t\t\t\t(((?i:component\\b))|(.+?))(?=\\s*|;)\n\t\t\t\t\t\t\n\t\t\t\t\t\t# Optional identifier $7 or illegal mismatched $8\n\t\t\t\t\t\t(\\s+((\\3)|(.+?)))?(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#generic_list_pattern"
+            },
+            {
+              "include": "#port_list_pattern"
+            },
+            {
+              "include": "#comments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.component.vhdl"
@@ -277,7 +284,6 @@
               "name": "keyword.control.is.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?:end))\\s+\n\n\t\t\t\t\t\t# The word component $3 or illegal word $4\n\t\t\t\t\t\t(((?i:component\\b))|(.+?))(?=\\s*|;)\n\t\t\t\t\t\t\n\t\t\t\t\t\t# Optional identifier $7 or illegal mismatched $8\n\t\t\t\t\t\t(\\s+((\\3)|(.+?)))?(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -294,60 +300,48 @@
             "8": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.component.vhdl",
-          "patterns": [
-            {
-              "include": "#generic_list_pattern"
-            },
-            {
-              "include": "#port_list_pattern"
-            },
-            {
-              "include": "#comments"
-            }
-          ]
+          }
         }
       ]
     },
     "constants_numeric": {
       "patterns": [
         {
-          "match": "\\b([+\\-]?[\\d_]+\\.[\\d_]+([eE][+\\-]?[\\d_]+)?)\\b",
-          "name": "constant.numeric.floating_point.vhdl"
+          "name": "constant.numeric.floating_point.vhdl",
+          "match": "\\b([+\\-]?[\\d_]+\\.[\\d_]+([eE][+\\-]?[\\d_]+)?)\\b"
         },
         {
-          "match": "\\b\\d+#[0-9A-Fa-f_]+#",
-          "name": "constant.numeric.base_pound_number_pound.vhdl"
+          "name": "constant.numeric.base_pound_number_pound.vhdl",
+          "match": "\\b\\d+#[0-9A-Fa-f_]+#"
         },
         {
-          "match": "\\b[\\d_]+([eE][\\d_]+)?\\b",
-          "name": "constant.numeric.integer.vhdl"
+          "name": "constant.numeric.integer.vhdl",
+          "match": "\\b[\\d_]+([eE][\\d_]+)?\\b"
         },
         {
-          "match": "[xX]\"[0-9a-fA-F_uUxXzZwWlLhH\\-]+\"",
-          "name": "constant.numeric.quoted.double.string.hex.vhdl"
+          "name": "constant.numeric.quoted.double.string.hex.vhdl",
+          "match": "[xX]\"[0-9a-fA-F_uUxXzZwWlLhH\\-]+\""
         },
         {
-          "match": "[oO]\"[0-7_uUxXzZwWlLhH\\-]+\"",
-          "name": "constant.numeric.quoted.double.string.octal.vhdl"
+          "name": "constant.numeric.quoted.double.string.octal.vhdl",
+          "match": "[oO]\"[0-7_uUxXzZwWlLhH\\-]+\""
         },
         {
-          "match": "[bB]?\"[01_uUxXzZwWlLhH\\-]+\"",
-          "name": "constant.numeric.quoted.double.string.binary.vhdl"
+          "name": "constant.numeric.quoted.double.string.binary.vhdl",
+          "match": "[bB]?\"[01_uUxXzZwWlLhH\\-]+\""
         },
         {
+          "name": "constant.numeric.quoted.double.string.illegal.vhdl",
+          "match": "([bBoOxX]\".+?\")",
           "captures": {
             "1": {
               "name": "invalid.illegal.quoted.double.string.vhdl"
             }
-          },
-          "match": "([bBoOxX]\".+?\")",
-          "name": "constant.numeric.quoted.double.string.illegal.vhdl"
+          }
         },
         {
-          "match": "'[01uUxXzZwWlLhH\\-]'",
-          "name": "constant.numeric.quoted.single.std_logic"
+          "name": "constant.numeric.quoted.single.std_logic",
+          "match": "'[01uUxXzZwWlLhH\\-]'"
         }
       ]
     },
@@ -370,7 +364,17 @@
     "entity_instantiation_pattern": {
       "patterns": [
         {
+          "name": "meta.block.entity_instantiation.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# Component identifier or illegal identifier $1\n\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t# Colon! $2\n\t\t\t\t\t\t\\s*(:)\\s*\n\n\t\t\t\t\t\t# Optional word use $4\n\t\t\t\t\t\t(((?i:use))\\s+)?\n\n\t\t\t\t\t\t# Required word entity $5\n\t\t\t\t\t\t((?i:entity))\\s+\n\n\t\t\t\t\t\t# Optional library unit identifier $8 for invalid identifier $9 followed by a dot $10\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))\n\t\t\t\t\t\t\t(\\.)\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Entity name reference $12 or illegal identifier $13\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))\n\n\t\t\t\t\t\t# Check to see if we are being followed by either open paren, end of line, or port or generic words\n\t\t\t\t\t\t(?=\\s*(\\(|$|(?i:port|generic)))\n\n\t\t\t\t\t\t# Optional architecture elaboration\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Open paren $16\n\t\t\t\t\t\t\t\\s*(\\()\\s*\n\n\t\t\t\t\t\t\t# Arch identifier $18 or invalid identifier $19\n\t\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))(?=\\s*\\))\n\n\t\t\t\t\t\t\t# Close paren $21\n\t\t\t\t\t\t\t\\s*(\\))\n\t\t\t\t\t\t)?\n\t\t\t\t\t",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.section.entity_instantiation.vhdl"
@@ -412,28 +416,34 @@
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.entity_instantiation.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "entity_pattern": {
       "patterns": [
         {
+          "name": "meta.block.entity.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line ...\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word entity $1\n\t\t\t\t\t\t((?i:entity\\b))\\s+\n\n\t\t\t\t\t\t# The identifier $3 or an invalid identifier $4\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z\\d_]*)|(.+?))(?=\\s)\n\t\t\t\t\t",
+          "end": "(?x)\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word entity $3\n\t\t\t\t\t\t(\\s+((?i:entity)))?\n\n\t\t\t\t\t\t# Optional identifier match $6 or indentifier mismatch $7\n\t\t\t\t\t\t(\\s+((\\3)|(.+?)))?\n\t\t\t\t\t\t\n\t\t\t\t\t\t# Make sure there is a semicolon following\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#generic_list_pattern"
+            },
+            {
+              "include": "#port_list_pattern"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.entity.vhdl"
@@ -445,7 +455,6 @@
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
           },
-          "end": "(?x)\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word entity $3\n\t\t\t\t\t\t(\\s+((?i:entity)))?\n\n\t\t\t\t\t\t# Optional identifier match $6 or indentifier mismatch $7\n\t\t\t\t\t\t(\\s+((\\3)|(.+?)))?\n\t\t\t\t\t\t\n\t\t\t\t\t\t# Make sure there is a semicolon following\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -459,29 +468,36 @@
             "7": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.entity.vhdl",
+          }
+        }
+      ]
+    },
+    "for_pattern": {
+      "patterns": [
+        {
+          "name": "meta.block.for.vhdl",
+          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Check for an identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Followed by a colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Make sure the next word is not wait\n\t\t\t\t\t\t(?!(?i:wait\\s*))\n\n\t\t\t\t\t\t# The for keyword $4\n\t\t\t\t\t\t\\b((?i:for))\\b\n\n\t\t\t\t\t\t# Make sure the next word is not all\n\t\t\t\t\t\t(?!\\s*(?i:all))\n\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Followed by generate or loop $3\n\t\t\t\t\t\t\t ((?i:generate|loop))\n\n\t\t\t\t\t\t\t# But it really is required $4\n\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t)\\b\n\n\t\t\t\t\t\t# The matching identifier $7 or an invalid identifier $8\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t# Only space and a semicolon left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "patterns": [
             {
-              "include": "#comments"
+              "include": "#control_patterns"
             },
             {
-              "include": "#generic_list_pattern"
+              "include": "#entity_instantiation_pattern"
             },
             {
-              "include": "#port_list_pattern"
+              "include": "#component_pattern"
+            },
+            {
+              "include": "#component_instantiation_pattern"
+            },
+            {
+              "include": "#process_pattern"
             },
             {
               "include": "#cleanup"
             }
-          ]
-        }
-      ]
-    },
-    "for_pattern": {
-      "patterns": [
-        {
-          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Check for an identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Followed by a colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Make sure the next word is not wait\n\t\t\t\t\t\t(?!(?i:wait\\s*))\n\n\t\t\t\t\t\t# The for keyword $4\n\t\t\t\t\t\t\\b((?i:for))\\b\n\n\t\t\t\t\t\t# Make sure the next word is not all\n\t\t\t\t\t\t(?!\\s*(?i:all))\n\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "2": {
               "name": "entity.name.tag.for.generate.begin.vhdl"
@@ -493,7 +509,6 @@
               "name": "keyword.control.for.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Followed by generate or loop $3\n\t\t\t\t\t\t\t ((?i:generate|loop))\n\n\t\t\t\t\t\t\t# But it really is required $4\n\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t)\\b\n\n\t\t\t\t\t\t# The matching identifier $7 or an invalid identifier $8\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t# Only space and a semicolon left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -510,35 +525,33 @@
             "8": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.for.vhdl",
+          }
+        }
+      ]
+    },
+    "function_definition_pattern": {
+      "patterns": [
+        {
+          "name": "meta.block.function_definition.vhdl",
+          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word function $1\n\t\t\t\t\t\t((?i:function))\\s+\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A valid normal identifier $3\n\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z\\d_]*)\n\t\t\t\t\t\t\t# A valid string quoted identifier $4\n\t\t\t\t\t\t\t|(\"\\S+\")\n\t\t\t\t\t\t\t# A valid backslash escaped identifier $5\n\t\t\t\t\t\t\t|(\\\\.+\\\\)\n\t\t\t\t\t\t\t# An invalid identifier $5\n\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t)\n\n\t\t\t\t\t\t# Check to make sure we have a list or we return\n\t\t\t\t\t\t(?=\\s*\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t \\(\n\t\t\t\t\t\t\t\t|(?i:\\breturn\\b)\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word function $3\n\t\t\t\t\t\t(\\s+((?i:function)))?\n\n\t\t\t\t\t\t# Optional matched identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\3|\\4|\\5)|(.+?)))?\n\n\t\t\t\t\t\t# Ending with whitespace and semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "patterns": [
             {
               "include": "#control_patterns"
             },
             {
-              "include": "#entity_instantiation_pattern"
-            },
-            {
-              "include": "#component_pattern"
+              "include": "#parenthetical_list"
             },
             {
-              "include": "#component_instantiation_pattern"
+              "include": "#type_pattern"
             },
             {
-              "include": "#process_pattern"
+              "include": "#record_pattern"
             },
             {
               "include": "#cleanup"
             }
-          ]
-        }
-      ]
-    },
-    "function_definition_pattern": {
-      "patterns": [
-        {
-          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word function $1\n\t\t\t\t\t\t((?i:function))\\s+\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A valid normal identifier $3\n\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z\\d_]*)\n\t\t\t\t\t\t\t# A valid string quoted identifier $4\n\t\t\t\t\t\t\t|(\"\\S+\")\n\t\t\t\t\t\t\t# A valid backslash escaped identifier $5\n\t\t\t\t\t\t\t|(\\\\.+\\\\)\n\t\t\t\t\t\t\t# An invalid identifier $5\n\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t)\n\n\t\t\t\t\t\t# Check to make sure we have a list or we return\n\t\t\t\t\t\t(?=\\s*\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t \\(\n\t\t\t\t\t\t\t\t|(?i:\\breturn\\b)\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.vhdl"
@@ -556,7 +569,6 @@
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word function $3\n\t\t\t\t\t\t(\\s+((?i:function)))?\n\n\t\t\t\t\t\t# Optional matched identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\3|\\4|\\5)|(.+?)))?\n\n\t\t\t\t\t\t# Ending with whitespace and semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -570,73 +582,38 @@
             "7": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.function_definition.vhdl",
-          "patterns": [
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#parenthetical_list"
-            },
-            {
-              "include": "#type_pattern"
-            },
-            {
-              "include": "#record_pattern"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "function_prototype_pattern": {
       "patterns": [
         {
-          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word function $1\n\t\t\t\t\t\t((?i:function))\\s+\n\n\t\t\t\t\t\t\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A valid normal identifier $3\n\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z\\d_]*)\n\t\t\t\t\t\t\t# A valid quoted identifier $4\n\t\t\t\t\t\t\t|(\"\\S+\")\n\t\t\t\t\t\t\t# A valid backslash escaped identifier $5\n\t\t\t\t\t\t\t|(\\\\.+\\\\)\n\t\t\t\t\t\t\t# An invalid identifier $6\n\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t)\n\n\t\t\t\t\t\t# Check to make sure we have a list or we return\n\t\t\t\t\t\t(?=\\s*\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t \\(\n\t\t\t\t\t\t\t\t|(?i:\\breturn\\b)\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.vhdl"
-            },
-            "3": {
-              "name": "entity.name.function.function.prototype.vhdl"
-            },
-            "4": {
-              "name": "entity.name.function.function.prototype.vhdl"
-            },
-            "5": {
-              "name": "entity.name.function.function.prototype.vhdl"
-            },
-            "6": {
-              "name": "invalid.illegal.function.name.vhdl"
-            }
-          },
-          "end": "(?<=;)",
           "name": "meta.block.function_prototype.vhdl",
+          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word function $1\n\t\t\t\t\t\t((?i:function))\\s+\n\n\t\t\t\t\t\t\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A valid normal identifier $3\n\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z\\d_]*)\n\t\t\t\t\t\t\t# A valid quoted identifier $4\n\t\t\t\t\t\t\t|(\"\\S+\")\n\t\t\t\t\t\t\t# A valid backslash escaped identifier $5\n\t\t\t\t\t\t\t|(\\\\.+\\\\)\n\t\t\t\t\t\t\t# An invalid identifier $6\n\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t)\n\n\t\t\t\t\t\t# Check to make sure we have a list or we return\n\t\t\t\t\t\t(?=\\s*\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t \\(\n\t\t\t\t\t\t\t\t|(?i:\\breturn\\b)\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
+          "end": "(?\u003c=;)",
           "patterns": [
             {
               "begin": "\\b(?i:return)(?=\\s+[^;]+\\s*;)",
+              "end": "\\;",
+              "patterns": [
+                {
+                  "include": "#parenthetical_list"
+                },
+                {
+                  "include": "#cleanup"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "keyword.control.return.vhdl"
                 }
               },
-              "end": "\\;",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.terminator.function_prototype.vhdl"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#parenthetical_list"
-                },
-                {
-                  "include": "#cleanup"
-                }
-              ]
+              }
             },
             {
               "include": "#parenthetical_list"
@@ -644,38 +621,77 @@
             {
               "include": "#cleanup"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.vhdl"
+            },
+            "3": {
+              "name": "entity.name.function.function.prototype.vhdl"
+            },
+            "4": {
+              "name": "entity.name.function.function.prototype.vhdl"
+            },
+            "5": {
+              "name": "entity.name.function.function.prototype.vhdl"
+            },
+            "6": {
+              "name": "invalid.illegal.function.name.vhdl"
+            }
+          }
         }
       ]
     },
     "generic_list_pattern": {
       "patterns": [
         {
+          "name": "meta.block.generic_list.vhdl",
           "begin": "\\b(?i:generic)\\b",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "keyword.control.generic.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.generic_list.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            }
-          ]
+          }
         }
       ]
     },
     "if_pattern": {
       "patterns": [
         {
+          "name": "meta.block.if.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Optional identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Followed by a colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Keyword if $4\n\t\t\t\t\t\t\\b((?i:if))\\b\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t# Optional generate or if keyword $4\n\t\t\t\t\t\t\t\t ((?i:generate|if))\n\n\t\t\t\t\t\t\t\t# Keyword if or generate required $5\n\t\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t\t)\\b\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t# Optional matching identifier $8\n\t\t\t\t\t\t\t\t\t (\\2)\n\n\t\t\t\t\t\t\t\t\t# Mismatched identifier $9\n\t\t\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Followed by a semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#process_pattern"
+            },
+            {
+              "include": "#entity_instantiation_pattern"
+            },
+            {
+              "include": "#component_pattern"
+            },
+            {
+              "include": "#component_instantiation_pattern"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "2": {
               "name": "entity.name.tag.if.generate.begin.vhdl"
@@ -687,7 +703,6 @@
               "name": "keyword.control.if.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t# Optional generate or if keyword $4\n\t\t\t\t\t\t\t\t ((?i:generate|if))\n\n\t\t\t\t\t\t\t\t# Keyword if or generate required $5\n\t\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t\t)\\b\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t# Optional matching identifier $8\n\t\t\t\t\t\t\t\t\t (\\2)\n\n\t\t\t\t\t\t\t\t\t# Mismatched identifier $9\n\t\t\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# Followed by a semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -704,51 +719,52 @@
             "9": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.if.vhdl",
-          "patterns": [
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#process_pattern"
-            },
-            {
-              "include": "#entity_instantiation_pattern"
-            },
-            {
-              "include": "#component_pattern"
-            },
-            {
-              "include": "#component_instantiation_pattern"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "match": "'(?i:active|ascending|base|delayed|driving|event|high|image|instance|last|left|leftof|length|low|path|pos|pred|quiet|range|reverse|right|rightof|simple|stable|succ|transaction|val|value)\\b",
-          "name": "keyword.control.attributes.vhdl"
+          "name": "keyword.control.attributes.vhdl",
+          "match": "'(?i:active|ascending|base|delayed|driving|event|high|image|instance|last|left|leftof|length|low|path|pos|pred|quiet|range|reverse|right|rightof|simple|stable|succ|transaction|val|value)\\b"
         },
         {
-          "match": "\\b(?i:abs|access|after|alias|all|and|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|mod|nand|new|next|nor|not|null|of|on|open|or|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|rem|report|return|rol|ror|select|severity|shared|signal|sla|sll|sra|srl|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|xnor|xor)\\b",
-          "name": "keyword.control.language.vhdl"
+          "name": "keyword.control.language.vhdl",
+          "match": "\\b(?i:abs|access|after|alias|all|and|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|mod|nand|new|next|nor|not|null|of|on|open|or|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|rem|report|return|rol|ror|select|severity|shared|signal|sla|sll|sra|srl|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|xnor|xor)\\b"
         },
         {
-          "match": "(\\+|\\-|<=|=|=>|:=|>=|>|<|/|\\||&|(\\*{1,2}))",
-          "name": "keyword.operator.vhdl"
+          "name": "keyword.operator.vhdl",
+          "match": "(\\+|\\-|\u003c=|=|=\u003e|:=|\u003e=|\u003e|\u003c|/|\\||\u0026|(\\*{1,2}))"
         }
       ]
     },
     "package_body_pattern": {
       "patterns": [
         {
+          "name": "meta.block.package_body.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# The word package $1\n\t\t\t\t\t\t\\b((?i:package))\\s+\n\n\t\t\t\t\t\t# ... but we want to be a package body $2\n\t\t\t\t\t\t((?i:body))\\s+\n\n\t\t\t\t\t\t# The valid identifier $4 or the invalid one $5\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z\\d_]*)|(.+?))\\s+\n\n\t\t\t\t\t\t# ... and we end it with an is $6\n\t\t\t\t\t\t((?i:is))\\b\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word package $3 body $4\n\t\t\t\t\t\t(\\s+((?i:package))\\s+((?i:body)))?\n\n\t\t\t\t\t\t# Optional identifier $7 or mismatched identifier $8\n\t\t\t\t\t\t(\\s+((\\4)|(.+?)))?(?=\\s*;)",
+          "patterns": [
+            {
+              "include": "#function_definition_pattern"
+            },
+            {
+              "include": "#procedure_definition_pattern"
+            },
+            {
+              "include": "#type_pattern"
+            },
+            {
+              "include": "#subtype_pattern"
+            },
+            {
+              "include": "#record_pattern"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.package.vhdl"
@@ -766,7 +782,6 @@
               "name": "keyword.control.is.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word package $3 body $4\n\t\t\t\t\t\t(\\s+((?i:package))\\s+((?i:body)))?\n\n\t\t\t\t\t\t# Optional identifier $7 or mismatched identifier $8\n\t\t\t\t\t\t(\\s+((\\4)|(.+?)))?(?=\\s*;)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -783,14 +798,22 @@
             "8": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.package_body.vhdl",
+          }
+        }
+      ]
+    },
+    "package_pattern": {
+      "patterns": [
+        {
+          "name": "meta.block.package.vhdl",
+          "begin": "(?x)\n\t\t\t\t\t\t# The word package $1\n\t\t\t\t\t\t\\b((?i:package))\\s+\n\n\t\t\t\t\t\t# ... but we do not want to be a package body\n\t\t\t\t\t\t(?!(?i:body))\n\n\t\t\t\t\t\t# The valid identifier $3 or the invalid one $4\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z\\d_]*)|(.+?))\\s+\n\n\t\t\t\t\t\t# ... and we end it with an is $5\n\t\t\t\t\t\t((?i:is))\\b\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word package $3\n\t\t\t\t\t\t(\\s+((?i:package)))?\n\n\t\t\t\t\t\t# Optional identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?(?=\\s*;)",
           "patterns": [
             {
-              "include": "#function_definition_pattern"
+              "include": "#function_prototype_pattern"
             },
             {
-              "include": "#procedure_definition_pattern"
+              "include": "#procedure_prototype_pattern"
             },
             {
               "include": "#type_pattern"
@@ -801,17 +824,13 @@
             {
               "include": "#record_pattern"
             },
+            {
+              "include": "#component_pattern"
+            },
             {
               "include": "#cleanup"
             }
-          ]
-        }
-      ]
-    },
-    "package_pattern": {
-      "patterns": [
-        {
-          "begin": "(?x)\n\t\t\t\t\t\t# The word package $1\n\t\t\t\t\t\t\\b((?i:package))\\s+\n\n\t\t\t\t\t\t# ... but we do not want to be a package body\n\t\t\t\t\t\t(?!(?i:body))\n\n\t\t\t\t\t\t# The valid identifier $3 or the invalid one $4\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z\\d_]*)|(.+?))\\s+\n\n\t\t\t\t\t\t# ... and we end it with an is $5\n\t\t\t\t\t\t((?i:is))\\b\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.package.vhdl"
@@ -826,7 +845,6 @@
               "name": "keyword.control.is.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end\\b))\n\n\t\t\t\t\t\t# Optional word package $3\n\t\t\t\t\t\t(\\s+((?i:package)))?\n\n\t\t\t\t\t\t# Optional identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?(?=\\s*;)",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -840,55 +858,21 @@
             "7": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.package.vhdl",
-          "patterns": [
-            {
-              "include": "#function_prototype_pattern"
-            },
-            {
-              "include": "#procedure_prototype_pattern"
-            },
-            {
-              "include": "#type_pattern"
-            },
-            {
-              "include": "#subtype_pattern"
-            },
-            {
-              "include": "#record_pattern"
-            },
-            {
-              "include": "#component_pattern"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "parenthetical_list": {
       "patterns": [
         {
-          "begin": "\\(",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.parenthetical_list.begin.vhdl"
-            }
-          },
-          "end": "(?<=\\))",
           "name": "meta.block.parenthetical_list.vhdl",
+          "begin": "\\(",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
+              "name": "meta.list.element.vhdl",
               "begin": "(?=['\"a-zA-Z0-9])",
               "end": "(;|\\)|,)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.item.stopping.character.vhdl"
-                }
-              },
-              "name": "meta.list.element.vhdl",
               "patterns": [
                 {
                   "include": "#comments"
@@ -899,74 +883,103 @@
                 {
                   "include": "#cleanup"
                 }
-              ]
+              ],
+              "endCaptures": {
+                "0": {
+                  "name": "meta.item.stopping.character.vhdl"
+                }
+              }
             },
             {
-              "match": "\\)",
-              "name": "invalid.illegal.unexpected.parenthesis.vhdl"
+              "name": "invalid.illegal.unexpected.parenthesis.vhdl",
+              "match": "\\)"
             },
             {
               "include": "#cleanup"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.parenthetical_list.begin.vhdl"
+            }
+          }
         }
       ]
     },
     "parenthetical_pair": {
       "patterns": [
         {
+          "name": "meta.block.parenthetical_pair.vhdl",
           "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#parenthetical_pair"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.scope.begin.vhdl"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.vhdl"
             }
-          },
-          "name": "meta.block.parenthetical_pair.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_pair"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "port_list_pattern": {
       "patterns": [
         {
+          "name": "meta.block.port_list.vhdl",
           "begin": "\\b(?i:port)\\b",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "keyword.control.port.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.port_list.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            }
-          ]
+          }
         }
       ]
     },
     "procedure_definition_pattern": {
       "patterns": [
         {
+          "name": "meta.block.procedure_definition.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word function $1\n\t\t\t\t\t\t((?i:procedure))\\s+\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A valid normal identifier $3\n\t\t\t\t\t\t\t ([a-zA-Z][a-zA-Z\\d_]*)\n\t\t\t\t\t\t\t# A valid quoted identifier $4\n\t\t\t\t\t\t\t|(\"\\S+\")\n\t\t\t\t\t\t\t# An invalid identifier $5\n\t\t\t\t\t\t\t|(.+?)\n\t\t\t\t\t\t)\n\n\t\t\t\t\t\t# Check to make sure we have a list is\n\t\t\t\t\t\t(?=\\s*(\\(|(?i:is)))\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word function $3\n\t\t\t\t\t\t(\\s+((?i:procedure)))?\n\n\t\t\t\t\t\t# Optional matched identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\3|\\4)|(.+?)))?\n\n\t\t\t\t\t\t# Ending with whitespace and semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            },
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#type_pattern"
+            },
+            {
+              "include": "#record_pattern"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.procedure.vhdl"
@@ -981,7 +994,6 @@
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word function $3\n\t\t\t\t\t\t(\\s+((?i:procedure)))?\n\n\t\t\t\t\t\t# Optional matched identifier $6 or mismatched identifier $7\n\t\t\t\t\t\t(\\s+((\\3|\\4)|(.+?)))?\n\n\t\t\t\t\t\t# Ending with whitespace and semicolon\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -995,32 +1007,21 @@
             "7": {
               "name": "invalid.illegal.mismatched.identifier.vhdl"
             }
-          },
-          "name": "meta.block.procedure_definition.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            },
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#type_pattern"
-            },
-            {
-              "include": "#record_pattern"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "procedure_prototype_pattern": {
       "patterns": [
         {
+          "name": "meta.block.procedure_prototype.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t\\b((?i:procedure))\\s+\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))\n\t\t\t\t\t\t(?=\\s*(\\(|;))\n\t\t\t\t\t",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#parenthetical_list"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.procedure.vhdl"
@@ -1032,25 +1033,28 @@
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctual.vhdl"
             }
-          },
-          "name": "meta.block.procedure_prototype.vhdl",
-          "patterns": [
-            {
-              "include": "#parenthetical_list"
-            }
-          ]
+          }
         }
       ]
     },
     "process_pattern": {
       "patterns": [
         {
+          "name": "meta.block.process.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Optional identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# The word process #4\n\t\t\t\t\t\t((?i:process))\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word process $3\n\t\t\t\t\t\t(\\s+((?i:process)))\n\n\t\t\t\t\t\t# Optional identifier $6 or invalid identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "2": {
               "name": "entity.name.section.process.begin.vhdl"
@@ -1062,7 +1066,6 @@
               "name": "keyword.control.process.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word process $3\n\t\t\t\t\t\t(\\s+((?i:process)))\n\n\t\t\t\t\t\t# Optional identifier $6 or invalid identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -1076,37 +1079,34 @@
             "7": {
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
-          },
-          "name": "meta.block.process.vhdl",
-          "patterns": [
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "punctuation": {
       "patterns": [
         {
-          "match": "(\\.|,|:|;|\\(|\\))",
-          "name": "punctuation.definition.other.vhdl"
+          "name": "punctuation.definition.other.vhdl",
+          "match": "(\\.|,|:|;|\\(|\\))"
         }
       ]
     },
     "record_pattern": {
       "patterns": [
         {
+          "name": "meta.block.record.vhdl",
           "begin": "\\b(?i:record)\\b",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\n\n\t\t\t\t\t\t# The word record $2\n\t\t\t\t\t\t\\s+((?i:record))\n\n\t\t\t\t\t\t# Optional identifier $5 or invalid identifier $6\n\t\t\t\t\t\t(\\s+(([a-zA-Z][a-zA-Z\\d_]*)|(.*?)))?\n\n\t\t\t\t\t\t# Only whitespace and semicolons can be left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "storage.type.record.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\n\n\t\t\t\t\t\t# The word record $2\n\t\t\t\t\t\t\\s+((?i:record))\n\n\t\t\t\t\t\t# Optional identifier $5 or invalid identifier $6\n\t\t\t\t\t\t(\\s+(([a-zA-Z][a-zA-Z\\d_]*)|(.*?)))?\n\n\t\t\t\t\t\t# Only whitespace and semicolons can be left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -1120,13 +1120,7 @@
             "6": {
               "name": "invalid.illegal.invalid.identifier.vhdl"
             }
-          },
-          "name": "meta.block.record.vhdl",
-          "patterns": [
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         },
         {
           "include": "#cleanup"
@@ -1136,6 +1130,8 @@
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.single.vhdl",
+          "match": "(').(')",
           "captures": {
             "1": {
               "name": "punctuation.definition.string.begin.vhdl"
@@ -1143,42 +1139,47 @@
             "2": {
               "name": "punctuation.definition.string.end.vhdl"
             }
-          },
-          "match": "(').(')",
-          "name": "string.quoted.single.vhdl"
+          }
         },
         {
+          "name": "string.quoted.double.vhdl",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.vhdl",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.vhdl"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.vhdl"
             }
-          },
-          "name": "string.quoted.double.vhdl",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.vhdl"
-            }
-          ]
+          }
         },
         {
+          "name": "string.other.backslash.vhdl",
           "begin": "\\\\",
-          "end": "\\\\",
-          "name": "string.other.backslash.vhdl"
+          "end": "\\\\"
         }
       ]
     },
     "subtype_pattern": {
       "patterns": [
         {
+          "name": "meta.block.subtype.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# The word subtype $1\n\t\t\t\t\t\t\\b((?i:subtype))\\s+\n\n\t\t\t\t\t\t# Valid identifier $3 or invalid identifier $4\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))\\s+\n\n\t\t\t\t\t\t# The word is $5\n\t\t\t\t\t\t((?i:is))\\b\n\t\t\t\t\t",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.subtype.vhdl"
@@ -1193,86 +1194,79 @@
               "name": "keyword.control.is.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.subtype.vhdl",
-          "patterns": [
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "support_constants": {
       "patterns": [
         {
-          "match": "\\b(?i:math_1_over_e|math_1_over_pi|math_1_over_sqrt_2|math_2_pi|math_3_pi_over_2|math_deg_to_rad|math_e|math_log10_of_e|math_log2_of_e|math_log_of_10|math_log_of_2|math_pi|math_pi_over_2|math_pi_over_3|math_pi_over_4|math_rad_to_deg|math_sqrt_2|math_sqrt_pi)\\b",
-          "name": "support.constant.ieee.math_real.vhdl"
+          "name": "support.constant.ieee.math_real.vhdl",
+          "match": "\\b(?i:math_1_over_e|math_1_over_pi|math_1_over_sqrt_2|math_2_pi|math_3_pi_over_2|math_deg_to_rad|math_e|math_log10_of_e|math_log2_of_e|math_log_of_10|math_log_of_2|math_pi|math_pi_over_2|math_pi_over_3|math_pi_over_4|math_rad_to_deg|math_sqrt_2|math_sqrt_pi)\\b"
         },
         {
-          "match": "\\b(?i:math_cbase_1|math_cbase_j|math_czero|positive_real|principal_value)\\b",
-          "name": "support.constant.ieee.math_complex.vhdl"
+          "name": "support.constant.ieee.math_complex.vhdl",
+          "match": "\\b(?i:math_cbase_1|math_cbase_j|math_czero|positive_real|principal_value)\\b"
         },
         {
-          "match": "\\b(?i:true|false)\\b",
-          "name": "support.constant.std.standard.vhdl"
+          "name": "support.constant.std.standard.vhdl",
+          "match": "\\b(?i:true|false)\\b"
         }
       ]
     },
     "support_functions": {
       "patterns": [
         {
-          "match": "\\b(?i:finish|stop|resolution_limit)\\b",
-          "name": "support.function.std.env.vhdl"
+          "name": "support.function.std.env.vhdl",
+          "match": "\\b(?i:finish|stop|resolution_limit)\\b"
         },
         {
-          "match": "\\b(?i:readline|read|writeline|write|endfile|endline)\\b",
-          "name": "support.function.std.textio.vhdl"
+          "name": "support.function.std.textio.vhdl",
+          "match": "\\b(?i:readline|read|writeline|write|endfile|endline)\\b"
         },
         {
-          "match": "\\b(?i:rising_edge|falling_edge|to_bit|to_bitvector|to_stdulogic|to_stdlogicvector|to_stdulogicvector|is_x)\\b",
-          "name": "support.function.ieee.std_logic_1164.vhdl"
+          "name": "support.function.ieee.std_logic_1164.vhdl",
+          "match": "\\b(?i:rising_edge|falling_edge|to_bit|to_bitvector|to_stdulogic|to_stdlogicvector|to_stdulogicvector|is_x)\\b"
         },
         {
-          "match": "\\b(?i:shift_left|shift_right|rotate_left|rotate_right|resize|to_integer|to_unsigned|to_signed)\\b",
-          "name": "support.function.ieee.numeric_std.vhdl"
+          "name": "support.function.ieee.numeric_std.vhdl",
+          "match": "\\b(?i:shift_left|shift_right|rotate_left|rotate_right|resize|to_integer|to_unsigned|to_signed)\\b"
         },
         {
-          "match": "\\b(?i:arccos(h?)|arcsin(h?)|arctan|arctanh|cbrt|ceil|cos|cosh|exp|floor|log10|log2|log|realmax|realmin|round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\b",
-          "name": "support.function.ieee.math_real.vhdl"
+          "name": "support.function.ieee.math_real.vhdl",
+          "match": "\\b(?i:arccos(h?)|arcsin(h?)|arctan|arctanh|cbrt|ceil|cos|cosh|exp|floor|log10|log2|log|realmax|realmin|round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\b"
         },
         {
-          "match": "\\b(?i:arg|cmplx|complex_to_polar|conj|get_principal_value|polar_to_complex)\\b",
-          "name": "support.function.ieee.math_complex.vhdl"
+          "name": "support.function.ieee.math_complex.vhdl",
+          "match": "\\b(?i:arg|cmplx|complex_to_polar|conj|get_principal_value|polar_to_complex)\\b"
         }
       ]
     },
     "support_types": {
       "patterns": [
         {
-          "match": "\\b(?i:boolean|bit|character|severity_level|integer|real|time|delay_length|now|natural|positive|string|bit_vector|file_open_kind|file_open_status|fs|ps|ns|us|ms|sec|min|hr|severity_level|note|warning|error|failure)\\b",
-          "name": "support.type.std.standard.vhdl"
+          "name": "support.type.std.standard.vhdl",
+          "match": "\\b(?i:boolean|bit|character|severity_level|integer|real|time|delay_length|now|natural|positive|string|bit_vector|file_open_kind|file_open_status|fs|ps|ns|us|ms|sec|min|hr|severity_level|note|warning|error|failure)\\b"
         },
         {
-          "match": "\\b(?i:line|text|side|width|input|output)\\b",
-          "name": "support.type.std.textio.vhdl"
+          "name": "support.type.std.textio.vhdl",
+          "match": "\\b(?i:line|text|side|width|input|output)\\b"
         },
         {
-          "match": "\\b(?i:std_logic|std_ulogic|std_logic_vector|std_ulogic_vector)\\b",
-          "name": "support.type.ieee.std_logic_1164.vhdl"
+          "name": "support.type.ieee.std_logic_1164.vhdl",
+          "match": "\\b(?i:std_logic|std_ulogic|std_logic_vector|std_ulogic_vector)\\b"
         },
         {
-          "match": "\\b(?i:signed|unsigned)\\b",
-          "name": "support.type.ieee.numeric_std.vhdl"
+          "name": "support.type.ieee.numeric_std.vhdl",
+          "match": "\\b(?i:signed|unsigned)\\b"
         },
         {
-          "match": "\\b(?i:complex|complex_polar)\\b",
-          "name": "support.type.ieee.math_complex.vhdl"
+          "name": "support.type.ieee.math_complex.vhdl",
+          "match": "\\b(?i:complex|complex_polar)\\b"
         }
       ]
     },
@@ -1298,7 +1292,17 @@
     "type_pattern": {
       "patterns": [
         {
+          "name": "meta.block.type.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# The word type $1\n\t\t\t\t\t\t\\b((?i:type))\\s+\n\n\t\t\t\t\t\t# Valid identifier $3 or invalid identifier $4\n\t\t\t\t\t\t(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# A semicolon is coming up if we are incomplete\n\t\t\t\t\t\t\t (?=\\s*;)\n\n\t\t\t\t\t\t\t# Or the word is comes up $7\n\t\t\t\t\t\t\t|(\\s+((?i:is)))\n\t\t\t\t\t\t)\\b\n\t\t\t\t\t",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#record_pattern"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.type.vhdl"
@@ -1313,28 +1317,28 @@
               "name": "keyword.control.is.vhdl"
             }
           },
-          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.vhdl"
             }
-          },
-          "name": "meta.block.type.vhdl",
-          "patterns": [
-            {
-              "include": "#record_pattern"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     },
     "while_pattern": {
       "patterns": [
         {
+          "name": "meta.block.while.vhdl",
           "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Check for an identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Followed by a colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# The for keyword $4\n\t\t\t\t\t\t\\b((?i:while))\\b\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Followed by keyword loop $3\n\t\t\t\t\t\t\t ((?i:loop))\n\n\t\t\t\t\t\t\t# But it really is required $4\n\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t)\\b\n\n\t\t\t\t\t\t# The matching identifier $7 or an invalid identifier $8\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t# Only space and a semicolon left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "patterns": [
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ],
           "beginCaptures": {
             "2": {
               "name": "entity.name.type.vhdl"
@@ -1346,7 +1350,6 @@
               "name": "keyword.control.while.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t\\b((?i:end))\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Followed by keyword loop $3\n\t\t\t\t\t\t\t ((?i:loop))\n\n\t\t\t\t\t\t\t# But it really is required $4\n\t\t\t\t\t\t\t|(\\S+)\n\t\t\t\t\t\t)\\b\n\n\t\t\t\t\t\t# The matching identifier $7 or an invalid identifier $8\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t# Only space and a semicolon left\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.control.end.vhdl"
@@ -1363,20 +1366,9 @@
             "8": {
               "name": "invalid.illegal.mismatched.identifier"
             }
-          },
-          "name": "meta.block.while.vhdl",
-          "patterns": [
-            {
-              "include": "#control_patterns"
-            },
-            {
-              "include": "#cleanup"
-            }
-          ]
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.vhdl",
-  "uuid": "99A3EB51-FCCD-4EA4-A642-10C2E8B93112"
-}
+  }
+}