github-linguist 5.3.3 → 6.0.0

data/grammars/text.html.ssp.json

@@ -1,49 +1,43 @@
 {
-  "fileTypes": [
-    "ssp"
-  ],
-  "foldingStartMarker": "(?x)\n\t\t(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\\b.*?>\n\t\t|<!--(?!.*-->)\n\t\t|\\{\\s*($|\\?>\\s*$|//|/\\*(.*\\*/\\s*$|(?!.*?\\*/)))\n\t\t)",
-  "foldingStopMarker": "(?x)\n\t\t(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>\n\t\t|^\\s*-->\n\t\t|(^|\\s)\\}\n\t\t)",
   "name": "Ssp (Scalate)",
+  "scopeName": "text.html.ssp",
   "patterns": [
     {
-      "begin": "<%+#",
+      "name": "comment.block.ssp",
+      "begin": "\u003c%+#",
+      "end": "%\u003e",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.ssp"
         }
-      },
-      "end": "%>",
-      "name": "comment.block.ssp"
+      }
     },
     {
-      "begin": "<%+(?!>)[-=]?",
-      "captures": {
-        "0": {
-          "name": "punctuation.section.embedded.scala"
-        }
-      },
-      "end": "-?%>",
       "name": "source.scala.embedded.html",
+      "begin": "\u003c%+(?!\u003e)[-=]?",
+      "end": "-?%\u003e",
       "patterns": [
         {
+          "name": "comment.line.number-sign.scala",
+          "match": "(#).*?(?=-?%\u003e)",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.scala"
             }
-          },
-          "match": "(#).*?(?=-?%>)",
-          "name": "comment.line.number-sign.scala"
+          }
         },
         {
           "include": "source.scala"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.section.embedded.scala"
+        }
+      }
     },
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.ssp",
-  "uuid": "1869C69F-D37C-4F69-86F3-9D7213CB57C7"
-}
+  ]
+}

data/grammars/text.html.tcl.json

