edgarfgp · edgarfgp · Jun 10, 2023 · Jun 9, 2023 · Jun 10, 2023
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Fantomas.Core" Version="[6.0.0]" />
+    <PackageVersion Include="Fantomas.Core" Version="[6.1.0-alpha-003]" />
     <PackageVersion Include="FSharp.Core" Version="7.0.200" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
@@ -15,4 +15,4 @@
     <PackageVersion Include="coverlet.collector" Version="3.1.2" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/docs/index.fsx b/docs/index.fsx
@@ -15,7 +15,7 @@ Let's take a look at an AST example in Fantomas:
 #r "../src/Fabulous.AST/bin/Release/netstandard2.1/publish/Fantomas.FCS.dll"
 #r "../src/Fabulous.AST/bin/Release/netstandard2.1/publish/Fantomas.Core.dll"
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST.Tests/ControlFlow/ControlFlow.fs b/src/Fabulous.AST.Tests/ControlFlow/ControlFlow.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.ControlFlow
 
 open NUnit.Framework
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST
 open Fabulous.AST.Tests
 

diff --git a/src/Fabulous.AST.Tests/ControlFlow/IfThen.fs b/src/Fabulous.AST.Tests/ControlFlow/IfThen.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.ControlFlow
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST
 open Fabulous.AST.Tests
 

diff --git a/src/Fabulous.AST.Tests/ControlFlow/IfThenElif.fs b/src/Fabulous.AST.Tests/ControlFlow/IfThenElif.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.ControlFlow
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST
 open Fabulous.AST.Tests
 

diff --git a/src/Fabulous.AST.Tests/ControlFlow/IfThenElse.fs b/src/Fabulous.AST.Tests/ControlFlow/IfThenElse.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.ControlFlow
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST
 open Fabulous.AST.Tests
 

diff --git a/src/Fabulous.AST.Tests/LetBindings/Function.fs b/src/Fabulous.AST.Tests/LetBindings/Function.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.LetBindings
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST
 open Fabulous.AST.Tests
 

diff --git a/src/Fabulous.AST.Tests/LetBindings/Literal.fs b/src/Fabulous.AST.Tests/LetBindings/Literal.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.LetBindings
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/LetBindings/Value.fs b/src/Fabulous.AST.Tests/LetBindings/Value.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST.Tests.LetBindings
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/Namespaces/Module.fs b/src/Fabulous.AST.Tests/Namespaces/Module.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.Namespaces
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/Namespaces/Namespace.fs b/src/Fabulous.AST.Tests/Namespaces/Namespace.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.Namespaces
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/Namespaces/NestedModule.fs b/src/Fabulous.AST.Tests/Namespaces/NestedModule.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.Namespaces
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/OpenDirectives/Open.fs b/src/Fabulous.AST.Tests/OpenDirectives/Open.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.OpenDirectives
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework
 

diff --git a/src/Fabulous.AST.Tests/OpenDirectives/OpenType.fs b/src/Fabulous.AST.Tests/OpenDirectives/OpenType.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.OpenDirectives
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework
 

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Abbrev.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Abbrev.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.TypeDefinitions
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework
 

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Class.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Class.fs
@@ -1,6 +1,6 @@
-namespace Fabulous.AST.Tests.TypeDefinitions
+namespace Fabulous.AST.Tests.TypeDefinitions
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.Tests
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Enum.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Enum.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.TypeDefinitions
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework
 

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Record.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Record.fs
@@ -1,6 +1,6 @@
-namespace Fabulous.AST.Tests.TypeDefinitions
+namespace Fabulous.AST.Tests.TypeDefinitions
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.Tests
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Union.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Union.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST.Tests.TypeDefinitions
 
 open Fabulous.AST.Tests
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 open NUnit.Framework
 

