@abaplint/transpiler 2.3.111 → 2.3.113

package/build/src/traversal.js

@@ -180,6 +180,7 @@ class Traversal {
     }
     findMethodReference(token, scope) {
         var _a, _b;
+        let candidate = undefined;
         if (scope === undefined) {
             return undefined;
         }
@@ -191,7 +192,13 @@ class Traversal {
                 if (((_a = r.extra) === null || _a === void 0 ? void 0 : _a.ooName) && ((_b = r.extra) === null || _b === void 0 ? void 0 : _b.ooType) === "INTF") {
                     name = r.extra.ooName + "$" + name;
                 }
-                return { def: r.resolved, name };
+                candidate = { def: r.resolved, name };
+                if (token.getStart() instanceof abaplint.VirtualPosition
+                    && name.toLowerCase().includes(token.getStr().toLowerCase()) === false) {
+                    // if its macros and they are nested everything can go wrong, so try looking for a better candidate
+                    continue;
+                }
+                return candidate;
             }
             else if (r.referenceType === abaplint.ReferenceType.BuiltinMethodReference
                 && r.position.getStart().equals(token.getStart())) {
@@ -200,7 +207,7 @@ class Traversal {
                 return { def, name };
             }
         }
-        return undefined;
+        return candidate;
     }
     isBuiltinVariable(token) {
         const scope = this.findCurrentScopeByToken(token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.3.111",
+  "version": "2.3.113",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.94.25",
+    "@abaplint/core": "^2.95.3",
     "source-map": "^0.7.4"
   },
   "devDependencies": {