From acd7ef3e140c9a2175b5f232cd85e960032e9b44 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Tue, 19 Nov 2024 11:42:44 +0100
Subject: [PATCH 1/4] Fix script/style/template indentation

This commit backports https://github.com/sublimehq/Packages/pull/4020
to ensure related indentation rules are correctly applied for ST4181+.

Scope changes are backported primarily due to their effect on syntax tests
and the goal to avoid a need to ship dedicated ST4181+ releases just due
to failing syntax tests, which do otherwise not have any significant effect
on highlighting.
---
 Vue Component.sublime-syntax   |  39 +++++--
 tests/syntax_test_script.vue   | 161 +++++++++++++++-----------
 tests/syntax_test_style.vue    | 201 +++++++++++++++++++++------------
 tests/syntax_test_template.vue |  16 +--
 4 files changed, 263 insertions(+), 154 deletions(-)

diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index a234cb2..065a859 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -12,6 +12,9 @@ file_extensions:
   - wpy
 
 variables:
+  # CSS specific variables
+  # ======================
+
   # Embedded script and style syntaxes may be wrapped into html comments for
   # historical reasons. The following patterns match them, while maintaining
   # correct boundaries of embedded source scopes. That's required to enable
@@ -20,10 +23,14 @@ variables:
   # see:
   # - https://github.com/sublimehq/Packages/issues/2322
   # - https://github.com/sublimehq/sublime_text/issues/4701
+  #
+  # Patterns backported from (required until ST4180):
+  # - https://github.com/sublimehq/Packages/pull/4020
   script_content_begin: |-
     (?x:
-    # whitespace followed by opening html comment begin punctuation
-      \s*(<!--)
+    # whitespace followed by opening html comment begin punctuation,
+    # optionally followed by whitespeace until end of line
+      \s*(<!--) (?:\s*\n)?
     # or any other non-whitespace character ahead
     | (?=\s*(?!<!--)\S)
     # or beginning of a line
@@ -31,26 +38,36 @@ variables:
     )
   script_content_end: |-
     (?x:
-    # optional html comment end punctuation followed by </script> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:script){{tag_name_break_char}})
+    # optional html comment end punctuation or any whitespace at beginning of
+    # line followed by </script> tag
+      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:script){{tag_name_break_char}})
     # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
+    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
+    | ^ \s* () (-->) \s* $
     )
   style_content_begin: '{{script_content_begin}}'
   style_content_end: |-
     (?x:
-    # optional html comment end punctuation followed by </style> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:style){{tag_name_break_char}})
+    # optional html comment end punctuation or any whitespace at beginning of
+    # line followed by </style> tag
+      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:style){{tag_name_break_char}})
     # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
+    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
+    | ^ \s* () (-->) \s* $
     )
+
+  # Vue specific variables
+  # ======================
+
   template_content_begin: '{{script_content_begin}}'
   template_content_end: |-
     (?x:
-    # optional html comment end punctuation followed by </template> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:template){{tag_name_break_char}})
+    # optional html comment end punctuation or any whitespace at beginning of
+    # line followed by </style> tag
+      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:template){{tag_name_break_char}})
     # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
+    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
+    | ^ \s* () (-->) \s* $
     )
 
 contexts:
diff --git a/tests/syntax_test_script.vue b/tests/syntax_test_script.vue
index 7c23c8f..92c0549 100644
--- a/tests/syntax_test_script.vue
+++ b/tests/syntax_test_script.vue
@@ -38,37 +38,38 @@
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- source.js.embedded.html - source source
-// ^ source.js.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
     <script>
     <!--
-//^^^^^^ - meta.tag - source
+//^^^^^^^ - meta.tag - source
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.js.embedded.html - source source - meta.tag - comment
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source - meta.tag
     -->
-//^^ source.js.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment - source
+//^^ - comment - source
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
     <script> <!--
-//  ^^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^^^ - source
 //  ^^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^^ entity.name.tag
 //         ^ punctuation.definition.tag.end.html
 //          ^ - meta.tag - comment
 //           ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//               ^ source.js.embedded.html - source source
 
     var foo = 100;
 // <- source.js.embedded.html - source source
@@ -77,12 +78,11 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.js.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^^ meta.tag
-//               ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment - source
+//^^ - comment - source
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^^ entity.name.tag
 //              ^ punctuation.definition.tag.end.html
@@ -92,13 +92,12 @@
 //  ^^^^^^^^ meta.tag - meta.attribute-with-value - source
 //          ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value - source
 //                                ^ meta.tag - meta.attribute-with-value - source
