FunctionAnnotationAction: improvements for top-level tuple patterns (#…

…759)

ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/Intentions/FunctionAnnotationAction.fs

@@ -84,20 +84,41 @@ module SpecifyTypes =
 type FunctionAnnotationAction(dataProvider: FSharpContextActionDataProvider) =
     inherit FSharpContextActionBase(dataProvider)
 
+    let rec (|TupleLikePattern|_|) (pattern: IFSharpPattern) =
+        match pattern with
+        | :? ITuplePat as pat -> Some(pat)
+        | :? IAsPat as pat ->
+            match pat.LeftPattern.IgnoreInnerParens() with
+            | TupleLikePattern pat -> Some(pat)
+            | _ -> None
+        | _ -> None
+
     let specifyParameterTypes displayContext (binding: IBinding) (mfv: FSharpMemberOrFunctionOrValue) =
         let types = FcsTypeUtil.getFunctionTypeArgs true mfv.FullType
-        let parameters = binding.ParametersDeclarations
+        let parameters = binding.ParametersDeclarations |> Seq.map _.Pattern
+
+        let rec specifyParameterTypes (types: FSharpType seq) (parameters: IFSharpPattern seq) isTopLevel =
+            for fcsType, parameter in Seq.zip types parameters do
+                match parameter.IgnoreInnerParens() with
+                | :? IConstPat | :? ITypedPat -> ()
+                | TupleLikePattern pat when isTopLevel ->
+                    specifyParameterTypes fcsType.GenericArguments pat.Patterns false
+                | pattern ->
+                    SpecifyTypes.specifyParameterType displayContext fcsType pattern
+
+        specifyParameterTypes types parameters true
 
-        for fcsType, parameter in (types, parameters) ||> Seq.zip do
-            match parameter.Pattern.IgnoreInnerParens() with
-            | :? IConstPat | :? ITypedPat -> ()
-            | pattern -> SpecifyTypes.specifyParameterType displayContext fcsType pattern
 
     let isAnnotated (binding: IBinding) =
+        let rec isAnnotated isTopLevel (pattern: IFSharpPattern) =
+            let pattern = pattern.IgnoreInnerParens()
+            match pattern with
+            | :? ITypedPat | :? IUnitPat -> true
+            | TupleLikePattern pat when isTopLevel -> pat.PatternsEnumerable |> Seq.forall (isAnnotated false)
+            | _ -> false
+
         isNotNull binding.ReturnTypeInfo &&
-        binding.ParametersDeclarations |> Seq.forall (fun p ->
-            let pattern = p.Pattern.IgnoreInnerParens()
-            pattern :? ITypedPat || pattern :? IUnitPat)
+        binding.ParametersDeclarations |> Seq.forall (fun p -> isAnnotated true p.Pattern)
 
     let hasBangInBindingKeyword (binding: IBinding) =
         let letExpr = LetOrUseExprNavigator.GetByBinding(binding)

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 01 - Tuple.fs.gold

@@ -1,4 +1,4 @@
 module Module
 
-let f{caret} ((a, b): int * int) : int =
+let f{caret} (a: int, b: int) : int =
     a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 06 - Tuple with as 01.fs

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} (a, b as c) =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 06 - Tuple with as 01.fs.gold

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} (a: int, b: int as c) : int =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 07 - Tuple with as 02.fs

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} (a: int, b as c) =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 07 - Tuple with as 02.fs.gold

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} (a: int, b: int as c) : int =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 08 - Tuple with as 03.fs

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a, b) as c) =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 08 - Tuple with as 03.fs.gold

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a: int, b: int) as c) : int =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 09 - Nested tuple 01.fs

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a, b)) =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 09 - Nested tuple 01.fs.gold

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a: int, b: int)) : int =
+    a + b

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 10 - Nested tuple 02.fs

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a, b), c) =
+    a + b + c

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 10 - Nested tuple 02.fs.gold

@@ -0,0 +1,4 @@
+module Module
+
+let f{caret} ((a, b): int * int, c: int) : int =
+    a + b + c

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 11 - Active pattern 01.fs

@@ -0,0 +1,5 @@
+module Module
+
+let (|TryParseBool|_|) (_: string) = Some(true)
+
+let f{caret} (TryParseBool enabled) = ()

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 11 - Active pattern 01.fs.gold

@@ -0,0 +1,5 @@
+module Module
+
+let (|TryParseBool|_|) (_: string) = Some(true)
+
+let f{caret} (TryParseBool enabled: string) : unit = ()

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 12 - Active pattern 02.fs

@@ -0,0 +1,5 @@
+module Module
+
+let (|TryParseBool|_|) (_: string) = Some(true)
+
+let f{caret} (TryParseBool enabled as x) = ()

ReSharper.FSharp/test/data/features/intentions/specifyTypes/Function - Parameters - Pattern 12 - Active pattern 02.fs.gold

@@ -0,0 +1,5 @@
+module Module
+
+let (|TryParseBool|_|) (_: string) = Some(true)
+
+let f{caret} (TryParseBool enabled as x: string) : unit = ()

ReSharper.FSharp/test/data/features/intentions/specifyTypes/availability/Let bindings - Tuples 01.fs

@@ -0,0 +1,10 @@
+do
+    let f1{on} (a, b): int = a + b
+    let f2{on} (a: int, (b: int, c: int)): int = 1
+    let f3{on} (a: int, b as c): int = 1
+
+    let g1{off} (a: int, (b, c): int * int): int = 1
+    let g2{off} (a: int, b: int as c): int = 1
+    let g3{off} (a, b as c: int * int): int = 1
+
+    ()

ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Intentions/SpecifyTypesTest.fs

@@ -28,6 +28,13 @@ type SpecifyTypesActionTest() =
     [<Test>] member x.``Function - Parameters - Pattern 03 - List``() = x.DoNamedTest()
     [<Test>] member x.``Function - Parameters - Pattern 04 - As``() = x.DoNamedTest()
     [<Test>] member x.``Function - Parameters - Pattern 05 - Param owner``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 06 - Tuple with as 01``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 07 - Tuple with as 02``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 08 - Tuple with as 03``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 09 - Nested tuple 01``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 10 - Nested tuple 02``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 11 - Active pattern 01``() = x.DoNamedTest()
+    [<Test>] member x.``Function - Parameters - Pattern 12 - Active pattern 02``() = x.DoNamedTest()
 
     [<Test>] member x.``Function - Return - Function 01``() = x.DoNamedTest()
     [<Test>] member x.``Function - Return - Function 02``() = x.DoNamedTest()
@@ -58,6 +65,7 @@ type SpecifyTypesActionAvailabilityTest() =
 
     [<Test>] member x.``Let bindings - Expr 01``() = x.DoNamedTest()
     [<Test>] member x.``Let bindings - Module 01``() = x.DoNamedTest()
+    [<Test>] member x.``Let bindings - Tuples 01``() = x.DoNamedTest()
 
     [<Test>] member x.``Class - member - 01``() = x.DoNamedTest()
     [<Test>] member x.``LetBang - 01`` () = x.DoNamedTest()