github-linguist 5.3.3 → 6.0.0

data/grammars/config.xcompose.json

@@ -1,9 +1,6 @@
 {
-  "scopeName": "config.xcompose",
   "name": "XCompose",
-  "fileTypes": [
-    "XCompose"
-  ],
+  "scopeName": "config.xcompose",
   "patterns": [
     {
       "include": "#comment"
@@ -31,32 +28,40 @@
     }
   ],
   "repository": {
+    "colon": {
+      "name": "entity.function.xcompose",
+      "match": ":"
+    },
     "comment": {
-      "match": "#.*",
-      "name": "comment.block.xcompose"
+      "name": "comment.block.xcompose",
+      "match": "#.*"
     },
-    "multikey": {
-      "match": "(?x) ( < ) ( Multi_key ) ( > )",
+    "key": {
+      "match": "(?x) ( \u003c ) ( \\S+ ) ( \u003e )",
       "captures": {
         "1": {
           "name": "entity.function.xcompose"
         },
         "2": {
-          "name": "declaror.class.xcompose"
+          "name": "keyword.xcompose.xcompose"
         },
         "3": {
           "name": "entity.function.xcompose"
         }
       }
     },
-    "key": {
-      "match": "(?x) ( < ) ( \\S+ ) ( > )",
+    "keyword": {
+      "name": "entity.function.xcompose",
+      "match": "\u0008include\u0008"
+    },
+    "multikey": {
+      "match": "(?x) ( \u003c ) ( Multi_key ) ( \u003e )",
       "captures": {
         "1": {
           "name": "entity.function.xcompose"
         },
         "2": {
-          "name": "keyword.xcompose.xcompose"
+          "name": "declaror.class.xcompose"
         },
         "3": {
           "name": "entity.function.xcompose"
@@ -64,20 +69,12 @@
       }
     },
     "quoted": {
-      "match": "\".*\"",
-      "name": "string.quoted.double.xcompose"
-    },
-    "colon": {
-      "match": ":",
-      "name": "entity.function.xcompose"
-    },
-    "keyword": {
-      "match": "\binclude\b",
-      "name": "entity.function.xcompose"
+      "name": "string.quoted.double.xcompose",
+      "match": "\".*\""
     },
     "unicode": {
-      "match": "U[0-9A-Fa-f]+",
-      "name": "storage.modifier.unicode.xcompose"
+      "name": "storage.modifier.unicode.xcompose",
+      "match": "U[0-9A-Fa-f]+"
     }
   }
-}
+}

data/grammars/file.lasso.json

@@ -1,17 +1,10 @@
 {
-  "fileTypes": [
-    "lasso",
-    "las",
-    "inc"
-  ],
-  "firstLineMatch": "<\\?(?i:=|lasso(script)?)",
-  "foldingStartMarker": "(?x)(\n\t\t<\\?(?i:=|lasso(script)?)\\b\n\t\t|(?i:if|inline|iterate|loop|match|protect|records|resultset|rows|while)(\\(|:).*(;|$)\n\t\t|\\/\\*(?!.*\\*\\/)\n\t    |\\{\\s*$\n\t    |\\{\\^\\s*$\n\t\t)",
-  "foldingStopMarker": "(?x)(\n\t\t\\s*\\?>\n\t\t|/(?i:if|inline|iterate|loop|match|protect|records|resultset|rows|while)(;|$)\n\t\t|^(?!.*?\\/\\*).*?\\*\\/\n\t\t|^\\s*\\}\n\t\t|^\\s*\\^\\}\n\t\t)",
   "name": "Lasso",
+  "scopeName": "file.lasso",
   "patterns": [
     {
       "name": "text.html.basic",
-      "begin": "(?m)\\A\\s*(?=<|\\[)",
+      "begin": "(?m)\\A\\s*(?=\u003c|\\[)",
       "end": "\\a",
       "patterns": [
         {
@@ -31,17 +24,53 @@
     }
   ],
   "repository": {
+    "embedded-code": {
+      "patterns": [
+        {
+          "include": "#lasso_script"
+        },
+        {
+          "include": "#lasso_brackets"
+        }
+      ]
+    },
+    "entities": {
+      "patterns": [
+        {
+          "name": "constant.character.entity.html",
+          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.html"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.html"
+            }
+          }
+        },
+        {
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
+        }
+      ]
+    },
     "lasso": {
       "patterns": [
         {
           "name": "meta.definition.type_trait.start.lasso",
-          "begin": "(?i)\\b(define)\\s+(?=[_a-z][_0-9a-z]*\\s*=>\\s*(type|trait|thread)\\s*\\{)",
+          "begin": "(?i)\\b(define)\\s+(?=[_a-z][_0-9a-z]*\\s*=\u003e\\s*(type|trait|thread)\\s*\\{)",
+          "end": "(=\u003e)\\s*(type|trait|thread)\\s*\\{",
+          "patterns": [
+            {
+              "name": "meta.name.type_trait.lasso",
+              "match": "[_a-z][_0-9a-z]*"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.definition.lasso"
             }
           },
-          "end": "(=>)\\s*(type|trait|thread)\\s*\\{",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.association.lasso"
@@ -49,148 +78,147 @@
             "2": {
               "name": "keyword.descriptors.lasso"
             }
-          },
-          "patterns": [
-            {
-              "match": "[_a-z][_0-9a-z]*",
-              "name": "meta.name.type_trait.lasso"
-            }
-          ]
+          }
         },
         {
           "name": "meta.definition.method.start.lasso",
-          "begin": "(?i)\\b(define)\\s+(?=[_a-z][_0-9a-z]*\\s*=>|\\()",
+          "begin": "(?i)\\b(define)\\s+(?=[_a-z][_0-9a-z]*\\s*=\u003e|\\()",
+          "end": "\\(|(=\u003e)",
+          "patterns": [
+            {
+              "name": "meta.name.method.lasso",
+              "match": "[_a-z][_0-9a-z]*"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.definition.lasso"
             }
           },
-          "end": "\\(|(=>)",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.association.lasso"
             }
-          },
-          "patterns": [
-            {
-              "match": "[_a-z][_0-9a-z]*",
-              "name": "meta.name.method.lasso"
-            }
-          ]
+          }
         },
         {
-          "match": "(?i)\\b(abort|case|define|else|if|inline|iterate|loop|loop_abort|loop_continue|loop_count|loop_key|loop_value|match|protect|records|resultset|return|rows|while)\\b",
-          "name": "keyword.control.lasso"
+          "name": "keyword.control.lasso",
+          "match": "(?i)\\b(abort|case|define|else|if|inline|iterate|loop|loop_abort|loop_continue|loop_count|loop_key|loop_value|match|protect|records|resultset|return|rows|while)\\b"
         },
         {
-          "match": "(?i)\\b(library|include)(_once)?\\b",
-          "name": "keyword.control.import.lasso"
+          "name": "keyword.control.import.lasso",
+          "match": "(?i)\\b(library|include)(_once)?\\b"
         },
         {
-          "match": "(?i)\\b(public|private|protected|data|type|thread|trait|import|parent|provide|require)\\b",
-          "name": "keyword.descriptors.lasso"
+          "name": "keyword.descriptors.lasso",
+          "match": "(?i)\\b(public|private|protected|data|type|thread|trait|import|parent|provide|require)\\b"
         },
         {
-          "match": "(?i)\\b(array|action_params?|boolean|bytes|capture|curl|currency|database_registry|date|dateandtime|decimal|delve|dir|duration|eacher|file|generateForEachKeyed|generateForEachUnKeyed|generateSeries|inline_type|integer|list|list_node|literal|local|locale|map|map_node\n\t\t\t\t\t|net_tcp|net_tcpssl|net_udp|net_udppacket|object|pair|pairup|paramdesc|pdf_barcode|pdf_chunk|pdf_color|pdf_doc|pdf_font|pdf_hyphenator|pdf_image|pdf_list|pdf_paragraph|pdf_phrase|pdf_read|pdf_table|pdf_text|pdf_typebase\n\t\t\t\t\t|percent|queriable_select|queriable_groupBy|queriable_grouping|queriable_groupJoin|queriable_join|queriable_orderBy|queriable_orderByDescending|queriable_selectMany|queriable_skip|queriable_take|queriable_thenBy|queriable_thenByDescending|queriable_where\n\t\t\t\t\t|queue|repeat|serialization_element|serialization_object_identity_compare|serialization_reader|serialization_writer|serialization_writer_ref|serialization_writer_standin|set|scientific\n\t\t\t\t\t|sqlite_column|sqlite_columnScanner|sqlite_currentrow|sqlite_db|sqlite_expressionGenerator|sqlite_query_stat|sqlite_results|sqlite_table|stack|staticarray|string|tie|timeonly|tree_base|tree_node|tree_nullNode|user_registry|var(iable)?|web_request|web_response|xml_element|xml_namednodemap_attr|xml_node|xml_nodelist|zip|zip_file)\\b",
-          "name": "storage.type.lasso"
+          "name": "storage.type.lasso",
+          "match": "(?i)\\b(array|action_params?|boolean|bytes|capture|curl|currency|database_registry|date|dateandtime|decimal|delve|dir|duration|eacher|file|generateForEachKeyed|generateForEachUnKeyed|generateSeries|inline_type|integer|list|list_node|literal|local|locale|map|map_node\n\t\t\t\t\t|net_tcp|net_tcpssl|net_udp|net_udppacket|object|pair|pairup|paramdesc|pdf_barcode|pdf_chunk|pdf_color|pdf_doc|pdf_font|pdf_hyphenator|pdf_image|pdf_list|pdf_paragraph|pdf_phrase|pdf_read|pdf_table|pdf_text|pdf_typebase\n\t\t\t\t\t|percent|queriable_select|queriable_groupBy|queriable_grouping|queriable_groupJoin|queriable_join|queriable_orderBy|queriable_orderByDescending|queriable_selectMany|queriable_skip|queriable_take|queriable_thenBy|queriable_thenByDescending|queriable_where\n\t\t\t\t\t|queue|repeat|serialization_element|serialization_object_identity_compare|serialization_reader|serialization_writer|serialization_writer_ref|serialization_writer_standin|set|scientific\n\t\t\t\t\t|sqlite_column|sqlite_columnScanner|sqlite_currentrow|sqlite_db|sqlite_expressionGenerator|sqlite_query_stat|sqlite_results|sqlite_table|stack|staticarray|string|tie|timeonly|tree_base|tree_node|tree_nullNode|user_registry|var(iable)?|web_request|web_response|xml_element|xml_namednodemap_attr|xml_node|xml_nodelist|zip|zip_file)\\b"
         },
         {
-          "comment": "This is for the ljapi types",
-          "match": "(?i)\\b(jchar|jchararray|jbyte|jbytearray|jfloat|jint|jshort)\\b",
-          "name": "storage.type.lasso"
+          "name": "storage.type.lasso",
+          "match": "(?i)\\b(jchar|jchararray|jbyte|jbytearray|jfloat|jint|jshort)\\b"
         },
         {
-          "match": "\\b(?i:void|null|true|false)\\b",
-          "name": "constant.language.lasso"
+          "name": "constant.language.lasso",
+          "match": "\\b(?i:void|null|true|false)\\b"
         },
         {
+          "name": "string.quoted.double.lasso",
           "begin": "\"",
           "end": "\"",
-          "name": "string.quoted.double.lasso",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.lasso"
+              "name": "constant.character.escape.lasso",
+              "match": "\\\\."
             }
           ]
         },
         {
+          "name": "string.quoted.single.lasso",
           "begin": "'",
           "end": "'",
-          "name": "string.quoted.single.lasso",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.lasso"
+              "name": "constant.character.escape.lasso",
+              "match": "\\\\."
             }
           ]
         },
         {
+          "name": "string.quoted.backtick.lasso",
           "begin": "`",
-          "end": "`",
-          "name": "string.quoted.backtick.lasso"
+          "end": "`"
         },
         {
+          "name": "comment.block.documentation.lasso",
           "begin": "/\\*\\*(\\!)?\\s*$",
-          "comment": "This now only highlights a docblock if the first line contains only /**\n\t\t\t\t\t\t\t\t- this is to stop highlighting everything as invalid when people do comment banners with /******** ...\n\t\t\t\t\t\t\t\t- Now matches /**! too - used for docblock templates",
-          "end": "\\*/",
-          "name": "comment.block.documentation.lasso"
+          "end": "\\*/"
         },
         {
+          "name": "comment.block.lasso",
           "begin": "/\\*",
-          "end": "\\*/",
-          "name": "comment.block.lasso"
+          "end": "\\*/"
         },
         {
-          "match": "(//).*?($\\n?|(?=\\?>))",
-          "name": "comment.line.double-slash.lasso"
+          "name": "comment.line.double-slash.lasso",
+          "match": "(//).*?($\\n?|(?=\\?\u003e))"
         },
         {
-          "match": "\\$[a-zA-Z_][a-zA-Z0-9_.]*",
-          "name": "variable.other.thread.lasso"
+          "name": "variable.other.thread.lasso",
+          "match": "\\$[a-zA-Z_][a-zA-Z0-9_.]*"
         },
         {
-          "match": "#[a-zA-Z_][a-zA-Z0-9_.]*",
-          "name": "variable.other.local.lasso"
+          "name": "variable.other.local.lasso",
+          "match": "#[a-zA-Z_][a-zA-Z0-9_.]*"
         },
         {
-          "match": "(\\s#1\\s|\\b(?i:self)\\b)",
-          "name": "variable.language.lasso"
+          "name": "variable.language.lasso",
+          "match": "(\\s#1\\s|\\b(?i:self)\\b)"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.lasso"
+          "name": "keyword.operator.increment-decrement.lasso",
+          "match": "(\\-\\-|\\+\\+)"
         },
         {
-          "match": "(\\-|\\+|\\*|/|%)",
-          "name": "keyword.operator.arithmetic.lasso"
+          "name": "keyword.operator.arithmetic.lasso",
+          "match": "(\\-|\\+|\\*|/|%)"
         },
         {
-          "match": "(?i)(!|&&|\\|\\||\\?|\\bnot\\b|\\band\\b|\\bor\\b)",
-          "name": "keyword.operator.logical.lasso"
+          "name": "keyword.operator.logical.lasso",
+          "match": "(?i)(!|\u0026\u0026|\\|\\||\\?|\\bnot\\b|\\band\\b|\\bor\\b)"
         },
         {
-          "match": "(=|:=|\\+=|\\-=|/=|%=)",
-          "name": "keyword.operator.assignment.lasso"
+          "name": "keyword.operator.assignment.lasso",
+          "match": "(=|:=|\\+=|\\-=|/=|%=)"
         },
         {
-          "match": "(===|==|!==|!=|<=|>=|<|>|>>|!>>)",
-          "name": "keyword.operator.comparison.lasso"
+          "name": "keyword.operator.comparison.lasso",
+          "match": "(===|==|!==|!=|\u003c=|\u003e=|\u003c|\u003e|\u003e\u003e|!\u003e\u003e)"
         },
         {
-          "match": "(->|&)",
-          "name": "keyword.operator.target.lasso"
+          "name": "keyword.operator.target.lasso",
+          "match": "(-\u003e|\u0026)"
         },
         {
-          "match": "(=>)",
-          "name": "keyword.operator.association.lasso"
+          "name": "keyword.operator.association.lasso",
+          "match": "(=\u003e)"
         }
       ]
     },
     "lasso-html": {
       "patterns": [
         {
-          "begin": "(<)([a-zA-Z0-9:]++)(?=[^>]*></\\2>)",
+          "name": "meta.tag.any.html",
+          "begin": "(\u003c)([a-zA-Z0-9:]++)(?=[^\u003e]*\u003e\u003c/\\2\u003e)",
+          "end": "(\u003e(\u003c)/)(\\2)(\u003e)",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -199,7 +227,6 @@
               "name": "entity.name.tag.html"
             }
           },
-          "end": "(>(<)/)(\\2)(>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -213,26 +240,12 @@
             "4": {
               "name": "punctuation.definition.tag.html"
             }
-          },
-          "name": "meta.tag.any.html",
-          "patterns": [
-            {
-              "include": "#tag-stuff"
-            }
-          ]
+          }
         },
         {
-          "begin": "(<\\?)(xml)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.xml.html"
-            }
-          },
-          "end": "(\\?>)",
           "name": "meta.tag.preprocessor.xml.html",
