Show refactors with code actions (only really works with intentions ui)

Author: lierdakil

lib/main/atom-ide/codeActionsProvider.ts

@@ -14,7 +14,7 @@ export function getCodeActionsProvider(codefixProvider: CodefixProvider): CodeAc
       _diagnostics: Message[],
     ): Promise<CodeAction[]> {
       return (await codefixProvider.runCodeFix(textEditor, range.start)).map((fix) => ({
-        getTitle: async () => fix.description,
+        getTitle: async () => ("description" in fix ? fix.description : fix.actionDescription),
         dispose: () => {},
         apply: async () => {
           await codefixProvider.applyFix(fix)

lib/main/atom/codefix/codefixProvider.ts

@@ -2,7 +2,12 @@ import * as Atom from "atom"
 import {ClientResolver, TSClient} from "../../../client"
 import {ErrorPusher} from "../../errorPusher"
 import {ApplyEdits} from "../../pluginManager"
-import {spanToRange} from "../utils"
+import {
+  applyRefactors,
+  getApplicableRefactorsActions,
+  RefactorAction,
+} from "../commands/refactorCode"
+import {pointToLocation, spanToRange} from "../utils"
 
 export class CodefixProvider {
   private supportedFixes: WeakMap<TSClient, Set<number>> = new WeakMap()
@@ -30,7 +35,7 @@ export class CodefixProvider {
   public async runCodeFix(
     textEditor: Atom.TextEditor,
     bufferPosition: Atom.Point,
-  ): Promise<protocol.CodeAction[]> {
+  ): Promise<Array<protocol.CodeAction | RefactorAction>> {
     const filePath = textEditor.getPath()
 
     if (filePath === undefined) return []
@@ -52,7 +57,7 @@ export class CodefixProvider {
       )
 
     const fixes = await Promise.all(requests)
-    const results: protocol.CodeAction[] = []
+    const results: Array<protocol.CodeAction | RefactorAction> = []
 
     for (const result of fixes) {
       if (result.body) {
@@ -62,11 +67,24 @@ export class CodefixProvider {
       }
     }
 
+    const refactors = await getApplicableRefactorsActions(client, {
+      file: filePath,
+      ...pointToLocation(bufferPosition),
+    })
+
+    results.push(...refactors)
+
     return results
   }
 
-  public async applyFix(fix: protocol.CodeAction) {
-    return this.applyEdits(fix.changes)
+  public async applyFix(fix: protocol.CodeAction | RefactorAction) {
+    if ("changes" in fix) return this.applyEdits(fix.changes)
+    else {
+      const client = await this.clientResolver.get(fix.refactorRange.file)
+      return applyRefactors(fix, client, {
+        applyEdits: this.applyEdits,
+      })
+    }
   }
 
   public dispose() {

lib/main/atom/codefix/intentionsProvider.ts

@@ -52,7 +52,7 @@ export function getIntentionsProvider(
     async getIntentions({bufferPosition, textEditor}) {
       return (await codefixProvider.runCodeFix(textEditor, bufferPosition)).map((fix) => ({
         priority: 100,
-        title: fix.description,
+        title: "description" in fix ? fix.description : fix.actionDescription,
         selected: () => {
           handlePromise(codefixProvider.applyFix(fix))
         },

lib/main/atom/commands/refactorCode.tsx

@@ -6,9 +6,10 @@ import {HighlightComponent} from "../views/highlightComponent"
 import {selectListView} from "../views/simpleSelectionView"
 import {addCommand, Dependencies} from "./registry"
 
-interface RefactorAction {
+export interface RefactorAction {
   refactorName: string
   refactorDescription: string
+  refactorRange: protocol.FileLocationOrRangeRequestArgs
   actionName: string
   actionDescription: string
   inlineable: boolean
@@ -56,11 +57,11 @@ addCommand("atom-text-editor", "typescript:refactor-selection", (deps) => ({
     })
 
     if (selectedAction === undefined) return
-    await applyRefactors(selectedAction, fileRange, client, deps)
+    await applyRefactors(selectedAction, client, deps)
   },
 }))
 
-async function getApplicableRefactorsActions(
+export async function getApplicableRefactorsActions(
   client: TSClient,
   pointOrRange: protocol.FileLocationOrRangeRequestArgs,
 ) {
@@ -76,6 +77,7 @@ async function getApplicableRefactorsActions(
       actions.push({
         refactorName: refactor.name,
         refactorDescription: refactor.description,
+        refactorRange: pointOrRange,
         actionName: action.name,
         actionDescription: action.description,
         inlineable: refactor.inlineable !== undefined ? refactor.inlineable : true,
@@ -100,14 +102,13 @@ async function getApplicabeRefactors(
   }
 }
 
-async function applyRefactors(
+export async function applyRefactors(
   selectedAction: RefactorAction,
-  range: protocol.FileLocationOrRangeRequestArgs,
   client: TSClient,
-  deps: Dependencies,
+  deps: Pick<Dependencies, "applyEdits">,
 ) {
   const responseEdits = await client.execute("getEditsForRefactor", {
-    ...range,
+    ...selectedAction.refactorRange,
     refactor: selectedAction.refactorName,
     action: selectedAction.actionName,
   })