Bug 51614 - Document is not part of the workspace exception

While trying to reproduce and verify bug fix from fc37fbf I found few more issues

1 files changed, 9 insertions, 0 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
index b9181c019b..03e197a5d4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
@@ -775,6 +775,15 @@ namespace MonoDevelop.Ide.TypeSystem
 		internal void InformDocumentClose (DocumentId analysisDocument, string filePath)

 		{

 			try {

+				lock (openDocuments) {
+					var openDoc = openDocuments.FirstOrDefault (d => d.Id == analysisDocument);
+					if (openDoc != null) {
+						openDoc.Dispose ();
+						openDocuments.Remove (openDoc);
+					}
+				}

+				if (!CurrentSolution.ContainsDocument (analysisDocument))

+					return;

 				var loader = new MonoDevelopTextLoader (filePath);

 				var document = this.GetDocument (analysisDocument);

 				var openDocument = this.openDocuments.FirstOrDefault (w => w.Id == analysisDocument);