+          "begin": "(\u003c\\?)(xml)",
+          "end": "(\\?\u003e)",
           "patterns": [
             {
               "include": "#tag-generic-attribute"
@@ -243,91 +256,83 @@
             {
               "include": "#string-single-quoted"
             }
-          ]
-        },
-        {
-          "begin": "<!--",
+          ],
           "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.html"
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.xml.html"
             }
-          },
-          "end": "--\\s*>",
+          }
+        },
+        {
           "name": "comment.block.html",
+          "begin": "\u003c!--",
+          "end": "--\\s*\u003e",
           "patterns": [
             {
-              "match": "--",
-              "name": "invalid.illegal.bad-comments-or-CDATA.html"
+              "name": "invalid.illegal.bad-comments-or-CDATA.html",
+              "match": "--"
             }
-          ]
-        },
-        {
-          "begin": "<!",
+          ],
           "captures": {
             "0": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.comment.html"
             }
-          },
-          "end": ">",
+          }
+        },
+        {
           "name": "meta.tag.sgml.html",
+          "begin": "\u003c!",
+          "end": "\u003e",
           "patterns": [
             {
+              "name": "meta.tag.sgml.doctype.html",
               "begin": "(DOCTYPE)",
+              "end": "(?=\u003e)",
+              "patterns": [
+                {
+                  "name": "string.quoted.double.doctype.identifiers-and-DTDs.html",
+                  "match": "\"[^\"\u003e]*\""
+                }
+              ],
               "captures": {
                 "1": {
                   "name": "entity.name.tag.doctype.html"
                 }
-              },
-              "end": "(?=>)",
-              "name": "meta.tag.sgml.doctype.html",
-              "patterns": [
-                {
-                  "match": "\"[^\">]*\"",
-                  "name": "string.quoted.double.doctype.identifiers-and-DTDs.html"
-                }
-              ]
+              }
             },
             {
+              "name": "constant.other.inline-data.html",
               "begin": "\\[CDATA\\[",
-              "end": "]](?=>)",
-              "name": "constant.other.inline-data.html"
+              "end": "]](?=\u003e)"
             },
             {
-              "match": "(\\s*)(?!--|>)\\S(\\s*)",
-              "name": "invalid.illegal.bad-comments-or-CDATA.html"
+              "name": "invalid.illegal.bad-comments-or-CDATA.html",
+              "match": "(\\s*)(?!--|\u003e)\\S(\\s*)"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.tag.html"
+            }
+          }
         },
         {
           "include": "#embedded-code"
         },
         {
-          "begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*/>)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.style.html"
-            },
-            "3": {
-              "name": "punctuation.definition.tag.html"
-            }
-          },
-          "end": "(</)((?i:style))(>)(?:\\s*\\n)?",
           "name": "source.css.embedded.html",
