Merge pull request #6026 from MDoerner/StopCrashingOnFindReferencesInDirtyState

retailcoder · web-flow · commit 1bb58c3a0050 · 2022-10-10T20:49:15.000-04:00
Handle inconsistent results from Find All references gracefully
diff --git a/Rubberduck.Core/UI/Converters/SearchResultToXamlConverter.cs b/Rubberduck.Core/UI/Converters/SearchResultToXamlConverter.cs
@@ -33,10 +33,12 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 textBlock.TextWrapping = TextWrapping.Wrap;
 
                 var input = item.ResultText.Replace(' ', nonBreakingSpace);
-                if (item.HighlightIndex.HasValue)
+                if (item.HighlightIndex.HasValue
+                    && item.HighlightIndex.Value.EndColumn < input.Length   // if we do not check this, any inconsistent input will crash the host.
+                    && item.HighlightIndex.Value.StartColumn < input.Length)
                 {
                     var highlight = item.HighlightIndex.Value;
-                    if (highlight.StartColumn > 0)
+                    if (highlight.StartColumn > 0) 
                     {
                         var preRun = new Run(input.Substring(0, highlight.StartColumn))
                         {

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,12 @@ public object Convert(object value, Type targetType, object parameter, CultureIn`
`33`	`33`	`textBlock.TextWrapping = TextWrapping.Wrap;`
`34`	`34`
`35`	`35`	`var input = item.ResultText.Replace(' ', nonBreakingSpace);`
`36`		`- if (item.HighlightIndex.HasValue)`
	`36`	`+ if (item.HighlightIndex.HasValue`
	`37`	`+ && item.HighlightIndex.Value.EndColumn < input.Length // if we do not check this, any inconsistent input will crash the host.`
	`38`	`+ && item.HighlightIndex.Value.StartColumn < input.Length)`
`37`	`39`	`{`
`38`	`40`	`var highlight = item.HighlightIndex.Value;`
`39`		`- if (highlight.StartColumn > 0)`
	`41`	`+ if (highlight.StartColumn > 0)`
`40`	`42`	`{`
`41`	`43`	`var preRun = new Run(input.Substring(0, highlight.StartColumn))`
`42`	`44`	`{`