Update to FCS 38 (#1240)

* update for surface area changes in fcs 38 * use correct disambiguations of different open definitions * Update failing unit test. * Format AstTransformer.fs * net5.0 * update github workflows to use net5.0 as well * use FCS 38 stable * Add DO token as TriviaNode to fix #303. * Add additional tests for F# 5. * Remove blank lines. Co-authored-by: nojaf <florian.verdonck@outlook.com>
fsprojects · Nov 12, 2020 · 95a8a5e · 95a8a5e
1 parent 4f795bc
commit 95a8a5e
Show file tree

Hide file tree

Showing 29 changed files with 887 additions and 204 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.245.1",
+      "version": "5.252.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.0",
+      "version": "5.20.4-alpha.1642",
       "commands": [
         "fake"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [3.1.100]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/.github/workflows/myget.yml b/.github/workflows/myget.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet: [3.1.100]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/build.fsx b/build.fsx
@@ -104,7 +104,7 @@ let fantomasExecutableForExternalTests projectdir =
         | DotNet.BuildConfiguration.Release -> "Release"
         | DotNet.BuildConfiguration.Custom s -> s
 
-    { ProcessName = "dotnet"; Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/netcoreapp3.0/fantomas-tool.dll" projectdir configuration ] }
+    { ProcessName = "dotnet"; Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/net5.0/fantomas-tool.dll" projectdir configuration ] }
 
 let externalProjectsToTest = [
 //    { GitUrl = @"https://github.com/fsprojects/Argu"
@@ -364,7 +364,7 @@ open Microsoft.Azure.Cosmos.Table
 open Microsoft.Azure.Documents
 
 Target.create "Benchmark" (fun _ ->
-    DotNet.exec id ("src" </> "Fantomas.Benchmarks" </> "bin" </> "Release" </> "netcoreapp3.1" </> "Fantomas.Benchmarks.dll") ""
+    DotNet.exec id ("src" </> "Fantomas.Benchmarks" </> "bin" </> "Release" </> "net5.0" </> "Fantomas.Benchmarks.dll") ""
     |> ignore
 
     match Environment.environVarOrNone "TABLE_STORAGE_CONNECTION_STRING" with

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,9 +1,10 @@
 source https://api.nuget.org/v3/index.json
-framework: netstandard2.0, netcoreapp3.1
+
+framework: netstandard2.0, net5.0
 storage: none
 
 nuget FSharp.Core
-nuget FSharp.Compiler.Service ~> 37.0
+nuget FSharp.Compiler.Service ~> 38.0
 nuget FsUnit
 nuget FsCheck
 nuget Microsoft.NET.Test.Sdk 16.7.0
@@ -15,4 +16,4 @@ nuget BenchmarkDotNet
 nuget editorconfig
 nuget MAB.DotIgnore 3.0.1
 
-github: fsprojects/fantomas:829faa6ba834f99afed9b4434b3a1680536474b2 src/Fantomas/CodePrinter.fs
+github: fsprojects/fantomas:829faa6ba834f99afed9b4434b3a1680536474b2 src/Fantomas/CodePrinter.fs
diff --git a/paket.lock b/paket.lock
diff --git a/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj b/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj b/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <Version>4.3.0-alpha-003</Version>

diff --git a/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs b/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs
@@ -89,16 +89,7 @@ let runFantomasTool arguments =
 
     let fantomasDll =
         Path.Combine
-            (pwd,
-             "..",
-             "..",
-             "..",
-             "..",
-             "Fantomas.CoreGlobalTool",
-             "bin",
-             configuration,
-             "netcoreapp3.1",
-             "fantomas-tool.dll")
+            (pwd, "..", "..", "..", "..", "Fantomas.CoreGlobalTool", "bin", configuration, "net5.0", "fantomas-tool.dll")
 
     use p = new Process()
     p.StartInfo.UseShellExecute <- false

diff --git a/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj b/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <ToolCommandName>fantomas</ToolCommandName>
     <PackAsTool>True</PackAsTool>
     <Version>4.3.0-alpha-003</Version>

diff --git a/src/Fantomas.Tests/CompilerDirectivesTests.fs b/src/Fantomas.Tests/CompilerDirectivesTests.fs
@@ -379,14 +379,17 @@ let ``some spacing is still lost in and around #if blocks, 303`` () =
 """
         ({ config with
                MaxInfixOperatorExpression = 75 })
-    |> should equal """let internal UpdateStrongNaming (assembly: AssemblyDefinition) (key: StrongNameKeyPair option) =
+    |> prepend newline
+    |> should equal """
+let internal UpdateStrongNaming (assembly: AssemblyDefinition) (key: StrongNameKeyPair option) =
     let assemblyName = assembly.Name
 #if NETCOREAPP2_0
+    do
 #else
     match key with
     | None ->
 #endif
-    do assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
+       assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
        assemblyName.HasPublicKey <- false
        assemblyName.PublicKey <- null
        assemblyName.PublicKeyToken <- null
@@ -398,6 +401,95 @@ let ``some spacing is still lost in and around #if blocks, 303`` () =
 #endif
 """
 
+[<Test>]
+let ``some spacing is still lost in and around #if blocks, no defines`` () =
+    formatSourceStringWithDefines [] """
+  let internal UpdateStrongNaming (assembly : AssemblyDefinition) (key : StrongNameKeyPair option) =
+    let assemblyName = assembly.Name
+#if NETCOREAPP2_0
+    do
+#else
+    match key with
+    | None ->
+#endif
+              assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
+              assemblyName.HasPublicKey <- false
+              assemblyName.PublicKey <- null
+              assemblyName.PublicKeyToken <- null
+#if NETCOREAPP2_0
+#else
+    | Some key' -> assemblyName.HasPublicKey <- true
+                   assemblyName.PublicKey <- key'.PublicKey // sets token implicitly
+#endif
+"""
+        ({ config with
+               MaxInfixOperatorExpression = 75 })
+    |> prepend newline
+    |> should equal """
+let internal UpdateStrongNaming (assembly: AssemblyDefinition) (key: StrongNameKeyPair option) =
+    let assemblyName = assembly.Name
+#if NETCOREAPP2_0
+
+#else
+    match key with
+    | None ->
+#endif
+        assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
+        assemblyName.HasPublicKey <- false
+        assemblyName.PublicKey <- null
+        assemblyName.PublicKeyToken <- null
+#if NETCOREAPP2_0
+#else
+    | Some key' ->
+        assemblyName.HasPublicKey <- true
+        assemblyName.PublicKey <- key'.PublicKey // sets token implicitly
+#endif
+"""
+
+[<Test>]
+let ``some spacing is still lost in and around #if blocks, NETCOREAPP2_0`` () =
+    formatSourceStringWithDefines [ "NETCOREAPP2_0" ] """
+  let internal UpdateStrongNaming (assembly : AssemblyDefinition) (key : StrongNameKeyPair option) =
+    let assemblyName = assembly.Name
+#if NETCOREAPP2_0
+    do
+#else
+    match key with
+    | None ->
+#endif
+              assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
+              assemblyName.HasPublicKey <- false
+              assemblyName.PublicKey <- null
+              assemblyName.PublicKeyToken <- null
+#if NETCOREAPP2_0
+#else
+    | Some key' -> assemblyName.HasPublicKey <- true
+                   assemblyName.PublicKey <- key'.PublicKey // sets token implicitly
+#endif
+"""
+        ({ config with
+               MaxInfixOperatorExpression = 75 })
+    |> prepend newline
+    |> should equal """
+let internal UpdateStrongNaming (assembly: AssemblyDefinition) (key: StrongNameKeyPair option) =
+    let assemblyName = assembly.Name
+#if NETCOREAPP2_0
+    do
+#else
+
+
+#endif
+       assembly.MainModule.Attributes <- assembly.MainModule.Attributes &&& (~~~ModuleAttributes.StrongNameSigned)
+       assemblyName.HasPublicKey <- false
+       assemblyName.PublicKey <- null
+       assemblyName.PublicKeyToken <- null
+#if NETCOREAPP2_0
+#else
+
+
+#endif
+"""
+
 [<Test>]
 let ``nested directives, FABLE_COMPILER`` () =
     formatSourceStringWithDefines [ "FABLE_COMPILER" ] """namespace Fable.React