+          "begin": "(?:^\\s+)?(\u003c)((?i:style))\\b(?![^\u003e]*/\u003e)",
+          "end": "(\u003c/)((?i:style))(\u003e)(?:\\s*\\n)?",
           "patterns": [
             {
               "include": "#tag-stuff"
             },
             {
-              "begin": "(>)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.html"
-                }
-              },
-              "end": "(?=</(?i:style))",
+              "begin": "(\u003e)",
+              "end": "(?=\u003c/(?i:style))",
               "patterns": [
                 {
                   "include": "#embedded-code"
@@ -335,89 +340,112 @@
                 {
                   "include": "source.css"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.html"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*/>)",
-          "beginCaptures": {
+          ],
+          "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
             },
             "2": {
-              "name": "entity.name.tag.script.html"
-            }
-          },
-          "end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?",
-          "endCaptures": {
-            "2": {
+              "name": "entity.name.tag.style.html"
+            },
+            "3": {
               "name": "punctuation.definition.tag.html"
             }
-          },
+          }
+        },
+        {
           "name": "source.js.embedded.html",
+          "begin": "(?:^\\s+)?(\u003c)((?i:script))\\b(?![^\u003e]*/\u003e)",
+          "end": "(?\u003c=\u003c/(script|SCRIPT))(\u003e)(?:\\s*\\n)?",
           "patterns": [
             {
               "include": "#tag-stuff"
             },
             {
-              "begin": "(?<!</(?:script|SCRIPT))(>)",
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.script.html"
-                }
-              },
-              "end": "(</)((?i:script))",
+              "begin": "(?\u003c!\u003c/(?:script|SCRIPT))(\u003e)",
+              "end": "(\u003c/)((?i:script))",
               "patterns": [
                 {
+                  "name": "comment.line.double-slash.js",
+                  "match": "(//).*?((?=\u003c/script)|$\\n?)",
                   "captures": {
                     "1": {
                       "name": "punctuation.definition.comment.js"
                     }
-                  },
-                  "match": "(//).*?((?=</script)|$\\n?)",
-                  "name": "comment.line.double-slash.js"
+                  }
                 },
                 {
+                  "name": "comment.block.js",
                   "begin": "/\\*",
+                  "end": "\\*/|(?=\u003c/script)",
                   "captures": {
                     "0": {
                       "name": "punctuation.definition.comment.js"
                     }
-                  },
-                  "end": "\\*/|(?=</script)",
-                  "name": "comment.block.js"
+                  }
                 },
                 {
                   "include": "source.js"
                 }