-//                                 ^^^^^ - meta.tag - source
+//                                 ^^^^^^ - meta.tag - source
 //   ^^^^^^ entity.name.tag
 //          ^^^^ entity.other.attribute-name.html
 //              ^ punctuation.separator.key-value.html
 //               ^^^^^^^^^^^^^^^^^ string.quoted.double.html
 //                                  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//                                      ^ source.js.embedded.html
 
     var foo = 100;
 // <- source.js.embedded.html - source source
@@ -107,12 +106,11 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.js.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^^ meta.tag
-//               ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment - source
+//^^ - comment - source
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^^ entity.name.tag
 //              ^ punctuation.definition.tag.end.html
@@ -128,10 +126,15 @@
 // <- source.js.embedded.html - source source
 // ^^^^^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- source.js.embedded.html - source source
-// ^ source.js.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- CoffeeScript
+     -->
+
     <script language="coffeescript">  </script>
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag - meta.tag meta.tag - source
 //          ^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.lang.html - meta.attribute-with-value meta.attribute-with-value
@@ -148,109 +151,137 @@
 
 // <- source.coffee.embedded.html - source source
     </script>
-// <- source.coffee.embedded.html - source source
-//^^ source.coffee.embedded.html - source source
+// <- - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="coffee">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.coffee.embedded.html - source source
         -->
-// ^^^^^ source.coffee.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- JSX
+     -->
+
     <script lang="jsx">
 
 // <- source.jsx.embedded.html - source source
     </script>
-// <- source.jsx.embedded.html - source source
-//^^ source.jsx.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="jsx">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.jsx.embedded.html - source source
         -->
-// ^^^^^ source.jsx.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- LiveScript
+     -->
+
     <script lang="livescript">
 
 // <- source.livescript.embedded.html - source source
     </script>
-// <- source.livescript.embedded.html - source source
-//^^ source.livescript.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="livescript">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.livescript.embedded.html - source source
         -->
-// ^^^^^ source.livescript.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- TypeScript
+     -->
+
     <script lang="ts">
 
 // <- source.ts.embedded.html - source source
     </script>
-// <- source.ts.embedded.html - source source
-//^^ source.ts.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="ts">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.ts.embedded.html - source source
         -->
-// ^^^^^ source.ts.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- TSX
+     -->
+
     <script lang="tsx">
 
 // <- source.tsx.embedded.html - source source
     </script>
-// <- source.tsx.embedded.html - source source
-//^^ source.tsx.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="tsx">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.tsx.embedded.html - source source
         -->
-// ^^^^^ source.tsx.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_style.vue b/tests/syntax_test_style.vue
index 54de7e8..2207931 100644
--- a/tests/syntax_test_style.vue
+++ b/tests/syntax_test_style.vue
@@ -37,48 +37,46 @@
 // <- source.css.embedded.html
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style>
-    <!--
-//^^^^^^ - meta.tag - source
-//  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.css.embedded.html - source source - meta.tag - comment
-    h1 {}
-// ^^^^^^^ source.css.embedded.html - source source - meta.tag
-    -->
-//^^ source.css.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
-    var i = 0;
-// ^^^^^^^^^^^^ - source
+        <!--
+//^^^^^^^^^^^ - meta.tag - source
+//      ^^^^ comment.block.html punctuation.definition.comment.begin.html
+        h1 {}
+// ^^^^^^^^^^^ source.css.embedded.html - source source - meta.tag
+        -->
+// <- - comment - source
+//^^^^^^ - comment - source
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//         ^ - comment - source
     </style>
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style> <!--
-//  ^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^^ - source
 //  ^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^ entity.name.tag
 //        ^ punctuation.definition.tag.end.html
 //         ^ - meta.tag - comment
 //          ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//              ^ source.css.embedded.html - source source
 
     h1 {}
 // <- source.css.embedded.html - source source
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^ meta.tag
-//              ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment - source
+//^^ - comment - source
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^ entity.name.tag
 //             ^ punctuation.definition.tag.end.html
@@ -88,24 +86,22 @@
 //  ^^^^^^^ meta.tag - meta.attribute-with-value - source
 //         ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value - source
 //                        ^ meta.tag - meta.attribute-with-value - source
-//                         ^^^^^ - meta.tag - source
+//                         ^^^^^^ - meta.tag - source
 //   ^^^^^ entity.name.tag
 //         ^^^^ entity.other.attribute-name.html
 //             ^ punctuation.separator.key-value.html
 //              ^^^^^^^^^^ string.quoted.double.html
 //                          ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//                              ^ source.css.embedded.html
 
     h1 {}
 // <- source.css.embedded.html - source source
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^ meta.tag
-//              ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment - source
+//^^ - comment - source
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^ entity.name.tag
 //             ^ punctuation.definition.tag.end.html
