Merge pull request #8998 from mono/workspace-ref-cleanup

[Ide] Clean a bit of the ProjectData implementation

Author: Therzok

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectData.cs

@@ -69,24 +69,24 @@ void OnMetadataReferenceUpdated (object sender, MetadataReferenceUpdatedEventArg
 					return;
 
 				lock (metadataReferences) {
-					if (!RemoveMetadataReference_NoLock (reference, workspace))
+					if (!RemoveMetadataReference_NoLock (reference))
 						return;
 					workspace.OnMetadataReferenceRemoved (projectId, args.OldSnapshot);
 
-					AddMetadataReference_NoLock (reference, workspace);
+					AddMetadataReference_NoLock (reference);
 					workspace.OnMetadataReferenceAdded (projectId, args.NewSnapshot.Value);
 				}
 			}
 
-			void AddMetadataReference_NoLock (MonoDevelopMetadataReference metadataReference, MonoDevelopWorkspace ws)
+			void AddMetadataReference_NoLock (MonoDevelopMetadataReference metadataReference)
 			{
 				System.Diagnostics.Debug.Assert (Monitor.IsEntered (metadataReferences));
 
 				metadataReferences.Add (metadataReference);
 				metadataReference.SnapshotUpdated += OnMetadataReferenceUpdated;
 			}
 
-			bool RemoveMetadataReference_NoLock (MonoDevelopMetadataReference metadataReference, MonoDevelopWorkspace ws)
+			bool RemoveMetadataReference_NoLock (MonoDevelopMetadataReference metadataReference)
 			{
 				System.Diagnostics.Debug.Assert (Monitor.IsEntered (metadataReferences));
 
@@ -96,12 +96,10 @@ bool RemoveMetadataReference_NoLock (MonoDevelopMetadataReference metadataRefere
 
 			public void Disconnect ()
 			{
-				if (!workspaceRef.TryGetTarget (out var ws))
-					return;
-
 				lock (metadataReferences) {
 					foreach (var reference in metadataReferences)
 						reference.SnapshotUpdated -= OnMetadataReferenceUpdated;
+					metadataReferences.Clear ();
 				}
 			}
 		}