Merge branch 'main' into update_analyzers

dawedawe · Dec 6, 2023 · e57ad00 · e57ad00
2 parents 78289ae + 862e33c
commit e57ad00
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changelog
 
-## Unreleased
+## 6.3.0-alpha-004 - 2023-12-06
 
 ### Fixed
 * Process is reserved keyword. [#2996](https://github.com/fsprojects/fantomas/issues/2996)
 * Always yield list items on separate lines if a conditional is present. [#2972](https://github.com/fsprojects/fantomas/issues/2972)
 * Trivia after mutable keyword is missing. [#3005](https://github.com/fsprojects/fantomas/issues/3005)
+* Formatting can depend on cursor position. [#3007](https://github.com/fsprojects/fantomas/issues/3007)
 
 ### Changed
 * Update FCS to 'Parser: recover on unfinished record decls, fix field ranges ', commit ee4a810ffe9e984e2ec8c55a9cb6d1c6631dd0b3 [#3006](https://github.com/fsprojects/fantomas/pull/3006)

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -35,7 +35,7 @@ Some common use cases include:
         <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
         <ServerGarbageCollection>true</ServerGarbageCollection>
         <LangVersion>preview</LangVersion>
-        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen</OtherFlags>
+        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen --strict-indentation+</OtherFlags>
     </PropertyGroup>
 
     <!-- Versions -->

diff --git a/src/Fantomas.Core.Tests/CursorTests.fs b/src/Fantomas.Core.Tests/CursorTests.fs
@@ -71,3 +71,18 @@ type FSharpReformatCode(textControlManager: ITextControlManager) =
 """
         (8, 19)
     |> assertCursor (7, 15)
+
+[<Test>]
+let ``cursor should not be considered as content before, 3007`` () =
+    let result =
+        formatWithCursor
+            """pipeline "init" {
+    stage "restore-sln" {
+        parallel
+        run "dotnet tool restore"
+    }
+}
+"""
+            (4, 0)
+
+    result |> assertCursor (4, 0)
diff --git a/src/Fantomas.Core/SyntaxOak.fs b/src/Fantomas.Core/SyntaxOak.fs
@@ -35,9 +35,27 @@ type NodeBase(range: range) =
     let nodesAfter = Queue<TriviaNode>(0)
 
     member _.ContentBefore: TriviaNode seq = nodesBefore
-    member _.HasContentBefore = not (Seq.isEmpty nodesBefore)
+
+    member _.HasContentBefore =
+        nodesBefore
+        |> Seq.filter (fun tn ->
+            match tn.Content with
+            | Cursor -> false
+            | _ -> true)
+        |> Seq.isEmpty
+        |> not
+
     member _.ContentAfter: TriviaNode seq = nodesAfter
-    member _.HasContentAfter = not (Seq.isEmpty nodesAfter)
+
+    member _.HasContentAfter =
+        nodesAfter
+        |> Seq.filter (fun tn ->
+            match tn.Content with
+            | Cursor -> false
+            | _ -> true)
+        |> Seq.isEmpty
+        |> not
+
     member _.Range = range
     member _.AddBefore triviaNode = nodesBefore.Enqueue triviaNode
     member _.AddAfter triviaNode = nodesAfter.Enqueue triviaNode