@@ -122,11 +118,15 @@
 // <- source.css.embedded.html - source source
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- Less
+     -->
+
     <style lang="less">  </style>
 //  ^^^^^^^^^^^^^^^^^^^ meta.tag - source
 //         ^^^^^^^^^^^ meta.attribute-with-value.lang.html - meta.attribute-with-value meta.attribute-with-value
@@ -138,112 +138,173 @@
 
 // <- source.less.embedded.html - source source
     </style>
-// <- source.less.embedded.html - source source
-//^^ source.less.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="less">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.less.embedded.html - source source
+
+// <- source.less.embedded.html
         -->
-// ^^^^^ source.less.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
 // <- - source - comment - meta.tag
 //^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- PostCSS
+     -->
+
     <style lang="postcss">
 
 // <- source.postcss.embedded.html
     </style>
-// <- source.postcss.embedded.html
-//^^ source.postcss.embedded.html
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="postcss">
         <!--
-// ^^^^^^^^^ - source.postcss
+// ^^^^^^^^^^ - source.postcss
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.postcss.embedded.html
+
+// <- source.postcss.embedded.html
         -->
-// ^^^^^ source.postcss.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- SugarSS
+     -->
+
     <style lang="postcss?parser=sugarss">
 
 // <- source.sss.embedded.html - source source
     </style>
-// <- source.sss.embedded.html - source source
-//^^ source.sss.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="postcss?parser=sugarss">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.sss.embedded.html - source source
+
+// <- source.sss.embedded.html
         -->
-// ^^^^^ source.sss.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- Sass
+     -->
+
     <style lang="sass">
 
 // <- source.sass.embedded.html - source source
     </style>
-// <- source.sass.embedded.html - source source
-//^^ source.sass.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="sass">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.sass.embedded.html - source source
+
+// <- source.sass.embedded.html
         -->
-// ^^^^^ source.sass.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- SCSS
+     -->
+
     <style lang="scss">
 
 // <- source.scss.embedded.html - source source
     </style>
-// <- source.scss.embedded.html - source source
-//^^ source.scss.embedded.html - source source
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="scss">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.scss.embedded.html - source source
+
+// <- source.scss.embedded.html
         -->
-// ^^^^^ source.scss.embedded.html - source source
+// <- - comment - source
+//^^^^^^ - comment - source
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
+// <- - meta.tag - source
+//^^ - meta.tag - source
+//  ^^^^^^^^ meta.tag - source
+
+
+    <!--
+     -- Stylus
+     -->
+
+    <style lang="stylus">
+
+// <- source.stylus.embedded.html - source source
+    </style>
+// <- - meta.tag - source
+//^^ - meta.tag - source
+//  ^^^^^^^^ meta.tag - source
+
+
+    <style lang="stylus">
+        <!--
+// ^^^^^^^^^^ - source
+//      ^^^^ comment.block.html punctuation.definition.comment.begin.html
+
+// <- source.stylus.embedded.html
+        -->
+// <- - comment - source
+//^^^^^^ - comment - source
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//         ^ - comment - source
+    </style>
+// <- - meta.tag - source
+//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_template.vue b/tests/syntax_test_template.vue
index c725b3a..5eabfa7 100644
--- a/tests/syntax_test_template.vue
+++ b/tests/syntax_test_template.vue
@@ -46,8 +46,8 @@
 // <- text.jade.embedded.html
 
     </template>
-// <- text.jade.embedded.html
-//^^ text.jade.embedded.html
+// <- - text.jade
+//^^ - text.jade
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 
 
@@ -64,8 +64,8 @@
 
 // <- text.jade.embedded.html
     </template>
-// <- text.jade.embedded.html
-//^^ text.jade.embedded.html
+// <- - text.jade
+//^^ - text.jade
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -84,8 +84,8 @@
 
 // <- text.pug.embedded.html
     </template>
-// <- text.pug.embedded.html
-//^^ text.pug.embedded.html
+// <- - text.pug
+//^^ - text.pug
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.pug
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -104,8 +104,8 @@
 
 // <- text.slim.embedded.html
     </template>
-// <- text.slim.embedded.html
-//^^ text.slim.embedded.html
+// <- - text.slim
+//^^ - text.slim
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.slm
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html

From ca855581529beaa03c35f28610ba2fef0cacaa22 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Tue, 19 Nov 2024 12:20:48 +0100
Subject: [PATCH 2/4] Backport HTML indentation rules

In order to properly handle `<template>` tag indentation in combination
with script/style comment handling dedicated indentation rules are required.

