Fix analyzer and expand tests

Author: Hosch250

RubberduckCodeAnalysis/ChainedWrapperAnalyzer.cs

@@ -39,7 +39,9 @@ private static void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
             }
 
             var expInterfaces = context.SemanticModel.GetTypeInfo(node.Expression).Type?.AllInterfaces;
-            var nameInterfaces = context.SemanticModel.GetTypeInfo(node.Name).Type?.AllInterfaces;
+
+            var nameValue = node.Name.Parent.Parent is InvocationExpressionSyntax ? node.Name.Parent.Parent : node.Name;
+            var nameInterfaces = context.SemanticModel.GetTypeInfo(nameValue).Type?.AllInterfaces;
 
             if (!expInterfaces.HasValue || !nameInterfaces.HasValue)
             {

RubberduckTestsCodeAnalysis/RubberduckCodeAnalysisUnitTests.cs

@@ -724,7 +724,6 @@ public class ChainedWrapperUnitTests : ChainedWrapperAnalyzer
     {
         [Test]
         [Category("ChainedWrappers")]
-        [Ignore("See #4377")]
         public void InterfaceContainsInterfaceType()
         {
             var test = @"namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
@@ -752,6 +751,76 @@ public void B()
             v.Execute().Execute();
         }
     }
+}";
+            var diagnostics = GetSortedDiagnostics(new[] { test }, LanguageNames.CSharp, GetCSharpDiagnosticAnalyzer());
+            Assert.AreEqual("ChainedWrapper", diagnostics.Single().Descriptor.Id);
+        }
+        [Test]
+        [Category("ChainedWrappers")]
+        public void InterfaceContainsInterfaceType_Property()
+        {
+            var test = @"namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
+{
+    public interface ISafeComWrapper
+    {
+        FooImp Value { get; }
+    }
+
+    public abstract class Foo : ISafeComWrapper
+    {
+        public virtual FooImp Value => new FooImp();
+    }
+
+    public class FooImp : Foo
+    {
+        public override FooImp Value => base.Value;
+    }
+
+    public class D
+    {
+        public void B()
+        {
+            var v = new FooImp();
+            var x = v.Value.Value;
+        }
+    }
+}";
+            var diagnostics = GetSortedDiagnostics(new[] { test }, LanguageNames.CSharp, GetCSharpDiagnosticAnalyzer());
+            Assert.AreEqual("ChainedWrapper", diagnostics.Single().Descriptor.Id);
+        }
+        [Test]
+        [Category("ChainedWrappers")]
+        public void InterfaceContainsInterfaceType_Property_ReverseAssignment()
+        {
+            var test = @"namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
+{
+    public interface ISafeComWrapper
+    {
+        FooImp Value { get; set; }
+    }
+
+    public abstract class Foo : ISafeComWrapper
+    {
+        public virtual FooImp Value
+        {
+            get => new FooImp();
+            set => new FooImp().Value = value;
+        }
+    }
+
+    public class FooImp : Foo
+    {
+        public override FooImp Value => base.Value;
+    }
+
+    public class D
+    {
+        public void B()
+        {
+            var v = new FooImp();
+            v.Value.Value = new FooImp();
+        }
+    }
 }";
             var diagnostics = GetSortedDiagnostics(new[] { test }, LanguageNames.CSharp, GetCSharpDiagnosticAnalyzer());
             Assert.AreEqual("ChainedWrapper", diagnostics.Single().Descriptor.Id);
@@ -785,4 +854,35 @@ protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer()
 
         }
     }
+}
+
+namespace Rubberduck.VBEditor.SafeComWrappers.Abstract1
+{
+    public interface ISafeComWrapper
+    {
+        FooImp Value { get; set; }
+    }
+
+    public abstract class Foo : ISafeComWrapper
+    {
+        public virtual FooImp Value
+        {
+            get => new FooImp();
+            set => new FooImp().Value = value;
+        }
+    }
+
+    public class FooImp : Foo
+    {
+        public override FooImp Value => base.Value;
+    }
+
+    public class D
+    {
+        public void B()
+        {
+            var v = new FooImp();
+            v.Value.Value = new FooImp();
+        }
+    }
 }