fix(typescript): fix interactive refactors (#244)

andrewbranch · web-flow · commit 9159efb7344c · 2024-11-08T14:13:29.000+08:00
diff --git a/packages/typescript/lib/node/proxyLanguageService.ts b/packages/typescript/lib/node/proxyLanguageService.ts
@@ -485,7 +485,7 @@ function getApplicableRefactors(language: Language<string>, getApplicableRefacto
 	};
 }
 function getEditsForRefactor(language: Language<string>, getEditsForRefactor: ts.LanguageService['getEditsForRefactor']): ts.LanguageService['getEditsForRefactor'] {
-	return (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
+	return (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences, interactiveRefactorArguments) => {
 		let edits: ts.RefactorEditInfo | undefined;
 		const fileName = filePath.replace(windowsPathReg, '/');
 		const [serviceScript, targetScript, sourceScript] = getServiceScript(language, fileName);
@@ -496,17 +496,17 @@ function getEditsForRefactor(language: Language<string>, getEditsForRefactor: ts
 			if (typeof positionOrRange === 'number') {
 				const generatePosition = toGeneratedOffset(language, serviceScript, sourceScript, positionOrRange, isCodeActionsEnabled);
 				if (generatePosition !== undefined) {
-					edits = getEditsForRefactor(targetScript.id, formatOptions, generatePosition, refactorName, actionName, preferences);
+					edits = getEditsForRefactor(targetScript.id, formatOptions, generatePosition, refactorName, actionName, preferences, interactiveRefactorArguments);
 				}
 			}
 			else {
 				for (const [generatedStart, generatedEnd] of toGeneratedRanges(language, serviceScript, sourceScript, positionOrRange.pos, positionOrRange.end, isCodeActionsEnabled)) {
-					edits = getEditsForRefactor(targetScript.id, formatOptions, { pos: generatedStart, end: generatedEnd }, refactorName, actionName, preferences);
+					edits = getEditsForRefactor(targetScript.id, formatOptions, { pos: generatedStart, end: generatedEnd }, refactorName, actionName, preferences, interactiveRefactorArguments);
 				}
 			}
 		}
 		else {
-			edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences);
+			edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences, interactiveRefactorArguments);
 		}
 		if (edits) {
 			edits.edits = transformFileTextChanges(language, edits.edits, false, isCodeActionsEnabled);

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ function getApplicableRefactors(language: Language<string>, getApplicableRefacto`
`485`	`485`	`};`
`486`	`486`	`}`
`487`	`487`	`function getEditsForRefactor(language: Language<string>, getEditsForRefactor: ts.LanguageService['getEditsForRefactor']): ts.LanguageService['getEditsForRefactor'] {`
`488`		`- return (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {`
	`488`	`+ return (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences, interactiveRefactorArguments) => {`
`489`	`489`	`let edits: ts.RefactorEditInfo \| undefined;`
`490`	`490`	`const fileName = filePath.replace(windowsPathReg, '/');`
`491`	`491`	`const [serviceScript, targetScript, sourceScript] = getServiceScript(language, fileName);`
`@@ -496,17 +496,17 @@ function getEditsForRefactor(language: Language<string>, getEditsForRefactor: ts`
`496`	`496`	`if (typeof positionOrRange === 'number') {`
`497`	`497`	`const generatePosition = toGeneratedOffset(language, serviceScript, sourceScript, positionOrRange, isCodeActionsEnabled);`
`498`	`498`	`if (generatePosition !== undefined) {`
`499`		`- edits = getEditsForRefactor(targetScript.id, formatOptions, generatePosition, refactorName, actionName, preferences);`
	`499`	`+ edits = getEditsForRefactor(targetScript.id, formatOptions, generatePosition, refactorName, actionName, preferences, interactiveRefactorArguments);`
`500`	`500`	`}`
`501`	`501`	`}`
`502`	`502`	`else {`
`503`	`503`	`for (const [generatedStart, generatedEnd] of toGeneratedRanges(language, serviceScript, sourceScript, positionOrRange.pos, positionOrRange.end, isCodeActionsEnabled)) {`
`504`		`- edits = getEditsForRefactor(targetScript.id, formatOptions, { pos: generatedStart, end: generatedEnd }, refactorName, actionName, preferences);`
	`504`	`+ edits = getEditsForRefactor(targetScript.id, formatOptions, { pos: generatedStart, end: generatedEnd }, refactorName, actionName, preferences, interactiveRefactorArguments);`
`505`	`505`	`}`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`	`else {`
`509`		`- edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences);`
	`509`	`+ edits = getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences, interactiveRefactorArguments);`
`510`	`510`	`}`
`511`	`511`	`if (edits) {`
`512`	`512`	`edits.edits = transformFileTextChanges(language, edits.edits, false, isCodeActionsEnabled);`