@@ -1,21 +1,26 @@
 {
-  "fileTypes": [
-    "tcl",
-    "adp",
-    "inc"
-  ],
-  "keyEquivalent": "^~T",
   "name": "HTML (Tcl)",
+  "scopeName": "text.html.tcl",
   "patterns": [
     {
-      "begin": "<%",
+      "name": "meta.embedded.line.tcl",
+      "contentName": "source.tcl",
+      "begin": "\u003c%",
+      "end": "(%)\u003e",
+      "patterns": [
+        {
+          "name": "keyword.other.tcl.aolserver",
+          "match": "(env|ns_adp_argc|ns_adp_argv|ns_adp_bind_args|ns_adp_break|ns_adp_debug|ns_adp_dir|ns_adp_dump|ns_adp_eval|ns_adp_exception|ns_adp_include|ns_adp_parse|ns_adp_puts|ns_adp_registertag|ns_adp_return|ns_adp_stream|ns_adp_tell|ns_adp_trunc|ns_atclose|ns_atexit|ns_atshutdown|ns_atsignal|ns_cache_flush|ns_cache_names|ns_cache_size|ns_cache_stats|ns_checkurl|ns_chmod|ns_cond|ns_config|ns_configsection|ns_configsections|ns_conn|ns_conncptofp|ns_connsendfp|ns_cp|ns_cpfp|ns_critsec|ns_crypt|ns_db|ns_dbconfigpath|ns_dberror|ns_dbformvalue|ns_dbformvalueput|ns_dbquotename|ns_dbquotevalue|ns_deleterow|ns_eval|ns_event|ns_ext|ns_findrowbyid|ns_fmttime|ns_ftruncate|ns_getcsv|ns_getform|ns_get_multipart_formdata|ns_geturl|ns_gifsize|ns_gmtime|ns_guesstype|ns_hostbyaddr|ns_hrefs|ns_httpget|ns_httpopen|ns_httptime|ns_info|ns_insertrow|ns_jpegsize|ns_kill|ns_library|ns_link|ns_localsqltimestamp|ns_localtime|ns_log|ns_logroll|ns_markfordelete|ns_mkdir|ns_mktemp|ns_modulepath|ns_mutex|ns_normalizepath|ns_param|ns_parseheader|ns_parsehttptime|ns_parsequery|ns_passwordcheck|ns_perm|ns_permpasswd|ns_pooldescription|ns_puts|ns_queryexists|ns_queryget|ns_querygetall|ns_quotehtml|ns_rand|ns_register_adptag|ns_register_filter|ns_register_proc|ns_register_trace|ns_rename|ns_requestauthorize|ns_respond|ns_return|ns_returnredirect|ns_rmdir|ns_rollfile|ns_rwlock|ns_schedule_daily|ns_schedule_proc|ns_schedule_weekly|ns_section|ns_sema|ns_sendmail|ns_server|ns_set|ns_setexpires|ns_set_precision|ns_share|ns_shutdown|ns_sleep|ns_sockaccept|ns_sockblocking|ns_sockcallback|ns_sockcheck|ns_socketpair|ns_socklistencallback|ns_socknonblocking|ns_socknread|ns_sockopen|ns_sockselect|ns_striphtml|ns_symlink|ns_thread|ns_time|ns_tmpnam|ns_truncate|ns_unlink|ns_unschedule_proc|ns_url2file|ns_urldecode|ns_urlencode|ns_uudecode|ns_uuencode|ns_write|ns_writecontent|ns_writefp|nsv_incr)\\b"
+        },
+        {
+          "include": "source.tcl"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.begin.tcl"
         }
       },
-      "contentName": "source.tcl",
-      "end": "(%)>",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.tcl"
@@ -23,22 +28,10 @@
         "1": {
           "name": "source.tcl"
         }
-      },
-      "name": "meta.embedded.line.tcl",
-      "patterns": [
-        {
-          "match": "(env|ns_adp_argc|ns_adp_argv|ns_adp_bind_args|ns_adp_break|ns_adp_debug|ns_adp_dir|ns_adp_dump|ns_adp_eval|ns_adp_exception|ns_adp_include|ns_adp_parse|ns_adp_puts|ns_adp_registertag|ns_adp_return|ns_adp_stream|ns_adp_tell|ns_adp_trunc|ns_atclose|ns_atexit|ns_atshutdown|ns_atsignal|ns_cache_flush|ns_cache_names|ns_cache_size|ns_cache_stats|ns_checkurl|ns_chmod|ns_cond|ns_config|ns_configsection|ns_configsections|ns_conn|ns_conncptofp|ns_connsendfp|ns_cp|ns_cpfp|ns_critsec|ns_crypt|ns_db|ns_dbconfigpath|ns_dberror|ns_dbformvalue|ns_dbformvalueput|ns_dbquotename|ns_dbquotevalue|ns_deleterow|ns_eval|ns_event|ns_ext|ns_findrowbyid|ns_fmttime|ns_ftruncate|ns_getcsv|ns_getform|ns_get_multipart_formdata|ns_geturl|ns_gifsize|ns_gmtime|ns_guesstype|ns_hostbyaddr|ns_hrefs|ns_httpget|ns_httpopen|ns_httptime|ns_info|ns_insertrow|ns_jpegsize|ns_kill|ns_library|ns_link|ns_localsqltimestamp|ns_localtime|ns_log|ns_logroll|ns_markfordelete|ns_mkdir|ns_mktemp|ns_modulepath|ns_mutex|ns_normalizepath|ns_param|ns_parseheader|ns_parsehttptime|ns_parsequery|ns_passwordcheck|ns_perm|ns_permpasswd|ns_pooldescription|ns_puts|ns_queryexists|ns_queryget|ns_querygetall|ns_quotehtml|ns_rand|ns_register_adptag|ns_register_filter|ns_register_proc|ns_register_trace|ns_rename|ns_requestauthorize|ns_respond|ns_return|ns_returnredirect|ns_rmdir|ns_rollfile|ns_rwlock|ns_schedule_daily|ns_schedule_proc|ns_schedule_weekly|ns_section|ns_sema|ns_sendmail|ns_server|ns_set|ns_setexpires|ns_set_precision|ns_share|ns_shutdown|ns_sleep|ns_sockaccept|ns_sockblocking|ns_sockcallback|ns_sockcheck|ns_socketpair|ns_socklistencallback|ns_socknonblocking|ns_socknread|ns_sockopen|ns_sockselect|ns_striphtml|ns_symlink|ns_thread|ns_time|ns_tmpnam|ns_truncate|ns_unlink|ns_unschedule_proc|ns_url2file|ns_urldecode|ns_urlencode|ns_uudecode|ns_uuencode|ns_write|ns_writecontent|ns_writefp|nsv_incr)\\b",
-          "name": "keyword.other.tcl.aolserver"
-        },
-        {
-          "include": "source.tcl"
-        }
-      ]
+      }
     },
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.tcl",
-  "uuid": "42F00A35-6D17-44B8-8C9B-438F9FE9E241"
-}
+  ]
+}

data/grammars/text.html.twig.json

@@ -1,13 +1,16 @@
 {
-  "fileTypes": [
-    "twig",
-    "html.twig"
-  ],
-  "keyEquivalent": "^~T",
   "name": "HTML (Twig)",
+  "scopeName": "text.html.twig",
   "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"
@@ -16,7 +19,6 @@
           "name": "entity.name.tag.html"
         }
       },
-      "end": "(>(<)/)(\\2)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -30,26 +32,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"
@@ -60,94 +48,86 @@
         {
           "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": "--"
         },
         {
           "include": "#embedded-code"
         }
-      ]
-    },
-    {
-      "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": "(?i: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"
@@ -155,61 +135,56 @@
             {
               "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": "#php"
@@ -226,30 +201,58 @@
             {
               "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"
@@ -258,21 +261,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"
@@ -281,21 +284,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"
@@ -304,29 +307,22 @@
           "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"
+      "name": "invalid.illegal.incomplete.html",
+      "match": "\u003c\u003e"
     },
     {
-      "match": "<",
-      "name": "invalid.illegal.bad-angle-bracket.html"
+      "name": "invalid.illegal.bad-angle-bracket.html",
+      "match": "\u003c"
     },
     {
       "include": "#twig-print-tag"
@@ -364,6 +360,8 @@
     "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"
@@ -371,98 +369,243 @@
             "3": {
               "name": "punctuation.definition.entity.html"
             }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          }
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
         }
       ]
     },