This commit therefore backports and adjusts indentation rules from
https://github.com/sublimehq/Packages/pull/4020
---
 Indentation Rules - Comments.tmPreferences |  13 ++
 Indentation Rules.tmPreferences            |  54 ++++++++
 tests/syntax_test_indentation.vue          | 146 +++++++++++++++++++++
 3 files changed, 213 insertions(+)
 create mode 100644 Indentation Rules - Comments.tmPreferences
 create mode 100644 Indentation Rules.tmPreferences
 create mode 100644 tests/syntax_test_indentation.vue

diff --git a/Indentation Rules - Comments.tmPreferences b/Indentation Rules - Comments.tmPreferences
new file mode 100644
index 0000000..9c858f6
--- /dev/null
+++ b/Indentation Rules - Comments.tmPreferences	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+	<key>scope</key>
+	<string>text.html.vue comment.block.html</string>
+	<key>settings</key>
+	<dict>
+		<!-- ignore anything until standalone closing comment punctuation -->
+		<key>unIndentedLinePattern</key>
+		<string>^(?!\s*-->)</string>
+	</dict>
+</dict>
+</plist>
diff --git a/Indentation Rules.tmPreferences b/Indentation Rules.tmPreferences
new file mode 100644
index 0000000..1b1b48c
--- /dev/null
+++ b/Indentation Rules.tmPreferences	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+	<key>scope</key>
+	<string>text.html.vue</string>
+	<key>settings</key>
+	<dict>
+		<key>decreaseIndentPattern</key>
+		<string><![CDATA[(?x)
+			# the beginning of the line followed by any amount of whitespace
+			# a valid HTML close tag except "html"
+			  ^[^<>]*+ </ (?!html[\t\n\f /<>])[^\t\n\f /<>]+ [^>]* >
+			| ^[\t\n\f ]*+
+			(
+				# the beginning of the line followed by closing HTML comment
+				# and </script> or </style> tag
+				  --> [\t\n\f ]* </ (?: script | style | template )[\t\n\f /<>]
+				# closing directive/section punctuation
+				| [?%]>
+				# closing curly or square brackets
+				| [\]\}]
+			)
+		]]></string>
+		<key>increaseIndentPattern</key>
+		<string><![CDATA[(?x)
+			# the beginning of the line followed by any amount of whitespace
+			^.* (
+				# a valid non-self-closing HTML tag that doesn't close itself on the same line
+				<(?!
+					  !--           # no comment
+					| [?%]          # no preprocessor section like PHP/ASP
+					| (?i:!doctype) # no document type
+					| (?i:area|base|br|col|frame|hr|html|img|input|link|meta|param)[\t\n\f /<>]
+				)(?:
+					# tag name
+					(?<html_tag>[^\t\n\f /<>]+)
+					# not self closing
+					(?:(?!/>)[^>])* >
+					# not closing in the same line
+					(?! .* </\k<html_tag>)
+				)
+				# directives that don't close themselves on the same line
+				| <\?(?!.*?\?>)
+				# sections that don't close themselves on the same line
+				| <\%(?!.*?\%>)
+				# open curly or square brackets at the end of a line with comments allowed
+				| [\[\{](?=\s*(?:<!--.*)?$)
+			)
+		]]></string>
+		<key>bracketIndentNextLinePattern</key>
+		<string><![CDATA[<(?i:!doctype)(?!.*>)]]></string>
+	</dict>
+</dict>
+</plist>
diff --git a/tests/syntax_test_indentation.vue b/tests/syntax_test_indentation.vue
new file mode 100644
index 0000000..c115e0a
--- /dev/null
+++ b/tests/syntax_test_indentation.vue
@@ -0,0 +1,146 @@
+## SYNTAX TEST reindent-unchanged "Vue Component.sublime-syntax"
+
+<!-------------------------------------
+ Indentation tests for script tags
+-------------------------------------->
+
+<!-- this comment's
+     indentation should
+     be unchanged
+-->
+<script>
+    var i = 0;
+    function foo() {
+        return i;
+    }
+</script>
+<!-- this comment's
+indentation should
+be unchanged -->
+<script>
+    <!--
+    var i = 0;
+    function foo() {
+        return i;
+    }
+    -->
+</script>
+<script> <!--
+    var i = 0;
+    function foo() {
+        return i;
+    }
+--> </script>
+
+
+<!-------------------------------------
+ Indentation tests for style tags
+-------------------------------------->
+
+<style>
+    p {
+        font-family: Helvetica;
+    }
+</style>
+<style>
+    <!--
+    p {
+        font-family: Helvetica;
+    }
+    -->
+</style>
+<style> <!--
+    p {
+        font-family: Helvetica;
+    }
+--> </style>
+
+
+<!-------------------------------------
+ Indentation tests for template tags
+-------------------------------------->
+
+<template>
+    mustache content
+</template>
+
+<template> <!--
+    mustache content
+--> </template>
+
+<template>
+    <!--
+    mustache content
+    -->
+</template>
+
+
+<template lang="jade">
+    jade content
+</template>
+
+<template lang="jade"> <!--
+    jade content
+--> </template>
+
+<template lang="jade">
+    <!--
+    jade content
+    -->
+</template>
+
+
+<template lang="pug">
+    pug content
+</template>
+
+<template lang="pug"> <!--
+    pug content
+--> </template>
+
+<template lang="pug">
+    <!--
+    pug content
+    -->
+</template>
+
+
+<!-------------------------------------
+ Indentation tests for html tags
+-------------------------------------->
+
+<template>
+    <body>
+        <div class="main">
+            <span class="something">Blah</span>
+            <span class="something">
+                Foobar
+            </span>
+        </div>
+
+        <script type="text/javascript" src="/some_script.js"></script>
+
+        <script type="text/json">
+            {
+                "dict": {
+                    "list": [
+                        "value"
+                    ]
+                }
+            }
+        </script>
+
+        <!-- Curly braces -->
+        foo {
+            bar { <!-- comment -->
+                baz
+            }
+        }
+        text
+        { <p></p> }
+        text
+        {{template}}
+        text
+
+    </body>
+</template>

From bcec8971248459f783622a3096c522d61e582565 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Thu, 21 Nov 2024 10:42:22 +0100
Subject: [PATCH 3/4] Simplify template tag indentation

This commit

1. removes special treatment of html comments wrapping template content
   as this is supported by browsers primarily for legacy code.

2. removes indentation rules and makes syntax tests more lazy to avoid
   them fail across various ST versions.

   As a result Vue completely relies on ST's indentation rules, which means
   it works best as of ST4180.
---
 Indentation Rules - Comments.tmPreferences |  13 --
 Indentation Rules.tmPreferences            |  54 --------
 Vue Component.sublime-syntax               |  39 +-----
 tests/syntax_test_indentation.vue          | 146 ---------------------
 tests/syntax_test_script.vue               |  67 +++-------
 tests/syntax_test_style.vue                |  82 ++++--------
 tests/syntax_test_template.vue             |  25 +---
 7 files changed, 53 insertions(+), 373 deletions(-)
 delete mode 100644 Indentation Rules - Comments.tmPreferences
 delete mode 100644 Indentation Rules.tmPreferences
 delete mode 100644 tests/syntax_test_indentation.vue

diff --git a/Indentation Rules - Comments.tmPreferences b/Indentation Rules - Comments.tmPreferences
deleted file mode 100644
index 9c858f6..0000000
--- a/Indentation Rules - Comments.tmPreferences	
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="1.0">
-<dict>
-	<key>scope</key>
-	<string>text.html.vue comment.block.html</string>
-	<key>settings</key>
-	<dict>
-		<!-- ignore anything until standalone closing comment punctuation -->
-		<key>unIndentedLinePattern</key>
-		<string>^(?!\s*-->)</string>
-	</dict>
-</dict>
-</plist>
diff --git a/Indentation Rules.tmPreferences b/Indentation Rules.tmPreferences
deleted file mode 100644
index 1b1b48c..0000000
--- a/Indentation Rules.tmPreferences	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="1.0">
-<dict>
-	<key>scope</key>
-	<string>text.html.vue</string>
-	<key>settings</key>
-	<dict>
-		<key>decreaseIndentPattern</key>
-		<string><![CDATA[(?x)
-			# the beginning of the line followed by any amount of whitespace
-			# a valid HTML close tag except "html"
-			  ^[^<>]*+ </ (?!html[\t\n\f /<>])[^\t\n\f /<>]+ [^>]* >
-			| ^[\t\n\f ]*+
-			(
-				# the beginning of the line followed by closing HTML comment
-				# and </script> or </style> tag
-				  --> [\t\n\f ]* </ (?: script | style | template )[\t\n\f /<>]
-				# closing directive/section punctuation
-				| [?%]>
-				# closing curly or square brackets
-				| [\]\}]
-			)
-		]]></string>
-		<key>increaseIndentPattern</key>
-		<string><![CDATA[(?x)
-			# the beginning of the line followed by any amount of whitespace
-			^.* (
-				# a valid non-self-closing HTML tag that doesn't close itself on the same line
-				<(?!
-					  !--           # no comment
-					| [?%]          # no preprocessor section like PHP/ASP
-					| (?i:!doctype) # no document type
-					| (?i:area|base|br|col|frame|hr|html|img|input|link|meta|param)[\t\n\f /<>]
-				)(?:
-					# tag name
-					(?<html_tag>[^\t\n\f /<>]+)
-					# not self closing
-					(?:(?!/>)[^>])* >
-					# not closing in the same line
-					(?! .* </\k<html_tag>)
-				)
-				# directives that don't close themselves on the same line
-				| <\?(?!.*?\?>)
-				# sections that don't close themselves on the same line
-				| <\%(?!.*?\%>)
-				# open curly or square brackets at the end of a line with comments allowed
-				| [\[\{](?=\s*(?:<!--.*)?$)
-			)
-		]]></string>
-		<key>bracketIndentNextLinePattern</key>
-		<string><![CDATA[<(?i:!doctype)(?!.*>)]]></string>
-	</dict>
-</dict>
-</plist>
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index 065a859..50a0166 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -59,16 +59,8 @@ variables:
   # Vue specific variables
   # ======================
 
-  template_content_begin: '{{script_content_begin}}'
-  template_content_end: |-
-    (?x:
-    # optional html comment end punctuation or any whitespace at beginning of
-    # line followed by </style> tag
-      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:template){{tag_name_break_char}})
-    # or standalone html comment end punctuation in a line
-    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
-    | ^ \s* () (-->) \s* $
-    )
+  template_content_begin: ^|(?=[{{ascii_space}}]*\S)
+  template_content_end: (?=(?:^\s*)?</(?i:template){{tag_name_break}})
 
 contexts:
 
