Merge pull request #9359 from mono/jstedfast-debugger-dont-evaluate-null-expressions

sgmunn · web-flow · commit a50f147886ac · 2019-11-21T15:32:19.000-05:00
[Debugger] Don't evaluate null expressions in the tooltip logic
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs
@@ -110,7 +110,7 @@ public async Task<QuickInfoItem> GetQuickInfoItemAsync (IAsyncQuickInfoSession s
 					debugInfo = await debugInfoProvider.Value.GetDebugInfoAsync (point, cancellationToken);
 				}
 
-				if (!debugInfo.IsDefault) {
+				if (!debugInfo.IsDefault && debugInfo.Text != null) {
 					await EvaluateAndShowTooltipAsync (session, view, point, debugInfo, cancellationToken);
 					return null;
 				}

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public async Task<QuickInfoItem> GetQuickInfoItemAsync (IAsyncQuickInfoSession s`
`110`	`110`	`debugInfo = await debugInfoProvider.Value.GetDebugInfoAsync (point, cancellationToken);`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (!debugInfo.IsDefault) {`
	`113`	`+ if (!debugInfo.IsDefault && debugInfo.Text != null) {`
`114`	`114`	`await EvaluateAndShowTooltipAsync (session, view, point, debugInfo, cancellationToken);`
`115`	`115`	`return null;`
`116`	`116`	`}`