fix: pug formatter extra spaces

close #1784
vuejs · Sep 4, 2022 · 6d93d9d · 6d93d9d
1 parent 28b56e0
commit 6d93d9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts
@@ -61,6 +61,7 @@ export function isIntrinsicElement(runtimeMode: 'runtime-dom' | 'runtime-uni-app
 export function generate(
 	ts: typeof import('typescript/lib/tsserverlibrary'),
 	vueCompilerOptions: _VueCompilerOptions,
+	sourceTemplate: string,
 	sourceLang: string,
 	templateAst: CompilerDOM.RootNode,
 	hasScriptSetup: boolean,
@@ -309,14 +310,16 @@ export function generate(
 			let rightCharacter: string;
 
 			// fix https://github.com/johnsoncodehk/volar/issues/1787
-			while ((leftCharacter = templateAst.loc.source.substring(start - 1, start)).trim() === '' && leftCharacter.length) {
+			while ((leftCharacter = sourceTemplate.substring(start - 1, start)).trim() === '' && leftCharacter.length) {
 				start--;
 				content = leftCharacter + content;
 			}
-			while ((rightCharacter = templateAst.loc.source.substring(start + content.length, start + content.length + 1)).trim() === '' && rightCharacter.length) {
+			while ((rightCharacter = sourceTemplate.substring(start + content.length, start + content.length + 1)).trim() === '' && rightCharacter.length) {
 				content = content + rightCharacter;
 			}
 
+			console.log(content, node.loc.source, sourceTemplate.substring(start - 10, start));
+
 			writeInterpolation(
 				content,
 				start,

diff --git a/packages/vue-language-core/src/plugins/vue-tsx.ts b/packages/vue-language-core/src/plugins/vue-tsx.ts
@@ -131,6 +131,7 @@ const plugin: VueLanguagePlugin = ({ modules, vueCompilerOptions, compilerOption
 			return templateGen.generate(
 				ts,
 				vueCompilerOptions,
+				sfc.template?.content ?? '',
 				sfc.template?.lang ?? 'html',
 				sfc.templateAst,
 				!!sfc.scriptSetup,