@@ -625,17 +617,10 @@ contexts:
 
   template-jade-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.jade
       embed_scope: text.jade.embedded.html
       escape: '{{template_content_end}}'
-      escape_captures:
-        1: text.jade.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: text.jade.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
+      pop: 1
 
   template-mustache:
     - meta_scope: meta.tag.template.begin.html
@@ -651,17 +636,10 @@ contexts:
 
   template-pug-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.pug
       embed_scope: text.pug.embedded.html
       escape: '{{template_content_end}}'
-      escape_captures:
-        1: text.pug.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: text.pug.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
+      pop: 1
 
   template-slim:
     - meta_scope: meta.tag.template.begin.html
@@ -672,17 +650,10 @@ contexts:
 
   template-slim-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.slim
       embed_scope: text.slim.embedded.html
       escape: '{{template_content_end}}'
-      escape_captures:
-        1: text.slim.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: text.slim.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
+      pop: 1
 
 ###[ TAG ATTRIBUTES ]#########################################################
 
diff --git a/tests/syntax_test_indentation.vue b/tests/syntax_test_indentation.vue
deleted file mode 100644
index c115e0a..0000000
--- a/tests/syntax_test_indentation.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-## SYNTAX TEST reindent-unchanged "Vue Component.sublime-syntax"
-
-<!-------------------------------------
- Indentation tests for script tags
--------------------------------------->
-
-<!-- this comment's
-     indentation should
-     be unchanged
--->
-<script>
-    var i = 0;
-    function foo() {
-        return i;
-    }
-</script>
-<!-- this comment's
-indentation should
-be unchanged -->
-<script>
-    <!--
-    var i = 0;
-    function foo() {
-        return i;
-    }
-    -->
-</script>
-<script> <!--
-    var i = 0;
-    function foo() {
-        return i;
-    }
---> </script>
-
-
-<!-------------------------------------
- Indentation tests for style tags
--------------------------------------->
-
-<style>
-    p {
-        font-family: Helvetica;
-    }
-</style>
-<style>
-    <!--
-    p {
-        font-family: Helvetica;
-    }
-    -->
-</style>
-<style> <!--
-    p {
-        font-family: Helvetica;
-    }
---> </style>
-
-
-<!-------------------------------------
- Indentation tests for template tags
--------------------------------------->
-
-<template>
-    mustache content
-</template>
-
-<template> <!--
-    mustache content
---> </template>
-
-<template>
-    <!--
-    mustache content
-    -->
-</template>
-
-
-<template lang="jade">
-    jade content
-</template>
-
-<template lang="jade"> <!--
-    jade content
---> </template>
-
-<template lang="jade">
-    <!--
-    jade content
-    -->
-</template>
-
-
-<template lang="pug">
-    pug content
-</template>
-
-<template lang="pug"> <!--
-    pug content
---> </template>
-
-<template lang="pug">
-    <!--
-    pug content
-    -->
-</template>
-
-
-<!-------------------------------------
- Indentation tests for html tags
--------------------------------------->
-
-<template>
-    <body>
-        <div class="main">
-            <span class="something">Blah</span>
-            <span class="something">
-                Foobar
-            </span>
-        </div>
-
-        <script type="text/javascript" src="/some_script.js"></script>
-
-        <script type="text/json">
-            {
-                "dict": {
-                    "list": [
-                        "value"
-                    ]
-                }
-            }
-        </script>
-
-        <!-- Curly braces -->
-        foo {
-            bar { <!-- comment -->
-                baz
-            }
-        }
-        text
-        { <p></p> }
-        text
-        {{template}}
-        text
-
-    </body>
-</template>
diff --git a/tests/syntax_test_script.vue b/tests/syntax_test_script.vue
index 92c0549..5ac0495 100644
--- a/tests/syntax_test_script.vue
+++ b/tests/syntax_test_script.vue
@@ -38,32 +38,26 @@
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
     <script>
     <!--
