Don't put a space before a prefix operator, unless we have to. (#3134)

* Don't put a space before a prefix operator, unless we have to. * Add feedback from code review * Only add space to measure when constant has sign. * Remove unnecessary open
fsprojects · Nov 2, 2024 · 75e8474 · 75e8474
1 parent 0dc03a2
commit 75e8474
Show file tree

Hide file tree

Showing 11 changed files with 244 additions and 156 deletions.
diff --git a/src/Fantomas.Core.Tests/ControlStructureTests.fs b/src/Fantomas.Core.Tests/ControlStructureTests.fs
@@ -644,7 +644,7 @@ let genPropertyWithGetSet astContext (b1, b2) rangeOfMember =
             genPreXmlDoc px
             +> genAttributes astContext ats
             +> genMemberFlags astContext mf1
-            +> ifElse isInline (!- "inline ") sepNone
+            +> ifElse isInline (!-"inline ") sepNone
             +> opt sepSpace ao genAccess
 
         assert (ps1 |> Seq.map fst |> Seq.forall Option.isNone)

diff --git a/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj b/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
@@ -134,6 +134,7 @@
     <Compile Include="BeginEndTests.fs" />
     <Compile Include="NullnessTests.fs" />
     <Compile Include="AutoPropertiesTests.fs" />
+    <Compile Include="PrefixTests.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fantomas.Core\Fantomas.Core.fsproj" />

diff --git a/src/Fantomas.Core.Tests/InterpolatedStringTests.fs b/src/Fantomas.Core.Tests/InterpolatedStringTests.fs
@@ -165,20 +165,6 @@ $\"\"\"one: {1}<
 >two: {2}\"\"\"
 "
 
-[<Test>]
-let ``prefix application, 1414`` () =
-    formatSourceString
-        """
-!- $".{s}"
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        """
-!- $".{s}"
-"""
-
 [<Test>]
 let ``format in FillExpr, 1549`` () =
     formatSourceString

diff --git a/src/Fantomas.Core.Tests/LambdaTests.fs b/src/Fantomas.Core.Tests/LambdaTests.fs
@@ -354,7 +354,7 @@ let genMemberFlagsForMemberBinding astContext (mf: MemberFlags) (rangeOfBindingA
                     | Token { TokenInfo = { TokenName = "MEMBER" } } -> r.StartLine = rangeOfBindingAndRhs.StartLine
 
                     | _ -> false)
-                |> Option.defaultValue (!- "override ")
+                |> Option.defaultValue (!-"override ")
                 <| ctx)
         <| ctx
 """

diff --git a/src/Fantomas.Core.Tests/LetBindingTests.fs b/src/Fantomas.Core.Tests/LetBindingTests.fs
@@ -1342,7 +1342,7 @@ let internal sepSpace =
         then
             ctx
         else
-            (!- " ") ctx
+            (!-" ") ctx
 """
 
 [<Test>]

diff --git a/src/Fantomas.Core.Tests/MultiLineLambdaClosingNewlineTests.fs b/src/Fantomas.Core.Tests/MultiLineLambdaClosingNewlineTests.fs
@@ -268,7 +268,7 @@ let expr =
         es
         (fun e ->
             match e with
-            | Paren(_, Lambda _, _) -> !- "lambda"
+            | Paren(_, Lambda _, _) -> !-"lambda"
             | _ -> genExpr astContext e
         )
 """

diff --git a/src/Fantomas.Core.Tests/OperatorTests.fs b/src/Fantomas.Core.Tests/OperatorTests.fs
@@ -5,41 +5,6 @@ open FsUnit
 open Fantomas.Core.Tests.TestHelpers
 open Fantomas.Core
 
-[<Test>]
-let ``should format prefix operators`` () =
-    formatSourceString
-        """let x = -y
-let z = !!x
-    """
-        config
-    |> should
-        equal
-        """let x = -y
-let z = !!x
-"""
-
-[<Test>]
-let ``should keep triple ~~~ operator`` () =
-    formatSourceString
-        """x ~~~FileAttributes.ReadOnly
-    """
-        config
-    |> should
-        equal
-        """x ~~~FileAttributes.ReadOnly
-"""
-
-[<Test>]
-let ``should keep single triple ~~~ operator`` () =
-    formatSourceString
-        """~~~FileAttributes.ReadOnly
-    """
-        config
-    |> should
-        equal
-        """~~~FileAttributes.ReadOnly
-"""
-
 [<Test>]
 let ``should keep parens around ? operator definition`` () =
     formatSourceString
@@ -62,17 +27,6 @@ let ``should keep parens around ?<- operator definition`` () =
         """let (?<-) f s = f s
 """
 
-[<Test>]
-let ``should keep parens around !+ prefix operator definition`` () =
-    formatSourceString
-        """let (!+) x = Include x
-    """
-        config
-    |> should
-        equal
-        """let (!+) x = Include x
-"""
-
 [<Test>]
 let ``should keep parens around ++ infix operator definition`` () =
     formatSourceString
@@ -474,19 +428,6 @@ let result =
     (typ.GetInterface(typeof<System.Collections.IEnumerable>.FullName) = null)
 """
 
-[<Test>]
-let ``operator before verbatim string add extra space, 736`` () =
-    formatSourceString
-        """Target M.Tools (fun _ -> !! @"Tools\Tools.sln" |> rebuild)
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        """
-Target M.Tools (fun _ -> !! @"Tools\Tools.sln" |> rebuild)
-"""
-
 [<Test>]
 let ``function call before pipe operator, 754`` () =
     formatSourceString
@@ -1178,42 +1119,6 @@ module Foo =
             | false -> id)
 """
 
-let operator_application_literal_values =
-    [ "-86y"
-      "86uy"
-      "-86s"
-      "86us"
-      "-86"
-      "-86l"
-      "86u"
-      "86ul"
-      "-123n"
-      "0x00002D3Fun"
-      "-86L"
-      "86UL"
-      "-4.41F"
-      "-4.14"
-      "-12456I"
-      "-0.7833M"
-      "'a'"
-      "\"text\""
-      "'a'B"
-      "\"text\"B" ]
-
-[<TestCaseSource("operator_application_literal_values")>]
-let ``operators maintain spacing from literal values`` (literalValue: string) =
-    formatSourceString
-        $"""
-let subtractTwo = + %s{literalValue}
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        $"""
-let subtractTwo = + %s{literalValue}
-"""
-
 [<Test>]
 let ``qualified name to active pattern, 1937`` () =
     formatSourceString
@@ -1515,25 +1420,3 @@ let allDecls =
     @+ iimplsLs
     @+ ctorLs
 """
-
-[<Test>]
-let ``adding space after prefix operator breaks code, 2796`` () =
-    formatSourceString
-        """
-let inline (~%%) id = int id
-
-let f a b = a + b
-
-let foo () = f %%"17" %%"42"
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        """
-let inline (~%%) id = int id
-
-let f a b = a + b
-
-let foo () = f %%"17" %%"42"
-"""