@abaplint/core 2.93.17 → 2.93.19

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/abap/5_syntax/expressions/inline_field_definition.js

@@ -13,7 +13,7 @@ class InlineFieldDefinition {
         let type = undefined;
         const field = (_a = node.findDirectExpression(Expressions.Field)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
         if (field === undefined) {
-            return;
+            return undefined;
         }
         const source = node.findDirectExpression(Expressions.Source);
         if (source) {
@@ -33,6 +33,7 @@ class InlineFieldDefinition {
         const identifier = new _typed_identifier_1.TypedIdentifier(field, filename, type, ["inline" /* IdentifierMeta.InlineDefinition */]);
         scope.addReference(field, identifier, _reference_1.ReferenceType.DataWriteReference, filename);
         scope.addIdentifier(identifier);
+        return type;
     }
 }
 exports.InlineFieldDefinition = InlineFieldDefinition;

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

@@ -19,8 +19,12 @@ class ReduceBody {
         if (letNode) {
             scoped = new let_1.Let().runSyntax(letNode, scope, filename);
         }
+        let first = undefined;
         for (const i of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
-            new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
+            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
+            if (found && first === undefined) {
+                first = found;
+            }
         }
         for (const forNode of node.findDirectExpressions(Expressions.For) || []) {
             new for_1.For().runSyntax(forNode, scope, filename);
@@ -37,7 +41,12 @@ class ReduceBody {
         while (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }
-        return new unknown_type_1.UnknownType("todo, ReduceBody");
+        if (first) {
+            return first;
+        }
+        else {
+            return new unknown_type_1.UnknownType("todo, ReduceBody");
+        }
     }
 }
 exports.ReduceBody = ReduceBody;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1396,7 +1396,7 @@ ${indentation}    output = ${topTarget}.`;
                 if (gby !== "") {
                     gby += " ";
                 }
-                gby = lg.concatTokens();
+                gby += lg.concatTokens();
             }
             if (gby !== "") {
                 gby = " GROUP BY ( " + gby + " )";
@@ -1405,8 +1405,12 @@ ${indentation}    output = ${topTarget}.`;
             if (groups) {
                 gby += " INTO DATA(" + groups.concatTokens() + ")";
             }
+            let inGroup = "";
+            if (forLoop.concatTokens().toUpperCase().includes(" IN GROUP ")) {
+                inGroup = "-items";
+            }
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${from}${to}${cond}${gby}.\n`;
+            body += indentation + `LOOP AT ${loopSource}${inGroup} INTO DATA(${loopTargetField})${from}${to}${cond}${gby}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
             }

package/package.json

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