fix by using Oak knowledge and altering the config for the dotlambda …

…construction
dawedawe · May 25, 2024 · 9dda7f0 · 9dda7f0
1 parent 489cfbf
commit 9dda7f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -1553,9 +1553,24 @@ let genExpr (e: Expr) =
     | Expr.IndexFromEnd node -> !- "^" +> genExpr node.Expr |> genNode node
     | Expr.Typar node -> genSingleTextNode node
     | Expr.DotLambda node ->
+        let genDotLambdaExpr expr =
+            fun ctx ->
+                let currentConfig = ctx.Config
+
+                let dotLambdaConfig =
+                    { currentConfig with
+                        // override the SpaceBefore[Upper|Lower]caseInvocation to avoid generating breaking code.
+                        // see unit tests for issue 3050``
+                        SpaceBeforeUppercaseInvocation = false
+                        SpaceBeforeLowercaseInvocation = false }
+
+                genExpr expr { ctx with Config = dotLambdaConfig }
+                // Restore the existing configuration after printing the DotLambda expression
+                |> fun ctx -> { ctx with Config = currentConfig }
+
         genSingleTextNode node.Underscore
         +> genSingleTextNode node.Dot
-        +> genExpr node.Expr
+        +> genDotLambdaExpr node.Expr
         |> genNode node
     | Expr.BeginEnd node ->
         let short =
@@ -2523,10 +2538,8 @@ let sepSpaceBeforeParenInFuncInvocation (functionExpr: Expr) (argExpr: Expr) ctx
     | Expr.DotLambda _, _ -> ctx
     | Expr.Constant _, _ -> sepSpace ctx
     | ParenExpr _, _ -> sepSpace ctx
-    | UppercaseExpr, ParenExpr _ ->
-        onlyIf (ctx.Config.SpaceBeforeUppercaseInvocation && not (lastWriteEventIsDotLambda ctx)) sepSpace ctx
-    | LowercaseExpr, ParenExpr _ ->
-        onlyIf (ctx.Config.SpaceBeforeLowercaseInvocation && not (lastWriteEventIsDotLambda ctx)) sepSpace ctx
+    | UppercaseExpr, ParenExpr _ -> onlyIf ctx.Config.SpaceBeforeUppercaseInvocation sepSpace ctx
+    | LowercaseExpr, ParenExpr _ -> onlyIf ctx.Config.SpaceBeforeLowercaseInvocation sepSpace ctx
     | Expr.Ident _, Expr.Ident _ -> sepSpace ctx
     | _ -> sepSpace ctx
 

diff --git a/src/Fantomas.Core/Context.fs b/src/Fantomas.Core/Context.fs
@@ -338,18 +338,6 @@ let lastWriteEventIsNewline ctx =
         | _ -> false)
     |> Option.defaultValue false
 
-let lastWriteEventIsDotLambda ctx =
-    ctx.WriterEvents
-    |> Queue.rev
-    |> List.ofSeq
-    |> function
-        | WriterEvent.Write f :: Write "." :: Write "_" :: _ ->
-            String.isNotNullOrWhitespace f
-            && (Char.IsLetter(f[0])
-                || (f.StartsWith("``", StringComparison.Ordinal)
-                    && f.EndsWith("``", StringComparison.Ordinal)))
-        | _ -> false
-
 let (|EmptyHashDefineBlock|_|) (events: WriterEvent array) =
     match Array.tryHead events, Array.tryLast events with
     | Some(CommentOrDefineEvent _), Some(CommentOrDefineEvent _) ->

diff --git a/src/Fantomas.Core/Context.fsi b/src/Fantomas.Core/Context.fsi
@@ -73,7 +73,6 @@ val hasWriteBeforeNewlineContent: ctx: Context -> bool
 val dump: isSelection: bool -> ctx: Context -> FormatResult
 val dumpAndContinue: ctx: Context -> Context
 val lastWriteEventIsNewline: ctx: Context -> bool
-val lastWriteEventIsDotLambda: ctx: Context -> bool
 
 /// Indent one more level based on configuration
 val indent: ctx: Context -> Context