@abaplint/core 2.79.9 → 2.79.13

package/build/abaplint.d.ts

@@ -2398,13 +2398,15 @@ declare interface IConfiguration {
 }
 
 declare interface IDDICReferences {
-    setUsing(obj: IObject, using: readonly IObject[]): void;
-    addUsing(obj: IObject, using: IObject | undefined): void;
+    setUsing(obj: IObject, using: readonly IObjectAndToken[]): void;
+    addUsing(obj: IObject, using: IObjectAndToken | undefined): void;
     clear(obj: IObject): void;
-    listUsing(obj: IObject): readonly IObject[];
+    listUsing(obj: IObject): readonly IObjectAndToken[];
     listWhereUsed(obj: IObject): {
         type: string;
         name: string;
+        token?: Token;
+        filename?: string;
     }[];
 }
 
@@ -2908,6 +2910,12 @@ export declare interface IObject extends IArtifact {
     getXML(): string | undefined;
 }
 
+declare interface IObjectAndToken {
+    object?: IObject;
+    token?: Token;
+    filename?: string;
+}
+
 declare interface IParseResult {
     updated: boolean;
     runtime: number;

package/build/src/abap/5_syntax/basic_types.js

@@ -163,7 +163,7 @@ class BasicTypes {
         }
         const ddic = this.scope.getDDIC().lookup(chainText);
         if (ddic) {
-            this.scope.getDDICReferences().addUsing(this.scope.getParentObj(), ddic.object);
+            this.scope.getDDICReferences().addUsing(this.scope.getParentObj(), { object: ddic.object, token: typeName.getFirstToken(), filename: this.filename });
             if (ddic.type instanceof _typed_identifier_1.TypedIdentifier) {
                 this.scope.addReference(typeName.getFirstToken(), ddic.type, _reference_1.ReferenceType.TypeReference, this.filename);
             }
@@ -469,7 +469,7 @@ class BasicTypes {
             foundType = found === null || found === void 0 ? void 0 : found.getType();
             if (foundType === undefined) {
                 const f = this.scope.getDDIC().lookupTableOrView(subs[0]);
-                this.scope.getDDICReferences().addUsing(this.scope.getParentObj(), f.object);
+                this.scope.getDDICReferences().addUsing(this.scope.getParentObj(), { object: f.object });
                 if (f.type instanceof _typed_identifier_1.TypedIdentifier) {
                     foundType = f.type.getType();
                 }

package/build/src/abap/5_syntax/statements/delete_cluster.js

@@ -13,7 +13,7 @@ class DeleteCluster {
         if (databaseName) {
             const found = (_a = scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(databaseName.concatTokens());
             if (found) {
-                scope.getDDICReferences().addUsing(scope.getParentObj(), found.object);
+                scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object });
             }
         }
     }

package/build/src/abap/5_syntax/statements/export.js

@@ -17,7 +17,7 @@ class Export {
         if (databaseName) {
             const found = (_a = scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(databaseName.concatTokens());
             if (found) {
-                scope.getDDICReferences().addUsing(scope.getParentObj(), found.object);
+                scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object });
             }
         }
     }

package/build/src/abap/5_syntax/statements/import.js

@@ -17,7 +17,7 @@ class Import {
         if (databaseName) {
             const found = (_a = scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(databaseName.concatTokens());
             if (found) {
-                scope.getDDICReferences().addUsing(scope.getParentObj(), found.object);
+                scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object });
             }
         }
     }

package/build/src/abap/5_syntax/statements/tables.js

@@ -17,7 +17,7 @@ class Tables {
         }
         const found = (_b = scope.getDDIC()) === null || _b === void 0 ? void 0 : _b.lookupTableOrView(name);
         if (found) {
-            scope.getDDICReferences().addUsing(scope.getParentObj(), found.object);
+            scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object });
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, found.type));
             return;
         }

package/build/src/ddic_references.js

