revert fix

vuejs · Oct 7, 2023 · eeaac3f · eeaac3f
1 parent 352f35a
commit eeaac3f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts
@@ -927,7 +927,6 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
 						},
 						emptyLocalVars,
 						identifiers,
-						new Set(),
 						vueCompilerOptions,
 					);
 					codes.push(';\n');

diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts
@@ -74,7 +74,6 @@ export function generate(
 	sfc: Sfc,
 	hasScriptSetupSlots: boolean,
 	slotsAssignName: string | undefined,
-	propsAssignName: string | undefined,
 	codegenStack: boolean,
 ) {
 
@@ -1893,7 +1892,7 @@ export function generate(
 				}
 				codes.push(addSuffix);
 			}
-		}, localVars, identifiers, new Set([propsAssignName ?? '']), vueCompilerOptions);
+		}, localVars, identifiers, vueCompilerOptions);
 		if (start !== undefined) {
 			for (const v of vars) {
 				v.offset = start + v.offset - prefix.length;

diff --git a/packages/vue-language-core/src/plugins/vue-tsx.ts b/packages/vue-language-core/src/plugins/vue-tsx.ts
@@ -152,21 +152,18 @@ function createTsx(fileName: string, _sfc: Sfc, { vueCompilerOptions, compilerOp
 			_sfc,
 			hasScriptSetupSlots.value,
 			slotsAssignName.value,
-			propsAssignName.value,
 			codegenStack,
 		);
 	});
 
 	//#region remove when https://github.com/vuejs/core/pull/5912 merged
 	const hasScriptSetupSlots = ref(false);
 	const slotsAssignName = ref<string>();
-	const propsAssignName = ref<string>();
 	//#endregion
 
 	const tsxGen = computed(() => {
 		hasScriptSetupSlots.value = !!scriptSetupRanges.value?.defineSlots;
 		slotsAssignName.value = scriptSetupRanges.value?.slotsAssignName;
-		propsAssignName.value = scriptSetupRanges.value?.propsAssignName;
 		return genScript(
 			ts,
 			fileName,

diff --git a/packages/vue-language-core/src/utils/transform.ts b/packages/vue-language-core/src/utils/transform.ts
@@ -9,7 +9,6 @@ export function walkInterpolationFragment(
 	cb: (fragment: string, offset: number | undefined, isJustForErrorMapping?: boolean) => void,
 	localVars: Record<string, number>,
 	identifiers: Set<string>,
-	skipVars: Set<string>,
 	vueOptions: VueCompilerOptions,
 ) {
 
@@ -22,7 +21,6 @@ export function walkInterpolationFragment(
 	const varCb = (id: ts.Identifier, isShorthand: boolean) => {
 		if (
 			!!localVars[id.text] ||
-			skipVars.has(id.text) ||
 			// https://github.com/vuejs/core/blob/245230e135152900189f13a4281302de45fdcfaa/packages/compiler-core/src/transforms/transformExpression.ts#L342-L352
 			isGloballyWhitelisted(id.text) ||
 			id.text === 'require' ||