-    "twig-print-tag": {
-      "begin": "\\{\\{-?",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.tag.twig"
-        }
-      },
-      "end": "-?\\}\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.tag.twig"
-        }
-      },
-      "name": "meta.tag.template.value.twig",
+    "php": {
+      "begin": "(?=(^\\s*)?\u003c\\?)",
+      "end": "(?!(^\\s*)?\u003c\\?)",
       "patterns": [
         {
-          "include": "#twig-constants"
-        },
-        {
-          "include": "#twig-operators"
-        },
+          "include": "text.html.php"
+        }
+      ]
+    },
+    "python": {
+      "name": "source.python.embedded.html",
+      "begin": "(?:^\\s*)\u003c\\?python(?!.*\\?\u003e)",
+      "end": "\\?\u003e(?:\\s*$\\n)?",
+      "patterns": [
         {
-          "include": "#twig-functions-warg"
-        },
+          "include": "source.python"
+        }
+      ]
+    },
+    "ruby": {
+      "patterns": [
         {
-          "include": "#twig-functions"
+          "name": "comment.block.erb",
+          "begin": "\u003c%+#",
+          "end": "%\u003e",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.erb"
+            }
+          }
         },
         {
-          "include": "#twig-macros"
+          "name": "source.ruby.embedded.html",
+          "begin": "\u003c%+(?!\u003e)=?",
+          "end": "-?%\u003e",
+          "patterns": [
+            {
+              "name": "comment.line.number-sign.ruby",
+              "match": "(#).*?(?=-?%\u003e)",
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.comment.ruby"
+                }
+              }
+            },
+            {
+              "include": "source.ruby"
+            }
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.ruby"
+            }
+          }
         },
         {
-          "include": "#twig-objects"
-        },
+          "name": "source.ruby.nitro.embedded.html",
+          "begin": "\u003c\\?r(?!\u003e)=?",
+          "end": "-?\\?\u003e",
+          "patterns": [
+            {
+              "name": "comment.line.number-sign.ruby.nitro",
+              "match": "(#).*?(?=-?\\?\u003e)",
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.comment.ruby.nitro"
+                }
+              }
+            },
+            {
+              "include": "source.ruby"
+            }
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.ruby.nitro"
+            }
+          }
+        }
+      ]
+    },
+    "string-double-quoted": {
+      "name": "string.quoted.double.html",
+      "begin": "\"",
+      "end": "\"",
+      "patterns": [
         {
-          "include": "#twig-properties"
+          "include": "#embedded-code"
         },
         {
-          "include": "#twig-filters-warg"
+          "include": "#entities"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.html"
+        }
+      }
+    },
+    "string-single-quoted": {
+      "name": "string.quoted.single.html",
+      "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "include": "#embedded-code"
         },
         {
-          "include": "#twig-filters"
+          "include": "#entities"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.html"
+        }
+      }
+    },
+    "tag-generic-attribute": {
+      "name": "entity.other.attribute-name.html",
+      "match": "\\b([a-zA-Z\\-:]+)"
+    },
+    "tag-id-attribute": {
+      "name": "meta.attribute-with-value.id.html",
+      "begin": "\\b(id)\\b\\s*(=)",
+      "end": "(?\u003c='|\")",
+      "patterns": [
+        {
+          "name": "string.quoted.double.html",
+          "contentName": "meta.toc-list.id.html",
+          "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#embedded-code"
+            },
+            {
+              "include": "#entities"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.html"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.html"
+            }
+          }
         },
         {
-          "include": "#twig-filters-warg-ud"
+          "name": "string.quoted.single.html",
+          "contentName": "meta.toc-list.id.html",
+          "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "include": "#embedded-code"
+            },
+            {
+              "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": [
+        {
+          "include": "#tag-id-attribute"
         },
         {
-          "include": "#twig-filters-ud"
+          "include": "#tag-generic-attribute"
         },
         {
-          "include": "#twig-strings"
+          "include": "#string-double-quoted"
         },
         {
-          "include": "#twig-arrays"
+          "include": "#string-single-quoted"
         },
         {
-          "include": "#twig-hashes"
+          "include": "#embedded-code"
         }
       ]
     },
-    "twig-statement-tag": {
-      "begin": "\\{%-?",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.tag.twig"
-        }
-      },
-      "end": "-?%\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.tag.twig"
-        }
-      },
-      "name": "meta.tag.template.block.twig",
+    "twig-arrays": {
+      "name": "meta.array.twig",
+      "begin": "(?\u003c=[\\s\\(\\{\\[:,])\\[",
+      "end": "\\]",
       "patterns": [
         {
-          "include": "#twig-constants"
+          "include": "#twig-arrays"
         },
         {
-          "include": "#twig-keywords"
+          "include": "#twig-hashes"
         },
         {
-          "include": "#twig-operators"
+          "include": "#twig-constants"
+        },
+        {
+          "include": "#twig-strings"
         },
         {
           "include": "#twig-functions-warg"
@@ -474,295 +617,149 @@
           "include": "#twig-macros"
         },
         {
-          "include": "#twig-filters-warg"
-        },
-        {
-          "include": "#twig-filters"
-        },
-        {
-          "include": "#twig-filters-warg-ud"
+          "include": "#twig-objects"
         },
         {
-          "include": "#twig-filters-ud"
+          "include": "#twig-properties"
         },
         {
-          "include": "#twig-objects"
+          "include": "#twig-filters-warg"
         },
         {
-          "include": "#twig-properties"
+          "include": "#twig-filters"
         },
         {
-          "include": "#twig-strings"
+          "include": "#twig-filters-warg-ud"
         },
         {
-          "include": "#twig-arrays"
+          "include": "#twig-filters-ud"
         },
         {
-          "include": "#twig-hashes"
+          "name": "punctuation.separator.object.twig",
+          "match": ","
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.array.begin.twig"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.array.end.twig"
+        }
+      }
     },
     "twig-comment-tag": {
+      "name": "comment.block.twig",
       "begin": "\\{#-?",
+      "end": "-?#\\}",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.twig"
         }
       },