-              ]
+              ],
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.html"
+                },
+                "2": {
+                  "name": "entity.name.tag.script.html"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(</?)((?i:body|head|html)\\b)",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
             },
             "2": {
-              "name": "entity.name.tag.structure.any.html"
+              "name": "entity.name.tag.script.html"
             }
           },
-          "end": "(>)",
+          "endCaptures": {
+            "2": {
+              "name": "punctuation.definition.tag.html"
+            }
+          }
+        },
+        {
           "name": "meta.tag.structure.any.html",
+          "begin": "(\u003c/?)((?i:body|head|html)\\b)",
+          "end": "(\u003e)",
           "patterns": [
             {
               "include": "#tag-stuff"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.structure.any.html"
+            }
+          }
         },
         {
-          "begin": "(</?)((?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)",
+          "name": "meta.tag.block.any.html",
+          "begin": "(\u003c/?)((?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)",
+          "end": "(\u003e)",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -426,21 +454,21 @@
               "name": "entity.name.tag.block.any.html"
             }
           },
-          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.end.html"
             }
-          },
-          "name": "meta.tag.block.any.html",
+          }
+        },
+        {
+          "name": "meta.tag.inline.any.html",
+          "begin": "(\u003c/?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
+          "end": "((?: ?/)?\u003e)",
           "patterns": [
             {
               "include": "#tag-stuff"
             }
-          ]
-        },
-        {
-          "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -449,21 +477,21 @@
               "name": "entity.name.tag.inline.any.html"
             }
           },
