Skip to content

Commit 49aa0dc

Browse files
committed
fix: plugin was breaking support for *Move to File* refactoring
1 parent 7c8879f commit 49aa0dc

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

typescript/src/codeActions/decorateProxy.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import getCustomCodeActions, { REFACTORS_CATEGORY } from './getCodeActions'
66
import improveBuiltin from './improveBuiltin'
77

88
export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
9-
proxy.getApplicableRefactors = (fileName, positionOrRange, preferences) => {
10-
let prior = languageService.getApplicableRefactors(fileName, positionOrRange, preferences)
9+
proxy.getApplicableRefactors = (fileName, positionOrRange, preferences, ...args) => {
10+
let prior = languageService.getApplicableRefactors(fileName, positionOrRange, preferences, ...args)
1111

1212
previousGetCodeActionsResult.value = compact(
1313
prior.flatMap(refactor => {
@@ -34,7 +34,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
3434
return prior
3535
}
3636

37-
proxy.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
37+
proxy.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences, ...args) => {
3838
const category = refactorName
3939
if (category === REFACTORS_CATEGORY) {
4040
const program = languageService.getProgram()
@@ -43,10 +43,19 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
4343
return edit
4444
}
4545
if (refactorName === 'Extract Symbol' && actionName.startsWith('function_scope')) {
46-
const handledResult = handleFunctionRefactorEdits(actionName, languageService, fileName, formatOptions, positionOrRange, refactorName, preferences)
46+
const handledResult = handleFunctionRefactorEdits(
47+
actionName,
48+
languageService,
49+
fileName,
50+
formatOptions,
51+
positionOrRange,
52+
refactorName,
53+
preferences,
54+
...args,
55+
)
4756
if (handledResult) return handledResult
4857
}
49-
const prior = languageService.getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences)
58+
const prior = languageService.getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences, ...args)
5059
if (!prior) return
5160
return improveBuiltin(fileName, refactorName, actionName, languageService, c, prior) ?? prior
5261
}

0 commit comments

Comments
 (0)