Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NullReferenceException during debugging #1779

Merged
merged 2 commits into from
Apr 3, 2015
Merged

Fix NullReferenceException during debugging #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc44da4
Fix NullReferenceException during debugging
wschae Apr 3, 2015
a3bf5b0
Fix NullReferenceException during debugging
wschae Apr 3, 2015
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
12 changes: 11 additions & 1 deletion src/VisualStudio/Core/Def/Implementation/EditAndContinue/VsReadOnlyDocumentTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Diagnostics;
using Microsoft.CodeAnalysis.EditAndContinue;
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
using Microsoft.CodeAnalysis.Internal.Log;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Editor;
using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
Expand All @@ -20,7 +21,9 @@ internal sealed class VsReadOnlyDocumentTracker : ForegroundThreadAffinitizedObj
private readonly Workspace _workspace;
private readonly AbstractProject _vsProject;

private bool _isDisposed;
private bool _isDisposed;

internal static readonly TraceLog log = new TraceLog(2048, "VsReadOnlyDocumentTracker");

public VsReadOnlyDocumentTracker(IEditAndContinueWorkspaceService encService, IVsEditorAdaptersFactoryService adapters, AbstractProject vsProject)
: base(assertIsForeground: true)
Expand Down Expand Up @@ -142,6 +145,13 @@ private void SetReadOnlyFlag(ITextBuffer buffer, bool value)
private static ITextBuffer GetTextBuffer(Workspace workspace, DocumentId documentId)
{
var doc = workspace.CurrentSolution.GetDocument(documentId);
if (doc == null)
{
// TODO (https://github.com/dotnet/roslyn/issues/1204): this check should be unnecessary.
log.Write($"GetTextBuffer: document not found for '{documentId?.GetDebuggerDisplay()}'");
return null;
}

SourceText text;
if (!doc.TryGetText(out text))
{
Expand Down
56 changes: 56 additions & 0 deletions src/VisualStudio/Core/Test/EditAndContinue/VsReadOnlyDocumentTrackerTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

Imports System.Collections.Immutable
Imports System.IO
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.Diagnostics
Imports Microsoft.CodeAnalysis.EditAndContinue
Expand Down Expand Up @@ -115,6 +116,61 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.EditAndContinue
Assert.Equal(Of UInteger)(0, mockVsBuffer._oldFlags) ' Editable
End Sub

<WorkItem(1147868, "DevDiv")>
<Fact>
Public Sub InvalidDocumentTest1()
Dim diagnosticService As IDiagnosticAnalyzerService = New EditAndContinueTestHelper.TestDiagnosticAnalyzerService()
Dim encService As IEditAndContinueWorkspaceService = New EditAndContinueWorkspaceService(diagnosticService)
Dim workspace = EditAndContinueTestHelper.CreateTestWorkspace()
Dim currentSolution = workspace.CurrentSolution
Dim project = currentSolution.Projects(0)

Dim mockVsBuffer = New VsTextBufferMock()
Assert.Equal(Of UInteger)(0, mockVsBuffer._oldFlags)

Dim mockEditorAdaptersFactoryService = New VsEditorAdaptersFactoryServiceMock(mockVsBuffer)
Dim readOnlyDocumentTracker As VsReadOnlyDocumentTracker

' start debugging & readOnlyDocumentTracker
encService.StartDebuggingSession(workspace.CurrentSolution)
readOnlyDocumentTracker = New VsReadOnlyDocumentTracker(encService, mockEditorAdaptersFactoryService, Nothing)

' valid document
readOnlyDocumentTracker.SetReadOnly(project.DocumentIds.First(), False)
Assert.Equal(Of UInteger)(0, mockVsBuffer._oldFlags) ' Editable

' invlid documentId
readOnlyDocumentTracker.SetReadOnly(Nothing, False) ' Check no NRE
End Sub

<WorkItem(1147868, "DevDiv")>
<Fact>
Public Sub InvalidDocumentTest2()
Dim diagnosticService As IDiagnosticAnalyzerService = New EditAndContinueTestHelper.TestDiagnosticAnalyzerService()
Dim encService As IEditAndContinueWorkspaceService = New EditAndContinueWorkspaceService(diagnosticService)
Dim workspace = EditAndContinueTestHelper.CreateTestWorkspace()
Dim currentSolution = workspace.CurrentSolution
Dim project = currentSolution.Projects(0)

Dim mockVsBuffer = New VsTextBufferMock()
Assert.Equal(Of UInteger)(0, mockVsBuffer._oldFlags)

Dim mockEditorAdaptersFactoryService = New VsEditorAdaptersFactoryServiceMock(mockVsBuffer)
Dim readOnlyDocumentTracker As VsReadOnlyDocumentTracker

' start debugging & readOnlyDocumentTracker
encService.StartDebuggingSession(workspace.CurrentSolution)
readOnlyDocumentTracker = New VsReadOnlyDocumentTracker(encService, mockEditorAdaptersFactoryService, Nothing)

' valid document
readOnlyDocumentTracker.SetReadOnly(project.DocumentIds.First(), False)
Assert.Equal(Of UInteger)(0, mockVsBuffer._oldFlags) ' Editable

' the given project does not contain this document
Dim newDocumentId = New DocumentId(New ProjectId(New Guid(), "TestProject"), New Guid(), "TestDoc")
readOnlyDocumentTracker.SetReadOnly(newDocumentId, False) ' Check no NRE
End Sub

#Region "Helper Methods"

Public Class VsTextBufferMock
Expand Down