@abaplint/core 2.93.18 → 2.93.20

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

@@ -14,7 +14,7 @@ class For extends combi_1.Expression {
         const then = (0, combi_1.seq)("THEN", _1.Source);
         const whil = (0, combi_1.seq)((0, combi_1.altPrio)("UNTIL", "WHILE"), _1.Cond);
         const itera = (0, combi_1.seq)(_1.InlineFieldDefinition, (0, combi_1.opt)(then), whil);
-        const groupBy = (0, combi_1.seq)("GROUP BY", (0, combi_1.alt)(field_chain_1.FieldChain, (0, combi_1.seq)("(", (0, combi_1.plus)(_1.LoopGroupByComponent), ")")));
+        const groupBy = (0, combi_1.seq)("GROUP BY", (0, combi_1.alt)(field_chain_1.FieldChain, (0, combi_1.seq)("(", (0, combi_1.plus)(_1.LoopGroupByComponent), ")")), (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.alt)("ASCENDING", "DESCENDING"), (0, combi_1.opt)("AS TEXT"))), (0, combi_1.opt)("WITHOUT MEMBERS"));
         const groups = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUPS", field_chain_1.FieldChain, "OF", _1.Target, "IN", _1.Source, (0, combi_1.optPrio)(groupBy)));
         const f = (0, combi_1.seq)("FOR", (0, combi_1.alt)(itera, inn, groups), (0, combi_1.optPrio)(_1.Let));
         return (0, combi_1.ver)(version_1.Version.v740sp05, f);

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1085,17 +1085,24 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             return;
         }
         const valueBody = source.findDirectExpression(Expressions.ValueBody);
-        if (valueBody === undefined || valueBody.getChildren().length !== 1) {
+        if (valueBody === undefined) {
             return;
         }
-        const fieldAssignment = valueBody.findDirectExpression(Expressions.FieldAssignment);
-        if (fieldAssignment === undefined) {
+        const fieldAssignments = valueBody.findDirectExpressions(Expressions.FieldAssignment);
+        if (fieldAssignments.length === 0) {
+            return;
+        }
+        else if (fieldAssignments.length !== valueBody.getChildren().length) {
             return;
         }
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
-        const code = `CLEAR ${target.concatTokens()}.\n` + indentation + target.concatTokens() + "-" + fieldAssignment.concatTokens();
+        let code = `CLEAR ${target.concatTokens()}.\n`;
+        for (const fieldAssignment of fieldAssignments) {
+            code += indentation + target.concatTokens() + "-" + fieldAssignment.concatTokens() + `.\n`;
+        }
+        code = code.trimEnd();
         const start = high.getFirstToken().getStart();
-        const end = high.getLastToken().getStart();
+        const end = high.getLastToken().getEnd();
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple move", this.getMetadata().key, this.conf.severity, fix);
     }
@@ -1396,7 +1403,7 @@ ${indentation}    output = ${topTarget}.`;
                 if (gby !== "") {
                     gby += " ";
                 }
-                gby = lg.concatTokens();
+                gby += lg.concatTokens();
             }
             if (gby !== "") {
                 gby = " GROUP BY ( " + gby + " )";

package/package.json

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