-//^^^^^^^ - meta.tag - source
+//^^^^^^ - meta.tag - source
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source - meta.tag
     -->
-// <- - comment - source
-//^^ - comment - source
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
     <script> <!--
-//  ^^^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^^ - source
 //  ^^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^^ entity.name.tag
@@ -78,8 +72,6 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// <- - comment - source
-//^^ - comment - source
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - meta.tag - source
 //      ^^^^^^^^^ meta.tag - comment - source
@@ -92,7 +84,7 @@
 //  ^^^^^^^^ meta.tag - meta.attribute-with-value - source
 //          ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value - source
 //                                ^ meta.tag - meta.attribute-with-value - source
-//                                 ^^^^^^ - meta.tag - source
+//                                 ^^^^^ - meta.tag - source
 //   ^^^^^^ entity.name.tag
 //          ^^^^ entity.other.attribute-name.html
 //              ^ punctuation.separator.key-value.html
@@ -106,8 +98,6 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// <- - comment - source
-//^^ - comment - source
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - meta.tag - source
 //      ^^^^^^^^^ meta.tag - comment - source
@@ -126,8 +116,6 @@
 // <- source.js.embedded.html - source source
 // ^^^^^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -151,23 +139,20 @@
 
 // <- source.coffee.embedded.html - source source
     </script>
