@abaplint/core 2.93.79 → 2.93.81

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.79";
+        return "2.93.81";
     }
     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 {
@@ -1459,28 +1460,40 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let body = "";
         let end = "";
         const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-        let loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        const of = (_c = forLoop.findExpressionAfterToken("OF")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        let loopTargetFieldExpression = forLoop.findFirstExpression(Expressions.TargetField);
+        let loopTargetFieldName = loopTargetFieldExpression === null || loopTargetFieldExpression === void 0 ? void 0 : loopTargetFieldExpression.concatTokens();
+        const of = forLoop.findExpressionAfterToken("OF");
         if (of !== undefined) {
-            loopTargetField = of;
-        }
-        if (((_e = (_d = forLoop.findDirectExpression(Expressions.InlineLoopDefinition)) === null || _d === void 0 ? void 0 : _d.getFirstChild()) === null || _e === void 0 ? void 0 : _e.get()) instanceof Expressions.TargetFieldSymbol) {
-            loopTargetField = undefined;
+            loopTargetFieldExpression = of;
+            loopTargetFieldName = of === null || of === void 0 ? void 0 : of.concatTokens();
+        }
+        if (((_c = (_b = forLoop.findDirectExpression(Expressions.InlineLoopDefinition)) === null || _b === void 0 ? void 0 : _b.getFirstChild()) === null || _c === void 0 ? void 0 : _c.get()) instanceof Expressions.TargetFieldSymbol) {
+            loopTargetFieldExpression = undefined;
+            loopTargetFieldName = undefined;
+        }
+        if (loopTargetFieldExpression) {
+            const start = loopTargetFieldExpression.getFirstToken().getStart();
+            const spag = highSyntax.spaghetti.lookupPosition(start, lowFile.getFilename());
+            if (loopTargetFieldName && spag) {
+                if (this.isDuplicateName(spag, loopTargetFieldName, start)) {
+                    this.renameVariable(spag, loopTargetFieldName, start, lowFile, highSyntax);
+                }
+            }
         }
-        let cond = ((_f = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || "";
+        let cond = ((_d = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
         if (cond !== "") {
             cond = " WHERE " + cond;
         }
         const loop = forLoop.findDirectExpression(Expressions.InlineLoopDefinition);
-        const indexInto = (_g = loop === null || loop === void 0 ? void 0 : loop.findExpressionAfterToken("INTO")) === null || _g === void 0 ? void 0 : _g.concatTokens();
+        const indexInto = (_e = loop === null || loop === void 0 ? void 0 : loop.findExpressionAfterToken("INTO")) === null || _e === void 0 ? void 0 : _e.concatTokens();
         if (forLoop.findDirectTokenByText("UNTIL")
             || forLoop.findDirectTokenByText("WHILE")) {
             const fieldDef = forLoop.findDirectExpression(Expressions.InlineFieldDefinition);
-            const field = (_h = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _h === void 0 ? void 0 : _h.concatTokens();
+            const field = (_f = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _f === void 0 ? void 0 : _f.concatTokens();
             const indexBackup = this.uniqueName(forLoop.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             body += indentation + "DATA " + field + " TYPE i.\n";
             const second = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.getChildren()[2];
@@ -1502,10 +1515,10 @@ ${indentation}    output = ${topTarget}.`;
             }
             end += indentation + "ENDWHILE";
         }
-        else if (loopTargetField !== undefined) {
-            let from = (_j = forLoop.findExpressionAfterToken("FROM")) === null || _j === void 0 ? void 0 : _j.concatTokens();
+        else if (loopTargetFieldName !== undefined) {
+            let from = (_g = forLoop.findExpressionAfterToken("FROM")) === null || _g === void 0 ? void 0 : _g.concatTokens();
             from = from ? " FROM " + from : "";
-            let to = (_k = forLoop.findExpressionAfterToken("TO")) === null || _k === void 0 ? void 0 : _k.concatTokens();
+            let to = (_h = forLoop.findExpressionAfterToken("TO")) === null || _h === void 0 ? void 0 : _h.concatTokens();
             to = to ? " TO " + to : "";
             let gby = "";
             for (const lg of forLoop.findDirectExpressions(Expressions.LoopGroupByComponent)) {
@@ -1542,19 +1555,19 @@ ${indentation}    output = ${topTarget}.`;
                 inGroup = "-items";
             }
             let into = "INTO DATA";
-            if (loopTargetField.startsWith("<")) {
+            if (loopTargetFieldName.startsWith("<")) {
                 into = "ASSIGNING FIELD-SYMBOL";
             }
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource}${inGroup} ${into}(${loopTargetField})${from}${to}${cond}${gby}.\n`;
+            body += indentation + `LOOP AT ${loopSource}${inGroup} ${into}(${loopTargetFieldName})${from}${to}${cond}${gby}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
             }
             end = "ENDLOOP";
         }
-        else if (loopTargetField === undefined) {
+        else if (loopTargetFieldName === undefined) {
             // todo, also backup sy-index / sy-tabix here?
-            const loopTargetFieldSymbol = (_l = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _l === void 0 ? void 0 : _l.concatTokens();
+            const loopTargetFieldSymbol = (_j = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _j === void 0 ? void 0 : _j.concatTokens();
             body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol})${cond}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
@@ -1934,9 +1947,15 @@ ${indentation}    output = ${topTarget}.`;
     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;
@@ -1949,16 +1968,29 @@ ${indentation}    output = ${topTarget}.`;
         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;
+    findRecursiveDuplicate(spag, name, skip) {
+        const found = spag.findVariable(name);
+        if ((found === null || found === void 0 ? void 0 : found.getStart().equals(skip)) === false) {
+            return found;
+        }
+        for (const child of (spag === null || spag === void 0 ? void 0 : spag.getChildren()) || []) {
+            const sub = this.findRecursiveDuplicate(child, name, skip);
+            if (sub) {
+                return sub;
             }
         }
-        return isDuplicate;
+        return undefined;
+    }
+    isDuplicateName(spag, name, pos) {
+        let parent = 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 this.findRecursiveDuplicate(parent, name, pos) !== undefined;
     }
     findType(i, lowFile, highSyntax, ref = false) {
         var _a;

package/package.json

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