pass language more data to code actions

Author: zardoy

typescript/src/codeActions/decorateProxy.ts

@@ -3,7 +3,7 @@ import { handleFunctionRefactorEdits, processApplicableRefactors } from './funct
 import getCodeActions, { REFACTORS_CATEGORY } from './getCodeActions'
 import improveBuiltin from './improveBuiltin'
 
-export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
     proxy.getApplicableRefactors = (fileName, positionOrRange, preferences) => {
         let prior = languageService.getApplicableRefactors(fileName, positionOrRange, preferences)
 
@@ -16,7 +16,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
 
         const program = languageService.getProgram()
         const sourceFile = program!.getSourceFile(fileName)!
-        const { info: refactorInfo } = getCodeActions(sourceFile, positionOrRange)
+        const { info: refactorInfo } = getCodeActions(sourceFile, positionOrRange, languageService, languageServiceHost)
         if (refactorInfo) prior = [...prior, refactorInfo]
 
         return prior
@@ -27,7 +27,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
         if (category === REFACTORS_CATEGORY) {
             const program = languageService.getProgram()
             const sourceFile = program!.getSourceFile(fileName)!
-            const { edit } = getCodeActions(sourceFile, positionOrRange, actionName)
+            const { edit } = getCodeActions(sourceFile, positionOrRange, languageService, languageServiceHost, formatOptions, actionName)
             return edit
         }
         if (refactorName === 'Extract Symbol' && actionName.startsWith('function_scope')) {

typescript/src/codeActions/getCodeActions.ts

@@ -2,7 +2,6 @@ import { compact } from '@zardoy/utils'
 import { findChildContainingPosition } from '../utils'
 import objectSwapKeysAndValues from './custom/objectSwapKeysAndValues'
 import changeStringReplaceToRegex from './custom/changeStringReplaceToRegex'
-import toggleBraces from './custom/toggleBraces'
 
 type SimplifiedRefactorInfo =
     | {
@@ -17,6 +16,9 @@ export type ApplyCodeAction = (
     position: number,
     range: ts.TextRange | undefined,
     node: ts.Node | undefined,
+    formatOptions: ts.FormatCodeSettings,
+    languageService: ts.LanguageService,
+    languageServiceHost: ts.LanguageServiceHost,
 ) => ts.RefactorEditInfo | SimplifiedRefactorInfo[] | undefined
 
 export type CodeAction = {
@@ -34,14 +36,17 @@ export const REFACTORS_CATEGORY = 'essential-refactors'
 export default (
     sourceFile: ts.SourceFile,
     positionOrRange: ts.TextRange | number,
+    languageService: ts.LanguageService,
+    languageServiceHost: ts.LanguageServiceHost,
+    formatOptions?: ts.FormatCodeSettings,
     requestingEditsId?: string,
 ): { info?: ts.ApplicableRefactorInfo; edit: ts.RefactorEditInfo } => {
     const range = typeof positionOrRange !== 'number' && positionOrRange.pos !== positionOrRange.end ? positionOrRange : undefined
     const pos = typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos
     const node = findChildContainingPosition(ts, sourceFile, pos)
     const appliableCodeActions = compact(
         codeActions.map(action => {
-            const edits = action.tryToApply(sourceFile, pos, range, node)
+            const edits = action.tryToApply(sourceFile, pos, range, node, formatOptions ?? {}, languageService, languageServiceHost)
             if (!edits) return
             return {
                 ...action,

typescript/src/codeFixes.ts

@@ -8,7 +8,7 @@ import namespaceAutoImports from './namespaceAutoImports'
 // codeFixes that I managed to put in files
 const externalCodeFixes = [addMissingProperties]
 
-export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig, languageServiceHost: ts.LanguageServiceHost) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
     proxy.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
         const sourceFile = languageService.getProgram()?.getSourceFile(fileName)!
         const node = findChildContainingPosition(ts, sourceFile, start)

typescript/src/decorateProxy.ts

@@ -81,8 +81,8 @@ export const decorateLanguageService = (
 
     proxy.getCompletionEntryDetails = (...inputArgs) => completionEntryDetails(inputArgs, languageService, prevCompletionsMap, c, prevCompletionsAdittionalData)
 
-    decorateCodeActions(proxy, languageService, c)
-    decorateCodeFixes(proxy, languageService, c, languageServiceHost)
+    decorateCodeActions(proxy, languageService, languageServiceHost, c)
+    decorateCodeFixes(proxy, languageService, languageServiceHost, c)
     decorateSemanticDiagnostics(proxy, languageService, languageServiceHost, c)
     decorateDefinitions(proxy, languageService, languageServiceHost, c)
     decorateReferences(proxy, languageService, c)