From ff2788d4084895a2c4cfa526668dc642e86de6fd Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Fri, 24 May 2024 05:19:27 +0800
Subject: [PATCH] fix(vscode): fix "as"/"instanceof" expressions syntax
 highlight (#4412)

---
 extensions/vscode/syntaxes/vue.tmLanguage.json             | 6 +++---
 test-workspace/language-service/syntax/directives.vue      | 6 +++---
 test-workspace/language-service/syntax/generic.vue         | 1 +
 test-workspace/language-service/syntax/inline-style.vue    | 7 +++++++
 .../language-service/syntax/template-expression.vue        | 7 +++++++
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 test-workspace/language-service/syntax/generic.vue
 create mode 100644 test-workspace/language-service/syntax/inline-style.vue
 create mode 100644 test-workspace/language-service/syntax/template-expression.vue

diff --git a/extensions/vscode/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json
index 7171625de0..c7ed60e3e2 100644
--- a/extensions/vscode/syntaxes/vue.tmLanguage.json
+++ b/extensions/vscode/syntaxes/vue.tmLanguage.json
@@ -1071,7 +1071,7 @@
 							"name": "source.ts.embedded.html.vue",
 							"patterns": [
 								{
-									"include": "source.ts"
+									"include": "source.ts#expression"
 								}
 							]
 						}
@@ -1092,7 +1092,7 @@
 							"name": "source.ts.embedded.html.vue",
 							"patterns": [
 								{
-									"include": "source.ts"
+									"include": "source.ts#expression"
 								}
 							]
 						}
@@ -1257,7 +1257,7 @@
 							"name": "source.ts.embedded.html.vue",
 							"patterns": [
 								{
-									"include": "source.ts"
+									"include": "source.ts#expression"
 								}
 							]
 						}
diff --git a/test-workspace/language-service/syntax/directives.vue b/test-workspace/language-service/syntax/directives.vue
index 05cbd0b298..d6408879e1 100644
--- a/test-workspace/language-service/syntax/directives.vue
+++ b/test-workspace/language-service/syntax/directives.vue
@@ -1,6 +1,7 @@
 <template>
 	<div @click></div>
 	<div @click="{}"></div>
+	<div @click="log('hello'); log('world');"></div>
 	<div #default></div>
 	<div #default="args"></div>
 	<div #></div>
@@ -15,12 +16,12 @@
 	<div :foo="':foo=123'"></div>
 	<div :foo="[{ bar: []}]"></div>
 	<div .prop="[1, 2]"></div>
-	<div style="width: 100%; height: auto;"></div>
 </template>
 
 <template lang="pug">
 div(@click)
 div(@click="{}")
+div(@click="log('hello'); log('world');")
 div(#default)
 div(#default="args")
 div(#)
@@ -35,7 +36,6 @@ div(v-if="true" v-else-if="true" v-else)
 div(:foo="':foo=123'")
 div(:foo="[{ bar: []}]")
 div(.prop="[1, 2]")
-div(style="width: 100%; height: auto;")
 </template>
 
 <template lang="pug">
@@ -48,6 +48,7 @@ h1#myId(class="text-right") hello
 <template lang="html">
 	<div @click></div>
 	<div @click="{}"></div>
+	<div @click="log('hello'); log('world');"></div>
 	<div #default></div>
 	<div #default="args"></div>
 	<div #></div>
@@ -62,5 +63,4 @@ h1#myId(class="text-right") hello
 	<div :foo="':foo=123'"></div>
 	<div :foo="[{ bar: []}]"></div>
 	<div .prop="[1, 2]"></div>
-	<div style="width: 100%; height: auto;"></div>
 </template>
diff --git a/test-workspace/language-service/syntax/generic.vue b/test-workspace/language-service/syntax/generic.vue
new file mode 100644
index 0000000000..511520b51a
--- /dev/null
+++ b/test-workspace/language-service/syntax/generic.vue
@@ -0,0 +1 @@
+<script setup generic="T"></script>
diff --git a/test-workspace/language-service/syntax/inline-style.vue b/test-workspace/language-service/syntax/inline-style.vue
new file mode 100644
index 0000000000..a0c68a6399
--- /dev/null
+++ b/test-workspace/language-service/syntax/inline-style.vue
@@ -0,0 +1,7 @@
+<template>
+	<div style="width: 100%; height: auto;"></div>
+</template>
+
+<template lang="pug">
+div(style="width: 100%; height: auto;")
+</template>
diff --git a/test-workspace/language-service/syntax/template-expression.vue b/test-workspace/language-service/syntax/template-expression.vue
new file mode 100644
index 0000000000..932ed655fc
--- /dev/null
+++ b/test-workspace/language-service/syntax/template-expression.vue
@@ -0,0 +1,7 @@
+<template>
+	<div v-if="var as XXX"></div>
+	<div v-if="var instanceof XXX"></div>
+	<div v-if="typeof xxx"></div>
+	<div v-if="typeof XXX"></div>
+	<div v-if="''.toString('xxx')"></div>
+</template>