@abaplint/core 2.86.5 → 2.86.8

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.86.5";
+        return "2.86.8";
     }
     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;
@@ -511,16 +515,29 @@ ${indentation}`);
     }
     tableCondition(tableExpression) {
         let condition = "";
+        let keyName = "";
         for (const c of tableExpression.getChildren() || []) {
             if (c.getFirstToken().getStr() === "[" || c.getFirstToken().getStr() === "]") {
                 continue;
             }
             else if (c.get() instanceof Expressions.ComponentChainSimple && condition === "") {
-                condition = "WITH KEY ";
+                if (keyName === "") {
+                    condition = "WITH KEY ";
+                }
+                else {
+                    condition = "WITH TABLE KEY " + keyName + " COMPONENTS ";
+                }
             }
             else if (c.get() instanceof Expressions.Source && condition === "") {
                 condition = "INDEX ";
             }
+            else if (c instanceof nodes_1.TokenNode && c.getFirstToken().getStr().toUpperCase() === "KEY") {
+                continue;
+            }
+            else if (c.get() instanceof Expressions.SimpleName) {
+                keyName = c.concatTokens();
+                continue;
+            }
             condition += c.concatTokens() + " ";
         }
         return condition;
@@ -1139,6 +1156,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);
@@ -1307,6 +1325,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()) {
@@ -1324,6 +1343,7 @@ ${indentation}    output = ${topTarget}.`;
                         break;
                     case "ELSE":
                         code += indent + "ELSE.\n";
+                        addElse = false;
                         break;
                     default:
                         throw "buildCondBody, unexpected token";
@@ -1342,6 +1362,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;
@@ -1428,6 +1453,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/build/src/rules/unsecure_fae.js

@@ -20,7 +20,7 @@ class UnsecureFAE {
             title: "Unsecure FAE",
             shortDescription: `Checks for unsecure FAE`,
             extendedInformation: `Issues from rule check_syntax must be fixed before this rule takes effect`,
-            tags: [_irule_1.RuleTag.Experimental],
+            tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Performance],
         };
     }
     getConfig() {

package/package.json

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