@@ -50,9 +50,8 @@ class DDICReferences {
         for (const name in this.index) {
             for (const type in this.index[name]) {
                 for (const f of this.index[name][type]) {
-                    if (f.getType() === searchType && f.getName() === searchName) {
-                        ret.push({ type, name });
-                        break; // current outermost loop
+                    if (f.object && f.object.getType() === searchType && f.object.getName() === searchName) {
+                        ret.push({ type, name, token: f.token, filename: f.filename });
                     }
                 }
             }

package/build/src/objects/data_element.js

@@ -60,7 +60,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
             }
         }
         if (lookup.object) {
-            references.push(lookup.object);
+            references.push({ object: lookup.object });
         }
         reg.getDDICReferences().setUsing(this, references);
         return lookup.type;

package/build/src/objects/rename/rename_data_element.js

@@ -15,6 +15,8 @@ class RenameDataElement {
         const helper = new renamer_helper_1.RenamerHelper(this.reg);
         changes = changes.concat(helper.buildXMLFileEdits(obj, "ROLLNAME", oldName, newName));
         changes = changes.concat(helper.renameFiles(obj, oldName, newName));
+        changes = changes.concat(helper.renameDDICCodeReferences(obj, oldName, newName));
+        changes = changes.concat(helper.renameDDICTABLReferences(obj, oldName, newName));
         return {
             documentChanges: changes,
         };

package/build/src/objects/rename/rename_domain.js

@@ -15,6 +15,7 @@ class RenameDomain {
         const helper = new renamer_helper_1.RenamerHelper(this.reg);
         changes = changes.concat(helper.buildXMLFileEdits(obj, "DOMNAME", oldName, newName));
         changes = changes.concat(helper.renameFiles(obj, oldName, newName));
+        changes = changes.concat(helper.renameDDICDTELReferences(obj, oldName, newName));
         return {
             documentChanges: changes,
         };

package/build/src/objects/rename/rename_global_class.js

@@ -45,6 +45,7 @@ class RenameGlobalClass {
         changes = changes.concat(helper.buildXMLFileEdits(obj, "CLSNAME", oldName, newName));
         changes = changes.concat(helper.renameFiles(obj, oldName, newName));
         changes = changes.concat(helper.renameReferences(obj.getIdentifier(), oldName, newName));
+        changes = changes.concat(helper.renameDDICTABLReferences(obj, oldName, newName));
         return {
             documentChanges: changes,
         };

package/build/src/objects/rename/renamer_helper.js

@@ -27,9 +27,54 @@ class RenamerHelper {
         // start with the last reference in the file first, if there are multiple refs per line
         return this.replaceRefs(refs, oldName, newName).reverse();
     }
-    buildXMLFileEdits(clas, xmlTag, oldName, newName) {
+    renameDDICCodeReferences(obj, oldName, newName) {
         const changes = [];
-        const xml = clas.getXMLFile();
+        const used = this.reg.getDDICReferences().listWhereUsed(obj);
+        for (const u of used) {
+            if (u.token === undefined || u.filename === undefined) {
+                continue;
+            }
+            const range = vscode_languageserver_types_1.Range.create(u.token.getStart().getRow() - 1, u.token.getStart().getCol() - 1, u.token.getStart().getRow() - 1, u.token.getStart().getCol() - 1 + oldName.length);
+            changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: u.filename, version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, newName.toLowerCase())]));
+        }
+        return changes;
+    }
+    renameDDICTABLReferences(obj, oldName, newName) {
+        const changes = [];
+        const used = this.reg.getDDICReferences().listWhereUsed(obj);
+        const handled = {};
+        for (const u of used) {
+            if (u.type !== "TABL" || handled[u.name.toUpperCase()] === true) {
+                // a TABL might reference the object multiple times, but they are all fixes in one call to buildXMLFileEdits
+                continue;
+            }
+            const tabl = this.reg.getObject(u.type, u.name);
+            if (tabl === undefined) {
+                continue;
+            }
+            changes.push(...this.buildXMLFileEdits(tabl, "ROLLNAME", oldName, newName));
+            handled[u.name.toUpperCase()] = true;
+        }
+        return changes;
+    }
+    renameDDICDTELReferences(obj, oldName, newName) {
+        const changes = [];
+        const used = this.reg.getDDICReferences().listWhereUsed(obj);
+        for (const u of used) {
+            if (u.type !== "DTEL") {
+                continue;
+            }
+            const tabl = this.reg.getObject(u.type, u.name);
+            if (tabl === undefined) {
+                continue;
+            }
+            changes.push(...this.buildXMLFileEdits(tabl, "DOMNAME", oldName, newName));
+        }
+        return changes;
+    }
+    buildXMLFileEdits(object, xmlTag, oldName, newName) {
+        const changes = [];
+        const xml = object.getXMLFile();
         if (xml === undefined) {
             return [];
         }

package/build/src/objects/table.js

@@ -74,7 +74,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 const lookup = ddic.lookupDataElement(field.ROLLNAME);
                 components.push({ name: field.FIELDNAME, type: lookup.type });
                 if (lookup.object) {
-                    references.push(lookup.object);
+                    references.push({ object: lookup.object });
                 }
             }
             else if (field.FIELDNAME === ".INCLUDE" || field.FIELDNAME === ".INCLU--AP") { // incude or append structure
@@ -84,7 +84,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 const lookup = ddic.lookupTableOrView(field.PRECFIELD);
                 let found = lookup.type;
                 if (lookup.object) {
-                    references.push(lookup.object);
+                    references.push({ object: lookup.object });
                 }
                 if (found instanceof _typed_identifier_1.TypedIdentifier) {
                     found = found.getType();
@@ -119,7 +119,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 const lookup = ddic.lookupTableOrView(field.ROLLNAME);
                 components.push({ name: field.FIELDNAME, type: lookup.type });
                 if (lookup.object) {
-                    references.push(lookup.object);
+                    references.push({ object: lookup.object });
                 }
             }
             else if (comptype === "R") {
@@ -136,7 +136,7 @@ class Table extends _abstract_object_1.AbstractObject {
                     const lookup = ddic.lookupObject(field.ROLLNAME);
                     components.push({ name: field.FIELDNAME, type: lookup.type });
                     if (lookup.object) {
-                        references.push(lookup.object);
+                        references.push({ object: lookup.object });
                     }
                 }
             }
@@ -144,13 +144,13 @@ class Table extends _abstract_object_1.AbstractObject {
                 const lookup = ddic.lookupTableType(field.ROLLNAME);
                 components.push({ name: field.FIELDNAME, type: lookup.type });
                 if (lookup.object) {
-                    references.push(lookup.object);
+                    references.push({ object: lookup.object });
                 }
             }
             else if (comptype === "") { // built in
                 const datatype = field.DATATYPE;
                 if (datatype === undefined) {
-                    throw new Error("Expected DATATYPE");
+                    throw new Error("Expected DATATYPE, while parsing TABL " + this.getName());
                 }
                 const length = field.LENG ? field.LENG : field.INTLEN;
                 components.push({

package/build/src/objects/table_type.js

@@ -38,28 +38,28 @@ class TableType extends _abstract_object_1.AbstractObject {
             const lookup = ddic.lookupTableOrView(this.parsedXML.rowtype);
             type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
             if (lookup.object) {
-                references.push(lookup.object);
+                references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "E") {
             const lookup = ddic.lookupDataElement(this.parsedXML.rowtype);
             type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
             if (lookup.object) {
-                references.push(lookup.object);
+                references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "L") {
             const lookup = ddic.lookupTableType(this.parsedXML.rowtype);
             type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
             if (lookup.object) {
-                references.push(lookup.object);
+                references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype !== undefined) {
             const lookup = ddic.lookupObject(this.parsedXML.rowtype);
             type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
             if (lookup.object) {
-                references.push(lookup.object);
+                references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "") {

package/build/src/objects/view.js

@@ -37,7 +37,7 @@ class View extends _abstract_object_1.AbstractObject {
             const lookup = ddic.lookupTableOrView(field.TABNAME);
             let found = lookup.type;
             if (lookup.object) {
-                references.push(lookup.object);
+                references.push({ object: lookup.object });
             }
             if (field.VIEWFIELD === ".APPEND") {
                 // it is already expanded in the abapGit xml

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.79.9";
+        return "2.79.13";
     }
     getDDICReferences() {
         return this.references;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.79.9",
+    "version": "2.79.13",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",