Remove MaxDotGetExpressionWidth (#3138)

* Remove MaxDotGetExpressionWidth * Fix remaining tests
fsprojects · Nov 29, 2024 · df13126 · df13126
1 parent 148d113
commit df13126
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 202 deletions.
diff --git a/docs/docs/end-users/Configuration.fsx b/docs/docs/end-users/Configuration.fsx
@@ -729,28 +729,6 @@ fsharp_max_function_binding_width = 10
     """
 (*** include-output ***)
 
-(**
-<fantomas-setting green></fantomas-setting>
-### fsharp_max_dot_get_expression_width
-<copy-to-clipboard text="fsharp_max_dot_get_expression_width = 100"></copy-to-clipboard>
-
-Control the maximum width for which (nested) [SynExpr.DotGet](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synexpr.html#DotGet) expressions should be in one line.
-*)
-
-(*** hide ***)
-printfn
-    $"# Default\n{toEditorConfigName (nameof FormatConfig.Default.MaxDotGetExpressionWidth)} = {FormatConfig.Default.MaxDotGetExpressionWidth}"
-(*** include-output ***)
-
-formatCode
-    """ 
-   let job = JobBuilder.UsingJobData(jobDataMap).Create<WrapperJob>().Build()
-    """
-    """
-fsharp_max_dot_get_expression_width = 60
-    """
-(*** include-output ***)
-
 (**
 <fantomas-setting green gr></fantomas-setting>
 ### fsharp_multiline_bracket_style

diff --git a/src/Fantomas.Core.Tests/ChainTests.fs b/src/Fantomas.Core.Tests/ChainTests.fs
@@ -181,8 +181,7 @@ let ``identifier dot appUnit dot typed appUnit `` () =
         """
 A.B().C<'d>()
 """
-        { config with
-            MaxDotGetExpressionWidth = 0 }
+        { config with MaxLineLength = 10 }
     |> prepend newline
     |> should
         equal
@@ -198,8 +197,7 @@ let ``identifier dot appUnit dot typed identifier `` () =
         """
 A.B().C<'d>
 """
-        { config with
-            MaxDotGetExpressionWidth = 0 }
+        { config with MaxLineLength = 10 }
     |> prepend newline
     |> should
         equal
@@ -215,8 +213,7 @@ let ``identifier dot identifier dot appExpr dot appUnit dot index expr`` () =
         """
 A.B.C(D).E().[0]
 """
-        { config with
-            MaxDotGetExpressionWidth = 0 }
+        { config with MaxLineLength = 10 }
     |> prepend newline
     |> should
         equal
@@ -233,8 +230,7 @@ let ``identifier dot identifier dot appExpr dot identifier dot index expr`` () =
         """
 A.B.C(D).E.[0]
 """
-        { config with
-            MaxDotGetExpressionWidth = 0 }
+        { config with MaxLineLength = 10 }
     |> prepend newline
     |> should
         equal
@@ -288,8 +284,7 @@ Map
     .empty<_, obj>
     .Add("headerAction", modifyHeader.Action.ArmValue)
 """
-        { config with
-            MaxDotGetExpressionWidth = 0 }
+        { config with MaxLineLength = 55 }
     |> prepend newline
     |> should
         equal
@@ -310,7 +305,7 @@ let d = Duck()
 
 d.Duck.Duck.Duck.Goose().Duck.Goose().Duck.Duck.Goose().Duck.Duck.Duck.Goose().Duck.Duck.Duck.Duck.Goose()
 """
-        config
+        { config with MaxLineLength = 45 }
     |> prepend newline
     |> should
         equal
@@ -335,9 +330,7 @@ let ``very long chain with a some index expressions`` () =
         """
 Universe.Galaxy.SolarSystem.Planet.[3].Countries.[9].People.Count
 """
-        { config with
-            MaxDotGetExpressionWidth = 0
-            MaxLineLength = 50 }
+        { config with MaxLineLength = 50 }
     |> prepend newline
     |> should
         equal
@@ -353,9 +346,7 @@ let ``even longer chain with only simple links`` () =
 Fooooooooooo.Baaaaaaaaaaaaaaaaar.Foooooooooooooooooo.Baaaaaaaar.Basssss.Baazzzzzzzzzzzzzzzzzz.[0].Meeeeeeeeeeeeeeeeeh
     .Moooooooooooooooo.Booooooooooooooooooooh.Yooooooooooooooou.Meeeeeeh.Meh2
 """
-        { config with
-            MaxDotGetExpressionWidth = 0
-            MaxLineLength = 50 }
+        { config with MaxLineLength = 50 }
     |> prepend newline
     |> should
         equal
@@ -426,9 +417,7 @@ Animal<
         "Spot"
     )
 """
-        { config with
-            MaxDotGetExpressionWidth = 0
-            MaxLineLength = 10 }
+        { config with MaxLineLength = 10 }
     |> prepend newline
     |> should
         equal

diff --git a/src/Fantomas.Core.Tests/CommentTests.fs b/src/Fantomas.Core.Tests/CommentTests.fs
@@ -1587,8 +1587,7 @@ Host
 
 //
 """
-        { config with
-            MaxDotGetExpressionWidth = 40 }
+        { config with MaxLineLength = 55 }
     |> prepend newline
     |> should
         equal

