commit codeactions files :xd:

Author: zardoy

typescript/src/codeActions/decorateProxy.ts

@@ -1,11 +1,17 @@
 import { GetConfig } from '../types'
+import { handleFunctionRefactorEdits, processApplicableRefactors } from './functionExtractors'
 import getCodeActions, { REFACTORS_CATEGORY } from './getCodeActions'
 import improveBuiltin from './improveBuiltin'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
     proxy.getApplicableRefactors = (fileName, positionOrRange, preferences) => {
         let prior = languageService.getApplicableRefactors(fileName, positionOrRange, preferences)
 
+        processApplicableRefactors(
+            prior.find(r => r.description === 'Extract function'),
+            c,
+        )
+
         if (c('markTsCodeActions.enable')) prior = prior.map(item => ({ ...item, description: `🔵 ${item.description}` }))
 
         const program = languageService.getProgram()
@@ -24,6 +30,10 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
             const { edit } = getCodeActions(sourceFile, positionOrRange, actionName)
             return edit
         }
+        if (refactorName === 'Extract Symbol' && actionName.startsWith('function_scope')) {
+            const handledResult = handleFunctionRefactorEdits(actionName, languageService, fileName, formatOptions, positionOrRange, refactorName, preferences)
+            if (handledResult) return handledResult
+        }
         const prior = languageService.getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences)
         if (!prior) return
         return improveBuiltin(fileName, refactorName, actionName, languageService, c, prior) ?? prior

typescript/src/codeActions/functionExtractors.ts

@@ -1,5 +1,5 @@
 import { GetConfig } from '../types'
-import { dedentString, findChildContainingExactPosition, findChildContainingPositionMaxDepth } from '../utils'
+import { dedentString, findChildContainingPositionMaxDepth } from '../utils'
 
 export const processApplicableRefactors = (refactor: ts.ApplicableRefactorInfo | undefined, c: GetConfig) => {
     if (!refactor) return

typescript/src/utils.ts

@@ -172,6 +172,20 @@ export const getChangesTracker = formatOptions => {
     return new tsFull.textChanges.ChangeTracker(/* will be normalized by vscode anyway */ '\n', tsFull.formatting.getFormatContext(formatOptions, {}))
 }
 
+export const dedentString = (string: string, addIndent = '', trimFirstLines = false) => {
+    let lines = string.split('\n')
+    if (trimFirstLines) {
+        let hitNonEmpty = false
+        lines = lines.filter(line => {
+            if (!hitNonEmpty && !line) return false
+            hitNonEmpty = true
+            return true
+        })
+    }
+    const minIndent = Math.min(...lines.filter(Boolean).map(line => line.match(/^\s*/)![0].length))
+    return lines.map(line => addIndent + line.slice(minIndent)).join('\n')
+}
+
 export const getCancellationToken = (languageServiceHost: ts.LanguageServiceHost) => {
     let cancellationToken = languageServiceHost.getCancellationToken?.() as ts.CancellationToken | undefined
     // if (!cancellationToken) {