Address feedback

1 files changed, 8 insertions, 2 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
index 08008430b4..b23ac24694 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
@@ -49,12 +49,18 @@ namespace MonoDevelop.CSharp.Debugger
 	[ExportDocumentControllerExtension (MimeType = "*")]
 	class DebuggerCompletionController : DocumentControllerExtension
 	{
+		public override Task<bool> SupportsController (DocumentController controller)
+		{
+			return Task.FromResult (controller.GetContent<ITextBuffer> () != null);
+		}
+
 		protected override object OnGetContent (Type type)
 		{
 			if (typeof (IDebuggerCompletionProvider).IsAssignableFrom (type)) {
-				var textView = Controller.GetContent<ITextView> ();
-				var analysisDocument = textView.TextBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges ();
 				var textBuffer = Controller.GetContent<ITextBuffer> ();
+				var analysisDocument = textBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges ();
+				if (analysisDocument == null)
+					return null;
 				return new DebuggerCompletionProvider (analysisDocument, textBuffer);
 			}
 			return base.OnGetContent (type);