fix Modification of newly created FM #214

Author: marcellourbani

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.7.7] 2024-04-20
+
+### Fixed
+
+- editing newly created FM
+
 ## [1.7.6] 2024-04-13
 
 ### Added

abap remote fs.code-workspace

@@ -34,8 +34,7 @@
       "**/.project": true,
       "**/.settings": true,
       "**/.factorypath": true,
-      "**/node_modules/**": true,
-      "**/tmp/**": true
+      "**/node_modules/**": true
     },
     "prettier.arrowParens": "avoid",
     "prettier.proseWrap": "never",
@@ -48,7 +47,9 @@
       "wiki",
       "sharedapi"
     ],
-    "tslint.exclude": ["**/node_modules/**"],
+    "tslint.exclude": [
+      "**/node_modules/**"
+    ],
     "githubIssues.queries": [
       {
         "label": "My Issues",
@@ -95,4 +96,4 @@
     "typescript.format.placeOpenBraceOnNewLineForFunctions": false,
     "typescript.preferences.quoteStyle": "auto"
   }
-}
+}

client/package.json

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

client/src/adt/operations/AdtObjectCreator.ts

@@ -31,7 +31,7 @@ import {
   createUri
 } from "./AdtObjectFinder"
 import { getClient, getRoot } from "../conections"
-import { isAbapStat, isFolder } from "abapfs"
+import { isAbapFolder, isAbapStat, isFolder } from "abapfs"
 import { fromNode } from "abapobject"
 import { pipe } from "fp-ts/lib/pipeable"
 import { bind, chain, map } from "fp-ts/lib/TaskEither"
@@ -75,7 +75,13 @@ export class AdtObjectCreator {
     if (otype === PACKAGE) otype = ""
     return this.types!.filter(x => x.PARENT_OBJECT_TYPE === otype)
   }
-
+  private async getAndRefreshParent(options: NewObjectOptions) {
+    if (options.objtype !== "FUGR/FF") return
+    const finder = new AdtObjectFinder(this.connId)
+    const { file, uri } = await finder.vscodeUriWithFile(options.parentPath, false)
+    if (isAbapFolder(file)) await file.refresh()
+    if (isAbapStat(file)) return file.object
+  }
   /**
    * Creates an ABAP object asking the user for unknown details
    * Tries to guess object type and parent/package from URI
@@ -99,7 +105,7 @@ export class AdtObjectCreator {
     if (transport.cancelled) return
     options.transport = transport.transport
     await getClient(this.connId).createObject(options)
-
+    const parent = await this.getAndRefreshParent(objDetails.options)
     const obj = fromNode(
       {
         EXPANDABLE: "",
@@ -109,12 +115,13 @@ export class AdtObjectCreator {
         OBJECT_VIT_URI: "",
         TECH_NAME: options.name
       },
-      undefined,
+      parent,
       getRoot(this.connId).service
     )
     if (options.objtype !== PACKAGE) await obj.loadStructure()
     return obj
   }
+
   public guessParentByType(hierarchy: FileStat[], type: ParentTypeIds): string {
     return (
       hierarchy.filter(isAbapStat).find(n => n.object.type === type)?.object

client/src/adt/operations/AdtObjectFinder.ts

@@ -103,6 +103,11 @@ export class AdtObjectFinder {
     return uf.uri
   }
 
+  public async vscodeObject(uri: string, main = true) {
+    const { file } = await this.vscodeUriWithFile(uri, main)
+    if (isAbapStat(file)) return file.object
+  }
+
   public clearCaches() {
     this.fragCache = promCache()
   }

client/src/commands/commands.ts

@@ -222,6 +222,7 @@ export class AdtCommands {
       const obj = await new AdtObjectCreator(connId).createObject(uri)
       if (!obj) return // user aborted
       log(`Created object ${obj.type} ${obj.name}`)
+      await obj.loadStructure()
 
       if (obj.type === PACKAGE) {
         commands.executeCommand("workbench.files.action.refreshFilesExplorer")

modules/abapObject/package.json

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

modules/abapObject/src/AOService.ts

@@ -3,15 +3,16 @@ import {
   AbapObjectStructure,
   NodeStructure,
   ADTClient,
-  NodeParents
+  NodeParents,
+  ObjectVersion
 } from "abap-adt-api"
 
 export interface AbapObjectService {
   mainPrograms: (path: string) => Promise<MainInclude[]>
   /** Loads the object metadata
    *    As will be called way too often, we will cache it for a second
    */
