@abaplint/cli 2.102.13 → 2.102.15

package/build/cli.js

@@ -21424,6 +21424,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";
@@ -29108,7 +29109,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({
@@ -29583,11 +29584,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)) {
@@ -36787,6 +36789,7 @@ const method_param_1 = __webpack_require__(/*! ../5_syntax/expressions/method_pa
 const _object_oriented_1 = __webpack_require__(/*! ../5_syntax/_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 const identifier_1 = __webpack_require__(/*! ../1_lexer/tokens/identifier */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/identifier.js");
+const _scope_type_1 = __webpack_require__(/*! ../5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -36804,7 +36807,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;
@@ -36879,7 +36886,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) {
@@ -36939,9 +36946,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) {
@@ -36966,7 +36973,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();
@@ -36993,7 +37000,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);
@@ -39938,7 +39947,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() + "\"";
@@ -40155,6 +40164,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;
@@ -48557,7 +48569,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.13";
+        return "2.102.15";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -53194,7 +53206,7 @@ const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplin
 const _builtin_1 = __webpack_require__(/*! ../abap/5_syntax/_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
 const _scope_type_1 = __webpack_require__(/*! ../abap/5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const statements_1 = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
-const crypto = __webpack_require__(/*! node:crypto */ "node:crypto");
+const crypto = __webpack_require__(/*! crypto */ "crypto");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -57285,6 +57297,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" },
@@ -80934,6 +80947,17 @@ module.exports = require("child_process");
 
 /***/ }),
 
+/***/ "crypto":
+/*!*************************!*\
+  !*** external "crypto" ***!
+  \*************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("crypto");
+
+/***/ }),
+
 /***/ "events":
 /*!*************************!*\
   !*** external "events" ***!
@@ -80956,17 +80980,6 @@ module.exports = require("fs");
 
 /***/ }),
 
-/***/ "node:crypto":
-/*!******************************!*\
-  !*** external "node:crypto" ***!
-  \******************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("node:crypto");
-
-/***/ }),
-
 /***/ "node:os":
 /*!**************************!*\
   !*** external "node:os" ***!

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.13",
+    "version": "2.102.15",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.13",
+        "@abaplint/core": "^2.102.15",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.5",
+        "@types/node": "^20.4.8",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.7",
         "chalk": "^5.3.0",