-// <- - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="coffee">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -179,24 +164,20 @@
 
 // <- source.jsx.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="jsx">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -208,24 +189,20 @@
 
 // <- source.livescript.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="livescript">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -237,24 +214,20 @@
 
 // <- source.ts.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="ts">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -266,22 +239,18 @@
 
 // <- source.tsx.embedded.html - source source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="tsx">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_style.vue b/tests/syntax_test_style.vue
index 2207931..36a3fac 100644
--- a/tests/syntax_test_style.vue
+++ b/tests/syntax_test_style.vue
@@ -37,30 +37,26 @@
 // <- source.css.embedded.html
 
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style>
         <!--
-//^^^^^^^^^^^ - meta.tag - source
+//^^^^^^^^^^ - meta.tag - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
         h1 {}
 // ^^^^^^^^^^^ source.css.embedded.html - source source - meta.tag
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style> <!--
-//  ^^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^ - source
 //  ^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^ entity.name.tag
@@ -72,8 +68,8 @@
 // <- source.css.embedded.html - source source
 
     --> </style>
-// <- - comment - source
-//^^ - comment - source
+// <- - comment
+//^^ - comment
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - meta.tag - source
 //      ^^^^^^^^ meta.tag - comment - source
@@ -86,7 +82,7 @@
 //  ^^^^^^^ meta.tag - meta.attribute-with-value - source
 //         ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value - source
 //                        ^ meta.tag - meta.attribute-with-value - source
-//                         ^^^^^^ - meta.tag - source
+//                         ^^^^^ - meta.tag - source
 //   ^^^^^ entity.name.tag
 //         ^^^^ entity.other.attribute-name.html
 //             ^ punctuation.separator.key-value.html
@@ -97,8 +93,8 @@
 // <- source.css.embedded.html - source source
 
     --> </style>
-// <- - comment - source
-//^^ - comment - source
+// <- - comment
+//^^ - comment
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - meta.tag - source
 //      ^^^^^^^^ meta.tag - comment - source
@@ -118,8 +114,6 @@
 // <- source.css.embedded.html - source source
 
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
@@ -138,20 +132,18 @@
 
 // <- source.less.embedded.html - source source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="less">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.less.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
@@ -168,25 +160,21 @@
 
 // <- source.postcss.embedded.html
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="postcss">
         <!--
-// ^^^^^^^^^^ - source.postcss
+// ^^^^^^^^^ - source.postcss
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.postcss.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
@@ -198,25 +186,21 @@
 
 // <- source.sss.embedded.html - source source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="postcss?parser=sugarss">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.sss.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
@@ -228,25 +212,21 @@
 
 // <- source.sass.embedded.html - source source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="sass">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.sass.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
@@ -258,25 +238,21 @@
 
 // <- source.scss.embedded.html - source source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="scss">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.scss.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
@@ -288,23 +264,19 @@
 
 // <- source.stylus.embedded.html - source source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style lang="stylus">
         <!--