-  objectStructure: (path: string) => Promise<AbapObjectStructure>
+  objectStructure: (path: string, refresh?: boolean, version?: ObjectVersion) => Promise<AbapObjectStructure>
   /** invalidate structure cache
    *    to be invoked after changing operations.
    *    will happen automatically on write
@@ -31,28 +32,30 @@ export interface AbapObjectService {
 export class AOService implements AbapObjectService {
   constructor(protected client: ADTClient) { }
 
-  private structCache = new Map<string, Promise<AbapObjectStructure>>()
+  private activeStructCache = new Map<string, Promise<AbapObjectStructure>>()
 
   delete(path: string, lockId: string, transport: string) {
     return this.client.deleteObject(path, lockId, transport)
   }
 
   invalidateStructCache(uri: string) {
-    this.structCache.delete(uri)
+    this.activeStructCache.delete(uri)
   }
 
   mainPrograms(path: string) {
     return this.client.statelessClone.mainPrograms(path)
   }
 
-  objectStructure(path: string) {
-    let structure = this.structCache.get(path)
+  objectStructure(path: string, refresh = false, version?: ObjectVersion) {
+    if (refresh) this.activeStructCache.delete(path)
+    let structure = this.activeStructCache.get(path)
     if (!structure) {
-      structure = this.client.statelessClone.objectStructure(path)
-      this.structCache.set(path, structure)
-      structure.finally(() =>
-        setTimeout(() => this.invalidateStructCache(path), 800)
-      )
+      structure = this.client.statelessClone.objectStructure(path, version)
+      this.activeStructCache.set(path, structure)
+      if (!version || version === "active")
+        structure.finally(() =>
+          setTimeout(() => this.invalidateStructCache(path), 800)
+        )
     }
     return structure
   }

modules/abapObject/src/AbapObject.ts

@@ -2,6 +2,7 @@ import {
   AbapObjectStructure,
   MainInclude,
   NodeStructure,
+  ObjectVersion,
   isNodeParent
 } from "abap-adt-api"
 import { AbapObjectService } from "./AOService"
@@ -47,6 +48,7 @@ export interface AbapObject {
   readonly changedAt: Date | undefined
   /** reads the main objects available for this object */
   mainPrograms: () => Promise<MainInclude[]>
+  readonly parent: AbapObject | undefined,
   /** whether we are able to write it */
   readonly canBeWritten: boolean
   /** objcect namespace
@@ -64,13 +66,15 @@ export interface AbapObject {
   readonly owner?: string
 
   /** loads/updates the object metadata */
-  loadStructure: () => Promise<AbapObjectStructure>
+  loadStructure: (refresh?: boolean, version?: ObjectVersion) => Promise<AbapObjectStructure>
   delete: (lockId: string, transport: string) => Promise<void>
   write: (contents: string, lockId: string, transport: string) => Promise<void>
   read: () => Promise<string>
   childComponents: () => Promise<NodeStructure>
 }
 
+const ignoreErr = () => { }
+
 export type AbapObjectConstructor = new (
   type: string,
   name: string,
@@ -180,11 +184,10 @@ export class AbapObjectBase implements AbapObject {
     return this.service.mainPrograms(this.path)
   }
 
-  async loadStructure(): Promise<AbapObjectStructure> {
+  async loadStructure(refresh = false, version?: ObjectVersion): Promise<AbapObjectStructure> {
     if (!this.name) throw ObjectErrors.noStructure(this)
-    this.structure = await this.service.objectStructure(
-      this.path.replace(/\/source\/main$/, "")
-    )
+    const base = this.path.replace(/\/source\/main$/, "")
+    this.structure = await this.service.objectStructure(base, refresh, version)
     return this.structure
   }
   async delete(lockId: string, transport = "") {
@@ -203,6 +206,8 @@ export class AbapObjectBase implements AbapObject {
     this.service.invalidateStructCache(this.path)
     if (this.lockObject !== this)
       this.service.invalidateStructCache(this.lockObject.path)
+    if (this.parent && this.parent.type !== PACKAGE)
+      await this.parent.loadStructure()
   }
 
   async read() {

modules/abapObject/src/objectTypes/AbapFunction.ts

@@ -25,7 +25,7 @@ export class AbapFunction extends AbapObjectBase {
         this,
         "Parent function group is required for function modules"
       )
-    if (!this.path.startsWith(parent.path))
+    if (!this.path.toLowerCase().startsWith(parent.path.toLowerCase()))
       throw ObjectErrors.Invalid(
         this,
         `Function ${name} doesn't belong to group ${parent.name}`