Fix another long-standing incremental document synchronisation bug

Most apparent on nvim for some reason.
razzmatazz · May 19, 2022 · 396387c · 396387c
1 parent 969bb74
commit 396387c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## (unreleased)
+## 0.5.1 - 2022-05-19 / Straigiškė 
+- Fix another long-standing bug with incremental document synchronisation;
+  - very visible on nvim but affects all editors/clients;
+  - reported by @Decodetalkers https://github.com/razzmatazz/csharp-language-server/issues/31;
 - Improve textDocument/completion:
   - provide `CompletionItem.FilterText` and `CompletionItem.SortText`;
 

diff --git a/src/CSharpLanguageServer/RoslynHelpers.fs b/src/CSharpLanguageServer/RoslynHelpers.fs
@@ -70,18 +70,22 @@ let lspLocationForRoslynLocation(loc: Microsoft.CodeAnalysis.Location): Types.Lo
         { Uri = "";
           Range = { Start = { Line=0; Character=0; }; End = { Line=0; Character=0; } } }
 
-let lspContentChangeEventToRoslynTextChange (sourceText: SourceText) (change: Types.TextDocumentContentChangeEvent) =
-    let changeTextSpan =
-        change.Range.Value
-        |> roslynLinePositionSpanForLspRange
-        |> sourceText.Lines.GetTextSpan
+let applyLspContentChangesOnRoslynSourceText
+        (changes: Types.TextDocumentContentChangeEvent[])
+        (initialSourceText: SourceText) =
 
-    TextChange(changeTextSpan, change.Text)
+    let applyLspContentChangeOnRoslynSourceText (sourceText: SourceText) (change: Types.TextDocumentContentChangeEvent) =
+        match change.Range with
+        | Some changeRange ->
+            let changeTextSpan =
+                changeRange |> roslynLinePositionSpanForLspRange
+                            |> sourceText.Lines.GetTextSpan
 
-let applyLspContentChangesOnRoslynSourceText (changes: Types.TextDocumentContentChangeEvent[]) (sourceText: SourceText) =
-    changes
-    |> Seq.map (lspContentChangeEventToRoslynTextChange sourceText)
-    |> sourceText.WithChanges
+            TextChange(changeTextSpan, change.Text) |> sourceText.WithChanges
+
+        | None -> SourceText.From(change.Text)
+
+    changes |> Seq.fold applyLspContentChangeOnRoslynSourceText initialSourceText
 
 let lspDocChangesFromSolutionDiff
         originalSolution

diff --git a/src/CSharpLanguageServer/Server.fs b/src/CSharpLanguageServer/Server.fs
@@ -630,7 +630,7 @@ let setupServerHandlers options lspClient =
                                  }
                         TextDocumentSync =
                             Some { TextDocumentSyncOptions.Default with
-                                     OpenClose = None
+                                     OpenClose = Some true
                                      Save = Some { IncludeText = Some true }
                                      Change = Some TextDocumentSyncKind.Incremental
                                  }