@abaplint/core 2.113.5 → 2.113.7

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

@@ -4,6 +4,7 @@ exports.ObjectOriented = void 0;
 const Statements = require("../2_statements/statements");
 const Expressions = require("../2_statements/expressions");
 const visibility_1 = require("../4_file_information/visibility");
+const types_1 = require("../types");
 // todo, think some of the public methods can be made private
 // todo: changet this class to static? for performance
 class ObjectOriented {
@@ -77,6 +78,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)) {

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

@@ -13,7 +13,6 @@ const method_call_param_1 = require("./method_call_param");
 const _reference_1 = require("../_reference");
 const component_name_1 = require("./component_name");
 const attribute_name_1 = require("./attribute_name");
-const class_definition_1 = require("../../types/class_definition");
 const _syntax_input_1 = require("../_syntax_input");
 class MethodCallChain {
     runSyntax(node, input, targetType) {
@@ -56,10 +55,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("~")) {

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

@@ -13,7 +13,6 @@ const source_field_1 = require("./source_field");
 const tokens_1 = require("../../1_lexer/tokens");
 const attribute_name_1 = require("./attribute_name");
 const component_name_1 = require("./component_name");
-const types_1 = require("../../types");
 const version_1 = require("../../../version");
 const _syntax_input_1 = require("../_syntax_input");
 const assert_error_1 = require("../assert_error");
@@ -93,10 +92,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;
                 }

package/build/src/lsp/_lookup.js

@@ -11,8 +11,10 @@ const _typed_identifier_1 = require("../abap/types/_typed_identifier");
 const _reference_1 = require("../abap/5_syntax/_reference");
 const _builtin_1 = require("../abap/5_syntax/_builtin");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
+const objects_1 = require("../objects");
 const types_1 = require("../abap/types");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
+const include_graph_1 = require("../utils/include_graph");
 class LSPLookup {
     static lookup(cursor, reg, obj) {
         var _a, _b;
@@ -25,7 +27,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;
         }

package/build/src/registry.js

@@ -67,7 +67,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/core",
-    "version": "2.113.5",
+    "version": "2.113.7",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -55,7 +55,7 @@
         "@types/mocha": "^10.0.7",
         "@types/node": "^22.5.4",
         "chai": "^4.5.0",
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
         "mocha": "^10.7.3",
         "c8": "^10.1.2",
         "source-map-support": "^0.5.21",