Merge pull request #9034 from mono/master-vsts999353

Fixes VSTS Bug 999353: System.ArgumentOutOfRangeException exception in

Author: slluis

main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs

@@ -706,7 +706,7 @@ void HandleSearchEntryChanged (object sender, EventArgs e)
 				};
 				popup.SelectedItemChanged += delegate {
 					var si = popup?.Content?.SelectedItem;
-					if (si == null || si.Item < 0 || si.Item >= si.DataSource.Count)
+					if (si == null || !si.IsValid)
 						return;
 					var text = si.DataSource [si.Item].AccessibilityMessage;
 					if (string.IsNullOrEmpty (text))

main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs

@@ -238,7 +238,7 @@ protected override void Dispose (bool disposing)
 
 		internal async void OpenFile ()
 		{
-			if (SelectedItem == null || SelectedItem.Item < 0 || SelectedItem.Item >= SelectedItem.DataSource.Count)
+			if (SelectedItem == null || !SelectedItem.IsValid)
 				return;
 
 			var item = SelectedItem.DataSource [SelectedItem.Item];
@@ -636,7 +636,7 @@ protected override Size OnGetPreferredSize (SizeConstraint widthConstraint, Size
 		ItemIdentifier GetItemAt (double px, double py)
 		{
 			double y = ParentBounds.Y + yMargin;
-			if (topItem != null){
+			if (topItem != null && topItem.IsValid) {
 				layout.Markup = GetRowMarkup (topItem.DataSource[topItem.Item]);
 				var ls = layout.GetSize ();
 				y += ls.Height + itemSeparatorHeight + itemPadding * 2;
@@ -1032,15 +1032,15 @@ protected virtual void OnItemActivated (EventArgs e)
 
 		public ISegment SelectedItemRegion {
 			get {
-				if (SelectedItem == null || SelectedItem.Item < 0 || SelectedItem.Item >= SelectedItem.DataSource.Count)
+				if (SelectedItem == null || !SelectedItem.IsValid)
 					return TextSegment.Invalid;
 				return SelectedItem.DataSource[SelectedItem.Item].Segment;
 			}
 		}
 
 		public string SelectedItemFileName {
 			get {
-				if (SelectedItem == null || SelectedItem.Item < 0 || SelectedItem.Item >= SelectedItem.DataSource.Count)
+				if (SelectedItem == null || !SelectedItem.IsValid)
 					return null;
 				return SelectedItem.DataSource[SelectedItem.Item].File;
 			}
@@ -1050,6 +1050,7 @@ internal class ItemIdentifier {
 			public SearchCategory Category { get; private set; }
 			public IReadOnlyList<SearchResult> DataSource { get; private set; }
 			public int Item { get; private set; }
+			public bool IsValid { get => DataSource != null && 0 <= Item && Item < DataSource.Count; }
 
 			public ItemIdentifier (SearchCategory category, IReadOnlyList<SearchResult> dataSource, int item)
 			{
@@ -1158,7 +1159,7 @@ protected override void OnDraw (Context context, Rectangle dirtyRect)
 
 			double y = alloc.Y + yMargin;
 			Size ls;
-			if (topItem != null) {
+			if (topItem != null && topItem.IsValid) {
 				headerLayout.Text = GettextCatalog.GetString ("Top Result");
 				ls = headerLayout.GetSize ();
 				context.SetColor (headerColor);