Parens: Keep parentheses around non-struct tuples in & patterns (#1…

…6391) * This case was missed in the original PR * Add entry to FCS release notes
dotnet · Dec 7, 2023 · 257702e · 257702e
1 parent ade7946
commit 257702e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/docs/release-notes/FSharp.Compiler.Service/8.0.200.md b/docs/release-notes/FSharp.Compiler.Service/8.0.200.md
@@ -1,3 +1,4 @@
 - Parens analysis: miscellaneous fixes - https://github.com/dotnet/fsharp/pull/16262
+- Parens: Keep parentheses around non-struct tuples in `&` patterns - https://github.com/dotnet/fsharp/pull/16391
 - Parens analysis: fix some parenthesization corner-cases in record expressions - https://github.com/dotnet/fsharp/pull/16370
 - Fixes #16359 - correctly handle imports with 0 length public key tokens - https://github.com/dotnet/fsharp/pull/16363
diff --git a/src/Compiler/Service/ServiceAnalysis.fs b/src/Compiler/Service/ServiceAnalysis.fs
@@ -1657,7 +1657,10 @@ module UnnecessaryParentheses =
                 | SynPat.Tuple _, SynPat.As _
 
                 // x, (y, z)
+                // x & (y, z)
+                // (x, y) & z
                 | SynPat.Tuple _, SynPat.Tuple(isStruct = false)
+                | SynPat.Ands _, SynPat.Tuple(isStruct = false)
 
                 // A, (B | C)
                 // A & (B | C)

diff --git a/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveUnnecessaryParenthesesTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveUnnecessaryParenthesesTests.fs
@@ -1765,7 +1765,7 @@ module Patterns =
                                 Ands(pats |> List.updateAt i (Paren inner)), Ands(pats |> List.updateAt i inner)
                             else
                                 Ands(pats |> List.updateAt i (Paren inner)), Ands(pats |> List.updateAt i (Paren inner))
-                    | Ands pats, (Or _ | As _) ->
+                    | Ands pats, (Or _ | As _ | Tuple _) ->
                         for i, _ in Seq.indexed pats do
                             Ands(pats |> List.updateAt i (Paren inner)), Ands(pats |> List.updateAt i (Paren inner))
                     | Ands pats, _ ->