@abaplint/core 2.120.21 → 2.120.22

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

@@ -151,7 +151,7 @@ class CreateObject {
         this.validateParameters(cdef, node, input);
     }
     static checkInstantiationAllowed(cdef, input) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const createVis = cdef.getCreateVisibility();
         if (createVis === visibility_1.Visibility.Public) {
             return undefined;
@@ -168,23 +168,30 @@ class CreateObject {
             input.scope.isLocalFriend(cdef.getName(), enclosingClass)) {
             return undefined;
         }
+        const enclosingDefinition = input.scope.findClassDefinition(enclosingClass);
+        if (enclosingDefinition !== undefined) {
+            const implementedInterfaces = new _object_oriented_1.ObjectOriented(input.scope).findInterfaces(enclosingDefinition);
+            if (cdef.getFriends().some(friend => implementedInterfaces.some(implemented => implemented.name.toUpperCase() === friend.toUpperCase()))) {
+                return undefined;
+            }
+        }
         // subclasses of friends also have friendship
-        let enclosingSup = (_a = input.scope.findClassDefinition(enclosingClass)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+        let enclosingSup = enclosingDefinition === null || enclosingDefinition === void 0 ? void 0 : enclosingDefinition.getSuperClass();
         while (enclosingSup !== undefined) {
             if (cdef.getFriends().some(f => f.toUpperCase() === enclosingSup.toUpperCase()) ||
                 input.scope.isLocalFriend(cdef.getName(), enclosingSup)) {
                 return undefined;
             }
-            enclosingSup = (_b = input.scope.findClassDefinition(enclosingSup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            enclosingSup = (_a = input.scope.findClassDefinition(enclosingSup)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
         }
         if (createVis === visibility_1.Visibility.Protected) {
             // subclasses are also allowed
-            let sup = (_c = input.scope.findClassDefinition(enclosingClass)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
+            let sup = (_b = input.scope.findClassDefinition(enclosingClass)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
             while (sup !== undefined) {
                 if (sup.toUpperCase() === cdef.getName().toUpperCase()) {
                     return undefined;
                 }
-                sup = (_d = input.scope.findClassDefinition(sup)) === null || _d === void 0 ? void 0 : _d.getSuperClass();
+                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
             }
         }
         return cdef.getName() + " cannot be instantiated, class is defined as " +

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.21";
+        return "2.120.22";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.120.21",
+    "version": "2.120.22",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",