remove all traces of move to existing file (unimplemented)

Author: zardoy

src/codeActionProvider.ts

@@ -1,19 +1,10 @@
 import * as vscode from 'vscode'
-import { relative, join } from 'path-browserify'
 import { defaultJsSupersetLangsWithVue } from '@zardoy/vscode-utils/build/langs'
-import { partition } from 'lodash'
 import { registerExtensionCommand, showQuickPick, getExtensionSetting, getExtensionCommandId } from 'vscode-framework'
 import { compact } from '@zardoy/utils'
 import { RequestResponseTypes, RequestOptionsTypes } from '../typescript/src/ipcTypes'
 import { sendCommand } from './sendCommand'
-import {
-    pickFileWithQuickPick,
-    getTsLikePath,
-    tsRangeToVscode,
-    tsTextChangesToVscodeTextEdits,
-    vscodeRangeToTs,
-    tsTextChangesToVscodeSnippetTextEdits,
-} from './util'
+import { tsTextChangesToVscodeTextEdits, vscodeRangeToTs, tsTextChangesToVscodeSnippetTextEdits } from './util'
 
 // extended and interactive code actions
 export default () => {
@@ -53,7 +44,7 @@ export default () => {
             if (context.triggerKind !== vscode.CodeActionTriggerKind.Invoke) return
             const result = await getPossibleTwoStepRefactorings(range)
             if (!result) return
-            const { turnArrayIntoObject, moveToExistingFile, extendedCodeActions } = result
+            const { turnArrayIntoObject, extendedCodeActions } = result
             const codeActions: vscode.CodeAction[] = []
             const getCommand = (arg): vscode.Command | undefined => ({
                 title: '',
@@ -69,14 +60,6 @@ export default () => {
                 })
             }
 
-            if (moveToExistingFile) {
-                // codeActions.push({
-                //     title: `Move to existing file`,
-                //     command: getCommand({ moveToExistingFile }),
-                //     kind: vscode.CodeActionKind.Refactor.append('move'),
-                // })
-            }
-
             codeActions.push(
                 ...compact(
                     extendedCodeActions.map(({ title, kind, codes }): ExtendedCodeAction | undefined => {
@@ -131,7 +114,7 @@ export default () => {
     registerExtensionCommand('applyRefactor' as any, async (_, arg?: RequestResponseTypes['getTwoStepCodeActions']) => {
         if (!arg) return
         let sendNextData: RequestOptionsTypes['twoStepCodeActionSecondStep']['data'] | undefined
-        const { turnArrayIntoObject, moveToExistingFile } = arg
+        const { turnArrayIntoObject } = arg
         if (turnArrayIntoObject) {
             const { keysCount, totalCount, totalObjectCount } = turnArrayIntoObject
             const selectedKey = await showQuickPick(
@@ -155,54 +138,12 @@ export default () => {
             }
         }
 
-        if (moveToExistingFile) {
-            sendNextData = {
-                name: 'moveToExistingFile',
-            }
-        }
-
         if (!sendNextData) return
         const editor = vscode.window.activeTextEditor!
         const nextResponse = await getSecondStepRefactoringData(editor.selection, sendNextData)
         if (!nextResponse) throw new Error('No code action data. Try debug.')
         const edit = new vscode.WorkspaceEdit()
-        let mainChanges = 'edits' in nextResponse && nextResponse.edits
-        if (moveToExistingFile && 'fileNames' in nextResponse) {
-            const { fileNames, fileEdits } = nextResponse
-            const selectedFilePath = await pickFileWithQuickPick(fileNames)
-            if (!selectedFilePath) return
-            const document = await vscode.workspace.openTextDocument(vscode.Uri.file(selectedFilePath))
-            // const outline = await vscode.commands.executeCommand('vscode.executeDocumentSymbolProvider', document.uri)
-
-            const currentEditorPath = getTsLikePath(vscode.window.activeTextEditor!.document.uri)
-            const currentFileEdits = [...fileEdits.find(fileEdit => fileEdit.fileName === currentEditorPath)!.textChanges]
-            const textChangeIndexToPatch = currentFileEdits.findIndex(currentFileEdit => currentFileEdit.newText.trim())
-            const { newText: updateImportText } = currentFileEdits[textChangeIndexToPatch]!
-            // TODO-mid use native path resolver (ext, index, alias)
-            let newRelativePath = relative(join(currentEditorPath, '..'), selectedFilePath)
-            if (!newRelativePath.startsWith('./') && !newRelativePath.startsWith('../')) newRelativePath = `./${newRelativePath}`
-            currentFileEdits[textChangeIndexToPatch]!.newText = updateImportText.replace(/(['"]).+(['"])/, (_m, g1) => `${g1}${newRelativePath}${g1}`)
-            mainChanges = currentFileEdits
-            const newFileText = fileEdits.find(fileEdit => fileEdit.isNewFile)!.textChanges[0]!.newText
-            const [importLines, otherLines] = partition(newFileText.split('\n'), line => line.startsWith('import '))
-            const startPos = new vscode.Position(0, 0)
-            const newFileNodes = await sendCommand<RequestResponseTypes['filterBySyntaxKind']>('filterBySyntaxKind', {
-                position: startPos,
-                document,
-            })
-            const lastImportDeclaration = newFileNodes?.nodesByKind.ImportDeclaration?.at(-1)
-            const lastImportEnd = lastImportDeclaration ? tsRangeToVscode(document, lastImportDeclaration.range).end : startPos
-            edit.set(vscode.Uri.file(selectedFilePath), [
-                {
-                    range: new vscode.Range(startPos, startPos),
-                    newText: [...importLines, '\n'].join('\n'),
-                },
-                {
-                    range: new vscode.Range(lastImportEnd, lastImportEnd),
-                    newText: ['\n', ...otherLines].join('\n'),
-                },
-            ])
-        }
+        const mainChanges = 'edits' in nextResponse && nextResponse.edits
 
         if (!mainChanges) return
         edit.set(editor.document.uri, tsTextChangesToVscodeTextEdits(editor.document, mainChanges))

typescript/src/ipcTypes.ts

@@ -64,7 +64,6 @@ export type RequestResponseTypes = {
             totalCount: number
             totalObjectCount: number
         }
-        moveToExistingFile?: Record<string, unknown>
         extendedCodeActions: IpcExtendedCodeAction[]
     }
     twoStepCodeActionSecondStep:
@@ -97,14 +96,10 @@ export type RequestOptionsTypes = {
     }
     twoStepCodeActionSecondStep: {
         range: [number, number]
-        data:
-            | {
-                  name: 'turnArrayIntoObject'
-                  selectedKeyName?: string
-              }
-            | {
-                  name: 'moveToExistingFile'
-              }
+        data: {
+            name: 'turnArrayIntoObject'
+            selectedKeyName?: string
+        }
     }
 
     acceptRenameWithParams: {

typescript/src/specialCommands/handle.ts

@@ -38,12 +38,10 @@ export default (
         changeType<RequestOptionsTypes['getTwoStepCodeActions']>(specialCommandArg)
         const node = findChildContainingPosition(ts, sourceFile, position)
         const posEnd = { pos: specialCommandArg.range[0], end: specialCommandArg.range[1] }
-        const moveToExistingFile = previousGetCodeActionsResult.value?.some(x => x.name === 'Move to a new file')
 
         const extendedCodeActions = getExtendedCodeActions(sourceFile, posEnd, languageService, undefined, undefined)
         return {
             turnArrayIntoObject: objectIntoArrayConverters(posEnd, node, undefined),
-            moveToExistingFile: moveToExistingFile ? {} : undefined,
             extendedCodeActions,
         }
     }
@@ -71,20 +69,6 @@ export default (
                 }
                 break
             }
-            case 'moveToExistingFile': {
-                const { edits } =
-                    languageService.getEditsForRefactor(fileName, formatOptions ?? {}, posEnd, 'Move to a new file', 'Move to a new file', preferences) ?? {}
-                if (!edits) return
-                data = {
-                    fileEdits: edits,
-                    fileNames: languageService
-                        .getProgram()!
-                        .getSourceFiles()
-                        .map(f => f.fileName)
-                        .filter(name => !name.includes('/node_modules/')),
-                }
-                break
-            }
         }
         return data
     }