Merge pull request #34195 from jasonmalinowski/fix-race-in-getopendoc…

…umentincurrentcontextwithchanges Fix race in GetOpenDocumentInCurrentContextWithChanges
dotnet · Mar 19, 2019 · 559630b · 559630b
2 parents 2b21099 + 6bfb43d
commit 559630b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Workspaces/Core/Portable/Workspace/TextExtensions.cs b/src/Workspaces/Core/Portable/Workspace/TextExtensions.cs
@@ -33,14 +33,15 @@ public static Document GetOpenDocumentInCurrentContextWithChanges(this SourceTex
         {
             if (Workspace.TryGetWorkspace(text.Container, out var workspace))
             {
+                var solution = workspace.CurrentSolution;
                 var id = workspace.GetDocumentIdInCurrentContext(text.Container);
-                if (id == null || !workspace.CurrentSolution.ContainsDocument(id))
+                if (id == null || !solution.ContainsDocument(id))
                 {
                     return null;
                 }
 
-                var sol = workspace.CurrentSolution.WithDocumentText(id, text, PreservationMode.PreserveIdentity);
-                return sol.GetDocument(id);
+                return solution.WithDocumentText(id, text, PreservationMode.PreserveIdentity)
+                               .GetDocument(id);
             }
 
             return null;