feat: redo on type format support

close vuejs/language-tools#2401
volarjs · Feb 17, 2023 · ec41473 · ec41473
1 parent 0a3c75f
commit ec41473
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/packages/language-service/src/documentFeatures/format.ts b/packages/language-service/src/documentFeatures/format.ts
@@ -83,18 +83,16 @@ export function register(context: LanguageServicePluginContext) {
 						start: map.virtualFileDocument.positionAt(0),
 						end: map.virtualFileDocument.positionAt(map.virtualFileDocument.getText().length),
 					});
-
-					if (virtualCodeEdits) {
-						toPatchIndentUris.push({
-							uri: map.virtualFileDocument.uri,
-							isCodeBlock,
-						});
-					}
 				}
 
 				if (!virtualCodeEdits)
 					continue;
 
+				toPatchIndentUris.push({
+					uri: map.virtualFileDocument.uri,
+					isCodeBlock,
+				});
+
 				for (const textEdit of virtualCodeEdits) {
 					const range = map.toSourceRange(textEdit.range);
 					if (range) {
@@ -118,6 +116,15 @@ export function register(context: LanguageServicePluginContext) {
 			if (level > 1) {
 
 				const baseIndent = options.insertSpaces ? ' '.repeat(options.tabSize) : '\t';
+				const editLines = new Set<number>();
+
+				if (onTypeParams) {
+					for (const edit of edits) {
+						for (let line = edit.range.start.line; line <= edit.range.end.line; line++) {
+							editLines.add(line);
+						}
+					}
+				}
 
 				for (const toPatchIndentUri of toPatchIndentUris) {
 
@@ -130,6 +137,16 @@ export function register(context: LanguageServicePluginContext) {
 							initialIndentLanguageId[map.virtualFileDocument.languageId] ? baseIndent : '',
 						);
 
+						if (onTypeParams) {
+							indentEdits = indentEdits.filter(edit => {
+								for (let line = edit.range.start.line; line <= edit.range.end.line; line++) {
+									if (!editLines.has(line))
+										return false;
+								}
+								return true;
+							});
+						}
+
 						indentEdits = indentEdits.filter(edit => isInsideRange(range!, edit.range));
 
 						if (indentEdits.length > 0) {

diff --git a/packages/language-service/src/languageFeatures/renamePrepare.ts b/packages/language-service/src/languageFeatures/renamePrepare.ts
@@ -4,7 +4,7 @@ import { languageFeatureWorker } from '../utils/featureWorkers';
 
 export function register(context: LanguageServicePluginContext) {
 
-	return async (uri: string, position: vscode.Position) => {
+	return (uri: string, position: vscode.Position) => {
 
 		return languageFeatureWorker(
 			context,