@abaplint/core 2.85.44 → 2.85.47

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -191,6 +191,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.moveWithTableTarget(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.downportSelectInline(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -259,6 +263,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceContains(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.replaceTableExpression(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -702,7 +710,38 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const start = high.getFirstToken().getStart();
         const end = high.getLastToken().getStart();
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
-        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, Reduce statement", this.getMetadata().key, this.conf.severity, fix);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple move", this.getMetadata().key, this.conf.severity, fix);
+    }
+    moveWithTableTarget(node, high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Move)) {
+            return undefined;
+        }
+        const target = high.findDirectExpression(Expressions.Target);
+        if (target === undefined) {
+            return undefined;
+        }
+        const tableExpression = target.findDirectExpression(Expressions.TableExpression);
+        if (tableExpression === undefined) {
+            return undefined;
+        }
+        const index = tableExpression.findDirectExpression(Expressions.Source);
+        if (index === undefined) {
+            return undefined;
+        }
+        let uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        uniqueName = `<${uniqueName}>`;
+        const tName = target.concatTokens().split("[")[0];
+        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+        const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.
+${indentation}READ TABLE ${tName} INDEX ${index === null || index === void 0 ? void 0 : index.concatTokens()} ASSIGNING <temp1>.
+${indentation}IF sy-subrc <> 0.
+${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
+${indentation}ENDIF.
+    ${uniqueName}`;
+        const start = target.getFirstToken().getStart();
+        const end = target.getLastToken().getEnd();
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, move with table target", this.getMetadata().key, this.conf.severity, fix);
     }
     moveWithOperator(high, lowFile) {
         var _a, _b, _c;
@@ -857,8 +896,8 @@ ${indentation}    output = ${topTarget}.`;
             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();
-            body += indentation + `  ${field} = ${field} + 1.\n`;
-            end = "ENDWHILE";
+            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();
@@ -1034,6 +1073,7 @@ ${indentation}    output = ${topTarget}.`;
             let structureName = uniqueName;
             let added = false;
             let data = "";
+            let previous = undefined;
             for (const b of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren()) || []) {
                 if (b.concatTokens() === "(" && added === false) {
                     structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
@@ -1053,8 +1093,13 @@ ${indentation}    output = ${topTarget}.`;
                     body += this.outlineLet(b, indentation, highSyntax, lowFile);
                 }
                 else if (b.concatTokens() === ")") {
+                    if (added === false && (previous === null || previous === void 0 ? void 0 : previous.concatTokens()) === "(") {
+                        body += data;
+                        added = true;
+                    }
                     body += indentation + `APPEND ${structureName} TO ${uniqueName}.\n`;
                 }
+                previous = b;
             }
             if (forLoop !== undefined) {
                 indentation = indentation.substring(2);
@@ -1332,6 +1377,43 @@ ${indentation}    output = ${topTarget}.`;
         }
         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
+        let found = false;
+        for (const c of node.findAllExpressionsRecursive(Expressions.Compare)) {
+            found = c.findDirectExpression(Expressions.MethodCallChain) !== undefined;
+            if (found === true) {
+                break;
+            }
+        }
+        if (found === false) {
+            return undefined;
+        }
+        for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
+            if (r.referenceType !== _reference_1.ReferenceType.BuiltinMethodReference) {
+                continue;
+            }
+            const func = r.position.getName().toUpperCase();
+            if (func === "CONTAINS") {
+                const token = r.position.getToken();
+                const expression = this.findMethodCallExpression(node, token);
+                if (expression === undefined) {
+                    continue;
+                }
+                const sList = expression.findAllExpressions(Expressions.Source).map(e => e.concatTokens());
+                if (sList.length !== 2) {
+                    continue;
+                }
+                const code = sList[0] + " CS " + sList[1];
+                const start = expression.getFirstToken().getStart();
+                const end = expression.getLastToken().getEnd();
+                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+                return issue_1.Issue.atToken(lowFile, token, "Downport contains()", this.getMetadata().key, this.conf.severity, fix);
+            }
+        }
+        return undefined;
+    }
     replaceLineFunctions(node, lowFile, highSyntax) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.44",
+    "version": "2.85.47",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,18 +48,18 @@
         "@microsoft/api-extractor": "^7.19.5",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.21",
+        "@types/node": "^17.0.22",
         "chai": "^4.3.6",
         "eslint": "^8.11.0",
         "mocha": "^9.2.2",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "^0.98.0",
+        "ts-json-schema-generator": "^1.0.0",
         "typescript": "^4.6.2"
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.7",
-        "json5": "^2.2.0",
+        "json5": "^2.2.1",
         "vscode-languageserver-protocol": "^3.16.0",
         "vscode-languageserver-types": "^3.16.0"
     }