Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Fixes VSTS Bug 946429: Document model content callback API edge cases #8772

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes VSTS Bug 946429: Document model content callback API edge cases #8772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/ContentCallbackRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

namespace MonoDevelop.Ide.Gui.Documents
{
class ContentCallbackRegistry
class ContentCallbackRegistry : IDisposable
{
List<ContentCallback> contentCallbacks;
Func<Type,object> contentGetter;
Expand Down Expand Up @@ -157,5 +157,12 @@ void InvokeCallback (object content, ContentCallback callback)
}
}
}

public void Dispose ()
{
// contentCallbacks do not need to be disposed atm, because the dispose only removes them from contentCallbacks
contentCallbacks = null;
contentGetter = null;
}
}
}
10 changes: 10 additions & 0 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ void OnContentChanged ()
{
var taskSource = new TaskCompletionSource<T> ();
var regCancel = cancellationToken.Register (() => taskSource.TrySetCanceled ());
disposeTokenSource?.Token.Register (() => taskSource.TrySetCanceled ());

var regContent = RunWhenContentAdded<T> (c => {
taskSource.TrySetResult (c);
});
Expand Down Expand Up @@ -637,9 +639,14 @@ void Window_CloseRequested (object sender, EventArgs e)
Close ().Ignore ();
}

CancellationTokenSource disposeTokenSource = new CancellationTokenSource ();

void Dispose ()
{
DocumentRegistry.Remove (this);
disposeTokenSource?.Cancel ();
disposeTokenSource?.Dispose ();
disposeTokenSource = null;
callbackRegistration?.Dispose ();
var workspace = Runtime.PeekService<RootWorkspace> ();
if (workspace != null)
Expand All @@ -655,7 +662,10 @@ void Dispose ()
window.CloseRequested -= Window_CloseRequested;
window = null;

contentCallbackRegistry?.Dispose ();
contentCallbackRegistry = null;

contentActiveViewCallbackRegistry?.Dispose ();
contentActiveViewCallbackRegistry = null;
}
#region document tasks
Expand Down