diff --git a/src/Fantomas.Core.Tests/CompilerDirectivesTests.fs b/src/Fantomas.Core.Tests/CompilerDirectivesTests.fs
@@ -651,8 +651,7 @@ type FunctionComponent =
 
     static member Foo = ()
 """
-        { config with
-            MaxDotGetExpressionWidth = 50 }
+        config
     |> should
         equal
         """namespace Fable.React
@@ -673,8 +672,7 @@ type FunctionComponent =
         let elemType =
             ReactBindings.React.``lazy`` (fun () ->
                 // React.lazy requires a default export
-                (importValueDynamic f)
-                    .``then`` (fun x -> createObj [ "default" ==> x ]))
+                (importValueDynamic f).``then`` (fun x -> createObj [ "default" ==> x ]))
 
         fun props ->
             ReactElementType.create
@@ -845,8 +843,7 @@ type FunctionComponent =
 
     static member Foo = ()
 """
-        { config with
-            MaxDotGetExpressionWidth = 50 }
+        config
     |> should
         equal
         """namespace Fable.React
@@ -867,8 +864,7 @@ type FunctionComponent =
         let elemType =
             ReactBindings.React.``lazy`` (fun () ->
                 // React.lazy requires a default export
-                (importValueDynamic f)
-                    .``then`` (fun x -> createObj [ "default" ==> x ]))
+                (importValueDynamic f).``then`` (fun x -> createObj [ "default" ==> x ]))
 
         fun props ->
             ReactElementType.create
@@ -2214,7 +2210,6 @@ let loader (projectRoot: string) (siteContent: SiteContents) =
   disableLiveRefresh
 """
         { config with
-            MaxDotGetExpressionWidth = 50
             MaxInfixOperatorExpression = 50 }
     |> prepend newline
     |> should

diff --git a/src/Fantomas.Core.Tests/ComputationExpressionTests.fs b/src/Fantomas.Core.Tests/ComputationExpressionTests.fs
@@ -1001,18 +1001,13 @@ let ``let bang + do expression + let + return in ce`` () =
         return Ok(user.Identity.Name, collectClaims user)
     }
 """
-        { config with
-            MaxDotGetExpressionWidth = 50 }
+        config
     |> prepend newline
     |> should
         equal
         """
 task {
-    let! config =
-        manager
-            .GetConfigurationAsync()
-            .ConfigureAwait(false)
-
+    let! config = manager.GetConfigurationAsync().ConfigureAwait(false)
     parameters.IssuerSigningKeys <- config.SigningKeys
     let user, _ = handler.ValidateToken((token: string), parameters)
     return Ok(user.Identity.Name, collectClaims user)
@@ -2300,8 +2295,7 @@ aggregateResult {
 }
 """
         { config with
-            MaxInfixOperatorExpression = 40
-            MaxDotGetExpressionWidth = 50 }
+            MaxInfixOperatorExpression = 40 }
     |> prepend newline
     |> should
         equal

diff --git a/src/Fantomas.Core.Tests/ControlStructureTests.fs b/src/Fantomas.Core.Tests/ControlStructureTests.fs
@@ -723,8 +723,7 @@ let ``keep new line before for loop, 1317`` () =
 
       state
 """
-        { config with
-            MaxDotGetExpressionWidth = 60 }
+        { config with MaxLineLength = 85 }
     |> prepend newline
     |> should
         equal

diff --git a/src/Fantomas.Core.Tests/CrampedMultilineBracketStyleTests.fs b/src/Fantomas.Core.Tests/CrampedMultilineBracketStyleTests.fs
@@ -778,9 +778,7 @@ let expect =
                                   args = []
                                   commands = [] }
 """
-        { config with
-            MaxDotGetExpressionWidth = 50
-            MaxArrayOrListWidth = 40 }
+        { config with MaxArrayOrListWidth = 40 }
     |> prepend newline
     |> should
         equal
@@ -1988,7 +1986,6 @@ let defaultTestOptions fwk common (o: DotNet.TestOptions) =
           Configuration = DotNet.BuildConfiguration.Debug }
 """
         { config with
-            MaxDotGetExpressionWidth = 50
             MaxInfixOperatorExpression = 50
             MaxRecordWidth = 55 }
     |> prepend newline

diff --git a/src/Fantomas.Core.Tests/DallasTests.fs b/src/Fantomas.Core.Tests/DallasTests.fs
@@ -1464,7 +1464,7 @@ let longExpr = genExpr e +> indentSepNlnUnindent (genSynLongIdentMultiline true
 
 fun ctx ->
     isShortExpression
-        ctx.Config.MaxDotGetExpressionWidth
+        ctx.Config.Blaaaaaaaaaaaaaaaaaaaaaaaaah
         shortExpr
         longExpr
         ctx
@@ -1477,7 +1477,7 @@ fun ctx ->
 let shortExpr = genExpr e +> genSynLongIdent true sli
 let longExpr = genExpr e +> indentSepNlnUnindent (genSynLongIdentMultiline true sli)
 
-fun ctx -> isShortExpression ctx.Config.MaxDotGetExpressionWidth shortExpr longExpr ctx
+fun ctx -> isShortExpression ctx.Config.Blaaaaaaaaaaaaaaaaaaaaaaaaah shortExpr longExpr ctx
 """
 
 [<Test>]