From f56a439f539e4d43aee958fa779bc2883e227994 Mon Sep 17 00:00:00 2001
From: SerKo <serko.dev@gmail.com>
Date: Sun, 16 Nov 2025 05:40:16 +0800
Subject: [PATCH 1/5] fix(vscode): improve handling of HTML tags starting with
 `template`

---
 .../vscode/syntaxes/vue.tmLanguage.json       | 10 +++---
 .../tests/__snapshots__/grammar.spec.ts.snap  | 31 +++++++++++++++++++
 .../tag-starts-with-template.vue              | 11 +++++++
 3 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue

diff --git a/extensions/vscode/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json
index e7e82a915d..7c7708911f 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -690,7 +690,7 @@
 					]
 				},
 				{
-					"begin": "(template)\\b",
+					"begin": "(template)(?=(?:\\s|\\/?>))",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.tag.$1.html.vue"
@@ -711,7 +711,7 @@
 						},
 						{
 							"begin": "(?<=>)",
-							"end": "(?=<\\/template\\b)",
+							"end": "(?=<\\/template(?=\\s|\\/?>))",
 							"name": "text.html.derivative",
 							"patterns": [
 								{
@@ -872,7 +872,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)\\b)",
+					"end": "(?=/>)|((</)(template)(?=(?:\\s|\\/?>)))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"
@@ -891,7 +891,7 @@
 			]
 		},
 		"template-tag-2": {
-			"begin": "(<)(template)\\b",
+			"begin": "(<)(template)(?=(?:\\s|\\/?>))",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html.vue"
@@ -910,7 +910,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)\\b)",
+					"end": "(?=/>)|((</)(template)(?=(?:\\s|\\/?>)))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"
diff --git a/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap b/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
index 5769077f2d..8afdfbe130 100644
--- a/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
+++ b/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
@@ -345,6 +345,37 @@ exports[`grammar > script-tag-in-script.vue 1`] = `
 #^ source.vue"
 `;
 
+exports[`grammar > tag-starts-with-template.vue 1`] = `
+"><template>
+#^ source.vue punctuation.definition.tag.begin.html.vue
+# ^^^^^^^^ source.vue entity.name.tag.template.html.vue
+#         ^ source.vue meta.tag-stuff punctuation.definition.tag.end.html.vue
+>    <template-foo></template-foo>
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template:bar></template:bar>
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo />
+#^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template:bar />
+#^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo bar></template-foo>
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo>{{ 0 }}</template-foo>
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template.foo[0].bar></template.foo[0].bar>
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo bar />
+#^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo />
+#^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+></template>
+#^^ source.vue punctuation.definition.tag.begin.html.vue
+#  ^^^^^^^^ source.vue entity.name.tag.template.html.vue
+#          ^ source.vue punctuation.definition.tag.end.html.vue
+>
+#^ source.vue"
+`;
+
 exports[`grammar > template-expression.vue 1`] = `
 "><template>
 #^ source.vue punctuation.definition.tag.begin.html.vue
diff --git a/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue b/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
new file mode 100644
index 0000000000..a024243994
--- /dev/null
+++ b/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
@@ -0,0 +1,11 @@
+<template>
+    <template-foo></template-foo>
+    <template:bar></template:bar>
+    <template-foo />
+    <template:bar />
+    <template-foo bar></template-foo>
+    <template-foo>{{ 0 }}</template-foo>
+    <template.foo[0].bar></template.foo[0].bar>
+    <template-foo bar />
+    <template-foo />
+</template>

From 5c4ef4d7708723d3e737bfe3fb3b3b981230e8f0 Mon Sep 17 00:00:00 2001
From: KazariEX <zinkawaii@qq.com>
Date: Sun, 16 Nov 2025 16:24:01 +0800
Subject: [PATCH 2/5] test: update

---
 .../vscode/tests/__snapshots__/grammar.spec.ts.snap    | 10 +++-------
 .../tests/grammarFixtures/tag-starts-with-template.vue |  6 ++----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap b/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
index 8afdfbe130..c2cdba8db1 100644
--- a/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
+++ b/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
@@ -352,22 +352,18 @@ exports[`grammar > tag-starts-with-template.vue 1`] = `
 #         ^ source.vue meta.tag-stuff punctuation.definition.tag.end.html.vue
 >    <template-foo></template-foo>
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
->    <template:bar></template:bar>
+>    <template:foo></template:foo>
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
->    <template-foo />
-#^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
->    <template:bar />
-#^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
 >    <template-foo bar></template-foo>
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
 >    <template-foo>{{ 0 }}</template-foo>
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
 >    <template.foo[0].bar></template.foo[0].bar>
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
->    <template-foo bar />
-#^^^^^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
 >    <template-foo />
 #^^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