diff --git a/src/Fabulous.AST/README.md b/src/Fabulous.AST/README.md
@@ -8,7 +8,7 @@ Fabulous.AST uses [Fantomas](https://fsprojects.github.io/fantomas/docs/end-user
 Let's take a look at an AST example in Fantomas:
 
 ```fsharp
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 
 let implementationSyntaxTree =

diff --git a/src/Fabulous.AST/Widgets/Call.fs b/src/Fabulous.AST/Widgets/Call.fs
@@ -2,7 +2,7 @@ namespace Fabulous.AST
 
 open System
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST/Widgets/Common.fs b/src/Fabulous.AST/Widgets/Common.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 
 type AccessControl =

diff --git a/src/Fabulous.AST/Widgets/Condition.fs b/src/Fabulous.AST/Widgets/Condition.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST/Widgets/ControlFlow/IfThen.fs b/src/Fabulous.AST/Widgets/ControlFlow/IfThen.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/ControlFlow/IfThenElif.fs b/src/Fabulous.AST/Widgets/ControlFlow/IfThenElif.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/ControlFlow/IfThenElse.fs b/src/Fabulous.AST/Widgets/ControlFlow/IfThenElse.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/LetBindings/Function.fs b/src/Fabulous.AST/Widgets/LetBindings/Function.fs
@@ -1,11 +1,12 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak
-
+open Fantomas.FCS
+open Fantomas.FCS.Text
+open Fantomas.FCS.Syntax
 open type Fabulous.AST.Ast
 
 

diff --git a/src/Fabulous.AST/Widgets/LetBindings/Literal.fs b/src/Fabulous.AST/Widgets/LetBindings/Literal.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST/Widgets/LetBindings/Value.fs b/src/Fabulous.AST/Widgets/LetBindings/Value.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST/Widgets/Match.fs b/src/Fabulous.AST/Widgets/Match.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/MatchClause.fs b/src/Fabulous.AST/Widgets/MatchClause.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak
 

diff --git a/src/Fabulous.AST/Widgets/Namespaces/AnonymousModule.fs b/src/Fabulous.AST/Widgets/Namespaces/AnonymousModule.fs
@@ -1,6 +1,6 @@
 namespace Fabulous.AST
 
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
 
 type AnonymousModuleNode(decls) =

diff --git a/src/Fabulous.AST/Widgets/Namespaces/Module.fs b/src/Fabulous.AST/Widgets/Namespaces/Module.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/Namespaces/Namespace.fs b/src/Fabulous.AST/Widgets/Namespaces/Namespace.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/Namespaces/NestedModule.fs b/src/Fabulous.AST/Widgets/Namespaces/NestedModule.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/OpenDirectives/Open.fs b/src/Fabulous.AST/Widgets/OpenDirectives/Open.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/OpenDirectives/OpenType.fs b/src/Fabulous.AST/Widgets/OpenDirectives/OpenType.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fabulous.AST.StackAllocatedCollections.StackList
 open Fantomas.Core.SyntaxOak

diff --git a/src/Fabulous.AST/Widgets/TypeDefinitions/Abbrev.fs b/src/Fabulous.AST/Widgets/TypeDefinitions/Abbrev.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 open Fabulous.AST.StackAllocatedCollections.StackList

diff --git a/src/Fabulous.AST/Widgets/TypeDefinitions/Class.fs b/src/Fabulous.AST/Widgets/TypeDefinitions/Class.fs
@@ -1,7 +1,7 @@
-namespace Fabulous.AST
+namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 open Fabulous.AST.StackAllocatedCollections.StackList
@@ -54,7 +54,7 @@ module Class =
                             None,
                             None,
                             SingleTextNode("(", Range.Zero),
-                            simplePatNodes,
+                            List.map Choice1Of2 simplePatNodes,
                             SingleTextNode(")", Range.Zero),
                             None,
                             Range.Zero

diff --git a/src/Fabulous.AST/Widgets/TypeDefinitions/Enum.fs b/src/Fabulous.AST/Widgets/TypeDefinitions/Enum.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 open Fabulous.AST.StackAllocatedCollections.StackList

diff --git a/src/Fabulous.AST/Widgets/TypeDefinitions/EnumCase.fs b/src/Fabulous.AST/Widgets/TypeDefinitions/EnumCase.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 open Fabulous.AST.StackAllocatedCollections.StackList

diff --git a/src/Fabulous.AST/Widgets/TypeDefinitions/Field.fs b/src/Fabulous.AST/Widgets/TypeDefinitions/Field.fs
@@ -1,7 +1,7 @@
 namespace Fabulous.AST
 
 open System.Runtime.CompilerServices
-open FSharp.Compiler.Text
+open Fantomas.FCS.Text
 open Fabulous.AST.StackAllocatedCollections
 open Fantomas.Core.SyntaxOak
 open Fabulous.AST.StackAllocatedCollections.StackList