From 923f835edb0119c0e85d6af388788c5c08e03a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=B1=E5=90=B9=E8=89=B2=E5=BE=A1=E5=AE=88?=
 <85992002+KazariEX@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:44:57 +0800
Subject: [PATCH] fix(vscode): correct highlighting on tag starting with
 `template` (#4770)

---
 .../vscode/syntaxes/vue.tmLanguage.json       |  8 ++--
 .../tests/__snapshots__/grammar.spec.ts.snap  | 39 +++++++++++++++++++
 .../tag-starts-with-template.vue              |  6 +++
 3 files changed, 49 insertions(+), 4 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 71109bc144..fbe30285e2 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -856,7 +856,7 @@
 			]
 		},
 		"template-tag-1": {
-			"begin": "(<)(template)\\b(>)",
+			"begin": "(<)(template[a-zA-Z0-9:-]*)\\b(>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html.vue"
@@ -878,7 +878,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)\\b)",
+					"end": "(?=/>)|((</)(template[a-zA-Z0-9:-]*)\\b)",
 					"endCaptures": {
 						"2": {
 							"name": "punctuation.definition.tag.begin.html.vue"
@@ -897,7 +897,7 @@
 			]
 		},
 		"template-tag-2": {
-			"begin": "(<)(template)\\b",
+			"begin": "(<)(template[a-zA-Z0-9:-]*)\\b",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html.vue"
@@ -916,7 +916,7 @@
 			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=/>)|((</)(template)\\b)",
+					"end": "(?=/>)|((</)(template[a-zA-Z0-9:-]*)\\b)",
 					"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 00f1dbdb3e..c0398a7cfc 100644
--- a/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
+++ b/extensions/vscode/tests/__snapshots__/grammar.spec.ts.snap
@@ -363,6 +363,45 @@ 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
+# ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.begin.html.vue
+#  ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start entity.name.tag.template-foo.html.vue
+#              ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+#               ^^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end punctuation.definition.tag.begin.html.vue
+#                 ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end entity.name.tag.template-foo.html.vue
+#                             ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+>	<template:bar></template:bar>
+#^ source.vue text.html.derivative
+# ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.begin.html.vue
+#  ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start entity.name.tag.template:bar.html.vue
+#              ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+#               ^^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end punctuation.definition.tag.begin.html.vue
+#                 ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end entity.name.tag.template:bar.html.vue
+#                             ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+>	<template-foo />
+#^ source.vue text.html.derivative
+# ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.begin.html.vue
+#  ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start entity.name.tag.template-foo.html.vue
+#              ^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end meta.tag-stuff
+#               ^^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+>	<template:bar />
+#^ source.vue text.html.derivative
+# ^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.begin.html.vue
+#  ^^^^^^^^^^^^ source.vue text.html.derivative meta.template-tag.start entity.name.tag.template:bar.html.vue
+#              ^ source.vue text.html.derivative meta.template-tag.start meta.template-tag.end meta.tag-stuff
+#               ^^ source.vue text.html.derivative meta.template-tag.start punctuation.definition.tag.end.html.vue
+></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"
+`;
+
 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..a40ee5d877
--- /dev/null
+++ b/extensions/vscode/tests/grammarFixtures/tag-starts-with-template.vue
@@ -0,0 +1,6 @@
+<template>
+	<template-foo></template-foo>
+	<template:bar></template:bar>
+	<template-foo />
+	<template:bar />
+</template>
\ No newline at end of file