@abaplint/core 2.93.80 → 2.93.82

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

@@ -8,11 +8,23 @@ const component_compare_1 = require("../expressions/component_compare");
 const component_cond_1 = require("../expressions/component_cond");
 class DeleteInternal {
     runSyntax(node, scope, filename) {
+        var _a;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
-        for (const t of node.findDirectExpressions(Expressions.Target)) {
-            new target_1.Target().runSyntax(t, scope, filename);
+        const target = node.findDirectExpression(Expressions.Target);
+        if (target) {
+            let tabl = undefined;
+            if (node.getChildren().length === 5 && node.getChildren()[2].concatTokens().toUpperCase() === "FROM") {
+                // it might be a database table
+                tabl = (_a = scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(target.concatTokens());
+                if (tabl) {
+                    scope.getDDICReferences().addUsing(scope.getParentObj(), { object: tabl.object });
+                }
+            }
+            if (tabl === undefined) {
+                new target_1.Target().runSyntax(target, scope, filename);
+            }
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
             new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -24,6 +24,7 @@ const tokens_1 = require("../abap/1_lexer/tokens");
 const include_graph_1 = require("../utils/include_graph");
 const objects_1 = require("../objects");
 const _builtin_1 = require("../abap/5_syntax/_builtin");
+const _scope_type_1 = require("../abap/5_syntax/_scope_type");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -35,6 +36,83 @@ class SkipToNextFile extends Error {
         this.issue = issue;
     }
 }
+class SpagHelper {
+    constructor(spag) {
+        this.spag = spag;
+    }
+    renameVariable(oldName, pos, lowFile, newName) {
+        let fix = undefined;
+        const references = this.findReferences(oldName, pos);
+        references.sort((a, b) => {
+            if (a.start.equals(b.start)) {
+                return 0;
+            }
+            return a.start.isAfter(b.start) ? 1 : -1;
+        });
+        for (const r of references) {
+            const replace = edit_helper_1.EditHelper.replaceRange(lowFile, r.start, r.end, newName);
+            if (fix === undefined) {
+                fix = replace;
+            }
+            else {
+                fix = edit_helper_1.EditHelper.merge(replace, fix);
+            }
+        }
+        return fix;
+    }
+    findReferences(name, pos) {
+        var _a, _b;
+        const positions = [];
+        function has(element) {
+            return positions.some(a => a.start.equals(element.start));
+        }
+        for (const r of this.spag.getData().references) {
+            if (((_a = r.resolved) === null || _a === void 0 ? void 0 : _a.getName()) === name && ((_b = r.resolved) === null || _b === void 0 ? void 0 : _b.getStart().equals(pos))) {
+                const sub = {
+                    start: r.position.getStart(),
+                    end: r.position.getEnd(),
+                };
+                if (has(sub) === false) {
+                    positions.push(sub);
+                }
+            }
+        }
+        for (const child of this.spag.getChildren()) {
+            const subPositions = new SpagHelper(child).findReferences(name, pos);
+            for (const sub of subPositions) {
+                if (has(sub) === false) {
+                    positions.push(sub);
+                }
+            }
+        }
+        return positions;
+    }
+    findRecursiveDuplicate(name, skip) {
+        var _a;
+        const found = this.spag.findVariable(name);
+        if ((found === null || found === void 0 ? void 0 : found.getStart().equals(skip)) === false) {
+            return found;
+        }
+        for (const child of ((_a = this.spag) === null || _a === void 0 ? void 0 : _a.getChildren()) || []) {
+            const sub = new SpagHelper(child).findRecursiveDuplicate(name, skip);
+            if (sub) {
+                return sub;
+            }
+        }
+        return undefined;
+    }
+    isDuplicateName(name, pos) {
+        let parent = this.spag.getParent();
+        while ((parent === null || parent === void 0 ? void 0 : parent.getIdentifier().stype) === _scope_type_1.ScopeType.Let
+            || (parent === null || parent === void 0 ? void 0 : parent.getIdentifier().stype) === _scope_type_1.ScopeType.For) {
+            parent = parent.getParent();
+        }
+        if (parent === undefined) {
+            return undefined;
+        }
+        return new SpagHelper(parent).findRecursiveDuplicate(name, pos) !== undefined;
+    }
+}
 class Downport {
     constructor() {
         this.conf = new DownportConf();
@@ -1478,7 +1556,7 @@ ${indentation}    output = ${topTarget}.`;
             const start = loopTargetFieldExpression.getFirstToken().getStart();
             const spag = highSyntax.spaghetti.lookupPosition(start, lowFile.getFilename());
             if (loopTargetFieldName && spag) {
-                if (this.isDuplicateName(spag, loopTargetFieldName, start)) {
+                if (new SpagHelper(spag).isDuplicateName(loopTargetFieldName, start)) {
                     this.renameVariable(spag, loopTargetFieldName, start, lowFile, highSyntax);
                 }
             }
@@ -1725,6 +1803,11 @@ ${indentation}    output = ${topTarget}.`;
                 if (firstName === "") {
                     firstName = name;
                 }
+                // TODO TODO TODO, WORK IN PROGRESS
+                const spag = highSyntax.spaghetti.lookupPosition(init.getFirstToken().getStart(), lowFile.getFilename());
+                if (spag && new SpagHelper(spag).isDuplicateName(name, init.getFirstToken().getStart())) {
+                    this.renameVariable(spag, name, init.getFirstToken().getStart(), lowFile, highSyntax);
+                }
                 const s = (_a = init.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                 const t = (_b = init.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 if (s) {
@@ -1923,7 +2006,7 @@ ${indentation}    output = ${topTarget}.`;
             if (spag === undefined) {
                 continue;
             }
-            if (this.isDuplicateName(spag, name, c.getFirstToken().getStart())) {
+            if (new SpagHelper(spag).isDuplicateName(name, c.getFirstToken().getStart())) {
                 this.renameVariable(spag, name, c.getFirstToken().getStart(), lowFile, highSyntax);
             }
             const found = spag.findVariable(name);
@@ -1944,40 +2027,11 @@ ${indentation}    output = ${topTarget}.`;
         return ret;
     }
     renameVariable(spag, name, pos, lowFile, highSyntax) {
-        var _a, _b;
-        const uniqueName = this.uniqueName(pos, lowFile.getFilename(), highSyntax);
-        const positions = new Set();
-        let fix = undefined;
-        for (const r of spag.getData().references) {
-            if (((_a = r.resolved) === null || _a === void 0 ? void 0 : _a.getName()) === name && ((_b = r.resolved) === null || _b === void 0 ? void 0 : _b.getStart().equals(pos))) {
-                const key = JSON.stringify(r.position.getStart());
-                if (positions.has(key)) {
-                    continue;
-                }
-                positions.add(key);
-                const replace = edit_helper_1.EditHelper.replaceRange(lowFile, r.position.getStart(), r.position.getEnd(), uniqueName);
-                if (fix === undefined) {
-                    fix = replace;
-                }
-                else {
-                    fix = edit_helper_1.EditHelper.merge(replace, fix);
-                }
-            }
-        }
+        const newName = this.uniqueName(pos, lowFile.getFilename(), highSyntax);
+        const fix = new SpagHelper(spag).renameVariable(name, pos, lowFile, newName);
         const issue = issue_1.Issue.atPosition(lowFile, pos, "Rename before outline", this.getMetadata().key, this.conf.severity, fix);
         throw new SkipToNextFile(issue);
     }
-    isDuplicateName(spag, name, pos) {
-        var _a;
-        let isDuplicate = false;
-        for (const child of ((_a = spag.getParent()) === null || _a === void 0 ? void 0 : _a.getChildren()) || []) {
-            const found = child.findVariable(name);
-            if ((found === null || found === void 0 ? void 0 : found.getStart().equals(pos)) === false) {
-                isDuplicate = true;
-            }
-        }
-        return isDuplicate;
-    }
     findType(i, lowFile, highSyntax, ref = false) {
         var _a;
         const expr = i.findDirectExpression(Expressions.TypeNameOrInfer);

package/package.json

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