-      "end": "-?#\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.twig"
         }
-      },
-      "name": "comment.block.twig"
+      }
     },
     "twig-constants": {
       "patterns": [
         {
-          "match": "(?i)(?<=[\\s\\[\\(\\{:,])(?:true|false|null|none)(?=[\\s\\)\\]\\}\\,])",
-          "name": "constant.language.twig"
+          "name": "constant.language.twig",
+          "match": "(?i)(?\u003c=[\\s\\[\\(\\{:,])(?:true|false|null|none)(?=[\\s\\)\\]\\}\\,])"
         },
         {
-          "match": "(?<=[\\s\\[\\(\\{:,]|\\.\\.|\\*\\*)[0-9]+(?:\\.[0-9]+)?(?=[\\s\\)\\]\\}\\,]|\\.\\.|\\*\\*)",
-          "name": "constant.numeric.twig"
+          "name": "constant.numeric.twig",
+          "match": "(?\u003c=[\\s\\[\\(\\{:,]|\\.\\.|\\*\\*)[0-9]+(?:\\.[0-9]+)?(?=[\\s\\)\\]\\}\\,]|\\.\\.|\\*\\*)"
         }
       ]
     },
-    "twig-operators": {
+    "twig-filters": {
+      "match": "(?\u003c=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[\\s\\|\\]\\}\\):,]|\\.\\.|\\*\\*)",
+      "captures": {
+        "1": {
+          "name": "support.function.twig"
+        }
+      }
+    },
+    "twig-filters-ud": {
+      "match": "(?\u003c=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)",
+      "captures": {
+        "1": {
+          "name": "meta.function-call.other.twig"
+        }
+      }
+    },
+    "twig-filters-warg": {
+      "contentName": "meta.function.arguments.twig",
+      "begin": "(?\u003c=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(batch|convert_encoding|date|date_modify|default|e(?:scape)?|format|join|merge|number_format|replace|round|slice|split|trim)(\\()",
+      "end": "\\)",
       "patterns": [
         {
-          "captures": {
-            "1": {
-              "name": "keyword.operator.arithmetic.twig"
-            }
-          },
-          "match": "(?<=\\s)(\\+|-|//?|%|\\*\\*?)(?=\\s)"
+          "include": "#twig-constants"
         },
         {
-          "captures": {
-            "1": {
-              "name": "keyword.operator.assignment.twig"
-            }
-          },
-          "match": "(?<=\\s)(=|~)(?=\\s)"
+          "include": "#twig-functions-warg"
         },
         {
-          "captures": {
-            "1": {
-              "name": "keyword.operator.bitwise.twig"
-            }
-          },
-          "match": "(?<=\\s)(b-(?:and|or|xor))(?=\\s)"
+          "include": "#twig-functions"
         },
         {
-          "captures": {
-            "1": {
-              "name": "keyword.operator.comparison.twig"
-            }
-          },
-          "match": "(?<=\\s)((?:!|=)=|<=?|>=?|(?:not )?in|is(?: not)?|(?:ends|starts) with|matches)(?=\\s)"
+          "include": "#twig-macros"
         },
         {
-          "captures": {
-            "1": {
-              "name": "keyword.operator.logical.twig"
-            }
-          },
-          "match": "(?<=\\s)(\\?|:|and|not|or)(?=\\s)"
+          "include": "#twig-objects"
         },
         {
-          "captures": {
-            "0": {
-              "name": "keyword.operator.other.twig"
-            }
-          },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)'\"])\\.\\.(?=[a-zA-Z0-9_\\x{7f}-\\x{ff}'\"])"
+          "include": "#twig-properties"
         },
         {
-          "captures": {
-            "0": {
-              "name": "keyword.operator.other.twig"
-            }
-          },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\}\\)'\"])\\|(?=[a-zA-Z_\\x{7f}-\\x{ff}])"
+          "include": "#twig-filters-warg"
+        },
+        {
+          "include": "#twig-filters"
+        },
+        {
+          "include": "#twig-filters-warg-ud"
+        },
+        {
+          "include": "#twig-filters-ud"
+        },
+        {
+          "include": "#twig-strings"
+        },
+        {
+          "include": "#twig-arrays"
+        },
+        {
+          "include": "#twig-hashes"
         }
-      ]
-    },
-    "twig-objects": {
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "variable.other.twig"
+          "name": "support.function.twig"
+        },
+        "2": {
+          "name": "punctuation.definition.parameters.begin.twig"
         }
       },
