@abaplint/core 2.91.11 → 2.91.14

package/build/src/abap/2_statements/statement_parser.js

@@ -105,7 +105,8 @@ class StatementParser {
         for (let statement of wa.statements) {
             // dont use CALL METHOD, when executing lazy, it easily gives a Move for the last statment if lazy logic is evaluated
             if (statement.get() instanceof _statement_1.Unknown
-                && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false) {
+                && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false
+                && statement.concatTokens().toUpperCase().startsWith("CALL FUNCTION ") === false) {
                 for (const { first, second } of this.buildSplits(statement.getTokens())) {
                     if (second.length === 1) {
                         continue; // probably punctuation

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -188,7 +188,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.stringTemplateAlpha(high, lowFile);
+        found = this.stringTemplateAlpha(high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -200,6 +200,18 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportRefSimple(high, lowFile);
+        if (found) {
+            return found;
+        }
+        found = this.downportRef(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
+        found = this.callFunctionParameterSimple(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.moveWithTableTarget(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -272,6 +284,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.getReference(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.replaceContains(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -779,6 +795,72 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         }
         return undefined;
     }
+    callFunctionParameterSimple(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.CallFunction)) {
+            return undefined;
+        }
+        let found = undefined;
+        for (const p of high.findAllExpressions(Expressions.FunctionExportingParameter)) {
+            found = p.findDirectExpression(Expressions.Source);
+            if (found && (found.findDirectExpression(Expressions.FieldChain)
+                || found.findDirectExpression(Expressions.Constant)
+                || found.findDirectExpression(Expressions.TextElement))) {
+                // its actually simple, ok
+                found = undefined;
+            }
+            else if (found !== undefined) {
+                break;
+            }
+        }
+        if (found === undefined) {
+            return undefined;
+        }
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const code = `DATA(${uniqueName}) = ${found.concatTokens()}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, found.getFirstToken().getStart(), found.getLastToken().getEnd(), uniqueName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, call function parameter", this.getMetadata().key, this.conf.severity, fix);
+    }
+    downportRefSimple(high, lowFile) {
+        var _a;
+        if (!(high.get() instanceof Statements.Move)
+            || high.getChildren().length !== 4
+            || high.getChildren()[2].getFirstToken().getStr().toUpperCase() !== "REF") {
+            return undefined;
+        }
+        const target = high.findDirectExpression(Expressions.Target);
+        if (target === undefined) {
+            return undefined;
+        }
+        const sourceRef = (_a = high.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
+        if (sourceRef === undefined || sourceRef.getChildren().length !== 1) {
+            return;
+        }
+        const code = `GET REFERENCE OF ${sourceRef.concatTokens()} INTO ${target.concatTokens()}`;
+        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, simple REF move", this.getMetadata().key, this.conf.severity, fix);
+    }
+    downportRef(high, lowFile, highSyntax) {
+        let found = undefined;
+        for (const s of high.findAllExpressionsRecursive(Expressions.Source)) {
+            if (s.getFirstToken().getStr().toUpperCase() === "REF"
+                && s.findDirectExpression(Expressions.TypeNameOrInfer)) {
+                found = s;
+            }
+        }
+        if (found === undefined) {
+            return undefined;
+        }
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const code = `DATA(${uniqueName}) = ${found.concatTokens()}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, found.getFirstToken().getStart(), found.getLastToken().getEnd(), uniqueName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, REF", this.getMetadata().key, this.conf.severity, fix);
+    }
     moveWithSimpleValue(high, lowFile) {
         if (!(high.get() instanceof Statements.Move)
             || high.getChildren().length !== 4) {
@@ -927,7 +1009,7 @@ ${indentation}${uniqueName}`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Expand operator", this.getMetadata().key, this.conf.severity, fix);
     }
     // must be very simple string templates, like "|{ ls_line-no ALPHA = IN }|"
-    stringTemplateAlpha(node, lowFile) {
+    stringTemplateAlpha(node, lowFile, highSyntax) {
         var _a, _b, _c;
         if (!(node.get() instanceof Statements.Move)) {
             return undefined;
@@ -936,8 +1018,13 @@ ${indentation}${uniqueName}`;
         if (topSource === undefined || topSource.getChildren().length !== 1) {
             return undefined;
         }
-        const child = topSource.getFirstChild();
+        let top = true;
+        let child = topSource.getFirstChild();
         if (!(child.get() instanceof Expressions.StringTemplate)) {
+            child = child.findFirstExpression(Expressions.StringTemplate);
+            top = false;
+        }
+        if (child === undefined || !(child.get() instanceof Expressions.StringTemplate)) {
             return undefined;
         }
         const templateTokens = child.getChildren();
@@ -962,13 +1049,28 @@ ${indentation}${uniqueName}`;
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
         const source = (_b = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
         const topTarget = (_c = node.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-        const code = `CALL FUNCTION '${functionName}'
+        const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        if (top === false) {
+            const code = `DATA ${uniqueName} TYPE string.
+${indentation}CALL FUNCTION '${functionName}'
+${indentation}  EXPORTING
+${indentation}    input  = ${source}
+${indentation}  IMPORTING
+${indentation}    output = ${uniqueName}.\n`;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, child.getFirstToken().getStart(), child.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
+        }
+        else {
+            const code = `CALL FUNCTION '${functionName}'
 ${indentation}  EXPORTING
 ${indentation}    input  = ${source}
 ${indentation}  IMPORTING
 ${indentation}    output = ${topTarget}.`;
-        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getFirstToken().getStart(), node.getLastToken().getEnd(), code);
-        return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
+            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getFirstToken().getStart(), node.getLastToken().getEnd(), code);
+            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
+        }
     }
     outlineLoopInput(node, lowFile, highSyntax) {
         if (!(node.get() instanceof Statements.Loop)) {
@@ -1643,6 +1745,26 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
+    getReference(node, lowFile, _highSyntax) {
+        var _a, _b, _c;
+        if (!(node.get() instanceof Statements.GetReference)) {
+            return undefined;
+        }
+        const inline = (_a = node.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.InlineData);
+        if (inline === undefined) {
+            return undefined;
+        }
+        const targetName = (_b = inline.findDirectExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        const sourceName = (_c = node.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        if (targetName === undefined || sourceName === undefined) {
+            return undefined;
+        }
+        const code = `DATA ${targetName} LIKE REF TO ${sourceName}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, inline.getFirstToken().getStart(), inline.getLastToken().getEnd(), targetName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, inline.getFirstToken(), "Downport, outline DATA ref", this.getMetadata().key, this.conf.severity, fix);
+    }
     replaceContains(node, lowFile, highSyntax) {
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         // only downport if its an single method call condition
@@ -1734,8 +1856,10 @@ ${indentation}    output = ${topTarget}.`;
             const target = node.findDirectExpression(Expressions.Target);
             const found = source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.NewObject);
             // must be at top level of the source for quickfix to work(todo: handle more scenarios)
-            // todo, assumption: the target is not an inline definition
-            if (target && found && source.concatTokens() === found.concatTokens()) {
+            if (target
+                && found
+                && source.concatTokens() === found.concatTokens()
+                && target.findDirectExpression(Expressions.InlineData) === undefined) {
                 const abap = this.newParameters(found, target.concatTokens(), highSyntax, lowFile);
                 if (abap !== undefined) {
                     fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getFirstToken().getStart(), node.getLastToken().getEnd(), abap);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.11",
+    "version": "2.91.14",
     "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.28.4",
+        "@microsoft/api-extractor": "^7.28.6",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
         "@types/node": "^18.0.6",