LambdaAnalyzer/SimplifyLambda: do not suggest if has conversion to a delegate

Author: DedSec256

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Analyzers/LambdaAnalyzer.fs

@@ -187,8 +187,8 @@ type LambdaAnalyzer() =
         | _ -> true
 
     let tryCreateWarning (ctor: ILambdaExpr * 'a -> #IHighlighting) (lambda: ILambdaExpr, replacementExpr: 'a as arg)
-            isFSharp6Supported =
-        if isFSharp6Supported && hasExplicitConversion lambda then null else
+            delegatesConversionSupported =
+        if delegatesConversionSupported && hasExplicitConversion lambda then null else
 
         let lambda = lambda.IgnoreParentParens()
 
@@ -201,7 +201,7 @@ type LambdaAnalyzer() =
         | ValueSome (:? FSharpActivePatternCase) -> null
         | _ ->
 
-        let outerReferenceCheck = isLambdaArgOwnerSupported lambda isFSharp6Supported replacementExprSymbol
+        let outerReferenceCheck = isLambdaArgOwnerSupported lambda delegatesConversionSupported replacementExprSymbol
         if not outerReferenceCheck then null else
 
         match replacementExprSymbol with
@@ -352,7 +352,7 @@ type LambdaAnalyzer() =
                     isFSharp60Supported :> _
 
             | true, false, replaceCandidate ->
-                tryCreateWarning LambdaCanBeSimplifiedWarning (lambda, replaceCandidate) isFSharp60Supported :> _
+                tryCreateWarning LambdaCanBeSimplifiedWarning (lambda, replaceCandidate) false :> _
 
             | _ ->
 

ReSharper.FSharp/test/data/features/daemon/lambdaAnalyzer/Delegates 03 - Simplify lambda.fs

@@ -0,0 +1,6 @@
+open System
+
+type A =
+    static member M(_: Func<int, string, unit>) = ()
+
+A.M(fun x y -> ignore y)

ReSharper.FSharp/test/data/features/daemon/lambdaAnalyzer/Delegates 03 - Simplify lambda.fs.gold

@@ -0,0 +1,8 @@
+open System
+
+type A =
+    static member M(_: Func<int, string, unit>) = ()
+
+A.M(fun x y -> ignore y)
+
+---------------------------------------------------------

ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Daemon/LambdaAnalyzerTest.fs

@@ -29,6 +29,7 @@ type LambdaAnalyzerTest() =
     [<Test>] member x.``Snd``() = x.DoNamedTest()
     [<Test>] member x.``Delegates 01``() = x.DoNamedTest()
     [<Test>] member x.``Delegates 02 - Method overloads``() = x.DoNamedTest()
+    [<Test>] member x.``Delegates 03 - Simplify lambda``() = x.DoNamedTest()
 
     [<Test; TestReferences("System.Core")>] member x.``Delegates``() = x.DoNamedTest()