@abaplint/cli 2.113.5 → 2.113.7

package/build/cli.js

@@ -21808,6 +21808,7 @@ exports.ObjectOriented = void 0;
 const Statements = __webpack_require__(/*! ../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const visibility_1 = __webpack_require__(/*! ../4_file_information/visibility */ "./node_modules/@abaplint/core/build/src/abap/4_file_information/visibility.js");
+const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 // todo, think some of the public methods can be made private
 // todo: changet this class to static? for performance
 class ObjectOriented {
@@ -21881,6 +21882,18 @@ class ObjectOriented {
         }
         return undefined;
     }
+    methodReferenceExtras(foundDef, ooName) {
+        if (foundDef === undefined) {
+            return {
+                ooName: ooName,
+                ooType: undefined,
+            };
+        }
+        return {
+            ooName: foundDef === null || foundDef === void 0 ? void 0 : foundDef.getName(),
+            ooType: foundDef instanceof types_1.ClassDefinition ? "CLAS" : "INTF",
+        };
+    }
     findClassName(node) {
         if (!(node.get() instanceof Statements.ClassImplementation
             || node.get() instanceof Statements.ClassDefinition)) {
@@ -25718,7 +25731,6 @@ const method_call_param_1 = __webpack_require__(/*! ./method_call_param */ "./no
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 const component_name_1 = __webpack_require__(/*! ./component_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_name.js");
 const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_name.js");
-const class_definition_1 = __webpack_require__(/*! ../../types/class_definition */ "./node_modules/@abaplint/core/build/src/abap/types/class_definition.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 class MethodCallChain {
     runSyntax(node, input, targetType) {
@@ -25761,10 +25773,8 @@ class MethodCallChain {
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
-                    const extra = {
-                        ooName: foundDef === null || foundDef === void 0 ? void 0 : foundDef.getName(),
-                        ooType: foundDef instanceof class_definition_1.ClassDefinition ? "CLAS" : "INTF"
-                    };
+                    const voidedName = context instanceof basic_1.VoidType ? context.getVoided() : undefined;
+                    const extra = helper.methodReferenceExtras(foundDef, className || voidedName);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
                 }
                 if (methodName === null || methodName === void 0 ? void 0 : methodName.includes("~")) {
@@ -26349,7 +26359,6 @@ const source_field_1 = __webpack_require__(/*! ./source_field */ "./node_modules
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_name.js");
 const component_name_1 = __webpack_require__(/*! ./component_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_name.js");
-const types_1 = __webpack_require__(/*! ../../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
@@ -26429,10 +26438,7 @@ class MethodSource {
                     return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                 }
                 else if (method) {
-                    const extra = {
-                        ooName: foundDef === null || foundDef === void 0 ? void 0 : foundDef.getName(),
-                        ooType: foundDef instanceof types_1.ClassDefinition ? "CLAS" : "INTF"
-                    };
+                    const extra = helper.methodReferenceExtras(foundDef, className);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
                     context = method;
                 }
@@ -42479,8 +42485,10 @@ const _typed_identifier_1 = __webpack_require__(/*! ../abap/types/_typed_identif
 const _reference_1 = __webpack_require__(/*! ../abap/5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 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 objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const types_1 = __webpack_require__(/*! ../abap/types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+const include_graph_1 = __webpack_require__(/*! ../utils/include_graph */ "./node_modules/@abaplint/core/build/src/utils/include_graph.js");
 class LSPLookup {
     static lookup(cursor, reg, obj) {
         var _a, _b;
@@ -42493,7 +42501,17 @@ class LSPLookup {
         if (fm) {
             return { hover: "Function Module " + fm };
         }
-        const bottomScope = new syntax_1.SyntaxLogic(reg, obj).run().spaghetti.lookupPosition(cursor.identifier.getStart(), cursor.identifier.getFilename());
+        let main = obj;
+        if (obj instanceof objects_1.Program && obj.isInclude()) {
+            // todo: this is slow
+            const ig = new include_graph_1.IncludeGraph(reg);
+            const mains = ig.listMainForInclude(cursor.identifier.getFilename());
+            if (mains.length === 1) {
+                // yea, well, or it has to be a popup
+                main = reg.findObjectForFile(reg.getFileByName(mains[0])) || obj;
+            }
+        }
+        const bottomScope = new syntax_1.SyntaxLogic(reg, main).run().spaghetti.lookupPosition(cursor.identifier.getStart(), cursor.identifier.getFilename());
         if (bottomScope === undefined) {
             return undefined;
         }
@@ -52696,7 +52714,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.5";
+        return "2.113.7";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.5",
+    "version": "2.113.7",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.5",
+        "@abaplint/core": "^2.113.7",
         "@types/chai": "^4.3.19",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
@@ -47,7 +47,7 @@
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
         "chalk": "^5.3.0",
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
         "memfs": "^4.11.1",