@abaplint/core 2.92.1 → 2.92.2

package/build/abaplint.d.ts

@@ -2002,6 +2002,7 @@ declare namespace Expressions {
         TypeTableKey,
         TypeTable,
         Type_2 as Type,
+        ValueBodyLine,
         ValueBodyLines,
         ValueBody,
         Value,
@@ -6106,6 +6107,10 @@ declare class ValueBody extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class ValueBodyLine extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class ValueBodyLines extends Expression {
     getRunnable(): IStatementRunnable;
 }

package/build/src/abap/2_statements/expressions/index.js

@@ -210,6 +210,7 @@ __exportStar(require("./type_param"), exports);
 __exportStar(require("./type_table_key"), exports);
 __exportStar(require("./type_table"), exports);
 __exportStar(require("./type"), exports);
+__exportStar(require("./value_body_line"), exports);
 __exportStar(require("./value_body_lines"), exports);
 __exportStar(require("./value_body"), exports);
 __exportStar(require("./value"), exports);

package/build/src/abap/2_statements/expressions/value_body.js

@@ -2,16 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueBody = void 0;
 const combi_1 = require("../combi");
-const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const value_body_lines_1 = require("./value_body_lines");
 class ValueBody extends combi_1.Expression {
     getRunnable() {
         const base = (0, combi_1.seq)("BASE", _1.Source);
-        // missing spaces caught by rule "parser_missing_space"
-        const foo = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.tok)(tokens_1.WParenLeft)), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.plusPrio)(_1.FieldAssignment), value_body_lines_1.ValueBodyLines, _1.Source)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
-        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(base), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, foo)));
+        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(base), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
         const tabdef = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.altPrio)("OPTIONAL", (0, combi_1.seq)("DEFAULT", _1.Source)));
         return (0, combi_1.optPrio)((0, combi_1.altPrio)(strucOrTab, (0, combi_1.seq)(_1.Source, (0, combi_1.optPrio)(tabdef))));
     }

package/build/src/abap/2_statements/expressions/value_body_line.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValueBodyLine = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+const value_body_lines_1 = require("./value_body_lines");
+class ValueBodyLine extends combi_1.Expression {
+    getRunnable() {
+        // missing spaces caught by rule "parser_missing_space"
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.tok)(tokens_1.WParenLeft)), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.plusPrio)(_1.FieldAssignment), value_body_lines_1.ValueBodyLines, _1.Source)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
+        return ret;
+    }
+}
+exports.ValueBodyLine = ValueBodyLine;
+//# sourceMappingURL=value_body_line.js.map

package/build/src/abap/5_syntax/expressions/value_body.js

@@ -27,8 +27,16 @@ class ValueBody {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             type = new source_1.Source().runSyntax(s, scope, filename);
         }
-        for (const l of node.findDirectExpressions(Expressions.ValueBodyLines)) {
-            for (const s of l.findDirectExpressions(Expressions.Source)) {
+        for (const foo of node.findDirectExpressions(Expressions.ValueBodyLine)) {
+            for (const l of foo.findDirectExpressions(Expressions.ValueBodyLines)) {
+                for (const s of l.findDirectExpressions(Expressions.Source)) {
+                    new source_1.Source().runSyntax(s, scope, filename);
+                }
+            }
+            for (const s of foo.findDirectExpressions(Expressions.FieldAssignment)) {
+                new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
+            }
+            for (const s of foo.findDirectExpressions(Expressions.Source)) {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }

package/build/src/registry.js

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

package/build/src/rules/align_parameters.js

@@ -56,7 +56,13 @@ foobar( moo   = 1
 
 foo = VALUE #(
     foo = bar
-    moo = 2 ).`,
+    moo = 2 ).
+
+DATA(sdf) = VALUE type(
+  common_val     = 2
+  another_common = 5
+  ( row_value = 4
+    value_foo = 5 ) ).`,
         };
     }
     getConfig() {
@@ -169,6 +175,27 @@ foo = VALUE #(
                 candidates.push({ parameters });
             }
         }
