Merge pull request #5150 from MDoerner/MoreFixesAroundFailedCoercionReferences

Fix as type names for array types resolved from COM

Author: bclothier

Rubberduck.Parsing/ComReflection/ComField.cs

@@ -36,7 +36,7 @@ public class ComField
 
         [DataMember(IsRequired = true)]
         private string _valueType = Tokens.Object;
-        public string ValueType => IsArray ? $"{_valueType}()" : _valueType;
+        public string ValueType => _valueType;
 
         [DataMember(IsRequired = true)]
         private Guid _enumGuid = Guid.Empty;

Rubberduck.Parsing/ComReflection/ComParameter.cs

@@ -73,7 +73,7 @@ public string DefaultAsEnum
 
         [DataMember(IsRequired = true)]
         private ComTypeName _typeName;
-        public string TypeName => IsArray ? $"{_typeName.Name}()" : _typeName.Name;
+        public string TypeName => _typeName.Name;
 
         [DataMember(IsRequired = true)]
         ComMember Parent { get; set; }

Rubberduck.Parsing/Symbols/DocumentModuleDeclaration.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.VBEditor;
 

Rubberduck.Parsing/Symbols/EventDeclaration.cs

@@ -2,7 +2,6 @@
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.ComReflection;
 using Rubberduck.Parsing.Grammar;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Linq;

Rubberduck.Parsing/Symbols/ProceduralModuleDeclaration.cs

@@ -25,7 +25,10 @@ public ProceduralModuleDeclaration(
                   attributes)
         { }
 
-        public ProceduralModuleDeclaration(ComModule statics, Declaration parent, QualifiedModuleName module,
+        public ProceduralModuleDeclaration(
+            ComModule statics, 
+            Declaration parent, 
+            QualifiedModuleName module,
             Attributes attributes)
             : this(
                 module.QualifyMemberName(statics.Name),

RubberduckTests/Grammar/ResolverTests.cs

@@ -6570,5 +6570,72 @@ End Function
                 Assert.IsFalse(failedAccesses.Any());
             }
         }
+
+        [Category("Grammar")]
+        [Category("Resolver")]
+        [Test]
+        public void ParamArray_NoFailedLetCoercionReference()
+        {
+            var classCode = @"
+Public Function Foo(index As Variant) As Class1
+End Function
+";
+
+            var moduleCode = $@"
+Private Function Foo(ParamArray args() As Variant) As Variant
+End Function
+
+Private Function Test() As Variant
+    Dim bar As Class1
+    Set bar = New Class1
+    Test = Foo(bar)
+End Function
+";
+
+            var vbe = MockVbeBuilder.BuildFromModules(
+                ("Class1", classCode, ComponentType.ClassModule),
+                ("Module1", moduleCode, ComponentType.StandardModule));
+
+            using (var state = Resolve(vbe.Object))
+            {
+                var failedAccesses = state.DeclarationFinder.FailedLetCoercions();
+
+                Assert.IsFalse(failedAccesses.Any());
+            }
+        }
+
+        [Category("Grammar")]
+        [Category("Resolver")]
+        [Test]
+        public void ParamArrayFromLibrary_NoFailedLetCoercionReference()
+        {
+            var classCode = @"
+Public Function Foo(index As Variant) As Class1
+End Function
+";
+
+            var moduleCode = $@"
+Private Function Test() As Variant
+    Dim bar As Class1
+    Set bar = New Class1
+    Test = Array(bar)
+End Function
+";
+
+            var vbe = new MockVbeBuilder()
+                .ProjectBuilder("TestProject", ProjectProtection.Unprotected)
+                .AddComponent("Class1", ComponentType.ClassModule, classCode)
+                .AddComponent("Module1", ComponentType.StandardModule, moduleCode)
+                .AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
+                .AddProjectToVbeBuilder()
+                .Build();
+
+            using (var state = Resolve(vbe.Object))
+            {
+                var failedAccesses = state.DeclarationFinder.FailedLetCoercions();
+
+                Assert.IsFalse(failedAccesses.Any());
+            }
+        }
     }
 }

RubberduckTests/Inspections/ValueRequiredInspectionTests.cs

@@ -342,6 +342,65 @@ End Sub
             Assert.IsFalse(inspectionResults.Any());
         }
 
+        [Category("Grammar")]
+        [Category("Resolver")]
+        [Test]
+        public void ParamArray_NoResult()
+        {
+            var classCode = @"
+Public Function Foo(index As Variant) As Class1
+End Function
+";
+
+            var moduleCode = $@"
+Private Function Foo(ParamArray args() As Variant) As Variant
+End Function
+
+Private Function Test() As Variant
+    Dim bar As Class1
+    Set bar = New Class1
+    Test = Foo(bar)
+End Function
+";
+
+            var vbe = MockVbeBuilder.BuildFromModules(
+                ("Class1", classCode, ComponentType.ClassModule),
+                ("Module1", moduleCode, ComponentType.StandardModule));
+
+            var inspectionResults = InspectionResults(vbe.Object);
+            Assert.IsFalse(inspectionResults.Any());
+        }
+
+        [Category("Grammar")]
+        [Category("Resolver")]
+        [Test]
+        public void ParamArrayInLibrary_NoResult()
+        {
+            var classCode = @"
+Public Function Foo(index As Variant) As Class1
+End Function
+";
+
+            var moduleCode = $@"
+Private Function Test() As Variant
+    Dim bar As Class1
+    Set bar = New Class1
+    Test = Array(bar)
+End Function
+";
+
+            var vbe = new MockVbeBuilder()
+                .ProjectBuilder("TestProject", ProjectProtection.Unprotected)
+                .AddComponent("Class1", ComponentType.ClassModule, classCode)
+                .AddComponent("Module1", ComponentType.StandardModule, moduleCode)
+                .AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
+                .AddProjectToVbeBuilder()
+                .Build();
+
+            var inspectionResults = InspectionResults(vbe.Object);
+            Assert.IsFalse(inspectionResults.Any());
+        }
+
         protected override IInspection InspectionUnderTest(RubberduckParserState state)
         {
             return new ValueRequiredInspection(state);