Remove SynPat_Or as trivia node candidate. (fsprojects#1860)

* Remove SynPat_Or as trivia node candidate. Fixes fsprojects#1855. Fixes fsprojects#1677.

* Update to Paket 6 and add global.json.

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "6.0.0-rc006",
+      "version": "6.0.0",
       "commands": [
         "paket"
       ]

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "5.0.0",
+    "rollForward": "minor"
+  }
+}

src/Fantomas.Tests/PatternMatchingTests.fs

@@ -1965,3 +1965,47 @@ let foo x =
     let y = x * x * (x + 1)
     x
 """
+
+[<Test>]
+let ``comment after multi-option match, 1855`` () =
+    formatSourceString
+        false
+        """
+match x with
+| "a" // still here
+| "b" // VANISHES
+| "c" -> "c"
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+match x with
+| "a" // still here
+| "b" // VANISHES
+| "c" -> "c"
+"""
+
+[<Test>]
+let ``comment after SynPat.Or in pattern match, 1677`` () =
+    formatSourceString
+        false
+        """
+match v with
+| x
+| y   // comment
+| z -> 42
+| _ -> 0
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+match v with
+| x
+| y // comment
+| z -> 42
+| _ -> 0
+"""

src/Fantomas/AstTransformer.fs

@@ -850,13 +850,12 @@ module private Ast =
                           yield! nodes
                           yield! (visitSynAttributeLists range attrs) ]
                         |> finalContinuation)
-            | SynPat.Or (synPat, synPat2, range) ->
+            | SynPat.Or (synPat, synPat2, _range) ->
                 let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list =
                     [ visit synPat; visit synPat2 ]
 
                 let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list =
-                    mkNode SynPat_Or range :: (List.collect id nodes)
-                    |> finalContinuation
+                    List.collect id nodes |> finalContinuation
 
                 Continuation.sequence continuations finalContinuation
             | SynPat.Ands (pats, range) ->

src/Fantomas/TriviaTypes.fs

@@ -230,7 +230,7 @@ type FsAstType =
     | SynPat_Named
     | SynPat_Typed
     | SynPat_Attrib
-    | SynPat_Or
+    // | SynPat_Or, use the inner patterns instead
     | SynPat_Ands
     | SynPat_LongIdent
     | SynPat_Tuple