-// ^^^^^^^^^^ - source
+// ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
 // <- source.stylus.embedded.html
         -->
-// <- - comment - source
-//^^^^^^ - comment - source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //         ^ - comment - source
     </style>
-// <- - meta.tag - source
-//^^ - meta.tag - source
 //  ^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_template.vue b/tests/syntax_test_template.vue
index 5eabfa7..b2998d4 100644
--- a/tests/syntax_test_template.vue
+++ b/tests/syntax_test_template.vue
@@ -19,25 +19,17 @@
 
     <template lang="jade"> foo --> </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ text.jade.embedded.html - meta.tag
-//                             ^^^^ - meta.tag - source
-//                             ^^^ comment.block.html punctuation.definition.comment.end.html
+//                        ^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                 ^^^^^^^^^^^ meta.tag - source
 
     <template lang="jade"> <!-- foo </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ - meta.tag - source
-//                         ^^^^ punctuation.definition.comment.begin.html
-//                             ^^^^^ text.jade.embedded.html - meta.tag
+//                        ^^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                  ^^^^^^^^^^^ meta.tag - source
 
     <template lang="jade"> <!-- foo --> </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ - meta.tag - source
-//                         ^^^^ punctuation.definition.comment.begin.html
-//                             ^^^^^ text.jade.embedded.html - meta.tag
-//                                  ^^^^ - meta.tag - source
-//                                  ^^^ comment.block.html punctuation.definition.comment.end.html
+//                        ^^^^^^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                      ^^^^^^^^^^^ meta.tag - source
 
 
@@ -46,8 +38,6 @@
 // <- text.jade.embedded.html
 
     </template>
-// <- - text.jade
-//^^ - text.jade
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 
 
@@ -60,12 +50,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                       ^ punctuation.definition.tag.end.html
-//                        ^ - text.jade
 
 // <- text.jade.embedded.html
     </template>
-// <- - text.jade
-//^^ - text.jade
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -80,12 +67,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                      ^ punctuation.definition.tag.end.html
-//                       ^ - text.pug
 
 // <- text.pug.embedded.html
     </template>
-// <- - text.pug
-//^^ - text.pug
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.pug
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -100,12 +84,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                      ^ punctuation.definition.tag.end.html
-//                       ^ - text.slim
 
 // <- text.slim.embedded.html
     </template>
-// <- - text.slim
-//^^ - text.slim
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.slm
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html

From 6cd6aa9a466a7af75ce143da5a85b7b4abde4aa2 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Thu, 21 Nov 2024 10:49:39 +0100
Subject: [PATCH 4/4] Revert patterns as they will be dropped for ST4128+

---
 Vue Component.sublime-syntax | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index 50a0166..41c14f4 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -23,14 +23,10 @@ variables:
   # see:
   # - https://github.com/sublimehq/Packages/issues/2322
   # - https://github.com/sublimehq/sublime_text/issues/4701
-  #
-  # Patterns backported from (required until ST4180):
-  # - https://github.com/sublimehq/Packages/pull/4020
   script_content_begin: |-
     (?x:
-    # whitespace followed by opening html comment begin punctuation,
-    # optionally followed by whitespeace until end of line
-      \s*(<!--) (?:\s*\n)?
+    # whitespace followed by opening html comment begin punctuation
+      \s*(<!--)
     # or any other non-whitespace character ahead
     | (?=\s*(?!<!--)\S)
     # or beginning of a line
@@ -38,22 +34,18 @@ variables:
     )
   script_content_end: |-
     (?x:
-    # optional html comment end punctuation or any whitespace at beginning of
-    # line followed by </script> tag
-      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:script){{tag_name_break_char}})
+    # optional html comment end punctuation followed by </script> tag
+      (?: (\s*) (-->) \s* )? (?=</(?i:script){{tag_name_break_char}})
     # or standalone html comment end punctuation in a line
-    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
-    | ^ \s* () (-->) \s* $
+    |   ^ (\s*) (-->) \s* $
     )
   style_content_begin: '{{script_content_begin}}'
   style_content_end: |-
     (?x:
-    # optional html comment end punctuation or any whitespace at beginning of
-    # line followed by </style> tag
-      (?: (?: ^ \s* | (\s*) ) (-->) \s* | ^ \s* )? (?=</(?i:style){{tag_name_break_char}})
+    # optional html comment end punctuation followed by </style> tag
+      (?: (\s*) (-->) \s* )? (?=</(?i:style){{tag_name_break_char}})
     # or standalone html comment end punctuation in a line
-    # note: Keep empty capture group for compatibility with existing 3rd-party syntaxes!
-    | ^ \s* () (-->) \s* $
+    |   ^ (\s*) (-->) \s* $
     )
 
   # Vue specific variables