huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dispose logic for EditorDocument 

This could throw when the document is disposed and wasn't open in the
editor.

Improved the tests to cover dispose as well for both cases.
This commit is contained in:
Ryan Nowak 2018-05-20 16:22:03 -07:00
parent 53eedb2e34
commit 4ac8b21978
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocument.cs
View File

@ -149,9 +149,17 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
_fileTracker.Changed -= ChangeTracker_Changed;
_fileTracker.StopListening();
EditorTextContainer.TextChanged -= TextContainer_Changed;
EditorTextContainer = null;
EditorTextBuffer = null;
if (EditorTextBuffer != null)
{
_snapshotTracker.StopTracking(EditorTextBuffer);
EditorTextBuffer = null;
}
if (EditorTextContainer != null)
{
EditorTextContainer.TextChanged -= TextContainer_Changed;
EditorTextContainer = null;
}
_documentManager.RemoveDocument(this);

30
test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
public void EditorDocument_CreatedWhileOpened()
{
// Arrange & Act
var document = new EditorDocument(
using (var document = new EditorDocument(
DocumentManager,
ProjectFilePath,
DocumentFilePath,
@ -50,19 +50,20 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
changedOnDisk: null,
changedInEditor: null,
opened: null,
closed: null);
// Assert
Assert.True(document.IsOpenInEditor);
Assert.Same(TextBuffer, document.EditorTextBuffer);
Assert.NotNull(document.EditorTextContainer);
closed: null))
{
// Assert
Assert.True(document.IsOpenInEditor);
Assert.Same(TextBuffer, document.EditorTextBuffer);
Assert.NotNull(document.EditorTextContainer);
}
}
[Fact]
public void EditorDocument_CreatedWhileClosed()
{
// Arrange & Act
var document = new EditorDocument(
using (var document = new EditorDocument(
DocumentManager,
ProjectFilePath,
DocumentFilePath,
@ -72,12 +73,13 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
changedOnDisk: null,
changedInEditor: null,
opened: null,
closed: null);
// Assert
Assert.False(document.IsOpenInEditor);
Assert.Null(document.EditorTextBuffer);
Assert.Null(document.EditorTextContainer);
closed: null))
{
// Assert
Assert.False(document.IsOpenInEditor);
Assert.Null(document.EditorTextBuffer);
Assert.Null(document.EditorTextContainer);
}
}
private class TestSourceTextContainer : SourceTextContainer