Revert "Address PR feedback"

This reverts commit c24e51ef.

Revert "Address PR feedback"
This reverts commit c24e51ef.
6a850ec8 · Manish Vasani · c24e51ef · 6a850ec8
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/Workspaces/Core/Portable/LinkedFileDiffMerging/LinkedFileDiffMergingSession.cs ...ble/LinkedFileDiffMerging/LinkedFileDiffMergingSession.cs +1 -1

未找到文件。
--- a/src/Workspaces/Core/Portable/LinkedFileDiffMerging/LinkedFileDiffMergingSession.cs
+++ b/src/Workspaces/Core/Portable/LinkedFileDiffMerging/LinkedFileDiffMergingSession.cs
@@ -86,7 +86,7 @@ internal async Task<LinkedFileMergeSessionResult> MergeDiffsAsync(IMergeConflict

            // Automatically merge non-conflicting diffs while collecting the conflicting diffs

-            var textDifferencingService = _oldSolution.Workspace.Services.GetService<IDocumentTextDifferencingService>();
+            var textDifferencingService = _oldSolution.Workspace.Services.GetService<IDocumentTextDifferencingService>() ?? new DefaultDocumentTextDifferencingService();
            var appliedChanges = await textDifferencingService.GetTextChangesAsync(_oldSolution.GetDocument(linkedDocumentGroup.First()), _newSolution.GetDocument(linkedDocumentGroup.First()), cancellationToken).ConfigureAwait(false);
            var unmergedChanges = new List<UnmergedDocumentChanges>();