diff --git a/package.json b/package.json
index 7bd8603bfc..2e95edd2db 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
 		"release:next-base": "npm run release:base -- --dist-tag next",
 		"release:next-vue": "cd ./extensions/vscode && npm run release:next",
 		"test": "vitest run",
+		"test:update": "vitest run --update",
 		"lint": "tsslint --projects {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
 		"lint:fix": "npm run lint -- --fix",
 		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter"
@@ -31,14 +32,14 @@
 	},
 	"pnpm": {
 		"overrides": {
-			"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2",
-			"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2",
-			"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2",
-			"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2",
-			"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2",
-			"@volar/test-utils": "https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2",
-			"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2",
-			"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2",
+			"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee",
+			"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee",
+			"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee",
+			"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee",
+			"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee",
+			"@volar/test-utils": "https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee",
+			"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee",
+			"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee",
 			"volar-service-typescript": "https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed",
 			"inquirer": "9.2.23"
 		}
diff --git a/packages/language-server/tests/__snapshots__/completions.spec.ts.snap b/packages/language-server/tests/__snapshots__/completions.spec.ts.snap
deleted file mode 100644
index f2b3dd1bf6..0000000000
--- a/packages/language-server/tests/__snapshots__/completions.spec.ts.snap
+++ /dev/null
@@ -1,124 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Completions > #2454 1`] = `
-"
-			<script setup lang="ts">
-			let vLoading: any;
-			</script>
-
-			<template>
-			<div v-loading="vLoading"></div>
-			</template>
-		"
-`;
-
-exports[`Completions > #2511 1`] = `
-"
-			<script setup lang="ts">
-			import componentForAutoImport$1 from './component-for-auto-import.vue';
-			</script>
-		"
-`;
-
-exports[`Completions > #3658 1`] = `
-"
-			<template>
-				<Comp>
-					<template #foo="foo">
-						{{ foo }}
-					</template>
-				</Comp>
-			</template>
-		"
-`;
-
-exports[`Completions > #4639 1`] = `
-"
-			<template>
-				<div @click.capture />
-			</template>
-		"
-`;
-
-exports[`Completions > $event argument 1`] = `"<template><div @click="console.log($event)"></div></template>"`;
-
-exports[`Completions > <script setup> 1`] = `
-"
-			<template>{{ foo }}</template>
-
-			<script lang="ts" setup>
-			const foo = 1;
-			</script>
-		"
-`;
-
-exports[`Completions > Alias path 1`] = `
-"
-			<script setup lang="ts">
-			import Component from '@/empty.vue';
-			</script>
-		"
-`;
-
-exports[`Completions > Component auto import 1`] = `
-"
-			<script setup lang="ts">
-import ComponentForAutoImport from './ComponentForAutoImport.vue';
-
-			</script>
-
-			<template>
-				<ComponentForAutoImport />
-			</template>
-		"
-`;
-
-exports[`Completions > Directives 1`] = `"<template><div v-html="$1"></div></template>"`;
-
-exports[`Completions > Directives 2`] = `"<template><div v-cloak></div></template>"`;
-
-exports[`Completions > Directives 3`] = `"<template><div v-else></div></template>"`;
-
-exports[`Completions > Directives 4`] = `"<template><div v-pre></div></template>"`;
-
-exports[`Completions > Relative path 1`] = `
-"
-			<script setup lang="ts">
-			import Component from './empty.vue';
-			</script>
-		"
-`;
-
-exports[`Completions > Slot name 1`] = `
-"
-			<template>
-				<Foo>
-					<template #default></template>
-				</Foo>
-			</template>
-
-			<script lang="ts" setup>
-			let Foo: new () => {
-				$slots: {
-					default: any;
-				};
-			};
-			</script>
-		"
-`;
-
-exports[`Completions > core#8811 1`] = `
-"
-			<script setup lang="ts">
-			declare const Foo: new () => {
-				$props: {
-					FooBar: string;
-				};
-			};
-			</script>
-
-			<template>
-				<Foo :-foo-bar="$1" ></Foo>
-			</template>
-		"
-`;
diff --git a/packages/language-server/tests/__snapshots__/definitions.spec.ts.snap b/packages/language-server/tests/__snapshots__/definitions.spec.ts.snap
deleted file mode 100644
index ff893647c0..0000000000
--- a/packages/language-server/tests/__snapshots__/definitions.spec.ts.snap
+++ /dev/null
@@ -1,61 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Definitions > #2600 1`] = `"tsconfigProject/foo.vue"`;
-
-exports[`Definitions > #2600 2`] = `
-{
-  "end": {
-    "character": 0,
-    "line": 0,
-  },
-  "start": {
-    "character": 0,
-    "line": 0,
-  },
-}
-`;
-
-exports[`Definitions > Alias path 1`] = `"tsconfigProject/foo.ts"`;
-
-exports[`Definitions > Alias path 2`] = `
-{
-  "end": {
-    "character": 25,
-    "line": 0,
-  },
-  "start": {
-    "character": 0,
-    "line": 0,
-  },
-}
-`;
-
-exports[`Definitions > TS to vue 1`] = `"tsconfigProject/empty.vue"`;
-
-exports[`Definitions > TS to vue 2`] = `
-{
-  "end": {
-    "character": 0,
-    "line": 0,
-  },
-  "start": {
-    "character": 0,
-    "line": 0,
-  },
-}
-`;
-
-exports[`Definitions > TS to vue 3`] = `"tsconfigProject/empty.vue"`;
-
-exports[`Definitions > TS to vue 4`] = `
-{
-  "end": {
-    "character": 0,
-    "line": 0,
-  },
-  "start": {
-    "character": 0,
-    "line": 0,
-  },
-}
-`;
diff --git a/packages/language-server/tests/__snapshots__/inlayHints.spec.ts.snap b/packages/language-server/tests/__snapshots__/inlayHints.spec.ts.snap
deleted file mode 100644
index 72d2107aaa..0000000000
--- a/packages/language-server/tests/__snapshots__/inlayHints.spec.ts.snap
+++ /dev/null
@@ -1,80 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Definitions > Destructured props 1`] = `
-"
-			<script setup lang="ts">
-			import { watch } from 'vue';
-
-			const { foo, bar, ...props } = defineProps<{
-				foo: string;
-				bar: string;
-				baz: string;
-			}>();
-
-			type foo = foo[string] & typeof [props.]foo;
-
-			interface foo extends (typeof [props.]foo) {
-				foo: string;
-				foo(foo: string): void;
-				foo: (foo: string) => void;
-			}
-
-			const obj = {
-				foo: [props.]foo,
-				[[props.]foo]: '',
-				foo[: props.foo],
-				foo(foo) { },
-				foo: function (foo) { },
-				get bar() { return this.foo; },
-				set bar(val) { this.foo = val; }
-			};
-
-			function func(foo) { }
-
-			class cls {
-				foo: string = [props.]foo;
-				constructor(foo) { }
-			}
-
-			for (const char of [props.]foo) { }
-
-			try { } catch (foo) { }
-
-			watch(() => [props.]foo, (foo) => {
-				console.log(foo, [props.]bar, props.baz);
-			});
-			</script>
-		"
-`;
-
-exports[`Definitions > Inline handler leading 1`] = `
-"
-			<script setup lang="ts">
-			let a = 0;
-			</script>
-
-			<template>
-				<div @click="[$event =>]a = 1"></div>
-			</template>
-		"
-`;
-
-exports[`Definitions > Missing props 1`] = `
-"
-			<script setup lang="ts">
-			import Foo from './foo.vue';
-			</script>
-
-			<template>
-				<Foo[foo!]></Foo>
-			</template>
-		"
-`;
-
-exports[`Definitions > Options wrapper 1`] = `
-"
-			<script>
-			export default [(await import('vue')).defineComponent(]{}[)];
-			</script>
-		"
-`;
diff --git a/packages/language-server/tests/__snapshots__/references.spec.ts.snap b/packages/language-server/tests/__snapshots__/references.spec.ts.snap
deleted file mode 100644
index b741277166..0000000000
--- a/packages/language-server/tests/__snapshots__/references.spec.ts.snap
+++ /dev/null
@@ -1,91 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Definitions > Default slot 1`] = `"tsconfigProject/foo.vue"`;
-
-exports[`Definitions > Default slot 2`] = `
-{
-  "end": {
-    "character": 16,
-    "line": 7,
-  },
-  "start": {
-    "character": 5,
-    "line": 7,
-  },
-}
-`;
-
-exports[`Definitions > Default slot 3`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Definitions > Default slot 4`] = `
-{
-  "end": {
-    "character": 9,
-    "line": 2,
-  },
-  "start": {
-    "character": 5,
-    "line": 2,
-  },
-}
-`;
-
-exports[`Definitions > Named slot 1`] = `"tsconfigProject/foo.vue"`;
-
-exports[`Definitions > Named slot 2`] = `
-{
-  "end": {
-    "character": 17,
-    "line": 6,
-  },
-  "start": {
-    "character": 14,
-    "line": 6,
-  },
-}
-`;
-
-exports[`Definitions > Named slot 3`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Definitions > Named slot 4`] = `
-{
-  "end": {
-    "character": 19,
-    "line": 2,
-  },
-  "start": {
-    "character": 16,
-    "line": 2,
-  },
-}
-`;
-
-exports[`Definitions > v-bind shorthand 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Definitions > v-bind shorthand 2`] = `
-{
-  "end": {
-    "character": 13,
-    "line": 6,
-  },
-  "start": {
-    "character": 10,
-    "line": 6,
-  },
-}
-`;
-
-exports[`Definitions > v-bind shorthand 3`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Definitions > v-bind shorthand 4`] = `
-{
-  "end": {
-    "character": 12,
-    "line": 2,
-  },
-  "start": {
-    "character": 9,
-    "line": 2,
-  },
-}
-`;
diff --git a/packages/language-server/tests/__snapshots__/renaming.spec.ts.snap b/packages/language-server/tests/__snapshots__/renaming.spec.ts.snap
deleted file mode 100644
index 4ba2f85a1e..0000000000
--- a/packages/language-server/tests/__snapshots__/renaming.spec.ts.snap
+++ /dev/null
@@ -1,573 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Renaming > #2410 1`] = `"fixture.vue"`;
-
-exports[`Renaming > #2410 2`] = `
-[
-  {
-    "newText": "h2",
-    "range": {
-      "end": {
-        "character": 18,
-        "line": 0,
-      },
-      "start": {
-        "character": 16,
-        "line": 0,
-      },
-    },
-  },
-  {
-    "newText": "h2",
-    "range": {
-      "end": {
-        "character": 13,
-        "line": 0,
-      },
-      "start": {
-        "character": 11,
-        "line": 0,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > #2410 3`] = `"fixture.vue"`;
-
-exports[`Renaming > #2410 4`] = `
-[
-  {
-    "newText": "h2",
-    "range": {
-      "end": {
-        "character": 18,
-        "line": 0,
-      },
-      "start": {
-        "character": 16,
-        "line": 0,
-      },
-    },
-  },
-  {
-    "newText": "h2",
-    "range": {
-      "end": {
-        "character": 13,
-        "line": 0,
-      },
-      "start": {
-        "character": 11,
-        "line": 0,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > <script setup> 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > <script setup> 2`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 12,
-        "line": 6,
-      },
-      "start": {
-        "character": 9,
-        "line": 6,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 10,
-        "line": 2,
-      },
-      "start": {
-        "character": 7,
-        "line": 2,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > CSS 1`] = `"fixture.vue"`;
-
-exports[`Renaming > CSS 2`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 27,
-        "line": 2,
-      },
-      "start": {
-        "character": 24,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 7,
-        "line": 7,
-      },
-      "start": {
-        "character": 4,
-        "line": 7,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > CSS 3`] = `"fixture.vue"`;
-
-exports[`Renaming > CSS 4`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 19,
-        "line": 2,
-      },
-      "start": {
-        "character": 16,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 7,
-        "line": 6,
-      },
-      "start": {
-        "character": 4,
-        "line": 6,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > CSS 5`] = `"fixture.vue"`;
-
-exports[`Renaming > CSS 6`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 33,
-        "line": 10,
-      },
-      "start": {
-        "character": 30,
-        "line": 10,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 27,
-        "line": 10,
-      },
-      "start": {
-        "character": 24,
-        "line": 10,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 27,
-        "line": 7,
-      },
-      "start": {
-        "character": 24,
-        "line": 7,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 12,
-        "line": 2,
-      },
-      "start": {
-        "character": 9,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 34,
-        "line": 12,
-      },
-      "start": {
-        "character": 31,
-        "line": 12,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 28,
-        "line": 12,
-      },
-      "start": {
-        "character": 25,
-        "line": 12,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 34,
-        "line": 11,
-      },
-      "start": {
-        "character": 31,
-        "line": 11,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 28,
-        "line": 11,
-      },
-      "start": {
-        "character": 25,
-        "line": 11,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 28,
-        "line": 9,
-      },
-      "start": {
-        "character": 25,
-        "line": 9,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 28,
-        "line": 8,
-      },
-      "start": {
-        "character": 25,
-        "line": 8,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component dynamic props 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > Component dynamic props 2`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 12,
-        "line": 6,
-      },
-      "start": {
-        "character": 9,
-        "line": 6,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 14,
-        "line": 2,
-      },
-      "start": {
-        "character": 11,
-        "line": 2,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component props 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > Component props 2`] = `
-[
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 23,
-        "line": 6,
-      },
-      "start": {
-        "character": 17,
-        "line": 6,
-      },
-    },
-  },
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 13,
-        "line": 2,
-      },
-      "start": {
-        "character": 7,
-        "line": 2,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component props 3`] = `"tsconfigProject/foo.vue"`;
-
-exports[`Renaming > Component props 4`] = `
-[
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 17,
-        "line": 3,
-      },
-      "start": {
-        "character": 11,
-        "line": 3,
-      },
-    },
-  },
-  {
-    "newText": "ccc-ddd",
-    "range": {
-      "end": {
-        "character": 18,
-        "line": 2,
-      },
-      "start": {
-        "character": 11,
-        "line": 2,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component returns 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > Component returns 2`] = `
-[
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 10,
-        "line": 2,
-      },
-      "start": {
-        "character": 7,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "bar",
-    "range": {
-      "end": {
-        "character": 9,
-        "line": 11,
-      },
-      "start": {
-        "character": 6,
-        "line": 11,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component tags 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > Component tags 2`] = `
-[
-  {
-    "newText": "cc-dd",
-    "range": {
-      "end": {
-        "character": 18,
-        "line": 3,
-      },
-      "start": {
-        "character": 13,
-        "line": 3,
-      },
-    },
-  },
-  {
-    "newText": "cc-dd",
-    "range": {
-      "end": {
-        "character": 10,
-        "line": 3,
-      },
-      "start": {
-        "character": 5,
-        "line": 3,
-      },
-    },
-  },
-  {
-    "newText": "CcDd",
-    "range": {
-      "end": {
-        "character": 16,
-        "line": 2,
-      },
-      "start": {
-        "character": 12,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "CcDd",
-    "range": {
-      "end": {
-        "character": 9,
-        "line": 2,
-      },
-      "start": {
-        "character": 5,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "CcDd",
-    "range": {
-      "end": {
-        "character": 14,
-        "line": 7,
-      },
-      "start": {
-        "character": 10,
-        "line": 7,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component type props 1`] = `"tsconfigProject/fixture.vue"`;
-
-exports[`Renaming > Component type props 2`] = `
-[
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 13,
-        "line": 2,
-      },
-      "start": {
-        "character": 7,
-        "line": 2,
-      },
-    },
-  },
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 23,
-        "line": 6,
-      },
-      "start": {
-        "character": 17,
-        "line": 6,
-      },
-    },
-  },
-]
-`;
-
-exports[`Renaming > Component type props 3`] = `"tsconfigProject/foo.vue"`;
-
-exports[`Renaming > Component type props 4`] = `
-[
-  {
-    "newText": "cccDdd",
-    "range": {
-      "end": {
-        "character": 17,
-        "line": 3,
-      },
-      "start": {
-        "character": 11,
-        "line": 3,
-      },
-    },
-  },
-  {
-    "newText": "ccc-ddd",
-    "range": {
-      "end": {
-        "character": 18,
-        "line": 2,
-      },
-      "start": {
-        "character": 11,
-        "line": 2,
-      },
-    },
-  },
-]
-`;
diff --git a/packages/language-server/tests/completions.spec.ts b/packages/language-server/tests/completions.spec.ts
index 560ac8a007..5bda73d90b 100644
--- a/packages/language-server/tests/completions.spec.ts
+++ b/packages/language-server/tests/completions.spec.ts
@@ -1,23 +1,47 @@
-import { InsertReplaceEdit, TextDocument, TextEdit } from '@volar/language-server';
+import { TextDocument } from '@volar/language-server';
 import { afterEach, describe, expect, it } from 'vitest';
 import { URI } from 'vscode-uri';
 import { getLanguageServer, testWorkspacePath } from './server.js';
 
 describe('Completions', async () => {
 
+	it('Vue tags', async () => {
+		expect(
+			(await requestCompletionList('fixture.vue', 'vue', `<|`)).items.map(item => item.label)
+		).toMatchInlineSnapshot(`
+			[
+			  "template",
+			  "script",
+			  "script setup",
+			  "style",
+			  "script lang="ts"",
+			  "script lang="tsx"",
+			  "script lang="jsx"",
+			  "script setup lang="ts"",
+			  "script setup lang="tsx"",
+			  "script setup lang="jsx"",
+			  "style lang="css"",
+			  "style lang="scss"",
+			  "style lang="less"",
+			  "style lang="postcss"",
+			  "template lang="pug"",
+			]
+		`);
+	});
+
 	it('Directives', async () => {
-		await assertCompletion('fixture.vue', 'vue', `<template><div v-ht|></div></template>`, 'v-html');
-		await assertCompletion('fixture.vue', 'vue', `<template><div v-cl|></div></template>`, 'v-cloak');
-		await assertCompletion('fixture.vue', 'vue', `<template><div v-el|></div></template>`, 'v-else');
-		await assertCompletion('fixture.vue', 'vue', `<template><div v-p|></div></template>`, 'v-pre');
+		await requestCompletionItem('fixture.vue', 'vue', `<template><div v-ht|></div></template>`, 'v-html');
+		await requestCompletionItem('fixture.vue', 'vue', `<template><div v-cl|></div></template>`, 'v-cloak');
+		await requestCompletionItem('fixture.vue', 'vue', `<template><div v-el|></div></template>`, 'v-else');
+		await requestCompletionItem('fixture.vue', 'vue', `<template><div v-p|></div></template>`, 'v-pre');
 	});
 
 	it('$event argument', async () => {
-		await assertCompletion('fixture.vue', 'vue', `<template><div @click="console.log($eve|)"></div></template>`, '$event');
+		await requestCompletionItem('fixture.vue', 'vue', `<template><div @click="console.log($eve|)"></div></template>`, 'event');
 	});
 
 	it('<script setup>', async () => {
-		await assertCompletion('fixture.vue', 'vue', `
+		await requestCompletionItem('fixture.vue', 'vue', `
 			<template>{{ f| }}</template>
 
 			<script lang="ts" setup>
@@ -27,7 +51,7 @@ describe('Completions', async () => {
 	});
 
 	it('Slot name', async () => {
-		await assertCompletion('fixture.vue', 'vue', `
+		await requestCompletionItem('fixture.vue', 'vue', `
 			<template>
 				<Foo>
 					<template #|></template>
@@ -45,7 +69,7 @@ describe('Completions', async () => {
 	});
 
 	it('#2454', async () => {
-		await assertCompletion('fixture.vue', 'vue', `
+		await requestCompletionItem('fixture.vue', 'vue', `
 			<script setup lang="ts">
 			let vLoading: any;
 			</script>
@@ -58,16 +82,32 @@ describe('Completions', async () => {
 
 	it('#2511', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/component-for-auto-import.vue', 'vue', `<script setup lang="ts"></script>`);
-		await assertCompletion('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			import componentFor|
-			</script>
-		`, 'ComponentForAutoImport');
+		await prepareDocument('tsconfigProject/component-for-auto-import.vue', 'vue', `<script setup lang="ts"></script>`);
+		expect(
+			(await requestCompletionItem('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				import componentFor|
+				</script>
+			`, 'ComponentForAutoImport')).textEdit
+		).toMatchInlineSnapshot(`
+			{
+			  "newText": "import componentForAutoImport$1 from './component-for-auto-import.vue';",
+			  "range": {
+			    "end": {
+			      "character": 23,
+			      "line": 2,
+			    },
+			    "start": {
+			      "character": 4,
+			      "line": 2,
+			    },
+			  },
+			}
+		`);
 	});
 
 	it('#3658', async () => {
-		await assertCompletion('fixture.vue', 'vue', `
+		await requestCompletionItem('fixture.vue', 'vue', `
 			<template>
 				<Comp>
 					<template #foo="foo">
@@ -79,7 +119,7 @@ describe('Completions', async () => {
 	});
 
 	it('#4639', async () => {
-		await assertCompletion('fixture.vue', 'vue', `
+		await requestCompletionItem('fixture.vue', 'vue', `
 			<template>
 				<div @click.| />
 			</template>
@@ -88,7 +128,7 @@ describe('Completions', async () => {
 
 	it('Alias path', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertCompletion('tsconfigProject/fixture.vue', 'vue', `
+		await requestCompletionItem('tsconfigProject/fixture.vue', 'vue', `
 			<script setup lang="ts">
 			import Component from '@/|';
 			</script>
@@ -97,7 +137,7 @@ describe('Completions', async () => {
 
 	it('Relative path', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertCompletion('tsconfigProject/fixture.vue', 'vue', `
+		await requestCompletionItem('tsconfigProject/fixture.vue', 'vue', `
 			<script setup lang="ts">
 			import Component from './|';
 			</script>
@@ -106,20 +146,68 @@ describe('Completions', async () => {
 
 	it('Component auto import', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/ComponentForAutoImport.vue', 'vue', `<script setup lang="ts"></script>`);
-		await assertCompletion('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			</script>
+		await prepareDocument('tsconfigProject/ComponentForAutoImport.vue', 'vue', `<script setup lang="ts"></script>`);
+		expect(
+			(await requestCompletionItem('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				</script>
 
-			<template>
-				<ComponentForA| />
-			</template>
-		`, 'ComponentForAutoImport');
+				<template>
+					<ComponentForA| />
+				</template>
+			`, 'ComponentForAutoImport'))
+		).toMatchInlineSnapshot(`
+			{
+			  "additionalTextEdits": [
+			    {
+			      "newText": "
+			import ComponentForAutoImport from './ComponentForAutoImport.vue';
+			",
+			      "range": {
+			        "end": {
+			          "character": 28,
+			          "line": 1,
+			        },
+			        "start": {
+			          "character": 28,
+			          "line": 1,
+			        },
+			      },
+			    },
+			  ],
+			  "detail": "Add import from "./ComponentForAutoImport.vue"
+			(property) default: DefineComponent<{}, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<{}>>, {}, {}>",
+			  "documentation": {
+			    "kind": "markdown",
+			    "value": "",
+			  },
+			  "insertTextFormat": 1,
+			  "kind": 5,
+			  "label": "ComponentForAutoImport",
+			  "labelDetails": {
+			    "description": "./ComponentForAutoImport.vue",
+			  },
+			  "sortText": "￿16",
+			  "textEdit": {
+			    "newText": "ComponentForAutoImport",
+			    "range": {
+			      "end": {
+			        "character": 19,
+			        "line": 5,
+			      },
+			      "start": {
+			        "character": 6,
+			        "line": 5,
+			      },
+			    },
+			  },
+			}
+		`);
 	});
 
 	it('core#8811', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertCompletion('tsconfigProject/fixture.vue', 'vue', `
+		await requestCompletionItem('tsconfigProject/fixture.vue', 'vue', `
 			<script setup lang="ts">
 			declare const Foo: new () => {
 				$props: {
@@ -148,58 +236,39 @@ describe('Completions', async () => {
 	 * @deprecated Remove this when #4717 fixed.
 	 */
 	async function ensureGlobalTypesHolder(folderName: string) {
-		const document = await openDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
+		const document = await prepareDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
 		const server = await getLanguageServer();
 		await server.sendDocumentDiagnosticRequest(document.uri);
 	}
 
-	async function assertCompletion(fileName: string, languageId: string, content: string, itemLabel: string) {
+	async function requestCompletionItem(fileName: string, languageId: string, content: string, itemLabel: string) {
+		const completions = await requestCompletionList(fileName, languageId, content);
+		let completion = completions.items.find(item => item.label === itemLabel);
+		expect(completion).toBeDefined();
+		if (completion!.data) {
+			const server = await getLanguageServer();
+			completion = await server.sendCompletionResolveRequest(completion!);
+			expect(completion).toBeDefined();
+		}
+		return completion!;
+	}
+
+	async function requestCompletionList(fileName: string, languageId: string, content: string) {
 		const offset = content.indexOf('|');
 		expect(offset).toBeGreaterThanOrEqual(0);
 		content = content.slice(0, offset) + content.slice(offset + 1);
 
 		const server = await getLanguageServer();
-		let document = await openDocument(fileName, languageId, content);
+		let document = await prepareDocument(fileName, languageId, content);
 
 		const position = document.positionAt(offset);
 		const completions = await server.sendCompletionRequest(document.uri, position);
+		expect(completions).toBeDefined();
 
-		let completion = completions?.items.find(item => item.label === itemLabel);
-		expect(completion).toBeDefined();
-
-		completion = await server.sendCompletionResolveRequest(completion!);
-		expect(completion).toBeDefined();
-
-		const edits: TextEdit[] = [];
-
-		if (completion.textEdit) {
-			if (InsertReplaceEdit.is(completion.textEdit)) {
-				edits.push({ newText: completion.textEdit.newText, range: completion.textEdit.replace });
-			}
-			else {
-				edits.push(completion.textEdit);
-			}
-		}
-		else {
-			edits.push({
-				newText: completion.insertText ?? completion.label,
-				range: { start: position, end: position },
-			});
-		}
-		if (completion.additionalTextEdits) {
-			edits.push(...completion.additionalTextEdits);
-		}
-		if (edits.length === 0) {
-			console.log(completion);
-		}
-		expect(edits.length).toBeGreaterThan(0);
-
-		document = await server.updateTextDocument(document.uri, edits);
-
-		expect(document.getText()).toMatchSnapshot();
+		return completions!;
 	}
 
-	async function openDocument(fileName: string, languageId: string, content: string) {
+	async function prepareDocument(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
 		const uri = URI.file(`${testWorkspacePath}/${fileName}`);
 		const document = await server.openInMemoryDocument(uri.toString(), languageId, content);
diff --git a/packages/language-server/tests/definitions.spec.ts b/packages/language-server/tests/definitions.spec.ts
index 2f10402043..af136e5b46 100644
--- a/packages/language-server/tests/definitions.spec.ts
+++ b/packages/language-server/tests/definitions.spec.ts
@@ -1,5 +1,4 @@
 import { Location, TextDocument } from '@volar/language-server';
-import * as path from 'path';
 import { afterEach, describe, expect, it } from 'vitest';
 import { URI } from 'vscode-uri';
 import { getLanguageServer, testWorkspacePath } from './server.js';
@@ -8,23 +7,77 @@ describe('Definitions', async () => {
 
 	it('TS to vue', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertDefinition('tsconfigProject/fixture1.ts', 'typescript', `import C|omponent from './empty.vue';`);
-		await assertDefinition('tsconfigProject/fixture2.ts', 'typescript', `import Component from '|./empty.vue';`);
+		expect(
+			await requestDefinition('tsconfigProject/fixture1.ts', 'typescript', `import C|omponent from './empty.vue';`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			      "start": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/empty.vue",
+			  },
+			]
+		`);
+		expect(
+			await requestDefinition('tsconfigProject/fixture2.ts', 'typescript', `import Component from '|./empty.vue';`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			      "start": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/empty.vue",
+			  },
+			]
+		`);
 	});
 
 	it('Alias path', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.ts', 'typescript', `export const foo = 'foo';`);
-		await assertDefinition('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			import { foo| } from '@/foo';
-			</script>
+		await prepareDocument('tsconfigProject/foo.ts', 'typescript', `export const foo = 'foo';`);
+		expect(
+			await requestDefinition('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				import { foo| } from '@/foo';
+				</script>
+			`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 25,
+			        "line": 0,
+			      },
+			      "start": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/foo.ts",
+			  },
+			]
 		`);
 	});
 
 	it('#2600', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.vue', 'vue', `
+		await prepareDocument('tsconfigProject/foo.vue', 'vue', `
 			<template>
 				<h1>{{ msg }}</h1>
 			</template>
@@ -33,10 +86,28 @@ describe('Definitions', async () => {
 			export default defineProps<{ msg: string }>()
 			</script>
 		`);
-		await assertDefinition('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			import Foo from '|@/foo.vue';
-			</script>
+		expect(
+			await requestDefinition('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				import Foo from '|@/foo.vue';
+				</script>
+			`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			      "start": {
+			        "character": 0,
+			        "line": 0,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/foo.vue",
+			  },
+			]
 		`);
 	});
 
@@ -54,31 +125,31 @@ describe('Definitions', async () => {
 	 * @deprecated Remove this when #4717 fixed.
 	 */
 	async function ensureGlobalTypesHolder(folderName: string) {
-		const document = await openDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
+		const document = await prepareDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
 		const server = await getLanguageServer();
 		await server.sendDocumentDiagnosticRequest(document.uri);
 	}
 
-	async function assertDefinition(fileName: string, languageId: string, content: string) {
+	async function requestDefinition(fileName: string, languageId: string, content: string) {
 		const offset = content.indexOf('|');
 		expect(offset).toBeGreaterThanOrEqual(0);
 		content = content.slice(0, offset) + content.slice(offset + 1);
 
 		const server = await getLanguageServer();
-		let document = await openDocument(fileName, languageId, content);
+		let document = await prepareDocument(fileName, languageId, content);
 
 		const position = document.positionAt(offset);
 		const definition = await server.sendDefinitionRequest(document.uri, position) as Location[] | null;
 		expect(definition).toBeDefined();
-		expect(definition!.length).greaterThan(0);
 
 		for (const loc of definition!) {
-			expect(path.relative(testWorkspacePath, URI.parse(loc.uri).fsPath)).toMatchSnapshot();
-			expect(loc.range).toMatchSnapshot();
+			loc.uri = loc.uri.replace(testWorkspacePath, '${testWorkspacePath}');
 		}
+
+		return definition!;
 	}
 
-	async function openDocument(fileName: string, languageId: string, content: string) {
+	async function prepareDocument(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
 		const uri = URI.file(`${testWorkspacePath}/${fileName}`);
 		const document = await server.openInMemoryDocument(uri.toString(), languageId, content);
diff --git a/packages/language-server/tests/inlayHints.spec.ts b/packages/language-server/tests/inlayHints.spec.ts
index 108da9c8a8..f3ac6a899a 100644
--- a/packages/language-server/tests/inlayHints.spec.ts
+++ b/packages/language-server/tests/inlayHints.spec.ts
@@ -7,91 +7,170 @@ describe('Definitions', async () => {
 
 	it('Inline handler leading', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertInlayHints('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			let a = 0;
-			</script>
-
-			<template>
-				<div @click="a = 1"></div>
-			</template>
+		expect(
+			await requestInlayHintsResult('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				let a = 0;
+				</script>
+
+				<template>
+					<div @click="a = 1"></div>
+				</template>
+			`)
+		).toMatchInlineSnapshot(`
+			"
+							<script setup lang="ts">
+							let a = 0;
+							</script>
+
+							<template>
+								<div @click="/* $event => */a = 1"></div>
+							</template>
+						"
 		`);
 	});
 
 	it('Missing props', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		openDocument('tsconfigProject/foo.vue', 'vue', `
+		prepareDocument('tsconfigProject/foo.vue', 'vue', `
 			<script setup lang="ts">
 			defineProps<{
 				foo: number;
 			}>();
 			</script>
 		`);
-		await assertInlayHints('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			import Foo from './foo.vue';
-			</script>
-
-			<template>
-				<Foo></Foo>
-			</template>
+		expect(
+			await requestInlayHintsResult('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				import Foo from './foo.vue';
+				</script>
+
+				<template>
+					<Foo></Foo>
+				</template>
+			`)
+		).toMatchInlineSnapshot(`
+			"
+							<script setup lang="ts">
+							import Foo from './foo.vue';
+							</script>
+
+							<template>
+								<Foo/* foo! */></Foo>
+							</template>
+						"
 		`);
 	});
 
 	it('Options wrapper', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertInlayHints('tsconfigProject/fixture.vue', 'vue', `
-			<script>
-			export default {};
-			</script>
+		expect(
+			await requestInlayHintsResult('tsconfigProject/fixture.vue', 'vue', `
+				<script>
+				export default {};
+				</script>
+			`)
+		).toMatchInlineSnapshot(`
+			"
+							<script>
+							export default /* (await import('vue')).defineComponent( */{}/* ) */;
+							</script>
+						"
 		`);
 	});
 
 	it('Destructured props', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertInlayHints('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			import { watch } from 'vue';
-
-			const { foo, bar, ...props } = defineProps<{
-				foo: string;
-				bar: string;
-				baz: string;
-			}>();
-
-			type foo = foo[string] & typeof foo;
-
-			interface foo extends (typeof foo) {
-				foo: string;
-				foo(foo: string): void;
-				foo: (foo: string) => void;
-			}
-
-			const obj = {
-				foo: foo,
-				[foo]: '',
-				foo,
-				foo(foo) { },
-				foo: function (foo) { },
-				get bar() { return this.foo; },
-				set bar(val) { this.foo = val; }
-			};
-
-			function func(foo) { }
-
-			class cls {
-				foo: string = foo;
-				constructor(foo) { }
-			}
-
-			for (const char of foo) { }
-
-			try { } catch (foo) { }
-
-			watch(() => foo, (foo) => {
-				console.log(foo, bar, props.baz);
-			});
-			</script>
+		expect(
+			await requestInlayHintsResult('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				import { watch } from 'vue';
+
+				const { foo, bar, ...props } = defineProps<{
+					foo: string;
+					bar: string;
+					baz: string;
+				}>();
+
+				type foo = foo[string] & typeof foo;
+
+				interface foo extends (typeof foo) {
+					foo: string;
+					foo(foo: string): void;
+					foo: (foo: string) => void;
+				}
+
+				const obj = {
+					foo: foo,
+					[foo]: '',
+					foo,
+					foo(foo) { },
+					foo: function (foo) { },
+					get bar() { return this.foo; },
+					set bar(val) { this.foo = val; }
+				};
+
+				function func(foo) { }
+
+				class cls {
+					foo: string = foo;
+					constructor(foo) { }
+				}
+
+				for (const char of foo) { }
+
+				try { } catch (foo) { }
+
+				watch(() => foo, (foo) => {
+					console.log(foo, bar, props.baz);
+				});
+				</script>
+			`)
+		).toMatchInlineSnapshot(`
+			"
+							<script setup lang="ts">
+							import { watch } from 'vue';
+
+							const { foo, bar, ...props } = defineProps<{
+								foo: string;
+								bar: string;
+								baz: string;
+							}>();
+
+							type foo = foo[string] & typeof /* props. */foo;
+
+							interface foo extends (typeof /* props. */foo) {
+								foo: string;
+								foo(foo: string): void;
+								foo: (foo: string) => void;
+							}
+
+							const obj = {
+								foo: /* props. */foo,
+								[/* props. */foo]: '',
+								foo/* : props.foo */,
+								foo(foo) { },
+								foo: function (foo) { },
+								get bar() { return this.foo; },
+								set bar(val) { this.foo = val; }
+							};
+
+							function func(foo) { }
+
+							class cls {
+								foo: string = /* props. */foo;
+								constructor(foo) { }
+							}
+
+							for (const char of /* props. */foo) { }
+
+							try { } catch (foo) { }
+
+							watch(() => /* props. */foo, (foo) => {
+								console.log(foo, /* props. */bar, props.baz);
+							});
+							</script>
+						"
 		`);
 	});
 
@@ -109,14 +188,14 @@ describe('Definitions', async () => {
 	 * @deprecated Remove this when #4717 fixed.
 	 */
 	async function ensureGlobalTypesHolder(folderName: string) {
-		const document = await openDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
+		const document = await prepareDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
 		const server = await getLanguageServer();
 		await server.sendDocumentDiagnosticRequest(document.uri);
 	}
 
-	async function assertInlayHints(fileName: string, languageId: string, content: string) {
+	async function requestInlayHintsResult(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
-		let document = await openDocument(fileName, languageId, content);
+		let document = await prepareDocument(fileName, languageId, content);
 
 		const inlayHints = await server.sendInlayHintRequest(document.uri, { start: document.positionAt(0), end: document.positionAt(content.length) });
 		expect(inlayHints).toBeDefined();
@@ -125,13 +204,13 @@ describe('Definitions', async () => {
 		let text = document.getText();
 		for (const hint of inlayHints!.sort((a, b) => document.offsetAt(b.position) - document.offsetAt(a.position))) {
 			const offset = document.offsetAt(hint.position);
-			text = text.slice(0, offset) + '[' + hint.label + ']' + text.slice(offset);
+			text = text.slice(0, offset) + '/* ' + hint.label + ' */' + text.slice(offset);
 		}
 
-		expect(text).toMatchSnapshot();
+		return text;
 	}
 
-	async function openDocument(fileName: string, languageId: string, content: string) {
+	async function prepareDocument(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
 		const uri = URI.file(`${testWorkspacePath}/${fileName}`);
 		const document = await server.openInMemoryDocument(uri.toString(), languageId, content);
diff --git a/packages/language-server/tests/references.spec.ts b/packages/language-server/tests/references.spec.ts
index 5f356080e8..d901a438c0 100644
--- a/packages/language-server/tests/references.spec.ts
+++ b/packages/language-server/tests/references.spec.ts
@@ -1,5 +1,4 @@
 import { TextDocument } from '@volar/language-server';
-import * as path from 'path';
 import { afterEach, describe, expect, it } from 'vitest';
 import { URI } from 'vscode-uri';
 import { getLanguageServer, testWorkspacePath } from './server.js';
@@ -8,7 +7,7 @@ describe('Definitions', async () => {
 
 	it('Default slot', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.vue', 'vue', `
+		await prepareDocument('tsconfigProject/foo.vue', 'vue', `
 			<script setup lang="ts">
 			import Fixture from './fixture.vue';
 			</script>
@@ -19,16 +18,47 @@ describe('Definitions', async () => {
 				</Fixture>
 			</template>
 		`);
-		await assertReferences('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				<slot|></slot>
-			</template>
+		expect(
+			await requestReferences('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					<slot|></slot>
+				</template>
+			`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 16,
+			        "line": 7,
+			      },
+			      "start": {
+			        "character": 5,
+			        "line": 7,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/foo.vue",
+			  },
+			  {
+			    "range": {
+			      "end": {
+			        "character": 10,
+			        "line": 2,
+			      },
+			      "start": {
+			        "character": 6,
+			        "line": 2,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/fixture.vue",
+			  },
+			]
 		`);
 	});
 
 	it('Named slot', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.vue', 'vue', `
+		await prepareDocument('tsconfigProject/foo.vue', 'vue', `
 			<script setup lang="ts">
 			import Fixture from './fixture.vue';
 			</script>
@@ -37,23 +67,85 @@ describe('Definitions', async () => {
 				<Fixture #foo></Fixture>
 			</template>
 		`);
-		await assertReferences('tsconfigProject/fixture.vue', 'vue', `
+		expect(
+			await requestReferences('tsconfigProject/fixture.vue', 'vue', `
 			<template>
 				<slot name="|foo"></slot>
 			</template>
+		`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 17,
+			        "line": 6,
+			      },
+			      "start": {
+			        "character": 14,
+			        "line": 6,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/foo.vue",
+			  },
+			  {
+			    "range": {
+			      "end": {
+			        "character": 19,
+			        "line": 2,
+			      },
+			      "start": {
+			        "character": 16,
+			        "line": 2,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/fixture.vue",
+			  },
+			]
 		`);
 	});
 
 	it('v-bind shorthand', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertReferences('tsconfigProject/fixture.vue', 'vue', `
-			<script setup lang="ts">
-			const |foo = 1;
-			</script>
+		expect(
+			await requestReferences('tsconfigProject/fixture.vue', 'vue', `
+				<script setup lang="ts">
+				const |foo = 1;
+				</script>
 
-			<template>
-				<Foo :foo></Foo>
-			</template>
+				<template>
+					<Foo :foo></Foo>
+				</template>
+			`)
+		).toMatchInlineSnapshot(`
+			[
+			  {
+			    "range": {
+			      "end": {
+			        "character": 14,
+			        "line": 6,
+			      },
+			      "start": {
+			        "character": 11,
+			        "line": 6,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/fixture.vue",
+			  },
+			  {
+			    "range": {
+			      "end": {
+			        "character": 13,
+			        "line": 2,
+			      },
+			      "start": {
+			        "character": 10,
+			        "line": 2,
+			      },
+			    },
+			    "uri": "file://\${testWorkspacePath}/tsconfigProject/fixture.vue",
+			  },
+			]
 		`);
 	});
 
@@ -71,31 +163,31 @@ describe('Definitions', async () => {
 	 * @deprecated Remove this when #4717 fixed.
 	 */
 	async function ensureGlobalTypesHolder(folderName: string) {
-		const document = await openDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
+		const document = await prepareDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
 		const server = await getLanguageServer();
 		await server.sendDocumentDiagnosticRequest(document.uri);
 	}
 
-	async function assertReferences(fileName: string, languageId: string, content: string) {
+	async function requestReferences(fileName: string, languageId: string, content: string) {
 		const offset = content.indexOf('|');
 		expect(offset).toBeGreaterThanOrEqual(0);
 		content = content.slice(0, offset) + content.slice(offset + 1);
 
 		const server = await getLanguageServer();
-		let document = await openDocument(fileName, languageId, content);
+		let document = await prepareDocument(fileName, languageId, content);
 
 		const position = document.positionAt(offset);
 		const references = await server.sendReferencesRequest(document.uri, position, { includeDeclaration: false });
 		expect(references).toBeDefined();
-		expect(references!.length).greaterThan(0);
 
 		for (const loc of references!) {
-			expect(path.relative(testWorkspacePath, URI.parse(loc.uri).fsPath)).toMatchSnapshot();
-			expect(loc.range).toMatchSnapshot();
+			loc.uri = loc.uri.replace(testWorkspacePath, '${testWorkspacePath}');
 		}
+
+		return references!;
 	}
 
-	async function openDocument(fileName: string, languageId: string, content: string) {
+	async function prepareDocument(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
 		const uri = URI.file(`${testWorkspacePath}/${fileName}`);
 		const document = await server.openInMemoryDocument(uri.toString(), languageId, content);
diff --git a/packages/language-server/tests/renaming.spec.ts b/packages/language-server/tests/renaming.spec.ts
index 20c357c7ef..f9b5905b86 100644
--- a/packages/language-server/tests/renaming.spec.ts
+++ b/packages/language-server/tests/renaming.spec.ts
@@ -7,82 +7,443 @@ import { getLanguageServer, testWorkspacePath } from './server.js';
 describe('Renaming', async () => {
 
 	it('#2410', async () => {
-		await assertRenaming('fixture.vue', 'vue', `<template><|h1></h1></template>`, 'h2');
-		await assertRenaming('fixture.vue', 'vue', `<template><h1|></h1></template>`, 'h2');
+		expect(
+			await requestRename('fixture.vue', 'vue', `<template><|h1></h1></template>`, 'h2')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/fixture.vue": [
+			      {
+			        "newText": "h2",
+			        "range": {
+			          "end": {
+			            "character": 18,
+			            "line": 0,
+			          },
+			          "start": {
+			            "character": 16,
+			            "line": 0,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "h2",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 0,
+			          },
+			          "start": {
+			            "character": 11,
+			            "line": 0,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
+		expect(
+			await requestRename('fixture.vue', 'vue', `<template><h1|></h1></template>`, 'h2')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/fixture.vue": [
+			      {
+			        "newText": "h2",
+			        "range": {
+			          "end": {
+			            "character": 18,
+			            "line": 0,
+			          },
+			          "start": {
+			            "character": 16,
+			            "line": 0,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "h2",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 0,
+			          },
+			          "start": {
+			            "character": 11,
+			            "line": 0,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('CSS', async () => {
-		await assertRenaming('fixture.vue', 'vue', `
-			<template>
-				<div :class="$style.foo|"></div>
-			</template>
+		expect(
+			await requestRename('fixture.vue', 'vue', `
+				<template>
+					<div :class="$style.foo|"></div>
+				</template>
 
-			<style module>
-			/* .foo { } */
-			.foo { }
-			</style>
+				<style module>
+				/* .foo { } */
+				.foo { }
+				</style>
 
-			<style module lang="scss">
-			// .foo { }
-			</style>
-		`, 'bar');
-		await assertRenaming('fixture.vue', 'vue', `
-			<template>
-				<div class="foo|"></div>
-			</template>
+				<style module lang="scss">
+				// .foo { }
+				</style>
+		`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 28,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 25,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 8,
+			            "line": 7,
+			          },
+			          "start": {
+			            "character": 5,
+			            "line": 7,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
+		expect(
+			await requestRename('fixture.vue', 'vue', `
+				<template>
+					<div class="foo|"></div>
+				</template>
 
-			<style scoped>
-			.foo { }
-			</style>
-		`, 'bar');
-		await assertRenaming('fixture.vue', 'vue', `
-			<script lang="ts" setup>
-			const foo = 1;
-			</script>
+				<style scoped>
+				.foo { }
+				</style>
+		`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 20,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 17,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 8,
+			            "line": 6,
+			          },
+			          "start": {
+			            "character": 5,
+			            "line": 6,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
+		expect(
+			await requestRename('fixture.vue', 'vue', `
+				<script lang="ts" setup>
+				const foo = 1;
+				</script>
 
-			<style>
-			/* .bar { color: v-bind(foo); } */
-			.bar { color: v-bind(foo|); }
-			.bar { color: v-bind('foo'); }
-			.bar { color: v-bind("foo"); }
-			.bar { color: v-bind(foo + foo); }
-			.bar { color: v-bind('foo + foo'); }
-			.bar { color: v-bind("foo + foo"); }
-			.bar { color: v-bind(); }
-			</style>
-
-			<style lang="scss">
-			// .bar { color: v-bind(foo); }
-			</style>
-		`, 'bar');
+				<style>
+				/* .bar { color: v-bind(foo); } */
+				.bar { color: v-bind(foo|); }
+				.bar { color: v-bind('foo'); }
+				.bar { color: v-bind("foo"); }
+				.bar { color: v-bind(foo + foo); }
+				.bar { color: v-bind('foo + foo'); }
+				.bar { color: v-bind("foo + foo"); }
+				.bar { color: v-bind(); }
+				</style>
+
+				<style lang="scss">
+				// .bar { color: v-bind(foo); }
+				</style>
+			`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 34,
+			            "line": 10,
+			          },
+			          "start": {
+			            "character": 31,
+			            "line": 10,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 28,
+			            "line": 10,
+			          },
+			          "start": {
+			            "character": 25,
+			            "line": 10,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 28,
+			            "line": 7,
+			          },
+			          "start": {
+			            "character": 25,
+			            "line": 7,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 10,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 35,
+			            "line": 12,
+			          },
+			          "start": {
+			            "character": 32,
+			            "line": 12,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 29,
+			            "line": 12,
+			          },
+			          "start": {
+			            "character": 26,
+			            "line": 12,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 35,
+			            "line": 11,
+			          },
+			          "start": {
+			            "character": 32,
+			            "line": 11,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 29,
+			            "line": 11,
+			          },
+			          "start": {
+			            "character": 26,
+			            "line": 11,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 29,
+			            "line": 9,
+			          },
+			          "start": {
+			            "character": 26,
+			            "line": 9,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 29,
+			            "line": 8,
+			          },
+			          "start": {
+			            "character": 26,
+			            "line": 8,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('Component props', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.vue', 'vue', `
-			<template>
-				<Comp :aaa-bbb="'foo'"></Comp>
-				<Comp :aaaBbb="'foo'"></Comp>
-			</template>
+		expect(
+			await prepareDocument('tsconfigProject/foo.vue', 'vue', `
+				<template>
+					<Comp :aaa-bbb="'foo'"></Comp>
+					<Comp :aaaBbb="'foo'"></Comp>
+				</template>
 
-			<script lang="ts" setup>
-			import Comp from './fixture.vue';
-			</script>
+				<script lang="ts" setup>
+				import Comp from './fixture.vue';
+				</script>
+			`)
+		).toMatchInlineSnapshot(`
+			FullTextDocument {
+			  "_content": "
+							<template>
+								<Comp :aaa-bbb="'foo'"></Comp>
+								<Comp :aaaBbb="'foo'"></Comp>
+							</template>
+
+							<script lang="ts" setup>
+							import Comp from './fixture.vue';
+							</script>
+						",
+			  "_languageId": "vue",
+			  "_lineOffsets": undefined,
+			  "_uri": "file:///Users/johnsonchu/Desktop/volar/vue/test-workspace/tsconfigProject/foo.vue",
+			  "_version": 1,
+			}
 		`);
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				{{ aaaBbb }}
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					{{ aaaBbb }}
+				</template>
 
-			<script lang="ts" setup>
-			defineProps({ aaaBbb|: String });
-			</script>
-		`, 'cccDdd');
+				<script lang="ts" setup>
+				defineProps({ aaaBbb|: String });
+				</script>
+			`, 'cccDdd')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 24,
+			            "line": 6,
+			          },
+			          "start": {
+			            "character": 18,
+			            "line": 6,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 14,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 8,
+			            "line": 2,
+			          },
+			        },
+			      },
+			    ],
+			    "file://\${testWorkspacePath}/tsconfigProject/foo.vue": [
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 18,
+			            "line": 3,
+			          },
+			          "start": {
+			            "character": 12,
+			            "line": 3,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "ccc-ddd",
+			        "range": {
+			          "end": {
+			            "character": 19,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 12,
+			            "line": 2,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('Component type props', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await openDocument('tsconfigProject/foo.vue', 'vue', `
+		await prepareDocument('tsconfigProject/foo.vue', 'vue', `
 			<template>
 				<Comp :aaa-bbb="'foo'"></Comp>
 				<Comp :aaaBbb="'foo'"></Comp>
@@ -92,76 +453,318 @@ describe('Renaming', async () => {
 			import Comp from './fixture.vue';
 			</script>
 		`);
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				{{ aaaBbb }}
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					{{ aaaBbb }}
+				</template>
 
-			<script lang="ts" setup>
-			defineProps<{ aaaBbb|: String }>();
-			</script>
-		`, 'cccDdd');
+				<script lang="ts" setup>
+				defineProps<{ aaaBbb|: String }>();
+				</script>
+			`, 'cccDdd')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 14,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 8,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 24,
+			            "line": 6,
+			          },
+			          "start": {
+			            "character": 18,
+			            "line": 6,
+			          },
+			        },
+			      },
+			    ],
+			    "file://\${testWorkspacePath}/tsconfigProject/foo.vue": [
+			      {
+			        "newText": "cccDdd",
+			        "range": {
+			          "end": {
+			            "character": 17,
+			            "line": 3,
+			          },
+			          "start": {
+			            "character": 11,
+			            "line": 3,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "ccc-ddd",
+			        "range": {
+			          "end": {
+			            "character": 18,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 11,
+			            "line": 2,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('Component dynamic props', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				<div :[foo|]="123"></div>
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					<div :[foo|]="123"></div>
+				</template>
 
-			<script lang="ts" setup>
-			const foo = 'foo';
-			</script>
-		`, 'bar');
+				<script lang="ts" setup>
+				const foo = 'foo';
+				</script>
+			`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 6,
+			          },
+			          "start": {
+			            "character": 10,
+			            "line": 6,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 15,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 12,
+			            "line": 2,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('Component returns', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				{{ foo| }}
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					{{ foo| }}
+				</template>
 
-			<script lang="ts">
-			import { defineComponent } from 'vue';
+				<script lang="ts">
+				import { defineComponent } from 'vue';
 
-			export default defineComponent({
-				setup() {
-					return {
-						foo: 1,
-					};
-				},
-			});
-			</script>
-		`, 'bar');
+				export default defineComponent({
+					setup() {
+						return {
+							foo: 1,
+						};
+					},
+				});
+				</script>
+			`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 11,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 8,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 10,
+			            "line": 11,
+			          },
+			          "start": {
+			            "character": 7,
+			            "line": 11,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('<script setup>', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				{{ foo| }}
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					{{ foo| }}
+				</template>
 
-			<script lang="ts" setup>
-			const foo = 1;
-			</script>
-		`, 'bar');
+				<script lang="ts" setup>
+				const foo = 1;
+				</script>
+			`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 6,
+			          },
+			          "start": {
+			            "character": 10,
+			            "line": 6,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 11,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 8,
+			            "line": 2,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	it('Component tags', async () => {
 		await ensureGlobalTypesHolder('tsconfigProject');
-		await assertRenaming('tsconfigProject/fixture.vue', 'vue', `
-			<template>
-				<AaBb></AaBb>
-				<aa-bb></aa-bb>
-			</template>
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					<AaBb></AaBb>
+					<aa-bb></aa-bb>
+				</template>
 
-			<script lang="ts" setup>
-			import AaBb| from './empty.vue';
-			</script>
-		`, 'CcDd');
+				<script lang="ts" setup>
+				import AaBb| from './empty.vue';
+				</script>
+			`, 'CcDd')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
+			      {
+			        "newText": "cc-dd",
+			        "range": {
+			          "end": {
+			            "character": 19,
+			            "line": 3,
+			          },
+			          "start": {
+			            "character": 14,
+			            "line": 3,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "cc-dd",
+			        "range": {
+			          "end": {
+			            "character": 11,
+			            "line": 3,
+			          },
+			          "start": {
+			            "character": 6,
+			            "line": 3,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "CcDd",
+			        "range": {
+			          "end": {
+			            "character": 17,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 13,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "CcDd",
+			        "range": {
+			          "end": {
+			            "character": 10,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 6,
+			            "line": 2,
+			          },
+			        },
+			      },
+			      {
+			        "newText": "CcDd",
+			        "range": {
+			          "end": {
+			            "character": 15,
+			            "line": 7,
+			          },
+			          "start": {
+			            "character": 11,
+			            "line": 7,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
 	});
 
 	const openedDocuments: TextDocument[] = [];
@@ -178,31 +781,32 @@ describe('Renaming', async () => {
 	 * @deprecated Remove this when #4717 fixed.
 	 */
 	async function ensureGlobalTypesHolder(folderName: string) {
-		const document = await openDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
+		const document = await prepareDocument(`${folderName}/globalTypesHolder.vue`, 'vue', '');
 		const server = await getLanguageServer();
 		await server.sendDocumentDiagnosticRequest(document.uri);
 	}
 
-	async function assertRenaming(fileName: string, languageId: string, _content: string, newName: string) {
+	async function requestRename(fileName: string, languageId: string, _content: string, newName: string) {
 		const offset = _content.indexOf('|');
 		expect(offset).toBeGreaterThanOrEqual(0);
 		const content = _content.slice(0, offset) + _content.slice(offset + 1);
 
 		const server = await getLanguageServer();
-		let document = await openDocument(fileName, languageId, content);
+		let document = await prepareDocument(fileName, languageId, content);
 
 		const position = document.positionAt(offset);
 		const edit = await server.sendRenameRequest(document.uri, position, newName);
 		expect(edit).toBeDefined();
-		expect(edit?.changes).toBeDefined();
 
 		for (const [uri, edits] of Object.entries(edit!.changes!)) {
-			expect(path.relative(testWorkspacePath, URI.parse(uri).fsPath)).toMatchSnapshot();
-			expect(edits).toMatchSnapshot();
+			delete edit!.changes![uri];
+			edit!.changes![uri.replace(testWorkspacePath, '${testWorkspacePath}')] = edits;
 		}
+
+		return edit;
 	}
 
-	async function openDocument(fileName: string, languageId: string, content: string) {
+	async function prepareDocument(fileName: string, languageId: string, content: string) {
 		const server = await getLanguageServer();
 		const uri = URI.file(`${testWorkspacePath}/${fileName}`);
 		const document = await server.openInMemoryDocument(uri.toString(), languageId, content);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1dfc3fa342..df1fd94061 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,14 +5,14 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@volar/kit': https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2
-  '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-  '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2
-  '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
-  '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2
-  '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-  '@volar/test-utils': https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2
-  '@volar/vscode': https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2
+  '@volar/kit': https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee
+  '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+  '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee
+  '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
+  '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee
+  '@volar/test-utils': https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee
+  '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+  '@volar/vscode': https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee
   volar-service-typescript: https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed
   inquirer: 9.2.23
 
@@ -33,8 +33,8 @@ importers:
         specifier: latest
         version: 1.0.14
       '@volar/language-service':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
       typescript:
         specifier: latest
         version: 5.5.3
@@ -54,8 +54,8 @@ importers:
         specifier: ^1.82.0
         version: 1.91.0
       '@volar/vscode':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee
       '@vscode/vsce':
         specifier: latest
         version: 3.0.0
@@ -84,8 +84,8 @@ importers:
   packages/component-meta:
     dependencies:
       '@volar/typescript':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       '@vue/language-core':
         specifier: 2.0.28
         version: link:../language-core
@@ -111,8 +111,8 @@ importers:
   packages/language-core:
     dependencies:
       '@volar/language-core':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
       '@vue/compiler-dom':
         specifier: ^3.4.0
         version: 3.4.31
@@ -148,8 +148,8 @@ importers:
         specifier: ^1.0.1
         version: 1.0.2
       '@volar/typescript':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       '@vue/compiler-sfc':
         specifier: ^3.4.0
         version: 3.4.31
@@ -157,8 +157,8 @@ importers:
   packages/language-plugin-pug:
     dependencies:
       '@volar/source-map':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee
       volar-service-pug:
         specifier: 0.0.61
         version: 0.0.61
@@ -173,14 +173,14 @@ importers:
   packages/language-server:
     dependencies:
       '@volar/language-core':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
       '@volar/language-server':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee
       '@volar/test-utils':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee
       '@vue/language-core':
         specifier: 2.0.28
         version: link:../language-core
@@ -200,14 +200,14 @@ importers:
   packages/language-service:
     dependencies:
       '@volar/language-core':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
       '@volar/language-service':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
       '@volar/typescript':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       '@vue/compiler-dom':
         specifier: ^3.4.0
         version: 3.4.31
@@ -228,28 +228,28 @@ importers:
         version: 1.0.1
       volar-service-css:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-emmet:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-html:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-json:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-pug:
         specifier: 0.0.61
         version: 0.0.61
       volar-service-pug-beautify:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-typescript:
         specifier: https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed
-        version: https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       volar-service-typescript-twoslash-queries:
         specifier: 0.0.61
-        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+        version: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       vscode-html-languageservice:
         specifier: ^5.2.0
         version: 5.3.0
@@ -267,8 +267,8 @@ importers:
         specifier: latest
         version: 1.0.2
       '@volar/kit':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2(typescript@5.5.3)
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee(typescript@5.5.3)
       vscode-languageserver-protocol:
         specifier: ^3.17.5
         version: 3.17.5
@@ -276,8 +276,8 @@ importers:
   packages/tsc:
     dependencies:
       '@volar/typescript':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       '@vue/language-core':
         specifier: 2.0.28
         version: link:../language-core
@@ -295,8 +295,8 @@ importers:
   packages/typescript-plugin:
     dependencies:
       '@volar/typescript':
-        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
-        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+        specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
+        version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       '@vue/language-core':
         specifier: 2.0.28
         version: link:../language-core
@@ -1103,38 +1103,38 @@ packages:
   '@vitest/utils@2.0.3':
     resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==}
 
-  '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2}
+  '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee}
     version: 2.4.0
     peerDependencies:
       typescript: '*'
 
-  '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2}
+  '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee}
     version: 2.4.0
 
-  '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2}
+  '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee}
     version: 2.4.0
 
-  '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2}
+  '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee}
     version: 2.4.0
 
-  '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2}
+  '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee}
     version: 2.4.0
 
-  '@volar/test-utils@https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2}
+  '@volar/test-utils@https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee}
     version: 2.4.0
 
-  '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2}
+  '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee}
     version: 2.4.0
 
-  '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2':
-    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2}
+  '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee':
+    resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee}
     version: 2.4.0
 
   '@vscode/emmet-helper@2.9.3':
@@ -3300,7 +3300,7 @@ packages:
     resolution: {integrity: sha512-Ct9L/w+IB1JU8F4jofcNCGoHy6TF83aiapfZq9A0qYYpq+Kk5dH+ONS+rVZSsuhsunq8UvAuF8Gk6B8IFLfniw==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3309,7 +3309,7 @@ packages:
     resolution: {integrity: sha512-iiYqBxjjcekqrRruw4COQHZME6EZYWVbkHjHDbULpml3g8HGJHzpAMkj9tXNCPxf36A+f1oUYjsvZt36qPg4cg==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3318,7 +3318,7 @@ packages:
     resolution: {integrity: sha512-yFE+YmmgqIL5HI4ORqP++IYb1QaGcv+xBboI0WkCxJJ/M35HZj7f5rbT3eQ24ECLXFbFCFanckwyWJVz5KmN3Q==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3327,7 +3327,7 @@ packages:
     resolution: {integrity: sha512-9PpEib6XE99gFjjjl8IkITktSvfPW39jFAGsHggT6SdlIb8zC7J0+rMjkyVUAUOpWvY5jPqkByX43LcxZvkrdQ==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3336,7 +3336,7 @@ packages:
     resolution: {integrity: sha512-FvZEZJdZ64pa3a0u1Urz08g4gHjuPcdMsEsJGiDLYqJnIZEGZRyhHUjSxfmAxihZCzp738W90tOMQDbgeQMGhA==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3348,7 +3348,7 @@ packages:
     resolution: {integrity: sha512-99FICGrEF0r1E2tV+SvprHPw9Knyg7BdW2fUch0tf59kG+KG+Tj4tL6tUg+cy8f23O/VXlmsWFMIE+bx1dXPnQ==}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -3357,7 +3357,7 @@ packages:
     resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed}
     version: 0.0.61
     peerDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -4380,24 +4380,24 @@ snapshots:
       loupe: 3.1.1
       tinyrainbow: 1.2.0
 
-  '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@87ad0b2(typescript@5.5.3)':
+  '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@28cbdee(typescript@5.5.3)':
     dependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
-      '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
+      '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       typesafe-path: 0.2.2
       typescript: 5.5.3
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
 
-  '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2':
+  '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee':
     dependencies:
-      '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2
+      '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee
 
-  '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2':
+  '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee':
     dependencies:
-      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
-      '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2
+      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
+      '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee
       path-browserify: 1.0.1
       request-light: 0.7.0
       vscode-languageserver: 9.0.1
@@ -4405,31 +4405,31 @@ snapshots:
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
 
-  '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2':
+  '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee':
     dependencies:
-      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
+      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
       vscode-languageserver-protocol: 3.17.5
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
 
-  '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@87ad0b2': {}
+  '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@28cbdee': {}
 
-  '@volar/test-utils@https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@87ad0b2':
+  '@volar/test-utils@https://pkg.pr.new/volarjs/volar.js/@volar/test-utils@28cbdee':
     dependencies:
-      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
-      '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2
+      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
+      '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
 
-  '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@87ad0b2':
+  '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@28cbdee':
     dependencies:
-      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@87ad0b2
+      '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@28cbdee
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@87ad0b2':
+  '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@28cbdee':
     dependencies:
-      '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@87ad0b2
+      '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@28cbdee
       path-browserify: 1.0.1
       vscode-languageclient: 9.0.1
       vscode-nls: 5.2.0
@@ -6791,61 +6791,61 @@ snapshots:
       - supports-color
       - terser
 
-  volar-service-css@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-css@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       vscode-css-languageservice: 6.3.0
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
-  volar-service-emmet@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-emmet@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       '@emmetio/css-parser': 0.4.0
       '@emmetio/html-matcher': 1.3.0
       '@vscode/emmet-helper': 2.9.3
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
-  volar-service-html@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-html@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       vscode-html-languageservice: 5.3.0
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
-  volar-service-json@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-json@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       vscode-json-languageservice: 5.4.0
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
-  volar-service-pug-beautify@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-pug-beautify@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       '@johnsoncodehk/pug-beautify': 0.2.2
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
   volar-service-pug@0.0.61:
     dependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
       muggle-string: 0.4.1
       pug-lexer: 5.0.1
       pug-parser: 6.0.0
-      volar-service-html: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2)
+      volar-service-html: 0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee)
       vscode-html-languageservice: 5.3.0
       vscode-languageserver-textdocument: 1.0.11
 
-  volar-service-typescript-twoslash-queries@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-typescript-twoslash-queries@0.0.61(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
-  volar-service-typescript@https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2):
+  volar-service-typescript@https://pkg.pr.new/volarjs/services/volar-service-typescript@177b9ed(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee):
     dependencies:
       path-browserify: 1.0.1
       semver: 7.6.2
@@ -6854,7 +6854,7 @@ snapshots:
       vscode-nls: 5.2.0
       vscode-uri: 3.0.8
     optionalDependencies:
-      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@87ad0b2
+      '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@28cbdee
 
   vscode-css-languageservice@6.3.0:
     dependencies: