@abaplint/core 2.86.2 → 2.86.5

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -894,36 +894,37 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e;
         let body = "";
         let end = "";
         const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
         const loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        if (forLoop.findDirectTokenByText("UNTIL")) {
-            const name = (_c = forLoop.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-            body += indentation + "DATA " + name + " TYPE i.\n";
+        let cond = ((_c = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+        if (cond !== "") {
+            cond = " WHERE " + cond;
+        }
+        if (forLoop.findDirectTokenByText("UNTIL")
+            || forLoop.findDirectTokenByText("WHILE")) {
+            const fieldDef = forLoop.findDirectExpression(Expressions.InlineFieldDefinition);
+            const field = (_d = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _d === void 0 ? void 0 : _d.concatTokens();
+            body += indentation + "DATA " + field + " TYPE i.\n";
+            const second = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.getChildren()[2];
+            if ((second === null || second === void 0 ? void 0 : second.get()) instanceof Expressions.Source) {
+                body += indentation + field + " = " + second.concatTokens() + ".\n";
+            }
+            const not = forLoop.findDirectTokenByText("UNTIL") ? " NOT" : "";
             const cond = forLoop.findFirstExpression(Expressions.Cond);
-            body += indentation + `WHILE NOT ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
-            const field = (_e = (_d = forLoop.findDirectExpression(Expressions.InlineFieldDefinition)) === null || _d === void 0 ? void 0 : _d.findFirstExpression(Expressions.Field)) === null || _e === void 0 ? void 0 : _e.concatTokens();
-            end += `  ${field} = ${field} + 1.\n`;
-            end += indentation + "ENDWHILE";
-        }
-        else if (forLoop.findDirectTokenByText("WHILE")) {
-            const name = (_f = forLoop.findFirstExpression(Expressions.Field)) === null || _f === void 0 ? void 0 : _f.concatTokens();
-            body += indentation + "DATA " + name + " TYPE i.\n";
-            const cond = forLoop.findFirstExpression(Expressions.Cond);
-            body += indentation + `WHILE ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
-            const field = (_h = (_g = forLoop.findDirectExpression(Expressions.InlineFieldDefinition)) === null || _g === void 0 ? void 0 : _g.findFirstExpression(Expressions.Field)) === null || _h === void 0 ? void 0 : _h.concatTokens();
+            body += indentation + `WHILE${not} ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
             end += `  ${field} = ${field} + 1.\n`;
             end += indentation + "ENDWHILE";
         }
         else if (loopTargetField) {
-            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField}).\n`;
+            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${cond}.\n`;
             end = "ENDLOOP";
         }
         else if (loopTargetField === undefined) {
-            const loopTargetFieldSymbol = (_j = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _j === void 0 ? void 0 : _j.concatTokens();
-            body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol}).\n`;
+            const loopTargetFieldSymbol = (_e = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+            body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol})${cond}.\n`;
             end = "ENDLOOP";
         }
         const l = forLoop.findDirectExpression(Expressions.Let);
@@ -1026,12 +1027,12 @@ ${indentation}    output = ${topTarget}.`;
                 name = init.getFirstToken().getStr();
                 body += indentation + `DATA(${name}) = ${(_a = reduceBody.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens()}.\n`;
             }
-            const forLoop = reduceBody.findDirectExpression(Expressions.For);
-            if (forLoop === undefined) {
-                continue;
+            let end = "";
+            for (const forLoop of (reduceBody === null || reduceBody === void 0 ? void 0 : reduceBody.findDirectExpressions(Expressions.For)) || []) {
+                const outlineFor = this.outlineFor(forLoop, indentation, lowFile, highSyntax);
+                body += outlineFor.body;
+                end = outlineFor.end + `.\n` + end;
             }
-            const outlineFor = this.outlineFor(forLoop, indentation, lowFile, highSyntax);
-            body += outlineFor.body;
             const next = reduceBody.findDirectExpression(Expressions.ReduceNext);
             if (next === undefined) {
                 continue;
@@ -1051,7 +1052,7 @@ ${indentation}    output = ${topTarget}.`;
                     body += concat;
                 }
             }
-            body += indentation + outlineFor.end + `.\n`;
+            body += indentation + end;
             body += indentation + `${uniqueName} = ${name}.\n`;
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 body +
@@ -1351,6 +1352,10 @@ ${indentation}    output = ${topTarget}.`;
             if (i.getFirstToken().getStr().toUpperCase() !== "CONV") {
                 continue;
             }
+            const end = i.findDirectTokenByText(")");
+            if (end === undefined) {
+                continue;
+            }
             const body = (_a = i.findDirectExpression(Expressions.ConvBody)) === null || _a === void 0 ? void 0 : _a.concatTokens();
             if (body === undefined) {
                 continue;
@@ -1362,7 +1367,7 @@ ${indentation}    output = ${topTarget}.`;
                 indent + `${uniqueName} = ${body}.\n` +
                 indent;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
-            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), end.getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Downport CONV", this.getMetadata().key, this.conf.severity, fix);
         }

package/build/src/rules/no_aliases.js

@@ -19,6 +19,7 @@ class NoAliases extends _abap_rule_1.ABAPRule {
             key: "no_aliases",
             title: "No ALIASES",
             shortDescription: `Detects use of the ALIAS statement`,
+            extendedInformation: `Only one issue is reported for chained statements`,
             tags: [_irule_1.RuleTag.SingleFile],
         };
     }
@@ -31,9 +32,14 @@ class NoAliases extends _abap_rule_1.ABAPRule {
     runParsed(file) {
         const issues = [];
         const message = "Do not use ALIASES";
+        let prev = undefined;
         for (const stat of file.getStatements()) {
             if (stat.get() instanceof Statements.Aliases) {
+                if (prev && prev.getColon() === stat.getColon()) {
+                    continue;
+                }
                 issues.push(issue_1.Issue.atStatement(file, stat, message, this.getMetadata().key, this.conf.severity));
+                prev = stat;
             }
         }
         return issues;

package/build/src/rules/unnecessary_chaining.js

@@ -33,7 +33,6 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
         this.conf = conf;
     }
     runParsed(file) {
-        var _a;
         const issues = [];
         const statements = file.getStatements();
         for (let i = 0; i < statements.length; i++) {
@@ -41,15 +40,20 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
             if (colon === undefined) {
                 continue;
             }
-            // find the next non Comment statement
             let j = 1;
             let nextStatement = statements[i + j];
             while ((nextStatement === null || nextStatement === void 0 ? void 0 : nextStatement.get()) instanceof _statement_1.Comment) {
                 j++;
                 nextStatement = statements[i + j];
             }
+            j = 1;
+            let prevStatement = statements[i - j];
+            while ((prevStatement === null || prevStatement === void 0 ? void 0 : prevStatement.get()) instanceof _statement_1.Comment) {
+                j--;
+                prevStatement = statements[i - j];
+            }
             const next = nextStatement === null || nextStatement === void 0 ? void 0 : nextStatement.getColon();
-            const prev = (_a = statements[i - 1]) === null || _a === void 0 ? void 0 : _a.getColon();
+            const prev = prevStatement === null || prevStatement === void 0 ? void 0 : prevStatement.getColon();
             if (next !== undefined && colon.getStart().equals(next.getStart())) {
                 continue;
             }

package/build/src/rules/unused_types.js

@@ -36,25 +36,6 @@ class WorkArea {
         return this.workarea.length;
     }
 }
-/*
-function removeDuplicates(list: readonly TypedIdentifier[]): readonly TypedIdentifier[] {
-  const deduplicated: TypedIdentifier[] = [];
-  for (const result of list) {
-    let cont = false;
-    for (const d of deduplicated) {
-      if (result.getStart().equals(d.getStart())) {
-        cont = true;
-        break;
-      }
-    }
-    if (cont === true) {
-      continue;
-    }
-    deduplicated.push(result);
-  }
-  return deduplicated;
-}
-*/
 class UnusedTypesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -149,7 +130,6 @@ class UnusedTypes {
         }
     }
     checkNode(node, obj, add) {
-        var _a;
         const ret = [];
         if (add === true) {
             const types = node.getData().types;
@@ -158,7 +138,8 @@ class UnusedTypes {
                 if (obj.containsFile(identifier.getFilename()) === false) {
                     continue;
                 }
-                else if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
+                else if (this.conf.skipNames
+                    && this.conf.skipNames.length > 0
                     && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
                     continue;
                 }

package/build/src/rules/unused_variables.js

@@ -138,7 +138,6 @@ Unused variables are not reported if the object contains syntax errors. Errors f
         }
     }
     buildWorkarea(node, obj) {
-        var _a;
         const stype = node.getIdentifier().stype;
         if (stype === _scope_type_1.ScopeType.OpenSQL) {
             return;
@@ -150,7 +149,8 @@ Unused variables are not reported if the object contains syntax errors. Errors f
             const vars = node.getData().vars;
             for (const name in vars) {
                 const meta = vars[name].getMeta();
-                if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
+                if (this.conf.skipNames
+                    && this.conf.skipNames.length > 0
                     && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
                     continue;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.86.2",
+    "version": "2.86.5",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,7 +45,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.19.5",
+        "@microsoft/api-extractor": "^7.20.0",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
         "@types/node": "^17.0.23",