-          "end": "((?: ?/)?>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.end.html"
             }
-          },
-          "name": "meta.tag.inline.any.html",
+          }
+        },
+        {
+          "name": "meta.tag.other.html",
+          "begin": "(\u003c/?)([a-zA-Z0-9:]+)",
+          "end": "(\u003e)",
           "patterns": [
             {
               "include": "#tag-stuff"
             }
-          ]
-        },
-        {
-          "begin": "(</?)([a-zA-Z0-9:]+)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -472,76 +500,39 @@
               "name": "entity.name.tag.other.html"
             }
           },
-          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.end.html"
             }
-          },
-          "name": "meta.tag.other.html",
-          "patterns": [
-            {
-              "include": "#tag-stuff"
-            }
-          ]
+          }
         },
         {
           "include": "#entities"
         },
         {
-          "match": "<>",
-          "name": "invalid.illegal.incomplete.html"
-        },
-        {
-          "match": "<",
-          "name": "invalid.illegal.bad-angle-bracket.html"
-        }
-      ]
-    },
-    "embedded-code": {
-      "patterns": [
-        {
-          "include": "#lasso_script"
-        },
-        {
-          "include": "#lasso_brackets"
-        }
-      ]
-    },
-    "entities": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.html"
-            }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          "name": "invalid.illegal.incomplete.html",
+          "match": "\u003c\u003e"
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "name": "invalid.illegal.bad-angle-bracket.html",
+          "match": "\u003c"
         }
       ]
     },
