Fix issue with it.IsAny completion when working with overloads

lconstan · lconstan · commit b33d80cc876b · 2020-05-21T17:16:49.000+02:00
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/Completion/AutoMockerItIsAnyProviderActionTests.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/Completion/AutoMockerItIsAnyProviderActionTests.cs
@@ -14,6 +14,8 @@ public class AutoMockerItIsAnyProviderActionTests : CodeCompletionTestBase
 		[TestCase("itIsAnyCompletionFull")]
 		[TestCase("itIsAnyCompletionParam")]
 		[TestCase("itIsAnyCompletionGeneric")]
+        [TestCase("itIsAnyCompletionOverload")]
+        [TestCase("itIsAnyCompletionOverloadAndGenerics")]
 		[TestCase("itIsAnyVerifyCompletionFull")]
 		public void should_fill_with_it_isAny(string testSrc)
 		{
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/Completion/ItIsAnyProviderActionTests.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/Completion/ItIsAnyProviderActionTests.cs
@@ -14,6 +14,8 @@ public class ItIsAnyProviderActionTests : CodeCompletionTestBase
         [TestCase("itIsAnyCompletionFull")]
         [TestCase("itIsAnyCompletionParam")]
         [TestCase("itIsAnyCompletionGeneric")]
+        [TestCase("itIsAnyCompletionOverload")]
+        [TestCase("itIsAnyCompletionOverloadAndGenerics")]
         [TestCase("itIsAnyVerifyCompletionFull")]
         public void should_fill_with_it_isAny(string testSrc) => DoOneTest(testSrc);
     }
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverload.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverload.cs
@@ -0,0 +1,27 @@
+// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+using Moq.AutoMock;
+using NUnit.Framework;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface
+    {
+        decimal GetGrossAmountInEuro(decimal price, decimal quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+	[TestFixture]
+    public class Test1
+    {
+		[Test]
+        public void METHOD()
+        {
+            var mock = new AutoMocker();
+            mock.Setup<ITestInterface>(x=>x.GetGrossAmountInEuro(It{caret}))
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverload.cs.gold b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverload.cs.gold
@@ -0,0 +1,27 @@
+﻿// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+using Moq.AutoMock;
+using NUnit.Framework;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface
+    {
+        decimal GetGrossAmountInEuro(decimal price, decimal quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+	[TestFixture]
+    public class Test1
+    {
+		[Test]
+        public void METHOD()
+        {
+            var mock = new AutoMocker();
+            mock.Setup<ITestInterface>(x=>x.GetGrossAmountInEuro(It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>())){caret}
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs
@@ -0,0 +1,28 @@
+// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using NUnit.Framework;
+using System;
+using Moq;
+using Moq.AutoMock;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface<T>
+    {
+        decimal GetGrossAmountInEuro(decimal price, T quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+	
+	[TestFixture]
+    public class Test1
+    {
+		[Test]
+        public void METHOD()
+        {
+            var mock = new AutoMocker();
+            mock.Setup<ITestInterface<decimal>>(x=>x.GetGrossAmountInEuro(It{caret}))
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs.gold b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/AutoMockerItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs.gold
@@ -0,0 +1,28 @@
+﻿// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using NUnit.Framework;
+using System;
+using Moq;
+using Moq.AutoMock;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface<T>
+    {
+        decimal GetGrossAmountInEuro(decimal price, T quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+	
+	[TestFixture]
+    public class Test1
+    {
+		[Test]
+        public void METHOD()
+        {
+            var mock = new AutoMocker();
+            mock.Setup<ITestInterface<decimal>>(x=>x.GetGrossAmountInEuro(It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>())){caret}
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverload.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverload.cs
@@ -0,0 +1,23 @@
+// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface
+    {
+        decimal GetGrossAmountInEuro(decimal price, decimal quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+    public class Test1
+    {
+        public void METHOD()
+        {
+            var mock = new Mock<ITestInterface>();
+            mock.Setup(x=>x.GetGrossAmountInEuro(it{caret}))
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverload.cs.gold b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverload.cs.gold
@@ -0,0 +1,23 @@
+﻿// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface
+    {
+        decimal GetGrossAmountInEuro(decimal price, decimal quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+    public class Test1
+    {
+        public void METHOD()
+        {
+            var mock = new Mock<ITestInterface>();
+            mock.Setup(x=>x.GetGrossAmountInEuro(It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>())){caret}
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs
@@ -0,0 +1,23 @@
+// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface<T>
+    {
+        decimal GetGrossAmountInEuro(decimal price, T quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+    public class Test1
+    {
+        public void METHOD()
+        {
+            var mock = new Mock<ITestInterface<decimal>>();
+            mock.Setup(x=>x.GetGrossAmountInEuro(it{caret}))
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs.gold b/Abc.MoqComplete/Abc.MoqComplete.Tests/data/ItIsAnyCompletion/itIsAnyCompletionOverloadAndGenerics.cs.gold
@@ -0,0 +1,23 @@
+﻿// ${COMPLETE_ITEM:It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>()}
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public interface ITestInterface<T>
+    {
+        decimal GetGrossAmountInEuro(decimal price, T quantity, int securityId, int currencyId, decimal spotRateInEuro);
+        decimal GetGrossAmountInEuro(string message);
+        decimal GetGrossAmountInEuro(int trade);
+        
+        void Build(int temp);
+    }
+
+    public class Test1
+    {
+        public void METHOD()
+        {
+            var mock = new Mock<ITestInterface<decimal>>();
+            mock.Setup(x=>x.GetGrossAmountInEuro(It.IsAny<decimal>(), It.IsAny<decimal>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<decimal>())){caret}
+        }
+    }
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/ItIsAny/BaseItIsAnyParameterProvider.cs b/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/ItIsAny/BaseItIsAnyParameterProvider.cs
@@ -77,19 +77,18 @@ protected override bool AddLookupItems(CSharpCodeCompletionContext context, IIte
 				return true;
 			}
 
-			var mockedMethodResolved = mockedMethodInvocationExpression.Reference.Resolve();
-
-			var declaredElements = Enumerable.Repeat(mockedMethodResolved.DeclaredElement, 1)
-				.Concat(mockedMethodResolved.Result.Candidates)
-				.Where(x => x != null);
-
-			var methods = declaredElements.OfType<IMethod>().Where(x => x.Parameters.Count > 1).ToList();
-
-			foreach (var method in methods)
-			{
-				var parameter = method.Parameters.Select(x => GetItIsAny(x, mockedMethodResolved.Substitution));
-				var proposedCompletion = string.Join(", ", parameter);
-				AddLookup(context, collector, proposedCompletion, isSetup ? 2 : 1);
+			var candidates = mockedMethodInvocationExpression.InvocationExpressionReference.GetCandidates();
+			foreach (var candidate in candidates)
+            {
+                var method = candidate.GetDeclaredElement() as IMethod;
+                var substitution = candidate.GetSubstitution();
+
+				if (method == null || method.Parameters.Count <= 1)
+					continue;
+
+                var parameter = method.Parameters.Select(x => GetItIsAny(x, substitution));
+                var proposedCompletion = string.Join(", ", parameter);
+                AddLookup(context, collector, proposedCompletion, isSetup ? 2 : 1);
 			}
 
 			return true;
diff --git a/Abc.MoqComplete/Directory.Build.props b/Abc.MoqComplete/Directory.Build.props
@@ -22,7 +22,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <Version>1.3.2</Version>
+    <Version>1.3.3</Version>
   </PropertyGroup>
   
 </Project>
diff --git a/Abc.MoqComplete/Plugin.props b/Abc.MoqComplete/Plugin.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SdkVersion>2020.1.0</SdkVersion>
+    <SdkVersion>2020.1.3</SdkVersion>
     <Title>MoqComplete</Title>
     <Description>Code completion for Moq</Description>
     <Authors>ABC Arbitrage Asset Management</Authors>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ public class AutoMockerItIsAnyProviderActionTests : CodeCompletionTestBase`
`14`	`14`	`[TestCase("itIsAnyCompletionFull")]`
`15`	`15`	`[TestCase("itIsAnyCompletionParam")]`
`16`	`16`	`[TestCase("itIsAnyCompletionGeneric")]`
	`17`	`+ [TestCase("itIsAnyCompletionOverload")]`
	`18`	`+ [TestCase("itIsAnyCompletionOverloadAndGenerics")]`
`17`	`19`	`[TestCase("itIsAnyVerifyCompletionFull")]`
`18`	`20`	`public void should_fill_with_it_isAny(string testSrc)`
`19`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ public class ItIsAnyProviderActionTests : CodeCompletionTestBase`
`14`	`14`	`[TestCase("itIsAnyCompletionFull")]`
`15`	`15`	`[TestCase("itIsAnyCompletionParam")]`
`16`	`16`	`[TestCase("itIsAnyCompletionGeneric")]`
	`17`	`+ [TestCase("itIsAnyCompletionOverload")]`
	`18`	`+ [TestCase("itIsAnyCompletionOverloadAndGenerics")]`
`17`	`19`	`[TestCase("itIsAnyVerifyCompletionFull")]`
`18`	`20`	`public void should_fill_with_it_isAny(string testSrc) => DoOneTest(testSrc);`
`19`	`21`	`}`