extract method (#228)

Author: marcellourbani

.vscode/launch.json

@@ -30,7 +30,10 @@
       "address": "localhost",
       "smartStep": true,
       "showAsyncStacks": true,
-      "restart": true,
+      "restart": {
+        "delay": 2000,
+        "maxAttempts": 100
+      },
       "skipFiles": [
         "<node_internals>/**"
       ],

client/package-lock.json

@@ -61,7 +61,7 @@
     "@abaplint/core": "^2.102.65",
     "@types/tmp": "0.2.3",
     "abap_cloud_platform": "^1.1.3",
-    "abap-adt-api": "^6.1.0",
+    "abap-adt-api": "^6.2.0",
     "abapfs": "file:../modules/abapfs",
     "abapobject": "file:../modules/abapObject",
     "client-oauth2": "^4.3.3",

client/package.json

@@ -5,11 +5,11 @@ import {
   window,
   commands,
   ProgressLocation,
-  Position,
-  Range
+  Range,
+  FileChangeType
 } from "vscode"
 import { pickAdtRoot, RemoteManager } from "../config"
-import { caughtToString, lineRange, log, splitAdtUri } from "../lib"
+import { caughtToString, inputBox, lineRange, log, rangeVscToApi, splitAdtUri } from "../lib"
 import { FavouritesProvider, FavItem } from "../views/favourites"
 import { findEditor, vsCodeUri } from "../langClient"
 import { showHideActivate } from "../listeners"
@@ -87,6 +87,27 @@ interface ShowObjectArgument {
   uri: string
 }
 export class AdtCommands {
+  @command(AbapFsCommands.extractMethod)
+  private static async extractMethod(url: string, range: Range) {
+    const uri = Uri.parse(url)
+    const client = getClient(uri.authority)
+    const root = getRoot(uri.authority)
+    const file = await root.getNodeAsync(uri.path)
+    if (isAbapFile(file)) {
+      const o = file.object
+      const proposal = await client.extractMethodEvaluate(o.path, rangeVscToApi(range))
+      const methodName = await window.showInputBox({ prompt: "Method name" })
+      if (!methodName) return
+      const transport = await selectTransport(o.path, "", client)
+      if (transport.cancelled) return
+      proposal.genericRefactoring.transport = transport.transport
+      proposal.name = methodName
+      const preview = await client.extractMethodPreview(proposal)
+      await client.extractMethodExecute(preview)
+      FsProvider.get().notifyChanges([{ type: FileChangeType.Changed, uri }])
+    }
+
+  }
   @command(AbapFsCommands.showDocumentation)
   private static async showAbapDoc() {
     return showAbapDoc()

client/src/commands/commands.ts

@@ -20,6 +20,7 @@ export const AbapFsCommands = {
   refreshDumps: "abapfs.refreshDumps",
   tableContents: "abapfs.tableContents",
   exportToJson: "abapfs.exportToJson",
+  extractMethod: "abapfs.extractMethod",
   // atc
   atcChecks: "abapfs.atcChecks",
   atcIgnore: "abapfs.atcIgnore",

client/src/commands/registry.ts

@@ -169,6 +169,8 @@ export const lineRange = (line: number) => new Range(
   vscPosition(line, 1)
 )
 
+export const rangeVscToApi = (r: Range): ApiRange => ({ start: { line: r.start.line + 1, column: r.start.character }, end: { line: r.end.line + 1, column: r.end.character } })
+
 export const splitAdtUri = (uri: string | UriParts): AdtUriParts => {
   if (isString(uri)) {
     const { start, end, ...rest } = splitAdtUriInternal(uri)

client/src/lib/vscodefunctions.ts

@@ -1,5 +1,6 @@
 import { TraceHitList, TraceRun, TraceStatementResponse } from "abap-adt-api/build/api/tracetypes"
 import { Profile, ProfileNode } from "v8-inspect-profiler"
+import { log } from "../../lib"
 // import { splitAdtUri } from "../../lib"
 
 const objectLink = (connId: string, uri: string, id: number) => `command:abapfs.showObject?${encodeURIComponent(JSON.stringify({ connId, uri }))}`
@@ -36,11 +37,11 @@ export const convertStatements = (run: TraceRun, resp: TraceStatementResponse, c
     const maxnodeId = nodes[nodes.length - 1]?.id || 0
     const samples = [1, ...nodes.map(n => n.id < maxnodeId ? n.id + 1 : n.id)]
     const timeDeltas = [0, ...resp.statements.map(n => n.traceEventNetTime.time)]
-    // const samples = nodes.map(n => n.id)
+    // const samples = nodes.map(n => n.id) 
     // const timeDeltas = resp.statements.map(n => n.traceEventNetTime.time)
     const selfTime = total(timeDeltas)
     const endTime = startTime + selfTime
-    for (const n of nodes) if (n.children?.find(c => c < n.id)) console.log("boo")
+    for (const n of nodes) if (n.children?.find(c => c < n.id)) log(`Unexpected child ID in profile`)
     return { startTime, endTime, nodes, samples, timeDeltas }
 }
 

client/src/views/traces/convertProfile.ts

@@ -20,6 +20,6 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "abap-adt-api": "^6.1.0"
+    "abap-adt-api": "^6.2.0"
   }
 }