fix(vscode): fix "as"/"instanceof" expressions syntax highlight (#4412)

vuejs · May 23, 2024 · ff2788d · ff2788d
1 parent 9a61776
commit ff2788d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>