@abaplint/core 2.95.44 → 2.95.45

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -246,14 +246,16 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 // actively editing the files
                 continue;
             }
+            if (highSyntax === undefined) {
+                highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
+            }
+            let containsUnknown = false;
             for (let i = 0; i < lowStatements.length; i++) {
                 const low = lowStatements[i];
                 const high = highStatements[i];
                 if ((low.get() instanceof _statement_1.Unknown && !(high.get() instanceof _statement_1.Unknown))
                     || high.findFirstExpression(Expressions.InlineData)) {
-                    if (highSyntax === undefined) {
-                        highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
-                    }
+                    containsUnknown = true;
                     try {
                         const issue = this.checkStatement(low, high, lowFile, highSyntax, highFile);
                         if (issue) {
@@ -271,6 +273,18 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                     }
                 }
             }
+            if (ret.length === 0 && containsUnknown) {
+                // this is a hack in order not to change too many unit tests
+                for (let i = 0; i < lowStatements.length; i++) {
+                    const high = highStatements[i];
+                    if (high.get() instanceof Statements.Data) {
+                        const issue = this.anonymousTableType(high, lowFile, highSyntax);
+                        if (issue) {
+                            ret.push(issue);
+                        }
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -684,6 +698,22 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    // the anonymous type minght be used in inferred type statements, define it so it can be referred
+    anonymousTableType(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Data)) {
+            return undefined;
+        }
+        const tt = high.findFirstExpression(Expressions.TypeTable);
+        if (tt === undefined) {
+            return undefined;
+        }
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const code = `TYPES ${uniqueName} ${tt.concatTokens()}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, tt.getFirstToken().getStart(), tt.getLastToken().getEnd(), "TYPE " + uniqueName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Add type for table definition", this.getMetadata().key, this.conf.severity, fix);
+    }
     downportMessage(high, lowFile, highSyntax) {
         var _a, _b;
         if (!(high.get() instanceof Statements.Message)) {
@@ -1876,7 +1906,12 @@ ${indentation}    output = ${topTarget}.`;
                 const s = (_a = init.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                 const t = (_b = init.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 if (s) {
-                    body += indentation + `DATA(${name}) = ${s}.\n`;
+                    if (s.toUpperCase().startsWith("VALUE #")) {
+                        body += indentation + `DATA(${name}) = ${s.replace("#", type)}.\n`;
+                    }
+                    else {
+                        body += indentation + `DATA(${name}) = ${s}.\n`;
+                    }
                 }
                 else {
                     body += indentation + `DATA ${name} TYPE ${t}.\n`;
@@ -1921,7 +1956,7 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineValue(low, high, lowFile, highSyntax) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
@@ -1931,6 +1966,7 @@ ${indentation}    output = ${topTarget}.`;
             if (firstToken.getStr().toUpperCase() !== "VALUE") {
                 continue;
             }
+            const valueBody = s.findDirectExpression(Expressions.ValueBody);
             let type = this.findType(s, lowFile, highSyntax);
             if (type === undefined) {
                 if (high.get() instanceof Statements.Move && high.findDirectExpression(Expressions.Source) === s) {
@@ -1943,7 +1979,6 @@ ${indentation}    output = ${topTarget}.`;
             else {
                 type = "TYPE " + type;
             }
-            const valueBody = s.findDirectExpression(Expressions.ValueBody);
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             let indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
@@ -1956,6 +1991,16 @@ ${indentation}    output = ${topTarget}.`;
             let added = false;
             let data = "";
             let previous = undefined;
+            if ((valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.ValueBodyLine)) !== undefined
+                && (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.For)) === undefined) {
+                structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+                data = indentation + `DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
+            }
+            else if ((valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.ValueBodyLine)) !== undefined
+                && ((_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.For)) === null || _b === void 0 ? void 0 : _b.findDirectTokenByText("GROUPS")) !== undefined) {
+                structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+                data = indentation + `  DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
+            }
             for (const a of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren()) || []) {
                 if (a.get() instanceof Expressions.FieldAssignment) {
                     if (added === false) {
@@ -1982,10 +2027,6 @@ ${indentation}    output = ${topTarget}.`;
                 if (a instanceof nodes_1.ExpressionNode && a.get() instanceof Expressions.ValueBodyLine) {
                     let skip = false;
                     for (const b of (a === null || a === void 0 ? void 0 : a.getChildren()) || []) {
-                        if (b.concatTokens() === "(" && added === false) {
-                            structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
-                            data = indentation + `DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
-                        }
                         if (b.get() instanceof Expressions.FieldAssignment) {
                             if (added === false) {
                                 body += data;
@@ -2014,7 +2055,7 @@ ${indentation}    output = ${topTarget}.`;
                     }
                 }
             }
-            if (body === "" && ((_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
+            if (body === "" && ((_c = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _c === void 0 ? void 0 : _c.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
                 const fieldChain = valueBody.findFirstExpression(Expressions.FieldChain);
                 const rowName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
                 let tableExpression = undefined;
@@ -2033,7 +2074,7 @@ ${indentation}    output = ${topTarget}.`;
                 }
                 let condition = "";
                 if ((tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.getChildren().length) === 3) {
-                    condition = "INDEX " + ((_c = tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens());
+                    condition = "INDEX " + ((_d = tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.findDirectExpression(Expressions.Source)) === null || _d === void 0 ? void 0 : _d.concatTokens());
                 }
                 else {
                     condition = "WITH KEY " + (tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.concatTokens().replace("[ ", "").replace(" ]", ""));

package/package.json

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