Merge branch 'master' into fix/template-ref-required

Author: johnsoncodehk

packages/language-core/lib/codegen/template/element.ts

@@ -549,7 +549,7 @@ function* generateReferencesForElements(
 		) {
 			const [content, startOffset] = normalizeAttributeValue(prop.value);
 
-			yield `// @ts-ignore${newLine}`;
+			yield `// @ts-ignore navigation for \`const ${content} = ref()\`${newLine}`;
 			yield `__VLS_ctx`;
 			yield* generatePropertyAccess(
 				options,

packages/language-server/tests/completions.spec.ts

@@ -188,6 +188,7 @@ describe('Completions', async () => {
 			  "slot",
 			  "template",
 			  "fixture",
+			  "BaseTransition",
 			]
 		`);
 	});
@@ -341,7 +342,7 @@ describe('Completions', async () => {
 			    "(",
 			  ],
 			  "detail": "Add import from "./ComponentForAutoImport.vue"
-			(property) default: DefineComponent<{}, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<{}>>, {}, {}>",
+			(property) default: DefineComponent<{}, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<{}> & Readonly<...>, ... 7 more ..., {}>",
 			  "documentation": {
 			    "kind": "markdown",
 			    "value": "",

packages/language-server/tests/renaming.spec.ts

@@ -871,16 +871,16 @@ describe('Renaming', async () => {
 		`);
 	});
 
-	it('Template Ref', async () => {
+	it('Ref', async () => {
 		expect(
 			await requestRename('tsconfigProject/fixture.vue', 'vue', `
 				<template>
 					<a ref="foo"></a>
 				</template>
 
 				<script lang="ts" setup>
-				import { useTemplateRef } from 'vue';
-				const el = useTemplateRef('foo|');
+				import { ref } from 'vue';
+				const foo| = ref();
 				</script>
 			`, 'bar')
 		).toMatchInlineSnapshot(`
@@ -900,6 +900,41 @@ describe('Renaming', async () => {
 			          },
 			        },
 			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 13,
+			            "line": 7,
+			          },
+			          "start": {
+			            "character": 10,
+			            "line": 7,
+			          },
+			        },
+			      },
+			    ],
+			  },
+			}
+		`);
+	});
+
+	it('Template Ref', async () => {
+		expect(
+			await requestRename('tsconfigProject/fixture.vue', 'vue', `
+				<template>
+					<a ref="foo"></a>
+				</template>
+
+				<script lang="ts" setup>
+				import { useTemplateRef } from 'vue';
+				const el = useTemplateRef('foo|');
+				</script>
+			`, 'bar')
+		).toMatchInlineSnapshot(`
+			{
+			  "changes": {
+			    "file://\${testWorkspacePath}/tsconfigProject/fixture.vue": [
 			      {
 			        "newText": "bar",
 			        "range": {
@@ -913,6 +948,19 @@ describe('Renaming', async () => {
 			          },
 			        },
 			      },
+			      {
+			        "newText": "bar",
+			        "range": {
+			          "end": {
+			            "character": 16,
+			            "line": 2,
+			          },
+			          "start": {
+			            "character": 13,
+			            "line": 2,
+			          },
+			        },
+			      },
 			    ],
 			  },
 			}

packages/tsc/tests/__snapshots__/dts.spec.ts.snap

@@ -9,20 +9,23 @@ describe(`vue-tsc`, () => {
 			getTscOutput('stable')
 		).toMatchInlineSnapshot(`
 			[
-			  "test-workspace/tsc/failureFixtures/directives/main.vue(4,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., {}>'.",
-			  "test-workspace/tsc/failureFixtures/directives/main.vue(9,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., {}>'.",
+			  "test-workspace/tsc/failureFixtures/directives/main.vue(4,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstanceWithMixins<Readonly<{}> & Readonly<{}>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 17 more ..., {}>'.",
+			  "test-workspace/tsc/failureFixtures/directives/main.vue(9,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstanceWithMixins<Readonly<{}> & Readonly<{}>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 17 more ..., {}>'.",
 			  "test-workspace/tsc/failureFixtures/directives/main.vue(12,2): error TS2578: Unused '@ts-expect-error' directive.",
 			]
 		`);
 	});
 
-	test.skipIf(!process.env.GITHUB_ACTIONS)(`TypeScript - Next`, () => {
+	const isUpdateEvent = process.env.npm_lifecycle_event === 'test:update';
+	const isGithubActions = !!process.env.GITHUB_ACTIONS;
+
+	test.skipIf(!isUpdateEvent && isGithubActions)(`TypeScript - Next`, () => {
 		expect(
 			getTscOutput('next')
 		).toMatchInlineSnapshot(`
 			[
-			  "test-workspace/tsc/failureFixtures/directives/main.vue(4,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., {}>'.",
-			  "test-workspace/tsc/failureFixtures/directives/main.vue(9,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., {}>'.",
+			  "test-workspace/tsc/failureFixtures/directives/main.vue(4,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstanceWithMixins<Readonly<{}> & Readonly<{}>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 17 more ..., {}>'.",
+			  "test-workspace/tsc/failureFixtures/directives/main.vue(9,6): error TS2339: Property 'notExist' does not exist on type 'CreateComponentPublicInstanceWithMixins<Readonly<{}> & Readonly<{}>, { exist: typeof exist; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 17 more ..., {}>'.",
 			  "test-workspace/tsc/failureFixtures/directives/main.vue(12,2): error TS2578: Unused '@ts-expect-error' directive.",
 			  "test-workspace/tsc/passedFixtures/#3373/tsconfig.json(4,3): error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 			  Use 'verbatimModuleSyntax' instead.",