Fix possible NRE in Quick Info

mhutch · Apr 30, 2024 · 1e71b80 · 1e71b80
1 parent cae105a
commit 1e71b80
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MonoDevelop.MSBuild.Editor/QuickInfo/MSBuildDiagnosticQuickInfoSource.cs b/MonoDevelop.MSBuild.Editor/QuickInfo/MSBuildDiagnosticQuickInfoSource.cs
@@ -60,9 +60,11 @@ QuickInfoItem GetQuickInfoItemInternal (IAsyncQuickInfoSession session, Cancella
 			elements.Add (displayElementFactory.GetDiagnosticTooltip (diagnostic));
 
 			var tagSpan = mappingSpan.Span.GetSpans (snapshot).First ();
-			applicableToSpan = applicableToSpan.HasValue ? applicableToSpan.Value.Overlap (tagSpan) : tagSpan;
+			applicableToSpan = applicableToSpan.HasValue ? (applicableToSpan.Value.Overlap (tagSpan)?? triggerSpan) : tagSpan;
 		}
 
+		applicableToSpan ??= triggerSpan;
+
 		return new QuickInfoItem (
 			snapshot.CreateTrackingSpan (applicableToSpan.Value, SpanTrackingMode.EdgeExclusive),
 			new ContainerElement (ContainerElementStyle.Stacked | ContainerElementStyle.VerticalPadding, elements)