Bump to alpha three (#1305)

* Detect escaped single quote in string as trivia. * Bump to 4.4.0-alpha-003
fsprojects · Dec 18, 2020 · 5afb9a9 · 5afb9a9
1 parent 312358d
commit 5afb9a9
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 6 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,10 @@
+### 4.4.0-alpha-003 - 12/2020
+
+* Stricter trivia selection. [#1304](https://github.com/fsprojects/fantomas/pull/1304)
+* Fix static member should only have a single indent. [#1300](https://github.com/fsprojects/fantomas/issues/1300)
+* Fix Named string argument to type provider requires a space prior to '@', which Fantomas removes. [#1209](https://github.com/fsprojects/fantomas/issues/1209)
+* Fix Don't indent too far. [#659](https://github.com/fsprojects/fantomas/issues/659)
+
 ### 4.4.0-alpha-002 - 12/2020
 
 * Revisit SynExpr.IfThenElse without Else branch [#1258](https://github.com/fsprojects/fantomas/issues/1258)

diff --git a/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj b/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <Version>4.4.0-alpha-002</Version>
+    <Version>4.4.0-alpha-003</Version>
     <NoWarn>FS0988</NoWarn>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>

diff --git a/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj b/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <ToolCommandName>fantomas</ToolCommandName>
     <PackAsTool>True</PackAsTool>
-    <Version>4.4.0-alpha-002</Version>
+    <Version>4.4.0-alpha-003</Version>
     <AssemblyName>fantomas-tool</AssemblyName>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>

diff --git a/src/Fantomas.Extras/Fantomas.Extras.fsproj b/src/Fantomas.Extras/Fantomas.Extras.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>4.4.0-alpha-002</Version>
+    <Version>4.4.0-alpha-003</Version>
     <Description>Utility package for Fantomas</Description>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>

diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>4.4.0-alpha-002</Version>
+    <Version>4.4.0-alpha-003</Version>
     <NoWarn>FS0988</NoWarn>
     <TargetFramework>net5.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>

diff --git a/src/Fantomas.Tests/SynConstTests.fs b/src/Fantomas.Tests/SynConstTests.fs
@@ -252,3 +252,18 @@ let a = \\\"\\\\\\\"
 
     getDefines source == []
 "
+
+[<Test>]
+let ``escaped single quote`` () =
+    formatSourceString
+        false
+        """
+let x = !-(sprintf "\'%s\'" escapedChar)
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let x = !-(sprintf "\'%s\'" escapedChar)
+"""
diff --git a/src/Fantomas/Fantomas.fsproj b/src/Fantomas/Fantomas.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>4.4.0-alpha-002</Version>
+    <Version>4.4.0-alpha-003</Version>
     <Description>Source code formatter for F#</Description>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>

diff --git a/src/Fantomas/TokenParser.fs b/src/Fantomas/TokenParser.fs
@@ -518,7 +518,7 @@ let private (|InterpStringEndToken|_|) token =
         None
 
 let escapedCharacterRegex =
-    System.Text.RegularExpressions.Regex("(\\\\(n|r|u|\\\"|\\\\))+")
+    System.Text.RegularExpressions.Regex("(\\\\(n|r|u|'|\\\"|\\\\))+")
 
 let rec private (|EndOfInterpolatedString|_|) tokens =
     match tokens with