@abaplint/core 2.113.237 → 2.113.239

package/build/abaplint.d.ts

@@ -1533,6 +1533,7 @@ export declare class CurrentScope {
     findType(name: string | undefined): TypedIdentifier | undefined;
     findExtraLikeType(name: string | undefined): TypedIdentifier | undefined;
     findVariable(name: string | undefined): TypedIdentifier | undefined;
+    findReturningParameter(): TypedIdentifier | undefined;
     getDDIC(): DDIC;
     getDDICReferences(): IDDICReferences;
     getMSAGReferences(): IMSAGReferences;
@@ -3926,8 +3927,12 @@ export declare interface IRegistry {
     getObjects(): Generator<IObject, void, undefined>;
     /** Get objects by type, including dependencies */
     getObjectsByType(type: string): Generator<IObject, void, undefined>;
-    /** Get number of objects in the registry, default is skipping dependencies */
-    getObjectCount(skipDependencies?: boolean): number;
+    /** Get number of objects in the registry */
+    getObjectCount(): {
+        total: number;
+        normal: number;
+        dependencies: number;
+    };
     getFirstObject(): IObject | undefined;
     getObject(type: string | undefined, name: string | undefined): IObject | undefined;
     findObjectForFile(file: IFile): IObject | undefined;
@@ -5635,7 +5640,11 @@ export declare class Registry implements IRegistry {
     getObjectsByType(type: string): Generator<IObject, void, undefined>;
     getFiles(): Generator<IFile, void, undefined>;
     getFirstObject(): IObject | undefined;
-    getObjectCount(skipDependencies?: boolean): number;
+    getObjectCount(): {
+        total: number;
+        normal: number;
+        dependencies: number;
+    };
     getFileByName(filename: string): IFile | undefined;
     getObject(type: string | undefined, name: string | undefined): IObject | undefined;
     getConfig(): IConfiguration;

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

@@ -31,8 +31,8 @@ class SQLFunction extends combi_1.Expression {
         // dunno if the version for substring is correct
         const dats_is_valid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_is_valid$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const dats_days_between = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_days_between$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const dats_add_days = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_is_valid$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const dats_add_months = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_is_valid$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const dats_add_days = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_add_days$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const dats_add_months = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^dats_add_months$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const ltrim = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^ltrim$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const rtrim = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^rtrim$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
         return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper, round, concat_with_space, ltrim, rtrim, substring, dats_is_valid, dats_days_between, dats_add_days, dats_add_months);

package/build/src/abap/5_syntax/_current_scope.js

@@ -378,6 +378,16 @@ class CurrentScope {
         }
         return this.findTypePoolConstant(name);
     }
+    findReturningParameter() {
+        var _a;
+        for (const v in ((_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().vars) || {}) {
+            const variable = this.current.getData().vars[v];
+            if (variable.getMeta().includes("returning" /* IdentifierMeta.MethodReturning */)) {
+                return variable;
+            }
+        }
+        return undefined;
+    }
     ///////////////////////////
     getDDIC() {
         return new ddic_1.DDIC(this.reg);

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Return = void 0;
+const Expressions = require("../../2_statements/expressions");
+const _reference_1 = require("../_reference");
+const _syntax_input_1 = require("../_syntax_input");
+const source_1 = require("../expressions/source");
+class Return {
+    runSyntax(node, input) {
+        const source = node.findDirectExpression(Expressions.Source);
+        if (source) {
+            const ret = input.scope.findReturningParameter();
+            if (ret === undefined) {
+                const message = "Method does not have a RETURNING parameter to assign to";
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, source.getFirstToken(), message));
+                return;
+            }
+            input.scope.addReference(source.getFirstToken(), ret, _reference_1.ReferenceType.DataReadReference, input.filename);
+            source_1.Source.runSyntax(source, input, ret.getType());
+        }
+    }
+}
+exports.Return = Return;
+//# sourceMappingURL=return.js.map

package/build/src/abap/5_syntax/syntax.js

@@ -67,6 +67,7 @@ const concatenate_1 = require("./statements/concatenate");
 const call_function_1 = require("./statements/call_function");
 const clear_1 = require("./statements/clear");
 const refresh_1 = require("./statements/refresh");
+const return_1 = require("./statements/return");
 const free_1 = require("./statements/free");
 const replace_1 = require("./statements/replace");
 const get_bit_1 = require("./statements/get_bit");
@@ -196,6 +197,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new clear_1.Clear());
     addToMap(new free_1.Free());
     addToMap(new refresh_1.Refresh());
+    addToMap(new return_1.Return());
     addToMap(new receive_1.Receive());
     addToMap(new get_bit_1.GetBit());
     addToMap(new class_local_friends_1.ClassLocalFriends());

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.237";
+        return "2.113.239";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -112,13 +112,16 @@ class Registry {
         }
         return undefined;
     }
-    getObjectCount(skipDependencies = true) {
-        let res = 0;
+    getObjectCount() {
+        const res = { total: 0, normal: 0, dependencies: 0 };
         for (const o of this.getObjects()) {
-            if (skipDependencies === true && this.isDependency(o)) {
-                continue;
+            res.total++;
+            if (this.isDependency(o)) {
+                res.dependencies++;
+            }
+            else {
+                res.normal++;
             }
-            res = res + 1;
         }
         return res;
     }
@@ -285,7 +288,7 @@ class Registry {
             return this;
         }
         ParsingPerformance.clear();
-        (_a = input === null || input === void 0 ? void 0 : input.progress) === null || _a === void 0 ? void 0 : _a.set(this.getObjectCount(false), "Lexing and parsing");
+        (_a = input === null || input === void 0 ? void 0 : input.progress) === null || _a === void 0 ? void 0 : _a.set(this.getObjectCount().normal, "Lexing and parsing");
         for (const o of this.getObjects()) {
             await ((_b = input === null || input === void 0 ? void 0 : input.progress) === null || _b === void 0 ? void 0 : _b.tick("Lexing and parsing(" + this.conf.getVersion() + ") - " + o.getType() + " " + o.getName()));
             this.parsePrivate(o);

package/build/src/rules/parser_missing_space.js

@@ -205,13 +205,26 @@ This rule makes sure the spaces are consistently required across the language.`,
     }
     checkCond(cond) {
         const children = cond.getAllTokens();
+        const dynamic = cond.findAllExpressions(Expressions.Dynamic);
         for (let i = 0; i < children.length - 1; i++) {
             const current = children[i];
             const next = children[i + 1];
             if (next.getStr().startsWith("'")
                 && next.getRow() === current.getRow()
                 && next.getCol() === current.getEnd().getCol()) {
-                return current.getEnd();
+                // skip if the token is part of a DYNAMIC expression
+                let isDynamic = false;
+                outer: for (const d of dynamic) {
+                    for (const t of d.getAllTokens()) {
+                        if (t === next || t === current) {
+                            isDynamic = true;
+                            break outer;
+                        }
+                    }
+                }
+                if (isDynamic === false) {
+                    return current.getEnd();
+                }
             }
         }
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.237",
+    "version": "2.113.239",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,20 +50,20 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.53.3",
+        "@microsoft/api-extractor": "^7.55.0",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^24.9.1",
+        "@types/node": "^24.10.1",
         "chai": "^4.5.0",
-        "eslint": "^9.38.0",
-        "mocha": "^11.7.4",
+        "eslint": "^9.39.1",
+        "mocha": "^11.7.5",
         "c8": "^10.1.3",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^2.4.0",
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.0",
+        "fast-xml-parser": "^5.3.2",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }