fix: template syntax and directive values formatting not working

close #2026
vuejs · Oct 22, 2022 · 415a4f7 · 415a4f7
1 parent f3f36ba
commit 415a4f7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/packages/language-service/src/documentFeatures/format.ts b/packages/language-service/src/documentFeatures/format.ts
@@ -243,26 +243,27 @@ export function register(context: DocumentServiceRuntimeContext) {
 				if (!edits.length)
 					return edits;
 
-				let newText = TextDocument.applyEdits(formatDocument, edits);
-
 				if (initialIndentBracket) {
+					let newText = TextDocument.applyEdits(formatDocument, edits);
 					newText = newText.substring(
 						newText.indexOf(initialIndentBracket[0]) + initialIndentBracket[0].length,
 						newText.lastIndexOf(initialIndentBracket[1]),
 					);
+					if (newText === document.getText()) {
+						edits = [];
+					}
+					else {
+						edits = [{
+							newText,
+							range: {
+								start: document.positionAt(0),
+								end: document.positionAt(document.getText().length),
+							},
+						}];
+					}
 				}
 
-				if (newText === document.getText()) {
-					return [];
-				}
-
-				return [{
-					range: {
-						start: document.positionAt(0),
-						end: document.positionAt(document.getText().length),
-					},
-					newText,
-				}];
+				return edits;
 			}
 		}
 

diff --git a/vue-language-tools/vue-language-core/src/plugins/vue-tsx.ts b/vue-language-tools/vue-language-core/src/plugins/vue-tsx.ts
@@ -92,7 +92,7 @@ const plugin: VueLanguagePlugin = ({ modules, vueCompilerOptions, compilerOption
 			}
 
 			if (sfc.template) {
-				fileNames.push(fileName + '.__VLS_template_format.tsx');
+				fileNames.push(fileName + '.__VLS_template_format.ts');
 				fileNames.push(fileName + '.__VLS_template_style.css');
 			}
 
@@ -123,7 +123,7 @@ const plugin: VueLanguagePlugin = ({ modules, vueCompilerOptions, compilerOption
 					embeddedFile.teleportMappings = [...tsx.teleports];
 				}
 			}
-			else if (suffix.match(/^\.__VLS_template_format\.tsx$/)) {
+			else if (suffix.match(/^\.__VLS_template_format\.ts$/)) {
 
 				embeddedFile.parentFileName = fileName + '.template.' + sfc.template?.lang;
 				embeddedFile.capabilities = {