@abaplint/core 2.85.28 → 2.85.31

package/build/src/abap/2_statements/statement_parser.js

@@ -103,7 +103,9 @@ class StatementParser {
     lazyUnknown(wa) {
         const result = [];
         for (let statement of wa.statements) {
-            if (statement.get() instanceof _statement_1.Unknown) {
+            // dont use CALL METHOD, when executing lazy, it easily gives a Move for the last statment if lazy logic is evaluated
+            if (statement.get() instanceof _statement_1.Unknown
+                && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false) {
                 for (const { first, second } of this.buildSplits(statement.getTokens())) {
                     const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
                     if (!(s.get() instanceof _statement_1.Unknown)) {

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

@@ -36,10 +36,11 @@ class MethodSource {
                         ooType: "CLAS"
                     };
                     scope.addReference(last.getFirstToken(), foundMethod, _reference_1.ReferenceType.MethodReference, filename, extra);
+                    return foundMethod;
                 }
             }
             else if (context instanceof basic_1.VoidType) {
-                return;
+                return context;
             }
             else {
                 throw new Error("MethodSource, not a object reference, " + node.concatTokens());
@@ -61,6 +62,7 @@ class MethodSource {
           new Dynamic().runSyntax(d, scope, filename);
         }
         */
+        return undefined;
     }
 }
 exports.MethodSource = MethodSource;

package/build/src/abap/5_syntax/statements/call.js

@@ -17,11 +17,11 @@ class Call {
         if (methodSource === undefined) {
             throw new Error("Call, child MethodSource not found");
         }
-        new method_source_1.MethodSource().runSyntax(methodSource, scope, filename);
+        const methodDef = new method_source_1.MethodSource().runSyntax(methodSource, scope, filename);
         const body = node.findDirectExpression(Expressions.MethodCallBody);
         if (body) {
             // todo, resolve the method definition above and pass, if possible, in case of dynamic pass void
-            new method_call_body_1.MethodCallBody().runSyntax(body, scope, filename, new void_type_1.VoidType("CallTODO"));
+            new method_call_body_1.MethodCallBody().runSyntax(body, scope, filename, methodDef || new void_type_1.VoidType("CallTODO"));
         }
     }
 }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -307,7 +307,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         return undefined;
     }
     downportSelectSingleInline(_low, high, lowFile, _highSyntax) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const targets = ((_a = high.findFirstExpression(Expressions.SQLIntoStructure)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.SQLTarget)) || [];
         if (targets.length !== 1) {
             return undefined;
@@ -338,6 +338,16 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         else if (fieldList.concatTokens() === "*") {
             fieldDefinition = `DATA ${name} TYPE ${tableName}.`;
         }
+        else if (fieldList.concatTokens().toUpperCase() === "COUNT( * )") {
+            fieldDefinition = `DATA ${name} TYPE i.`;
+        }
+        else if (fieldList.getChildren().length === 1 && fieldList.getChildren()[0].get() instanceof Expressions.SQLAggregation) {
+            const c = fieldList.getChildren()[0];
+            if (c instanceof nodes_1.ExpressionNode) {
+                const concat = (_d = c.findFirstExpression(Expressions.SQLArithmetics)) === null || _d === void 0 ? void 0 : _d.concatTokens();
+                fieldDefinition = `DATA ${name} TYPE ${tableName}-${concat}.`;
+            }
+        }
         else {
             for (const f of fields) {
                 const fieldName = f.concatTokens();
@@ -474,6 +484,7 @@ ${indentation}`);
         if (!(((_a = target === null || target === void 0 ? void 0 : target.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.InlineData)) {
             return undefined;
         }
+        let type = "";
         const source = node.findFirstExpression(Expressions.Source);
         if (source === undefined) {
             return undefined;
@@ -491,13 +502,25 @@ ${indentation}`);
             return undefined;
         }
         else if (source.findFirstExpression(Expressions.TableExpression)) {
-            return undefined;
+            const chain = source.findDirectExpression(Expressions.FieldChain);
+            if (chain !== undefined
+                && chain.getChildren().length === 2
+                && chain.getChildren()[0].get() instanceof Expressions.SourceField
+                && chain.getChildren()[1].get() instanceof Expressions.TableExpression) {
+                type = "LINE OF " + chain.getChildren()[0].concatTokens();
+            }
+            else {
+                return undefined;
+            }
+        }
+        else {
+            type = source.concatTokens();
         }
         const targetName = (_c = target.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens();
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
         const firstToken = node.getFirstToken();
         const lastToken = node.getLastToken();
-        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${targetName} LIKE ${source.concatTokens()}.\n${indentation}`);
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${targetName} LIKE ${type}.\n${indentation}`);
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), lastToken.getEnd(), `${targetName} = ${source.concatTokens()}.`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
@@ -1004,15 +1027,22 @@ ${indentation}    output = ${topTarget}.`;
             if (spag === undefined) {
                 continue;
             }
-            const found = spag.findVariable(name);
-            if (found === undefined) {
-                continue;
+            let type = "";
+            if (node.concatTokens().toUpperCase().startsWith("APPEND INITIAL LINE TO ")) {
+                type = "LIKE LINE OF " + ((_b = node.findFirstExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
             }
-            else if (found.getType() instanceof basic_1.VoidType) {
-                return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Error outlining voided type", this.getMetadata().key, this.conf.severity);
+            else {
+                const found = spag.findVariable(name);
+                if (found === undefined) {
+                    continue;
+                }
+                else if (found.getType() instanceof basic_1.VoidType) {
+                    return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Error outlining voided type", this.getMetadata().key, this.conf.severity);
+                }
+                type = "TYPE ";
+                type += found.getType().getQualifiedName() ? found.getType().getQualifiedName().toLowerCase() : found.getType().toABAP();
             }
-            const type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
-            const code = `FIELD-SYMBOLS ${name} TYPE ${type}.\n` +
+            const code = `FIELD-SYMBOLS ${name} ${type}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), name);

package/package.json

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