Merge pull request #9 from vchirikov/master

MrLuje · web-flow · commit 7cfec8e25348 · 2020-08-26T21:49:24.000+02:00
Add support of multiple methods
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "paket": {
+      "version": "5.247.4",
+      "commands": [
+        "paket"
+      ]
+    }
+  }
+}
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/Mocking.Helpers/Mocking.Helpers/Core/BaseMockingProvider.cs b/Mocking.Helpers/Mocking.Helpers/Core/BaseMockingProvider.cs
@@ -1,16 +1,13 @@
-﻿using Microsoft.CodeAnalysis;
+﻿using System.Linq;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Mocking.Helpers.Interfaces
 {
     public abstract class BaseMockingProvider
     {
         public abstract string AssemblyName { get; }
-        public abstract string MockingMethodName { get; }
+        public abstract string[] MockingMethodNames { get; }
         public abstract string MockingWildcardMethod { get; }
 
         protected string FormatMockingWildcardMethod(string parameterTypeName)
@@ -20,7 +17,7 @@ protected string FormatMockingWildcardMethod(string parameterTypeName)
 
         public virtual string GenerateSuggestionForParameterWildcard(SemanticModel model, IMethodSymbol methodSymbol, ArgumentListSyntax arguments)
         {
-            var suggestionParameter = methodSymbol.Parameters.Aggregate(String.Empty, (acc, p) => $"{acc}, {this.FormatMockingWildcardMethod(p.Type.ToMinimalDisplayString(model, arguments.SpanStart))}").TrimStart(',').Trim();
+            var suggestionParameter = methodSymbol.Parameters.Aggregate(string.Empty, (acc, p) => $"{acc}, {this.FormatMockingWildcardMethod(p.Type.ToMinimalDisplayString(model, arguments.SpanStart))}").TrimStart(',').Trim();
             return suggestionParameter;
         }
 
diff --git a/Mocking.Helpers/Mocking.Helpers/FakeItEasy/FakeItEasyIgnoredCompletion.cs b/Mocking.Helpers/Mocking.Helpers/FakeItEasy/FakeItEasyIgnoredCompletion.cs
@@ -18,12 +18,11 @@ public class FakeItEasyIgnoredCompletion : CompletionProvider
         public FakeItEasyIgnoredCompletion()
         {
             this._provider = new FakeItEasyProvider();
+            IsFakeItEasyCallToMethod = (InvocationExpressionSyntax invocation) => this._provider.MockingMethodNames.Any(methodName => SyntaxHelpers.IsMethodNamed(invocation, methodName));
         }
 
-        internal bool IsFakeItEasyCallToMethod(InvocationExpressionSyntax invocation)
-        {
-            return SyntaxHelpers.IsMethodNamed(invocation, this._provider.MockingMethodName);
-        }
+        internal readonly Func<InvocationExpressionSyntax, bool> IsFakeItEasyCallToMethod;
+
 
         public override async Task ProvideCompletionsAsync(CompletionContext context)
         {
diff --git a/Mocking.Helpers/Mocking.Helpers/FakeItEasy/FakeItEasyProvider.cs b/Mocking.Helpers/Mocking.Helpers/FakeItEasy/FakeItEasyProvider.cs
@@ -1,16 +1,10 @@
-﻿using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Mocking.Helpers.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+﻿using Mocking.Helpers.Interfaces;
 
 namespace Mocking.Helpers.FakeItEasy
 {
     public class FakeItEasyProvider : BaseMockingProvider
     {
-        public override string MockingMethodName => "CallTo";
+        public override string[] MockingMethodNames { get; } = new[] { "CallTo" };
         public override string AssemblyName => "FakeItEasy";
         public override string MockingWildcardMethod => "A<{0}>._";
     }
diff --git a/Mocking.Helpers/Mocking.Helpers/Moq/MoqIsAnyCompletion.cs b/Mocking.Helpers/Mocking.Helpers/Moq/MoqIsAnyCompletion.cs
@@ -1,9 +1,7 @@
 ﻿using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -17,12 +15,10 @@ public class MoqIsAnyCompletion : CompletionProvider
         public MoqIsAnyCompletion()
         {
             this._provider = new MoqProvider();
+            IsMoqSetupMethod = (InvocationExpressionSyntax invocation) => this._provider.MockingMethodNames.Any(methodName => SyntaxHelpers.IsMethodNamed(invocation, methodName));
         }
 
-        internal bool IsMoqSetupMethod(InvocationExpressionSyntax invocation)
-        {
-            return SyntaxHelpers.IsMethodNamed(invocation, this._provider.MockingMethodName);
-        }
+        internal readonly Func<InvocationExpressionSyntax, bool> IsMoqSetupMethod;
 
         public override async Task ProvideCompletionsAsync(CompletionContext context)
         {
diff --git a/Mocking.Helpers/Mocking.Helpers/Moq/MoqProvider.cs b/Mocking.Helpers/Mocking.Helpers/Moq/MoqProvider.cs
@@ -1,16 +1,10 @@
-﻿using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Mocking.Helpers.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+﻿using Mocking.Helpers.Interfaces;
 
 namespace Mocking.Helpers.Moq
 {
     public class MoqProvider : BaseMockingProvider
     {
-        public override string MockingMethodName => "Setup";
+        public override string[] MockingMethodNames { get; } = new[] { "Setup", "Verify" };
         public override string AssemblyName => "Moq";
         public override string MockingWildcardMethod => "It.IsAny<{0}>()";
     }
diff --git a/Mocking.Helpers/Mocking.Helpers/NSubstitute/NSubstituteArgAnyCompletion.cs b/Mocking.Helpers/Mocking.Helpers/NSubstitute/NSubstituteArgAnyCompletion.cs
@@ -2,9 +2,7 @@
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Mocking.Helpers.NSubstitute
@@ -17,12 +15,10 @@ public class NSubstituteArgAnyCompletion : CompletionProvider
         public NSubstituteArgAnyCompletion()
         {
             this._provider = new NSubstituteProvider();
+            IsSubstituteForMethod = (InvocationExpressionSyntax invocation) => this._provider.MockingMethodNames.Any(methodName => SyntaxHelpers.IsMethodNamed(invocation, methodName));
         }
 
-        internal bool IsSubstituteForMethod(InvocationExpressionSyntax invocation)
-        {
-            return SyntaxHelpers.IsMethodNamed(invocation, this._provider.MockingMethodName);
-        }
+        internal readonly Func<InvocationExpressionSyntax, bool> IsSubstituteForMethod;
 
         public override async Task ProvideCompletionsAsync(CompletionContext context)
         {
diff --git a/Mocking.Helpers/Mocking.Helpers/NSubstitute/NSubstituteProvider.cs b/Mocking.Helpers/Mocking.Helpers/NSubstitute/NSubstituteProvider.cs
@@ -1,16 +1,11 @@
-﻿using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Mocking.Helpers.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using Mocking.Helpers.Interfaces;
 
 namespace Mocking.Helpers.NSubstitute
 {
     public class NSubstituteProvider : BaseMockingProvider
     {
         public override string AssemblyName => "NSubstitute";
-        public override string MockingMethodName => "For";
+        public override string[] MockingMethodNames { get; } = new[] { "For" };
         public override string MockingWildcardMethod => "Arg.Any<{0}>()";
     }
 }
diff --git a/Mocking.Helpers/Mocking.Helpers/SyntaxHelpers.cs b/Mocking.Helpers/Mocking.Helpers/SyntaxHelpers.cs
@@ -14,13 +14,11 @@ internal static bool IsMethodNamed(InvocationExpressionSyntax invocation, string
         {
             var method = invocation.Expression as MemberAccessExpressionSyntax;
             var methodName = method?.Name.Identifier.ValueText;
-            return methodName == expectedMethodName;
+            return string.Equals(methodName, expectedMethodName, StringComparison.Ordinal);
         }
 
-        static internal bool IsCommaOrOpenParenthesis(SyntaxToken token)
-        {
-            return token.IsKind(SyntaxKind.OpenParenToken) || token.IsKind(SyntaxKind.CommaToken);
-        }
+        internal static readonly Func<SyntaxToken, bool> IsCommaOrOpenParenthesis =
+            (SyntaxToken token) => token.IsKind(SyntaxKind.OpenParenToken) || token.IsKind(SyntaxKind.CommaToken);
 
         /// <summary>
         /// Get token at current position
@@ -75,7 +73,7 @@ static internal IEnumerable<IMethodSymbol> GetCandidatesMockedMethodSignatures(S
             {
                 mockSignatures.AddRange(symbolInfo.CandidateSymbols.OfType<IMethodSymbol>());
             }
-            return mockSignatures.Where(m => !m.IsStatic && m.Parameters.Any());
+            return mockSignatures.Where(m => !m.IsStatic && m.Parameters.Length > 0);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,13 @@`
`1`		`-using Microsoft.CodeAnalysis;`
	`1`	`+using System.Linq;`
	`2`	`+using Microsoft.CodeAnalysis;`
`2`	`3`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`3`		`-using System;`
`4`		`-using System.Collections.Generic;`
`5`		`-using System.Linq;`
`6`		`-using System.Text;`
`7`	`4`
`8`	`5`	`namespace Mocking.Helpers.Interfaces`
`9`	`6`	`{`
`10`	`7`	`public abstract class BaseMockingProvider`
`11`	`8`	`{`
`12`	`9`	`public abstract string AssemblyName { get; }`
`13`		`- public abstract string MockingMethodName { get; }`
	`10`	`+ public abstract string[] MockingMethodNames { get; }`
`14`	`11`	`public abstract string MockingWildcardMethod { get; }`
`15`	`12`
`16`	`13`	`protected string FormatMockingWildcardMethod(string parameterTypeName)`
`@@ -20,7 +17,7 @@ protected string FormatMockingWildcardMethod(string parameterTypeName)`
`20`	`17`
`21`	`18`	`public virtual string GenerateSuggestionForParameterWildcard(SemanticModel model, IMethodSymbol methodSymbol, ArgumentListSyntax arguments)`
`22`	`19`	`{`
`23`		`- var suggestionParameter = methodSymbol.Parameters.Aggregate(String.Empty, (acc, p) => $"{acc}, {this.FormatMockingWildcardMethod(p.Type.ToMinimalDisplayString(model, arguments.SpanStart))}").TrimStart(',').Trim();`
	`20`	`+ var suggestionParameter = methodSymbol.Parameters.Aggregate(string.Empty, (acc, p) => $"{acc}, {this.FormatMockingWildcardMethod(p.Type.ToMinimalDisplayString(model, arguments.SpanStart))}").TrimStart(',').Trim();`
`24`	`21`	`return suggestionParameter;`
`25`	`22`	`}`
`26`	`23`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,11 @@ public class FakeItEasyIgnoredCompletion : CompletionProvider`
`18`	`18`	`public FakeItEasyIgnoredCompletion()`
`19`	`19`	`{`
`20`	`20`	`this._provider = new FakeItEasyProvider();`
	`21`	`+ IsFakeItEasyCallToMethod = (InvocationExpressionSyntax invocation) => this._provider.MockingMethodNames.Any(methodName => SyntaxHelpers.IsMethodNamed(invocation, methodName));`
`21`	`22`	`}`
`22`	`23`
`23`		`- internal bool IsFakeItEasyCallToMethod(InvocationExpressionSyntax invocation)`
`24`		`- {`
`25`		`- return SyntaxHelpers.IsMethodNamed(invocation, this._provider.MockingMethodName);`
`26`		`- }`
	`24`	`+ internal readonly Func<InvocationExpressionSyntax, bool> IsFakeItEasyCallToMethod;`
	`25`	`+`
`27`	`26`
`28`	`27`	`public override async Task ProvideCompletionsAsync(CompletionContext context)`
`29`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,10 @@`
`1`		`-using Microsoft.CodeAnalysis;`
`2`		`-using Microsoft.CodeAnalysis.CSharp.Syntax;`
`3`		`-using Mocking.Helpers.Interfaces;`
`4`		`-using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Text;`
	`1`	`+using Mocking.Helpers.Interfaces;`
`8`	`2`
`9`	`3`	`namespace Mocking.Helpers.FakeItEasy`
`10`	`4`	`{`
`11`	`5`	`public class FakeItEasyProvider : BaseMockingProvider`
`12`	`6`	`{`
`13`		`- public override string MockingMethodName => "CallTo";`
	`7`	`+ public override string[] MockingMethodNames { get; } = new[] { "CallTo" };`
`14`	`8`	`public override string AssemblyName => "FakeItEasy";`
`15`	`9`	`public override string MockingWildcardMethod => "A<{0}>._";`
`16`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,11 @@`
`1`		`-using Microsoft.CodeAnalysis;`
`2`		`-using Microsoft.CodeAnalysis.CSharp.Syntax;`
`3`		`-using Mocking.Helpers.Interfaces;`
`4`		`-using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Text;`
	`1`	`+using Mocking.Helpers.Interfaces;`
`7`	`2`
`8`	`3`	`namespace Mocking.Helpers.NSubstitute`
`9`	`4`	`{`
`10`	`5`	`public class NSubstituteProvider : BaseMockingProvider`
`11`	`6`	`{`
`12`	`7`	`public override string AssemblyName => "NSubstitute";`
`13`		`- public override string MockingMethodName => "For";`
	`8`	`+ public override string[] MockingMethodNames { get; } = new[] { "For" };`
`14`	`9`	`public override string MockingWildcardMethod => "Arg.Any<{0}>()";`
`15`	`10`	`}`
`16`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,11 @@ internal static bool IsMethodNamed(InvocationExpressionSyntax invocation, string`
`14`	`14`	`{`
`15`	`15`	`var method = invocation.Expression as MemberAccessExpressionSyntax;`
`16`	`16`	`var methodName = method?.Name.Identifier.ValueText;`
`17`		`- return methodName == expectedMethodName;`
	`17`	`+ return string.Equals(methodName, expectedMethodName, StringComparison.Ordinal);`
`18`	`18`	`}`
`19`	`19`
`20`		`- static internal bool IsCommaOrOpenParenthesis(SyntaxToken token)`
`21`		`- {`
`22`		`- return token.IsKind(SyntaxKind.OpenParenToken) \|\| token.IsKind(SyntaxKind.CommaToken);`
`23`		`- }`
	`20`	`+ internal static readonly Func<SyntaxToken, bool> IsCommaOrOpenParenthesis =`
	`21`	`+ (SyntaxToken token) => token.IsKind(SyntaxKind.OpenParenToken) \|\| token.IsKind(SyntaxKind.CommaToken);`
`24`	`22`
`25`	`23`	`/// <summary>`
`26`	`24`	`/// Get token at current position`
`@@ -75,7 +73,7 @@ static internal IEnumerable<IMethodSymbol> GetCandidatesMockedMethodSignatures(S`
`75`	`73`	`{`
`76`	`74`	`mockSignatures.AddRange(symbolInfo.CandidateSymbols.OfType<IMethodSymbol>());`
`77`	`75`	`}`
`78`		`- return mockSignatures.Where(m => !m.IsStatic && m.Parameters.Any());`
	`76`	`+ return mockSignatures.Where(m => !m.IsStatic && m.Parameters.Length > 0);`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`	`}`