Merge pull request #1012 from Muppets/CC0020-cannot-be-used

carloscds · web-flow · commit 48addde1665e · 2018-11-20T17:03:10.000-02:00
Fixes #930 CC0020 cannot be used when types are declared
diff --git a/src/CSharp/CodeCracker/Style/ConvertLambdaExpressionToMethodGroupAnalyzer.cs b/src/CSharp/CodeCracker/Style/ConvertLambdaExpressionToMethodGroupAnalyzer.cs
@@ -65,7 +65,13 @@ internal static InvocationExpressionSyntax GetInvocationIfAny(SyntaxNode node)
                 : (node as ParenthesizedLambdaExpressionSyntax)?.Body;
 
             var invocation = body as InvocationExpressionSyntax;
-            if (invocation != null) return invocation;
+
+            if (invocation != null)
+            {
+                if (invocation.Expression is GenericNameSyntax && (((GenericNameSyntax)invocation.Expression).TypeArgumentList.Arguments.Count > 0)) return null;
+
+                return invocation;
+            }
 
             var possibleBlock = body as BlockSyntax;
             if (possibleBlock == null || possibleBlock.Statements.Count != 1) return null;
diff --git a/test/CSharp/CodeCracker.Test/Style/ConvertLambdaExpressionToMethodGroupTests.cs b/test/CSharp/CodeCracker.Test/Style/ConvertLambdaExpressionToMethodGroupTests.cs
@@ -598,5 +598,23 @@ public static Task<TResult> Finally<TResult>(this Task<TResult> task, Func<Task<
 ";
             await VerifyCSharpHasNoDiagnosticsAsync(oldCode);
         }
+
+        [Fact]
+        public async Task DoNotCreateDiagnosticWhenSubstitutionMayBreakTypeConversion()
+        {
+            const string oldCode = @"
+using System.Linq;
+class Foo
+{
+    void M()
+    {
+        var xs = new System.Collections.Generic.List<int>();
+        xs.Select(x => Func<int>(x));
+    }
+    object Func<T>(object x) => x;
+}";
+            await VerifyCSharpHasNoDiagnosticsAsync(oldCode);
+        }
+
     }
 }
