revert: "feat: support auto-complete for template local variables"

This reverts commit 7d8c939. close #1312, open #1284
vuejs · May 18, 2022 · 2f78618 · 2f78618
1 parent 2cf646f
commit 2f78618
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/packages/vue-code-gen/src/generators/template.ts b/packages/vue-code-gen/src/generators/template.ts
@@ -498,13 +498,6 @@ export function generate(
 			}
 			tsCodeGen.addText(`) {\n`);
 
-			// fix https://github.com/johnsoncodehk/volar/issues/1284
-			tsCodeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase & {\n`);
-			for (const localVar in localVars) {
-				tsCodeGen.addText(`${localVar}: typeof ${localVar},\n`);
-			}
-			tsCodeGen.addText(`};\n`);
-
 			for (const childNode of node.children) {
 				visitNode(childNode, parentEl);
 			}
@@ -603,14 +596,6 @@ export function generate(
 
 				for (const varName of slotBlockVars)
 					localVars[varName] = (localVars[varName] ?? 0) + 1;
-
-				if (slotBlockVars.length) {
-					tsCodeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase & {\n`);
-					for (const localVar of slotBlockVars) {
-						tsCodeGen.addText(`${localVar}: typeof ${localVar},\n`);
-					}
-					tsCodeGen.addText(`};\n`);
-				}
 			}
 			writeDirectives(node);
 			writeElReferences(node); // <el ref="foo" />

diff --git a/packages/vue-typescript/src/use/useSfcTemplateScript.ts b/packages/vue-typescript/src/use/useSfcTemplateScript.ts
@@ -99,7 +99,7 @@ export function useSfcTemplateScript(
 
 		writeImportTypes();
 
-		codeGen.addText(`declare const __VLS_ctxBase: InstanceType<typeof __VLS_component> & {\n`);
+		codeGen.addText(`declare var __VLS_ctx: InstanceType<typeof __VLS_component> & {\n`);
 		/* CSS Module */
 		const cssModuleMappingsArr: ReturnType<typeof writeCssClassProperties>[] = [];
 		for (const moduleName in cssModuleClasses.value) {
@@ -109,16 +109,15 @@ export function useSfcTemplateScript(
 			codeGen.addText('};\n');
 		}
 		codeGen.addText(`};\n`);
-		codeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase;\n`);
 
-		codeGen.addText(`declare const __VLS_vmUnwrap: typeof __VLS_options & { components: { } };\n`);
+		codeGen.addText(`declare var __VLS_vmUnwrap: typeof __VLS_options & { components: { } };\n`);
 
 		/* Components */
 		codeGen.addText('/* Components */\n');
-		codeGen.addText('declare const __VLS_otherComponents: NonNullable<typeof __VLS_component extends { components: infer C } ? C : {}> & __VLS_types.GlobalComponents & typeof __VLS_vmUnwrap.components & __VLS_types.PickComponents<typeof __VLS_ctx>;\n');
-		codeGen.addText('declare const __VLS_ownComponent: __VLS_types.SelfComponent<typeof __VLS_name, typeof __VLS_component>;\n');
-		codeGen.addText('declare const __VLS_allComponents: typeof __VLS_otherComponents & Omit<typeof __VLS_ownComponent, keyof typeof __VLS_otherComponents>;\n');
-		codeGen.addText('declare const __VLS_rawComponents: __VLS_types.ConvertInvalidComponents<typeof __VLS_allComponents> & JSX.IntrinsicElements;\n'); // sort by priority
+		codeGen.addText('declare var __VLS_otherComponents: NonNullable<typeof __VLS_component extends { components: infer C } ? C : {}> & __VLS_types.GlobalComponents & typeof __VLS_vmUnwrap.components & __VLS_types.PickComponents<typeof __VLS_ctx>;\n');
+		codeGen.addText('declare var __VLS_ownComponent: __VLS_types.SelfComponent<typeof __VLS_name, typeof __VLS_component>;\n');
+		codeGen.addText('declare var __VLS_allComponents: typeof __VLS_otherComponents & Omit<typeof __VLS_ownComponent, keyof typeof __VLS_otherComponents>;\n');
+		codeGen.addText('declare var __VLS_rawComponents: __VLS_types.ConvertInvalidComponents<typeof __VLS_allComponents> & JSX.IntrinsicElements;\n'); // sort by priority
 
 		codeGen.addText(`__VLS_allComponents.${SearchTexts.Components};\n`);
 		codeGen.addText(`({} as __VLS_types.GlobalAttrs).${SearchTexts.GlobalAttrs};\n`);
@@ -128,7 +127,7 @@ export function useSfcTemplateScript(
 		codeGen.addText('type __VLS_StyleScopedClasses = {\n');
 		const cssScopedMappings = writeCssClassProperties(cssScopedClasses.value, true, 'boolean', true);
 		codeGen.addText('};\n');
-		codeGen.addText('declare const __VLS_styleScopedClasses: __VLS_StyleScopedClasses | keyof __VLS_StyleScopedClasses | (keyof __VLS_StyleScopedClasses)[];\n');
+		codeGen.addText('declare var __VLS_styleScopedClasses: __VLS_StyleScopedClasses | keyof __VLS_StyleScopedClasses | (keyof __VLS_StyleScopedClasses)[];\n');
 
 		codeGen.addText(`/* CSS variable injection */\n`);
 		writeCssVars();