@abaplint/core 2.91.12 → 2.91.13

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -200,7 +200,11 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.moveWithSimpleRef(high, lowFile);
+        found = this.downportRefSimple(high, lowFile);
+        if (found) {
+            return found;
+        }
+        found = this.downportRef(high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -280,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;
@@ -814,7 +822,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         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);
     }
-    moveWithSimpleRef(high, lowFile) {
+    downportRefSimple(high, lowFile) {
         var _a;
         if (!(high.get() instanceof Statements.Move)
             || high.getChildren().length !== 4
@@ -835,6 +843,23 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         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") {
+                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) {
@@ -1719,6 +1744,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
@@ -1810,8 +1855,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.12",
+    "version": "2.91.13",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",