-      "match": "(?<=[\\s\\{\\[\\(:,])([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?=[\\s\\}\\[\\]\\(\\)\\.\\|,:])"
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.end.twig"
+        }
+      }
     },
-    "twig-properties": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.property.twig"
-            },
-            "2": {
-              "name": "variable.other.property.twig"
-            }
-          },
-          "match": "(?x)\n                        (?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}])\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                        (?=[\\.\\s\\|\\[\\)\\]\\}:,])\n                    "
-        },
-        {
-          "begin": "(?x)\n                        (?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}])\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                        (\\()\n                    ",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.separator.property.twig"
-            },
-            "2": {
-              "name": "variable.other.property.twig"
-            },
-            "3": {
-              "name": "punctuation.definition.parameters.begin.twig"
-            }
-          },
-          "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.end.twig"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#twig-constants"
-            },
-            {
-              "include": "#twig-functions-warg"
-            },
-            {
-              "include": "#twig-functions"
-            },
-            {
-              "include": "#twig-macros"
-            },
-            {
-              "include": "#twig-objects"
-            },
-            {
-              "include": "#twig-properties"
-            },
-            {
-              "include": "#twig-filters-warg"
-            },
-            {
-              "include": "#twig-filters"
-            },
-            {
-              "include": "#twig-filters-warg-ud"
-            },
-            {
-              "include": "#twig-filters-ud"
-            },
-            {
-              "include": "#twig-strings"
-            },
-            {
-              "include": "#twig-arrays"
-            }
-          ],
-          "contentName": "meta.function.arguments.twig"
-        },
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.section.array.begin.twig"
-            },
-            "2": {
-              "name": "variable.other.property.twig"
-            },
-            "3": {
-              "name": "punctuation.section.array.end.twig"
-            },
-            "4": {
-              "name": "punctuation.section.array.begin.twig"
-            },
-            "5": {
-              "name": "variable.other.property.twig"
-            },
-            "6": {
-              "name": "punctuation.section.array.end.twig"
-            },
-            "7": {
-              "name": "punctuation.section.array.begin.twig"
-            },
-            "8": {
-              "name": "variable.other.property.twig"
-            },
-            "9": {
-              "name": "punctuation.section.array.end.twig"
-            }
-          },
-          "match": "(?x)\n                        (?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]])\n                        (?:\n                            (\\[)('[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*')(\\])\n                            |(\\[)(\"[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*\")(\\])\n                            |(\\[)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\])\n                        )\n                    "
-        }
-      ]
-    },
-    "twig-strings": {
-      "patterns": [
-        {
-          "begin": "(?:(?<!\\\\)|(?<=\\\\\\\\))'",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.twig"
-            }
-          },
-          "end": "(?:(?<!\\\\)|(?<=\\\\\\\\))'",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.twig"
-            }
-          },
-          "name": "string.quoted.single.twig"
-        },
-        {
-          "begin": "(?:(?<!\\\\)|(?<=\\\\\\\\))\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.twig"
-            }
-          },
-          "end": "(?:(?<!\\\\)|(?<=\\\\\\\\))\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.twig"
-            }
-          },
-          "name": "string.quoted.double.twig"
-        }
-      ]
-    },
-    "twig-arrays": {
-      "begin": "(?<=[\\s\\(\\{\\[:,])\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.array.begin.twig"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.array.end.twig"
-        }
-      },
+    "twig-filters-warg-ud": {
+      "contentName": "meta.function.arguments.twig",
+      "begin": "(?\u003c=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\()",
+      "end": "\\)",
       "patterns": [
-        {
-          "include": "#twig-arrays"
-        },
-        {
-          "include": "#twig-hashes"
-        },
         {
           "include": "#twig-constants"
         },
-        {
-          "include": "#twig-strings"
-        },
         {
           "include": "#twig-functions-warg"
         },
@@ -791,38 +788,45 @@
           "include": "#twig-filters-ud"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.object.twig"
+          "include": "#twig-strings"
+        },
+        {
+          "include": "#twig-arrays"
+        },
+        {
+          "include": "#twig-hashes"
         }
       ],
-      "name": "meta.array.twig"
-    },
-    "twig-hashes": {
-      "begin": "(?<=[\\s\\(\\{\\[:,])\\{",
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.hash.begin.twig"
+        "1": {
+          "name": "meta.function-call.other.twig"
+        },
+        "2": {
+          "name": "punctuation.definition.parameters.begin.twig"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "punctuation.section.hash.end.twig"
+          "name": "punctuation.definition.parameters.end.twig"
         }
-      },
+      }
+    },
+    "twig-functions": {
+      "match": "(?\u003c=is\\s)(defined|empty|even|iterable|odd)",
+      "captures": {
+        "1": {
+          "name": "support.function.twig"
+        }
+      }
+    },
+    "twig-functions-warg": {
+      "contentName": "meta.function.arguments.twig",
+      "begin": "(?\u003c=[\\s\\(\\[\\{:,])(attribute|block|constant|cycle|date|divisible by|dump|include|max|min|parent|random|range|same as|source|template_from_string)(\\()",
+      "end": "\\)",
       "patterns": [
-        {
-          "include": "#twig-hashes"
-        },
-        {
-          "include": "#twig-arrays"
-        },
         {
           "include": "#twig-constants"
         },
-        {
-          "include": "#twig-strings"
-        },
         {
           "include": "#twig-functions-warg"
         },
@@ -851,22 +855,12 @@
           "include": "#twig-filters-ud"
         },
         {
-          "match": ":",
-          "name": "punctuation.separator.key-value.twig"
+          "include": "#twig-strings"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.object.twig"
+          "include": "#twig-arrays"
         }
       ],