-    "lasso_script": {
-      "begin": "(<\\?)(?i:=|lasso(script)?)",
-      "end": "(\\?>)",
+    "lasso_brackets": {
       "name": "source.lasso.embedded.html",
+      "begin": "\\[",
+      "end": "\\]",
       "patterns": [
         {
           "include": "#lasso"
         }
       ]
     },
-    "lasso_brackets": {
-      "begin": "\\[",
-      "end": "\\]",
+    "lasso_script": {
       "name": "source.lasso.embedded.html",
+      "begin": "(\u003c\\?)(?i:=|lasso(script)?)",
+      "end": "(\\?\u003e)",
       "patterns": [
         {
           "include": "#lasso"
@@ -552,6 +543,7 @@
       "patterns": [
         {
           "begin": "(\\{(literal)\\})",
+          "end": "(\\{/(literal)\\})",
           "captures": {
             "1": {
               "name": "source.smarty.embedded.html"
@@ -559,36 +551,23 @@
             "2": {
               "name": "support.function.built-in.smarty"
             }
-          },
-          "end": "(\\{/(literal)\\})"
+          }
         },
         {
+          "name": "source.smarty.embedded.html",
           "begin": "{{|{",
-          "disabled": 1,
           "end": "}}|}",
-          "name": "source.smarty.embedded.html",
           "patterns": [
-            {
-              "include": "source.smarty"
-            }
-          ]
+            {}
+          ],
+          "disabled": true
         }
       ]
     },
     "string-double-quoted": {
+      "name": "string.quoted.double.html",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.html"
-        }
-      },
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
-      "name": "string.quoted.double.html",
       "patterns": [
         {
           "include": "#embedded-code"
@@ -596,22 +575,22 @@
         {
           "include": "#entities"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
+      }
+    },
+    "string-single-quoted": {
       "name": "string.quoted.single.html",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#embedded-code"
@@ -619,40 +598,32 @@
         {
           "include": "#entities"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.html"
+        }
+      }
     },
     "tag-generic-attribute": {
-      "match": "\\b([a-zA-Z\\-:]+)",
-      "name": "entity.other.attribute-name.html"
+      "name": "entity.other.attribute-name.html",
+      "match": "\\b([a-zA-Z\\-:]+)"
     },
     "tag-id-attribute": {
-      "begin": "\\b(id)\\b\\s*(=)",
-      "captures": {
-        "1": {
-          "name": "entity.other.attribute-name.id.html"
-        },
-        "2": {
-          "name": "punctuation.separator.key-value.html"
-        }
-      },
-      "end": "(?<='|\")",
       "name": "meta.attribute-with-value.id.html",
+      "begin": "\\b(id)\\b\\s*(=)",
+      "end": "(?\u003c='|\")",
       "patterns": [
         {
-          "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.html"
-            }
-          },
+          "name": "string.quoted.double.html",
           "contentName": "meta.toc-list.id.html",
+          "begin": "\"",
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.html"
-            }
-          },
-          "name": "string.quoted.double.html",
           "patterns": [
             {
               "include": "#embedded-code"
@@ -660,23 +631,23 @@
             {
               "include": "#entities"
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.html"
             }
           },
-          "contentName": "meta.toc-list.id.html",
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.html"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.html",
+          "contentName": "meta.toc-list.id.html",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
               "include": "#embedded-code"
@@ -684,9 +655,27 @@
             {
               "include": "#entities"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.html"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.html"
+            }
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.id.html"
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html"
+        }
+      }
     },
     "tag-stuff": {
       "patterns": [
@@ -707,7 +696,5 @@
         }
       ]
     }
-  },
-  "scopeName": "file.lasso",
-  "uuid": "ED5E138D-C4A8-4F7A-AAC6-74C315471D00"
-}
+  }
+}