@abaplint/core 2.102.14 → 2.102.15

package/build/abaplint.d.ts

@@ -3706,6 +3706,7 @@ declare interface IStructure {
 declare interface IStructureComponent {
     name: string;
     type: AbstractType;
+    renamingSuffix?: string;
 }
 
 declare interface IStructureRunnable {
@@ -5020,6 +5021,7 @@ export declare enum ScopeType {
     FunctionModule = "function",
     Method = "method",
     MethodInstance = "method_instance",
+    MethodDefinition = "method_definition",
     For = "for",
     Let = "let",
     OpenSQL = "open_sql"

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

@@ -16,6 +16,7 @@ var ScopeType;
     ScopeType["FunctionModule"] = "function";
     ScopeType["Method"] = "method";
     ScopeType["MethodInstance"] = "method_instance";
+    ScopeType["MethodDefinition"] = "method_definition";
     ScopeType["For"] = "for";
     ScopeType["Let"] = "let";
     ScopeType["OpenSQL"] = "open_sql";

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

@@ -24,7 +24,7 @@ class IncludeType {
             const components = [];
             for (const c of ityp.getComponents()) {
                 if (c.name === as) {
-                    components.push(c);
+                    components.push(Object.assign(Object.assign({}, c), { renamingSuffix: suffix }));
                     continue;
                 }
                 components.push({

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

@@ -19,11 +19,12 @@ class MethodImplementation {
         if (methodDefinition === undefined) {
             throw new Error("Method definition \"" + methodName + "\" not found");
         }
+        const start = node.getFirstToken().getStart();
         if (methodDefinition.isStatic() === false) {
-            scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, node.getFirstToken().getStart(), filename);
+            scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, start, filename);
             scope.addList(classDefinition.getAttributes().getInstance());
         }
-        scope.push(_scope_type_1.ScopeType.Method, methodName, node.getFirstToken().getStart(), filename);
+        scope.push(_scope_type_1.ScopeType.Method, methodName, start, filename);
         scope.addReference(methodToken, methodDefinition, _reference_1.ReferenceType.MethodImplementationReference, filename);
         scope.addList(methodDefinition.getParameters().getAll());
         for (const i of helper.findInterfaces(classDefinition)) {

package/build/src/abap/types/method_parameters.js

@@ -11,6 +11,7 @@ const method_param_1 = require("../5_syntax/expressions/method_param");
 const _object_oriented_1 = require("../5_syntax/_object_oriented");
 const _reference_1 = require("../5_syntax/_reference");
 const identifier_1 = require("../1_lexer/tokens/identifier");
+const _scope_type_1 = require("../5_syntax/_scope_type");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -28,7 +29,11 @@ class MethodParameters {
         this.preferred = undefined;
         this.exceptions = [];
         this.filename = filename;
-        this.parse(node, scope, filename);
+        // need the scope for LIKE typing inside method parameters
+        const parentName = scope.getName();
+        scope.push(_scope_type_1.ScopeType.MethodDefinition, "method definition", node.getStart(), filename);
+        this.parse(node, scope, filename, parentName);
+        scope.pop(node.getEnd());
     }
     getFilename() {
         return this.filename;
@@ -103,7 +108,7 @@ class MethodParameters {
         return this.defaults[parameter.toUpperCase()];
     }
     ///////////////////
-    parse(node, scope, filename) {
+    parse(node, scope, filename, parentName) {
         var _a, _b;
         const handler = node.findFirstExpression(Expressions.EventHandler);
         if (handler) {
@@ -163,9 +168,9 @@ class MethodParameters {
         if (returning) {
             this.returning = new method_def_returning_1.MethodDefReturning().runSyntax(returning, scope, this.filename, ["returning" /* IdentifierMeta.MethodReturning */]);
         }
-        this.workaroundRAP(node, scope, filename);
+        this.workaroundRAP(node, scope, filename, parentName);
     }
-    workaroundRAP(node, scope, filename) {
+    workaroundRAP(node, _scope, filename, parentName) {
         const resultName = node.findExpressionAfterToken("RESULT");
         const isRap = node.findExpressionAfterToken("IMPORTING");
         if (isRap) {
@@ -190,7 +195,7 @@ class MethodParameters {
             this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
         }
         // its some kind of magic
-        if (scope.getName().toUpperCase() === "CL_ABAP_BEHAVIOR_SAVER") {
+        if (parentName.toUpperCase() === "CL_ABAP_BEHAVIOR_SAVER") {
             const tempChanging = this.changing.map(c => new _typed_identifier_1.TypedIdentifier(c.getToken(), filename, new basic_1.VoidType("RapMethodParameter"), c.getMeta()));
             while (this.changing.length > 0) {
                 this.changing.shift();
@@ -217,7 +222,9 @@ class MethodParameters {
             else if (meta.includes("importing" /* IdentifierMeta.MethodImporting */)) {
                 extraMeta.push("read_only" /* IdentifierMeta.ReadOnly */);
             }
-            target.push(new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]));
+            const id = new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]);
+            scope.addIdentifier(id);
+            target.push(id);
             if (opt.getLastToken().getStr().toUpperCase() === "OPTIONAL") {
                 const name = target[target.length - 1].getName().toUpperCase();
                 this.optional.push(name);

package/build/src/lsp/_lookup.js

@@ -55,7 +55,7 @@ class LSPLookup {
             const hover = "Type Definition, " + cursor.token.getStr() + "\n\n" + this.dumpType(type);
             return { hover, definition: found, definitionId: type, scope: bottomScope };
         }
-        const method = this.findMethodDefinition(cursor, bottomScope);
+        const method = this.findMethodDefinition(cursor, bottomScope.getParent());
         if (method !== undefined && method.getStart().equals(cursor.token.getStart())) {
             const found = _lsp_utils_1.LSPUtils.identiferToLocation(method);
             const hover = "Method Definition \"" + method.getName() + "\"";
@@ -272,6 +272,9 @@ class LSPLookup {
     }
     static findMethodDefinition(found, scope) {
         var _a, _b, _c, _d;
+        if (scope === undefined) {
+            return undefined;
+        }
         if (scope.getIdentifier().stype !== _scope_type_1.ScopeType.ClassDefinition
             || !(found.snode.get() instanceof Statements.MethodDef)) {
             return undefined;

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.14";
+        return "2.102.15";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/function_module_recommendations.js

@@ -30,6 +30,7 @@ class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleCo
             { name: "POPUP_TO_CONFIRM_STEP", replace: "use POPUP_TO_CONFIRM" },
             { name: "POPUP_TO_DECIDE", replace: "use POPUP_TO_CONFIRM" },
             { name: "POPUP_TO_GET_VALUE", replace: "use POPUP_GET_VALUES" },
+            { name: "QF05_RANDOM_INTEGER", replace: "use CL_ABAP_RANDOM_INT" },
             { name: "REUSE_ALV_GRID_DISPLAY", replace: "use CL_SALV_TABLE=>FACTORY or CL_GUI_ALV_GRID" },
             { name: "ROUND", replace: "use built in function: round()" },
             { name: "SAPGUI_PROGRESS_INDICATOR", replace: "use CL_PROGRESS_INDICATOR" },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.14",
+    "version": "2.102.15",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.36.3",
         "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.5",
+        "@types/node": "^20.4.8",
         "chai": "^4.3.7",
         "eslint": "^8.46.0",
         "mocha": "^10.2.0",