-      "name": "meta.hash.twig"
-    },
-    "twig-keywords": {
-      "match": "(?<=\\s)((?:end)?(?:autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim)|as|do|else|elseif|extends|flush|from|ignore missing|import|include|only|use|with)(?=\\s)",
-      "name": "keyword.control.twig"
-    },
-    "twig-functions-warg": {
-      "begin": "(?<=[\\s\\(\\[\\{:,])(attribute|block|constant|cycle|date|divisible by|dump|include|max|min|parent|random|range|same as|source|template_from_string)(\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.twig"
@@ -875,16 +869,29 @@
           "name": "punctuation.definition.parameters.begin.twig"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.twig"
         }
-      },
+      }
+    },
+    "twig-hashes": {
+      "name": "meta.hash.twig",
+      "begin": "(?\u003c=[\\s\\(\\{\\[:,])\\{",
+      "end": "\\}",
       "patterns": [
+        {
+          "include": "#twig-hashes"
+        },
+        {
+          "include": "#twig-arrays"
+        },
         {
           "include": "#twig-constants"
         },
+        {
+          "include": "#twig-strings"
+        },
         {
           "include": "#twig-functions-warg"
         },
@@ -913,44 +920,33 @@
           "include": "#twig-filters-ud"
         },
         {
-          "include": "#twig-strings"
+          "name": "punctuation.separator.key-value.twig",
+          "match": ":"
         },
         {
-          "include": "#twig-arrays"
+          "name": "punctuation.separator.object.twig",
+          "match": ","
         }
       ],
-      "contentName": "meta.function.arguments.twig"
-    },
-    "twig-functions": {
-      "captures": {
-        "1": {
-          "name": "support.function.twig"
-        }
-      },
-      "match": "(?<=is\\s)(defined|empty|even|iterable|odd)"
-    },
-    "twig-macros": {
-      "begin": "(?x)\n                    (?<=[\\s\\(\\[\\{:,])\n                    ([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                    (?:\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                    )?\n                    (\\()\n            ",
       "beginCaptures": {
-        "1": {
-          "name": "meta.function-call.twig"
-        },
-        "2": {
-          "name": "punctuation.separator.property.twig"
-        },
-        "3": {
-          "name": "variable.other.property.twig"
-        },
-        "4": {
-          "name": "punctuation.definition.parameters.begin.twig"
+        "0": {
+          "name": "punctuation.section.hash.begin.twig"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.parameters.end.twig"
+          "name": "punctuation.section.hash.end.twig"
         }
-      },
+      }
+    },
+    "twig-keywords": {
+      "name": "keyword.control.twig",
+      "match": "(?\u003c=\\s)((?:end)?(?:autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim)|as|do|else|elseif|extends|flush|from|ignore missing|import|include|only|use|with)(?=\\s)"
+    },
+    "twig-macros": {
+      "contentName": "meta.function.arguments.twig",
+      "begin": "(?x)\n                    (?\u003c=[\\s\\(\\[\\{:,])\n                    ([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                    (?:\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                    )?\n                    (\\()\n            ",
+      "end": "\\)",
       "patterns": [
         {
           "include": "#twig-constants"
@@ -995,95 +991,105 @@
           "include": "#twig-hashes"
         }
       ],
-      "contentName": "meta.function.arguments.twig"
-    },
-    "twig-filters-warg": {
-      "begin": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(batch|convert_encoding|date|date_modify|default|e(?:scape)?|format|join|merge|number_format|replace|round|slice|split|trim)(\\()",
       "beginCaptures": {
         "1": {
-          "name": "support.function.twig"
+          "name": "meta.function-call.twig"
         },
         "2": {
+          "name": "punctuation.separator.property.twig"
+        },
+        "3": {
+          "name": "variable.other.property.twig"
+        },
+        "4": {
           "name": "punctuation.definition.parameters.begin.twig"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.twig"
         }
-      },
-      "patterns": [
-        {
-          "include": "#twig-constants"
-        },
-        {
-          "include": "#twig-functions-warg"
-        },
-        {
-          "include": "#twig-functions"
-        },
-        {
-          "include": "#twig-macros"
-        },
-        {
-          "include": "#twig-objects"
-        },
-        {
-          "include": "#twig-properties"
-        },
+      }
+    },
+    "twig-objects": {
+      "match": "(?\u003c=[\\s\\{\\[\\(:,])([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?=[\\s\\}\\[\\]\\(\\)\\.\\|,:])",
+      "captures": {
+        "1": {
+          "name": "variable.other.twig"
+        }
+      }
+    },
+    "twig-operators": {
+      "patterns": [
         {
-          "include": "#twig-filters-warg"
+          "match": "(?\u003c=\\s)(\\+|-|//?|%|\\*\\*?)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.arithmetic.twig"
+            }
+          }
         },
         {
-          "include": "#twig-filters"
+          "match": "(?\u003c=\\s)(=|~)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.assignment.twig"
+            }
+          }
         },
         {
-          "include": "#twig-filters-warg-ud"
+          "match": "(?\u003c=\\s)(b-(?:and|or|xor))(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.bitwise.twig"
+            }
+          }
         },
         {
-          "include": "#twig-filters-ud"
+          "match": "(?\u003c=\\s)((?:!|=)=|\u003c=?|\u003e=?|(?:not )?in|is(?: not)?|(?:ends|starts) with|matches)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.comparison.twig"
+            }
+          }
         },
         {
-          "include": "#twig-strings"
+          "match": "(?\u003c=\\s)(\\?|:|and|not|or)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.logical.twig"
+            }
+          }
         },
         {
-          "include": "#twig-arrays"
+          "match": "(?\u003c=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)'\"])\\.\\.(?=[a-zA-Z0-9_\\x{7f}-\\x{ff}'\"])",
+          "captures": {
+            "0": {
+              "name": "keyword.operator.other.twig"
+            }
+          }
         },
         {
-          "include": "#twig-hashes"
-        }
-      ],
-      "contentName": "meta.function.arguments.twig"
-    },
-    "twig-filters": {
-      "captures": {
-        "1": {
-          "name": "support.function.twig"
+          "match": "(?\u003c=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\}\\)'\"])\\|(?=[a-zA-Z_\\x{7f}-\\x{ff}])",
+          "captures": {
+            "0": {
+              "name": "keyword.operator.other.twig"
+            }
+          }
         }
-      },
-      "match": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[\\s\\|\\]\\}\\):,]|\\.\\.|\\*\\*)"
+      ]
     },
-    "twig-filters-warg-ud": {
-      "begin": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "meta.function-call.other.twig"
-        },
-        "2": {
-          "name": "punctuation.definition.parameters.begin.twig"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.parameters.end.twig"
-        }
-      },
+    "twig-print-tag": {
+      "name": "meta.tag.template.value.twig",
+      "begin": "\\{\\{-?",
+      "end": "-?\\}\\}",
       "patterns": [
         {
           "include": "#twig-constants"
         },
+        {
+          "include": "#twig-operators"
+        },
         {
           "include": "#twig-functions-warg"
         },
@@ -1121,230 +1127,218 @@
           "include": "#twig-hashes"
         }
       ],
-      "contentName": "meta.function.arguments.twig"
-    },
-    "twig-filters-ud": {
-      "captures": {
-        "1": {
-          "name": "meta.function-call.other.twig"
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.tag.twig"
         }
       },
-      "match": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)"
-    },
-    "php": {
-      "begin": "(?=(^\\s*)?<\\?)",
-      "end": "(?!(^\\s*)?<\\?)",
-      "patterns": [
-        {
-          "include": "text.html.php"
-        }
-      ]
-    },
-    "python": {
-      "begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
-      "end": "\\?>(?:\\s*$\\n)?",
-      "name": "source.python.embedded.html",
-      "patterns": [
-        {
-          "include": "source.python"
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.tag.twig"
         }
-      ]
+      }
     },
-    "ruby": {
+    "twig-properties": {
       "patterns": [
         {
-          "begin": "<%+#",
+          "match": "(?x)\n                        (?\u003c=[a-zA-Z0-9_\\x{7f}-\\x{ff}])\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                        (?=[\\.\\s\\|\\[\\)\\]\\}:,])\n                    ",
           "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.erb"
+            "1": {
+              "name": "punctuation.separator.property.twig"
+            },
+            "2": {
+              "name": "variable.other.property.twig"
             }
-          },
-          "end": "%>",
-          "name": "comment.block.erb"
+          }
         },
         {
-          "begin": "<%+(?!>)=?",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.embedded.ruby"
-            }
-          },
-          "end": "-?%>",
-          "name": "source.ruby.embedded.html",
+          "contentName": "meta.function.arguments.twig",
+          "begin": "(?x)\n                        (?\u003c=[a-zA-Z0-9_\\x{7f}-\\x{ff}])\n                        (\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n                        (\\()\n                    ",
+          "end": "\\)",
           "patterns": [
             {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.comment.ruby"
-                }
-              },
-              "match": "(#).*?(?=-?%>)",
-              "name": "comment.line.number-sign.ruby"
+              "include": "#twig-constants"
             },
             {
-              "include": "source.ruby"
+              "include": "#twig-functions-warg"
+            },
+            {
+              "include": "#twig-functions"
+            },
+            {
+              "include": "#twig-macros"
+            },
+            {
+              "include": "#twig-objects"
+            },
+            {
+              "include": "#twig-properties"
+            },
+            {
+              "include": "#twig-filters-warg"
+            },
+            {
+              "include": "#twig-filters"
+            },
+            {
+              "include": "#twig-filters-warg-ud"
+            },
+            {
+              "include": "#twig-filters-ud"
+            },
+            {
+              "include": "#twig-strings"
+            },
+            {
+              "include": "#twig-arrays"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.property.twig"
+            },
+            "2": {
+              "name": "variable.other.property.twig"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.twig"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.parameters.end.twig"
+            }
+          }
         },
         {
-          "begin": "<\\?r(?!>)=?",
+          "match": "(?x)\n                        (?\u003c=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]])\n                        (?:\n                            (\\[)('[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*')(\\])\n                            |(\\[)(\"[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*\")(\\])\n                            |(\\[)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\])\n                        )\n                    ",
           "captures": {
-            "0": {
-              "name": "punctuation.section.embedded.ruby.nitro"
-            }
-          },
-          "end": "-?\\?>",
-          "name": "source.ruby.nitro.embedded.html",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.comment.ruby.nitro"
-                }
-              },
-              "match": "(#).*?(?=-?\\?>)",
-              "name": "comment.line.number-sign.ruby.nitro"
+            "1": {
+              "name": "punctuation.section.array.begin.twig"
             },
