Support fixed in SingleExpr (fsprojects#2114)

* feat: support `fixed` in SingleExpr * fix: oh Fantomas! * fix: move test to correct file * feat: add test with comment * fix: oh Fantomas! * fix: long live spaces * feat: support comment after `fixed`
jindraivanek · Mar 30, 2022 · f6604c1 · f6604c1
1 parent 15f611a
commit f6604c1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/src/Fantomas.Tests/SingleExprTests.fs b/src/Fantomas.Tests/SingleExprTests.fs
@@ -213,3 +213,31 @@ let ``comment after address of tokens`` () =
 && // comment
     foobar
 """
+
+[<Test>]
+let ``parse `fixed` in SingleExpr, 2112`` () =
+    formatSourceString false """let x = fixed expr""" config
+    |> prepend newline
+    |> should
+        equal
+        """
+let x = fixed expr
+"""
+
+[<Test>]
+let ``handle comment after `fixed` in SingleExpr, 2112`` () =
+    formatSourceString
+        false
+        """
+let a = fixed // comment
+                 b
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let a =
+    fixed // comment
+        b
+"""
diff --git a/src/Fantomas/AstTransformer.fs b/src/Fantomas/AstTransformer.fs
@@ -600,9 +600,11 @@ module private Ast =
                     mkNode SynExpr_DiscardAfterMissingQualificationAfterDot range
                     :: nodes
                     |> finalContinuation)
-            | SynExpr.Fixed (expr, range) ->
+            | SynExpr.Fixed (expr, StartRange 5 (fixedKeyword, range)) ->
                 visit expr (fun nodes ->
-                    mkNode SynExpr_Fixed range :: nodes
+                    [ yield mkNode SynExpr_Fixed range
+                      yield mkNode SynExpr_Fixed_Fixed fixedKeyword
+                      yield! nodes ]
                     |> finalContinuation)
             | SynExpr.InterpolatedString (parts, _, range) ->
                 mkNode SynExpr_InterpolatedString range

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1250,6 +1250,7 @@ and genExpr astContext synExpr ctx =
                 genTriviaFor SynExpr_YieldOrReturnFrom_ReturnBang returnBangKeyword !- "return! "
             | Do doKeyword -> genTriviaFor SynExpr_Do_Do doKeyword !- "do "
             | DoBang doBangKeyword -> genTriviaFor SynExpr_DoBang_DoBang doBangKeyword !- "do! "
+            | Fixed fixedKeyword -> genTriviaFor SynExpr_Fixed_Fixed fixedKeyword !- "fixed "
             +> autoIndentAndNlnIfExpressionExceedsPageWidth (genExpr astContext e)
         | ConstExpr (c, r) -> genConst c r
         | NullExpr -> !- "null"

diff --git a/src/Fantomas/SourceParser.fs b/src/Fantomas/SourceParser.fs
@@ -568,6 +568,7 @@ type ExprKind =
     | ReturnFrom of keyword: range
     | Do of keyword: range
     | DoBang of Keyword: range
+    | Fixed of keyword: range
 
 let (|SingleExpr|_|) =
     function
@@ -584,6 +585,7 @@ let (|SingleExpr|_|) =
         Some(ReturnFrom returnBangKeyword, e)
     | SynExpr.Do (e, StartRange 2 (doKeyword, _range)) -> Some(Do doKeyword, e)
     | SynExpr.DoBang (e, StartRange 3 (doBangKeyword, _range)) -> Some(DoBang doBangKeyword, e)
+    | SynExpr.Fixed (e, StartRange 5 (fixedKeyword, _range)) -> Some(Fixed fixedKeyword, e)
     | _ -> None
 
 type TypedExprKind =

diff --git a/src/Fantomas/TriviaTypes.fs b/src/Fantomas/TriviaTypes.fs
@@ -198,6 +198,7 @@ type FsAstType =
     | SynExpr_FromParseError
     | SynExpr_DiscardAfterMissingQualificationAfterDot
     | SynExpr_Fixed
+    | SynExpr_Fixed_Fixed
     | SynExpr_InterpolatedString
     | SynExpr_IndexRange
     | SynExpr_IndexFromEnd