+        for (const vb of stru.findAllExpressionsRecursive(Expressions.ValueBodyLine)) {
+            const parameters = [];
+            const fieldAssignments = vb.findDirectExpressions(Expressions.FieldAssignment);
+            if (fieldAssignments.length <= 1) {
+                continue;
+            }
+            for (const fs of fieldAssignments) {
+                const children = fs.getChildren();
+                if (children.length < 3) {
+                    continue; // unexpected
+                }
+                parameters.push({
+                    left: children[0],
+                    eq: children[1].getFirstToken().getStart(),
+                    right: children[2],
+                });
+            }
+            if (parameters.length > 0) {
+                candidates.push({ parameters });
+            }
+        }
         return candidates;
     }
     raiseAndCreateCandidates(stru) {

package/build/src/rules/downport.js

@@ -1500,54 +1500,65 @@ ${indentation}    output = ${topTarget}.`;
             let end = "";
             let structureName = uniqueName;
             let added = false;
-            let skip = 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);
-                    data = indentation + `DATA ${structureName} LIKE LINE OF ${uniqueName}.\n`;
-                }
-                if (b.get() instanceof Expressions.FieldAssignment) {
+            for (const a of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren()) || []) {
+                if (a.get() instanceof Expressions.FieldAssignment) {
                     if (added === false) {
                         body += data;
                         added = true;
                     }
-                    body += indentation + structureName + "-" + b.concatTokens() + ".\n";
+                    body += indentation + structureName + "-" + a.concatTokens() + ".\n";
                 }
-                else if (b instanceof nodes_1.ExpressionNode && b.get() instanceof Expressions.For) {
-                    const outlineFor = this.outlineFor(b, indentation, lowFile, highSyntax);
+                else if (a instanceof nodes_1.ExpressionNode && a.get() instanceof Expressions.For) {
+                    const outlineFor = this.outlineFor(a, indentation, lowFile, highSyntax);
                     body += outlineFor.body;
                     end = outlineFor.end + `.\n` + end;
                     indentation += "  ";
                 }
-                else if (b.get() instanceof Expressions.Source) {
+                else if (a instanceof nodes_1.ExpressionNode && a.get() instanceof Expressions.Source) {
+                    // special handling for superflous value expression
                     if ((valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren().length) === 1) {
-                        body += indentation + uniqueName + " = " + b.concatTokens() + `.\n`;
-                    }
-                    structureName = b.concatTokens();
-                    if (base && (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectTokenByText("(")) === undefined) {
-                        structureName = uniqueName;
+                        body += indentation + uniqueName + " = " + a.concatTokens() + `.\n`;
                     }
                 }
-                else if (b.get() instanceof Expressions.ValueBodyLines) {
-                    body += indentation + "APPEND " + b.concatTokens() + ` TO ${uniqueName}.\n`;
-                    skip = true;
-                }
-                else if (b instanceof nodes_1.ExpressionNode && b.get() instanceof Expressions.Let) {
-                    body += this.outlineLet(b, indentation, highSyntax, lowFile);
+                else if (a instanceof nodes_1.ExpressionNode && a.get() instanceof Expressions.Let) {
+                    body += this.outlineLet(a, indentation, highSyntax, lowFile);
                 }
-                else if (b.concatTokens() === ")") {
-                    if (added === false && (previous === null || previous === void 0 ? void 0 : previous.concatTokens()) === "(") {
-                        body += data;
-                        added = true;
-                    }
-                    if (skip === false) {
-                        body += indentation + `APPEND ${structureName} TO ${uniqueName}.\n`;
+                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;
+                                added = true;
+                            }
+                            body += indentation + structureName + "-" + b.concatTokens() + ".\n";
+                        }
+                        else if (b.get() instanceof Expressions.Source) {
+                            body += indentation + "APPEND " + b.concatTokens() + ` TO ${uniqueName}.\n`;
+                            skip = true;
+                        }
+                        else if (b.get() instanceof Expressions.ValueBodyLines) {
+                            body += indentation + "APPEND " + b.concatTokens() + ` TO ${uniqueName}.\n`;
+                            skip = true;
+                        }
+                        else if (b.concatTokens() === ")") {
+                            if (added === false && (previous === null || previous === void 0 ? void 0 : previous.concatTokens()) === "(") {
+                                body += data;
+                                added = true;
+                            }
+                            if (skip === false) {
+                                body += indentation + `APPEND ${structureName} TO ${uniqueName}.\n`;
+                            }
+                        }
+                        previous = b;
                     }
-                    skip = false;
                 }
-                previous = b;
             }
             if (body === "" && ((_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
                 const fieldChain = valueBody.findFirstExpression(Expressions.FieldChain);

package/build/src/rules/parser_missing_space.js

@@ -50,7 +50,7 @@ This rule makes sure the spaces are consistently required across the language.`,
     }
     missingSpace(statement) {
         const found = statement.findAllExpressionsMulti([Expressions.CondSub, Expressions.SQLCond,
-            Expressions.ValueBody, Expressions.NewObject, Expressions.Cond,
+            Expressions.ValueBodyLine, Expressions.NewObject, Expressions.Cond,
             Expressions.ComponentCond, Expressions.ComponentCondSub, Expressions.MethodCallParam], true);
         let pos = undefined;
         for (const f of found) {
@@ -70,8 +70,8 @@ This rule makes sure the spaces are consistently required across the language.`,
             else if (type instanceof Expressions.SQLCond) {
                 pos = this.checkSQLCond(f);
             }
-            else if (type instanceof Expressions.ValueBody) {
-                pos = this.checkValueBody(f);
+            else if (type instanceof Expressions.ValueBodyLine) {
+                pos = this.checkValueBodyLine(f);
             }
             else if (type instanceof Expressions.NewObject) {
                 pos = this.checkNewObject(f);
@@ -173,7 +173,7 @@ This rule makes sure the spaces are consistently required across the language.`,
         }
         return undefined;
     }
-    checkValueBody(vb) {
+    checkValueBodyLine(vb) {
         var _a, _b;
         const children = vb.getChildren();
         for (let i = 0; i < children.length; i++) {

package/package.json

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