@abaplint/core 2.86.4 → 2.86.7

package/build/src/registry.js

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

package/build/src/rules/double_space.js

@@ -56,6 +56,7 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
                 && !(s.get() instanceof _statement_1.Unknown)
                 && !(s.get() instanceof statements_1.MethodDef)
                 && !(s.get() instanceof _statement_1.MacroCall)
+                && !(s.get() instanceof statements_1.Events)
                 && !(s.get() instanceof _statement_1.MacroContent)) {
                 issues = issues.concat(this.checkKeywords(s, file));
             }

package/build/src/rules/downport.js

@@ -267,6 +267,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceMethodConditional(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.replaceTableExpression(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -894,15 +898,19 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d;
+        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();
+        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 = (_c = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            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) {
@@ -915,12 +923,12 @@ ${indentation}    output = ${topTarget}.`;
             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 = (_d = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _d === void 0 ? void 0 : _d.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);
@@ -1023,12 +1031,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;
@@ -1048,7 +1056,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 +
@@ -1135,6 +1143,7 @@ ${indentation}    output = ${topTarget}.`;
                 body += indentation + end;
             }
             const abap = `DATA ${uniqueName} ${type}.\n` +
+                indentation + `CLEAR ${uniqueName}.\n` + // might be called inside a loop
                 body +
                 indentation;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
@@ -1303,6 +1312,7 @@ ${indentation}    output = ${topTarget}.`;
     buildCondBody(body, uniqueName, indent, lowFile, highSyntax) {
         let code = "";
         let first = true;
+        let addElse = true;
         for (const c of body.getChildren()) {
             if (c instanceof nodes_1.TokenNode) {
                 switch (c.getFirstToken().getStr().toUpperCase()) {
@@ -1320,6 +1330,7 @@ ${indentation}    output = ${topTarget}.`;
                         break;
                     case "ELSE":
                         code += indent + "ELSE.\n";
+                        addElse = false;
                         break;
                     default:
                         throw "buildCondBody, unexpected token";
@@ -1338,6 +1349,11 @@ ${indentation}    output = ${topTarget}.`;
                 throw "buildCondBody, unexpected expression, " + c.get().constructor.name;
             }
         }
+        if (addElse) {
+            // COND might be called inside a loop
+            code += indent + "ELSE.\n";
+            code += indent + `  CLEAR ${uniqueName}.\n`;
+        }
         code += indent + "ENDIF.\n";
         code += indent;
         return code;
@@ -1348,6 +1364,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;
@@ -1359,7 +1379,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);
         }
@@ -1420,6 +1440,18 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
+    replaceMethodConditional(node, lowFile, _highSyntax) {
+        for (const c of node.findAllExpressionsRecursive(Expressions.Compare)) {
+            const chain = c.findDirectExpression(Expressions.MethodCallChain);
+            if (chain === undefined) {
+                continue;
+            }
+            const end = chain.getLastToken().getEnd();
+            const fix = edit_helper_1.EditHelper.insertAt(lowFile, end, " IS NOT INITIAL");
+            return issue_1.Issue.atToken(lowFile, chain.getFirstToken(), "Downport method conditional", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceContains(node, lowFile, highSyntax) {
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         // only downport if its an single method call condition

package/build/src/rules/keyword_case.js

@@ -141,12 +141,16 @@ class KeywordCase extends _abap_rule_1.ABAPRule {
             }
         }
         const skip = new Skip(this.getConfig());
+        let prev = undefined;
         for (const statement of file.getStatements()) {
             if (skip.skipStatement(statement) === true) {
                 continue;
             }
             let result = this.traverse(statement, statement.get());
             if (result.length > 0) {
+                if (prev && result[0].token.getStart().equals(prev.getStart())) {
+                    continue;
+                }
                 if (statement.getColon() !== undefined) {
                     // if its a chained statement, go token by token
                     result = [result[0]];
@@ -156,6 +160,7 @@ class KeywordCase extends _abap_rule_1.ABAPRule {
                 if (issues.length > MAX_ISSUES) {
                     break;
                 }
+                prev = result[0].token;
             }
         }
         return issues;

package/package.json

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