+>    <template-foo/>
+#^^^^^^^^^^^^^^^^^^^^ source.vue text.html.derivative
 ></template>
 #^^ source.vue punctuation.definition.tag.begin.html.vue
 #  ^^^^^^^^ source.vue entity.name.tag.template.html.vue
diff --git a/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue b/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
index a024243994..6ef436e833 100644
--- a/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
+++ b/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
@@ -1,11 +1,9 @@
 <template>
     <template-foo></template-foo>
-    <template:bar></template:bar>
-    <template-foo />
-    <template:bar />
+    <template:foo></template:foo>
     <template-foo bar></template-foo>
     <template-foo>{{ 0 }}</template-foo>
     <template.foo[0].bar></template.foo[0].bar>
-    <template-foo bar />
     <template-foo />
+    <template-foo/>
 </template>

From 0335831dc7c5b4dc590dcb06d717c8b3c0676a1b Mon Sep 17 00:00:00 2001
From: KazariEX <zinkawaii@qq.com>
Date: Sun, 16 Nov 2025 16:25:59 +0800
Subject: [PATCH 3/5] refactor: remove redundant non-capture groups

---
 extensions/vscode/syntaxes/vue.tmLanguage.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/vscode/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json
index 7c7708911f..6cd86a8f91 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -690,7 +690,7 @@
 					]
 				},
 				{
-					"begin": "(template)(?=(?:\\s|\\/?>))",
+					"begin": "(template)(?=\\s|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.tag.$1.html.vue"
@@ -872,7 +872,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)(?=(?:\\s|\\/?>)))",
+					"end": "(?=/>)|((</)(template)(?=\\s|\\/?>))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"
@@ -891,7 +891,7 @@
 			]
 		},
 		"template-tag-2": {
-			"begin": "(<)(template)(?=(?:\\s|\\/?>))",
+			"begin": "(<)(template)(?=\\s|\\/?>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html.vue"
@@ -910,7 +910,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)(?=(?:\\s|\\/?>)))",
+					"end": "(?=/>)|((</)(template)(?=\\s|\\/?>))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"

From ae3d2ea0147f2eaea65e9ad5f2125eb63138367b Mon Sep 17 00:00:00 2001
From: KazariEX <zinkawaii@qq.com>
Date: Sun, 16 Nov 2025 16:31:20 +0800
Subject: [PATCH 4/5] fix: correct close tag pattern

---
 extensions/vscode/syntaxes/vue.tmLanguage.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json
index 6cd86a8f91..abf43d223c 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -711,7 +711,7 @@
 						},
 						{
 							"begin": "(?<=>)",
-							"end": "(?=<\\/template(?=\\s|\\/?>))",
+							"end": "(?=<\\/template[\\s>])",
 							"name": "text.html.derivative",
 							"patterns": [
 								{
@@ -872,7 +872,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)(?=\\s|\\/?>))",
+					"end": "(?=/>)|((</)(template)(?=[\\s>]))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"
@@ -910,7 +910,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)(?=\\s|\\/?>))",
+					"end": "(?=/>)|((</)(template)(?=[\\s>]))",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"

From 06e96b4e98647c613dad0ed26ebea23f3d1373ff Mon Sep 17 00:00:00 2001
From: KazariEX <zinkawaii@qq.com>
Date: Sun, 16 Nov 2025 16:38:27 +0800
Subject: [PATCH 5/5] fix: same change to `<script>` and `<style>`

---
 extensions/vscode/syntaxes/vue.tmLanguage.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/vscode/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json
index abf43d223c..b0d1cab30e 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -722,7 +722,7 @@
 					]
 				},
 				{
-					"begin": "(script)\\b",
+					"begin": "(script)(?=\\s|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.tag.$1.html.vue"
@@ -743,7 +743,7 @@
 						},
 						{
 							"begin": "(?<=>)",
-							"end": "(?=<\\/script\\b)",
+							"end": "(?=<\\/script[\\s>])",
 							"name": "source.js",
 							"patterns": [
 								{
@@ -754,7 +754,7 @@
 					]
 				},
 				{
-					"begin": "(style)\\b",
+					"begin": "(style)(?=\\s|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.tag.$1.html.vue"
@@ -775,7 +775,7 @@
 						},
 						{
 							"begin": "(?<=>)",
-							"end": "(?=<\\/style\\b)",
+							"end": "(?=<\\/style[\\s>])",
 							"name": "source.css",
 							"patterns": [
 								{