-            {
-              "include": "source.ruby"
+            "2": {
+              "name": "variable.other.property.twig"
+            },
+            "3": {
+              "name": "punctuation.section.array.end.twig"
+            },
+            "4": {
+              "name": "punctuation.section.array.begin.twig"
+            },
+            "5": {
+              "name": "variable.other.property.twig"
+            },
+            "6": {
+              "name": "punctuation.section.array.end.twig"
+            },
+            "7": {
+              "name": "punctuation.section.array.begin.twig"
+            },
+            "8": {
+              "name": "variable.other.property.twig"
+            },
+            "9": {
+              "name": "punctuation.section.array.end.twig"
             }
-          ]
+          }
         }
       ]
     },
-    "string-double-quoted": {
-      "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.html"
-        }
-      },
-      "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
-      "name": "string.quoted.double.html",
+    "twig-statement-tag": {
+      "name": "meta.tag.template.block.twig",
+      "begin": "\\{%-?",
+      "end": "-?%\\}",
       "patterns": [
         {
-          "include": "#embedded-code"
+          "include": "#twig-constants"
         },
         {
-          "include": "#entities"
+          "include": "#twig-keywords"
+        },
+        {
+          "include": "#twig-operators"
+        },
+        {
+          "include": "#twig-functions-warg"
+        },
+        {
+          "include": "#twig-functions"
+        },
+        {
+          "include": "#twig-macros"
+        },
+        {
+          "include": "#twig-filters-warg"
+        },
+        {
+          "include": "#twig-filters"
+        },
+        {
+          "include": "#twig-filters-warg-ud"
+        },
+        {
+          "include": "#twig-filters-ud"
+        },
+        {
+          "include": "#twig-objects"
+        },
+        {
+          "include": "#twig-properties"
+        },
+        {
+          "include": "#twig-strings"
+        },
+        {
+          "include": "#twig-arrays"
+        },
+        {
+          "include": "#twig-hashes"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.html"
+          "name": "punctuation.section.tag.twig"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
-      "name": "string.quoted.single.html",
-      "patterns": [
-        {
-          "include": "#embedded-code"
-        },
-        {
-          "include": "#entities"
+          "name": "punctuation.section.tag.twig"
         }
-      ]
+      }
     },
-    "tag-generic-attribute": {
-      "match": "\\b([a-zA-Z\\-:]+)",
-      "name": "entity.other.attribute-name.html"
-    },
-    "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",
+    "twig-strings": {
       "patterns": [
         {
-          "begin": "\"",
+          "name": "string.quoted.single.twig",
+          "begin": "(?:(?\u003c!\\\\)|(?\u003c=\\\\\\\\))'",
+          "end": "(?:(?\u003c!\\\\)|(?\u003c=\\\\\\\\))'",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.string.begin.html"
+              "name": "punctuation.definition.string.begin.twig"
             }
           },
-          "contentName": "meta.toc-list.id.html",
-          "end": "\"",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.string.end.html"
-            }
-          },
-          "name": "string.quoted.double.html",
-          "patterns": [
-            {
-              "include": "#embedded-code"
-            },
-            {
-              "include": "#entities"
+              "name": "punctuation.definition.string.end.twig"
             }
-          ]
+          }
         },
         {
-          "begin": "'",
+          "name": "string.quoted.double.twig",
+          "begin": "(?:(?\u003c!\\\\)|(?\u003c=\\\\\\\\))\"",
+          "end": "(?:(?\u003c!\\\\)|(?\u003c=\\\\\\\\))\"",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.string.begin.html"
+              "name": "punctuation.definition.string.begin.twig"
             }
           },
-          "contentName": "meta.toc-list.id.html",
-          "end": "'",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.string.end.html"
-            }
-          },
-          "name": "string.quoted.single.html",
-          "patterns": [
-            {
-              "include": "#embedded-code"
-            },
-            {
-              "include": "#entities"
+              "name": "punctuation.definition.string.end.twig"
             }
-          ]
-        }
-      ]
-    },
-    "tag-stuff": {
-      "patterns": [
-        {
-          "include": "#tag-id-attribute"
-        },
-        {
-          "include": "#tag-generic-attribute"
-        },
-        {
-          "include": "#string-double-quoted"
-        },
-        {
-          "include": "#string-single-quoted"
-        },
-        {
-          "include": "#embedded-code"
+          }
         }
       ]
     }
-  },
-  "scopeName": "text.html.twig",
-  "uuid": "C220B028-86FF-44CB-8A59-27937FC83730"
-}
+  }
+}