@abaplint/core 2.85.24 → 2.85.25

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -44,19 +44,21 @@ Current rules:
 * CONV is outlined
 * COND is outlined
 * REDUCE is outlined
+* SWITCH is outlined
+* APPEND expression is outlined
 * EMPTY KEY is changed to DEFAULT KEY, opposite of DEFAULT KEY in https://rules.abaplint.org/avoid_use/
 * CAST changed to ?=
 * LOOP AT method_call( ) is outlined
 * VALUE # with structure fields
 * VALUE # with internal table lines
-* Table Expressions[ index ] are outlined
+* Table Expressions are outlined
 * SELECT INTO @DATA definitions are outlined
 * Some occurrences of string template formatting option ALPHA changed to function module call
 * SELECT/INSERT/MODIFY/DELETE/UPDATE "," in field list removed, "@" in source/targets removed
 * PARTIALLY IMPLEMENTED removed, it can be quick fixed via rule implement_methods
 * RAISE EXCEPTION ... MESSAGE
-* APPEND expression is outlined
 * Moving with +=, -=, /=, *=, &&= is expanded
+* line_exists and line_index is downported to READ TABLE
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -192,6 +194,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineSwitch(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.outlineCast(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -224,7 +230,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceLineExists(high, lowFile, highSyntax);
+        found = this.replaceLineFunctions(high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -408,16 +414,11 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         return undefined;
     }
     replaceTableExpression(node, lowFile, highSyntax) {
-        var _a;
         for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {
             const tableExpression = fieldChain.findDirectExpression(Expressions.TableExpression);
             if (tableExpression === undefined) {
                 continue;
             }
-            if (tableExpression.getChildren().length > 3) {
-                // for now, only support the INDEX scenario
-                continue;
-            }
             let pre = "";
             let startToken = undefined;
             for (const child of fieldChain.getChildren()) {
@@ -432,11 +433,24 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
             if (startToken === undefined) {
                 continue;
             }
+            let condition = "";
+            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 ";
+                }
+                else if (c.get() instanceof Expressions.Source && condition === "") {
+                    condition = "INDEX ";
+                }
+                condition += c.concatTokens() + " ";
+            }
             const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const firstToken = node.getFirstToken();
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${pre}.
-${indentation}READ TABLE ${pre} INDEX ${(_a = tableExpression.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens()} INTO ${uniqueName}.
+${indentation}READ TABLE ${pre} ${condition}INTO ${uniqueName}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
 ${indentation}ENDIF.
@@ -735,6 +749,67 @@ ${indentation}    output = ${topTarget}.`;
         }
         return { body, end };
     }
+    outlineSwitch(node, lowFile, highSyntax) {
+        var _a, _b;
+        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+            const firstToken = i.getFirstToken();
+            if (firstToken.getStr().toUpperCase() !== "SWITCH") {
+                continue;
+            }
+            const type = this.findType(i, lowFile, highSyntax);
+            if (type === undefined) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            let body = "";
+            let name = "";
+            const switchBody = i.findDirectExpression(Expressions.SwitchBody);
+            if (switchBody === undefined) {
+                continue;
+            }
+            for (const l of ((_a = switchBody === null || switchBody === void 0 ? void 0 : switchBody.findDirectExpression(Expressions.Let)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.InlineFieldDefinition)) || []) {
+                name = l.getFirstToken().getStr();
+                body += indentation + `DATA(${name}) = ${(_b = switchBody.findFirstExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens()}.\n`;
+            }
+            body += `DATA ${uniqueName} TYPE ${type}.\n`;
+            let firstSource = false;
+            let inWhen = false;
+            for (const c of switchBody.getChildren()) {
+                if (c.get() instanceof Expressions.Source && firstSource === false) {
+                    body += indentation + `CASE ${c.concatTokens()}.`;
+                    firstSource = true;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "THEN") {
+                    inWhen = true;
+                    body += ".\n";
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "WHEN") {
+                    inWhen = false;
+                    body += `\n${indentation}  WHEN `;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "OR") {
+                    body += ` OR `;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "ELSE") {
+                    inWhen = true;
+                    body += `\n${indentation}  WHEN OTHERS.\n`;
+                }
+                else if (inWhen === false) {
+                    body += c.concatTokens();
+                }
+                else {
+                    body += indentation + "    " + uniqueName + " = " + c.concatTokens() + ".";
+                }
+            }
+            body += "\n" + indentation + "ENDCASE.\n" + indentation;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), body);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, firstToken, "Downport SWITCH", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     outlineReduce(node, lowFile, highSyntax) {
         var _a;
         for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
@@ -1101,12 +1176,13 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceLineExists(node, lowFile, highSyntax) {
+    replaceLineFunctions(node, lowFile, highSyntax) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
+            const func = r.position.getName().toUpperCase();
             if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
-                && r.position.getName().toUpperCase() === "LINE_EXISTS") {
+                && (func === "LINE_EXISTS" || func === "LINE_INDEX")) {
                 const token = r.position.getToken();
                 const expression = this.findMethodCallExpression(node, token);
                 if (expression === undefined) {
@@ -1120,19 +1196,23 @@ ${indentation}    output = ${topTarget}.`;
                     else if (c.get() instanceof Expressions.ComponentChainSimple && condition === "") {
                         condition = "WITH KEY ";
                     }
+                    else if (c.get() instanceof Expressions.Source && condition === "") {
+                        condition = "INDEX ";
+                    }
                     condition += c.concatTokens() + " ";
                 }
                 const tableName = (_b = expression === null || expression === void 0 ? void 0 : expression.findFirstExpression(Expressions.SourceField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
                 const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+                const sy = func === "LINE_EXISTS" ? "sy-subrc" : "sy-tabix";
                 const code = `DATA ${uniqueName} LIKE sy-subrc.\n` +
                     indentation + `READ TABLE ${tableName} ${condition}TRANSPORTING NO FIELDS.\n` +
-                    indentation + uniqueName + " = sy-subrc.\n" +
+                    indentation + uniqueName + ` = ${sy}.\n` +
                     indentation;
                 const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
                 const start = expression.getFirstToken().getStart();
                 const end = expression.getLastToken().getEnd();
-                const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + " = 0");
+                const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + (func === "LINE_EXISTS" ? " = 0" : ""));
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
                 return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.24",
+    "version": "2.85.25",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@types/mocha": "^9.1.0",
         "@types/node": "^17.0.21",
         "chai": "^4.3.6",
-        "eslint": "^8.9.0",
+        "eslint": "^8.10.0",
         "mocha": "^9.2.1",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",