From 527202d830c031af6706ab0f37c2d3aab9da12d3 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Fri, 13 May 2022 17:32:38 +1000
Subject: [PATCH 1/2] Highlight the search term in the options page

---
 .../Options/AdvancedOptionPageControl.xaml    |   4 +-
 .../Options/AdvancedOptionPageControl.xaml.cs |   5 +-
 .../IntelliSenseOptionPageControl.xaml.cs     |   4 +-
 .../Core/Impl/Options/AbstractOptionPage.cs   |   7 +
 .../Impl/Options/AbstractOptionPageControl.cs |  55 ++++-
 .../Impl/Options/OptionPageSearchHandler.cs   | 123 +++++++++++
 .../Options/OptionPageSearchHandlerTests.vb   | 208 ++++++++++++++++++
 .../Options/AdvancedOptionPageControl.xaml    |   2 +-
 .../Options/AdvancedOptionPageControl.xaml.vb |   2 +-
 9 files changed, 400 insertions(+), 10 deletions(-)
 create mode 100644 src/VisualStudio/Core/Impl/Options/OptionPageSearchHandler.cs
 create mode 100644 src/VisualStudio/Core/Test/Options/OptionPageSearchHandlerTests.vb

diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
index 3dde53e4cdb62..93be68796dd11 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
@@ -15,7 +15,7 @@
             <GroupBox x:Uid="AnalysisGroupBox"
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Analysis}">
                 <StackPanel>
-                    <Label Content="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}"/>
+                    <Label x:Name="Run_background_code_analysis_for_label" Content="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}"/>
                     <StackPanel>
                         <ComboBox x:Name="Run_background_code_analysis_for" IsEditable="false" AutomationProperties.Name="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}">
                             <ComboBoxItem Content="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_None}" Tag="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_None_Tag}" />
@@ -24,7 +24,7 @@
                             <ComboBoxItem Content="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_Full_Solution}" Tag="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_Full_Solution_Tag}" />
                         </ComboBox>
                     </StackPanel>
-                    <Label Content="{x:Static local:AdvancedOptionPageStrings.Option_Show_compiler_errors_and_warnings_for}"/>
+                    <Label x:Name="Show_compiler_errors_and_warnings_for_label" Content="{x:Static local:AdvancedOptionPageStrings.Option_Show_compiler_errors_and_warnings_for}"/>
                     <StackPanel>
                         <ComboBox x:Name="Show_compiler_errors_and_warnings_for" IsEditable="false" AutomationProperties.Name="{x:Static local:AdvancedOptionPageStrings.Option_Show_compiler_errors_and_warnings_for}">
                             <ComboBoxItem Content="{x:Static local:AdvancedOptionPageStrings.Option_Compiler_Diagnostics_Scope_None}" Tag="{x:Static local:AdvancedOptionPageStrings.Option_Compiler_Diagnostics_Scope_None_Tag}" />
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
index a103ec868aef7..5283d8a5d853a 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -51,8 +51,8 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             InitializeComponent();
 
             // Analysis
-            BindToOption(Run_background_code_analysis_for, SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.CSharp);
-            BindToOption(Show_compiler_errors_and_warnings_for, SolutionCrawlerOptionsStorage.CompilerDiagnosticsScopeOption, LanguageNames.CSharp);
+            BindToOption(Run_background_code_analysis_for, SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.CSharp, label: Run_background_code_analysis_for_label);
+            BindToOption(Show_compiler_errors_and_warnings_for, SolutionCrawlerOptionsStorage.CompilerDiagnosticsScopeOption, LanguageNames.CSharp, label: Show_compiler_errors_and_warnings_for_label);
             BindToOption(DisplayDiagnosticsInline, InlineDiagnosticsOptions.EnableInlineDiagnostics, LanguageNames.CSharp);
             BindToOption(at_the_end_of_the_line_of_code, InlineDiagnosticsOptions.Location, InlineDiagnosticsLocations.PlacedAtEndOfCode, LanguageNames.CSharp);
             BindToOption(on_the_right_edge_of_the_editor_window, InlineDiagnosticsOptions.Location, InlineDiagnosticsLocations.PlacedAtEndOfEditor, LanguageNames.CSharp);
@@ -206,6 +206,7 @@ private void UpdatePullDiagnosticsOptions()
         {
             var normalPullDiagnosticsOption = OptionStore.GetOption(InternalDiagnosticsOptions.NormalDiagnosticMode);
             Enable_pull_diagnostics_experimental_requires_restart.IsChecked = GetCheckboxValueForDiagnosticMode(normalPullDiagnosticsOption);
+            AddSearchHandler(Enable_pull_diagnostics_experimental_requires_restart);
 
             static bool? GetCheckboxValueForDiagnosticMode(DiagnosticMode mode)
             {
diff --git a/src/VisualStudio/CSharp/Impl/Options/IntelliSenseOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/IntelliSenseOptionPageControl.xaml.cs
index 3f668ff9d7f82..39ee194983d2f 100644
--- a/src/VisualStudio/CSharp/Impl/Options/IntelliSenseOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/IntelliSenseOptionPageControl.xaml.cs
@@ -26,6 +26,7 @@ public IntelliSenseOptionPageControl(OptionStore optionStore) : base(optionStore
             BindToOption(Show_completion_list_after_a_character_is_typed, CompletionOptionsStorage.TriggerOnTypingLetters, LanguageNames.CSharp);
             Show_completion_list_after_a_character_is_deleted.IsChecked = this.OptionStore.GetOption(CompletionOptionsStorage.TriggerOnDeletion, LanguageNames.CSharp) == true;
             Show_completion_list_after_a_character_is_deleted.IsEnabled = Show_completion_list_after_a_character_is_typed.IsChecked == true;
+            AddSearchHandler(Show_completion_list_after_a_character_is_deleted);
 
             BindToOption(Never_include_snippets, CompletionOptionsStorage.SnippetsBehavior, SnippetsRule.NeverInclude, LanguageNames.CSharp);
             BindToOption(Always_include_snippets, CompletionOptionsStorage.SnippetsBehavior, SnippetsRule.AlwaysInclude, LanguageNames.CSharp);
@@ -39,8 +40,9 @@ public IntelliSenseOptionPageControl(OptionStore optionStore) : base(optionStore
             BindToOption(Automatically_show_completion_list_in_argument_lists, CompletionOptionsStorage.TriggerInArgumentLists, LanguageNames.CSharp);
 
             Show_items_from_unimported_namespaces.IsChecked = this.OptionStore.GetOption(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp);
+            AddSearchHandler(Show_items_from_unimported_namespaces);
             Tab_twice_to_insert_arguments.IsChecked = this.OptionStore.GetOption(CompletionViewOptions.EnableArgumentCompletionSnippets, LanguageNames.CSharp);
-
+            AddSearchHandler(Tab_twice_to_insert_arguments);
         }
 
         private void Show_completion_list_after_a_character_is_typed_Checked(object sender, RoutedEventArgs e)
diff --git a/src/VisualStudio/Core/Impl/Options/AbstractOptionPage.cs b/src/VisualStudio/Core/Impl/Options/AbstractOptionPage.cs
index 6467604de0811..55c1244b521bd 100644
--- a/src/VisualStudio/Core/Impl/Options/AbstractOptionPage.cs
+++ b/src/VisualStudio/Core/Impl/Options/AbstractOptionPage.cs
@@ -128,12 +128,19 @@ public override void SaveSettingsToStorage()
             _needsLoadOnNextActivate = true;
         }
 
+        protected override void SearchStringChanged(string searchString)
+        {
+            pageControl.OnSearch(searchString);
+        }
+
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
 
             if (pageControl != null)
             {
+                // Clear the search because we don't recreate controls
+                pageControl.OnSearch(string.Empty);
                 pageControl.Close();
             }
         }
diff --git a/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs b/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
index b955d02ba0fae..daabe5e2cf87b 100644
--- a/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
+++ b/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
@@ -22,6 +21,7 @@ public abstract class AbstractOptionPageControl : UserControl
     {
         internal readonly OptionStore OptionStore;
         private readonly List<BindingExpressionBase> _bindingExpressions = new List<BindingExpressionBase>();
+        private readonly List<OptionPageSearchHandler> _searchHandlers = new();
 
         protected AbstractOptionPageControl(OptionStore optionStore)
         {
@@ -73,6 +73,8 @@ private protected void BindToOption(CheckBox checkbox, Option2<bool> optionKey)
                 UpdateSourceTrigger = UpdateSourceTrigger.Default
             };
 
+            AddSearchHandler(checkbox);
+
             var bindingExpression = checkbox.SetBinding(CheckBox.IsCheckedProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -87,6 +89,8 @@ private protected void BindToOption(CheckBox checkbox, Option2<bool?> nullableOp
                 Converter = new NullableBoolOptionConverter(onNullValue)
             };
 
+            AddSearchHandler(checkbox);
+
             var bindingExpression = checkbox.SetBinding(CheckBox.IsCheckedProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -100,6 +104,8 @@ private protected void BindToOption(CheckBox checkbox, PerLanguageOption2<bool>
                 UpdateSourceTrigger = UpdateSourceTrigger.Default
             };
 
+            AddSearchHandler(checkbox);
+
             var bindingExpression = checkbox.SetBinding(CheckBox.IsCheckedProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -114,6 +120,8 @@ private protected void BindToOption(CheckBox checkbox, PerLanguageOption2<bool?>
                 Converter = new NullableBoolOptionConverter(onNullValue)
             };
 
+            AddSearchHandler(checkbox);
+
             var bindingExpression = checkbox.SetBinding(CheckBox.IsCheckedProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -144,7 +152,7 @@ private protected void BindToOption(TextBox textBox, PerLanguageOption2<int> opt
             _bindingExpressions.Add(bindingExpression);
         }
 
-        private protected void BindToOption<T>(ComboBox comboBox, Option2<T> optionKey)
+        private protected void BindToOption<T>(ComboBox comboBox, Option2<T> optionKey, ContentControl label = null)
         {
             var binding = new Binding()
             {
@@ -154,11 +162,16 @@ private protected void BindToOption<T>(ComboBox comboBox, Option2<T> optionKey)
                 ConverterParameter = comboBox
             };
 
+            AddSearchHandler(comboBox);
+
+            if (label is not null)
+                AddSearchHandler(label);
+
             var bindingExpression = comboBox.SetBinding(ComboBox.SelectedIndexProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
 
-        private protected void BindToOption<T>(ComboBox comboBox, PerLanguageOption2<T> optionKey, string languageName)
+        private protected void BindToOption<T>(ComboBox comboBox, PerLanguageOption2<T> optionKey, string languageName, ContentControl label = null)
         {
             var binding = new Binding()
             {
@@ -168,6 +181,11 @@ private protected void BindToOption<T>(ComboBox comboBox, PerLanguageOption2<T>
                 ConverterParameter = comboBox
             };
 
+            AddSearchHandler(comboBox);
+
+            if (label is not null)
+                AddSearchHandler(label);
+
             var bindingExpression = comboBox.SetBinding(ComboBox.SelectedIndexProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -183,6 +201,8 @@ private protected void BindToOption<T>(RadioButton radiobutton, PerLanguageOptio
                 ConverterParameter = optionValue
             };
 
+            AddSearchHandler(radiobutton);
+
             var bindingExpression = radiobutton.SetBinding(RadioButton.IsCheckedProperty, binding);
             _bindingExpressions.Add(bindingExpression);
         }
@@ -202,6 +222,35 @@ internal virtual void OnSave()
         internal virtual void Close()
         {
         }
+
+        internal virtual void OnSearch(string searchString)
+        {
+            var shouldScrollIntoView = true;
+            foreach (var handler in _searchHandlers)
+            {
+                if (handler.TryHighlightSearchString(searchString) && shouldScrollIntoView)
+                {
+                    handler.EnsureVisible();
+                    shouldScrollIntoView = false;
+                }
+            }
+        }
+
+        private protected void AddSearchHandler(ComboBox comboBox)
+        {
+            foreach (ComboBoxItem item in comboBox.Items)
+            {
+                AddSearchHandler(item);
+            }
+        }
+
+        private protected void AddSearchHandler(ContentControl control)
+        {
+            if (control.Content is string content)
+            {
+                _searchHandlers.Add(new OptionPageSearchHandler(control, content));
+            }
+        }
     }
 
     public class RadioButtonCheckedConverter : IValueConverter
diff --git a/src/VisualStudio/Core/Impl/Options/OptionPageSearchHandler.cs b/src/VisualStudio/Core/Impl/Options/OptionPageSearchHandler.cs
new file mode 100644
index 0000000000000..a3b447923f188
--- /dev/null
+++ b/src/VisualStudio/Core/Impl/Options/OptionPageSearchHandler.cs
@@ -0,0 +1,123 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics;
+using System.Windows;
+using System;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.Options
+{
+    internal class OptionPageSearchHandler
+    {
+        public static readonly Brush HighlightForeground = SystemColors.HighlightTextBrush;
+        public static readonly Brush HighlightBackground = SystemColors.HighlightBrush;
+
+        private readonly ContentControl _control;
+        private readonly string _originalContent;
+        private readonly int _accessKeyIndex;
+        private readonly string _content;
+
+        public OptionPageSearchHandler(ContentControl control, string originalContent)
+        {
+            _control = control;
+            _originalContent = originalContent;
+
+            // Currently only support one access key, and no underscores
+            Debug.Assert(_originalContent.Split('_').Length <= 2);
+
+            _accessKeyIndex = _originalContent.IndexOf('_');
+
+            // We strip out the access key so it doesn't interupt search, and because we have to handle displaying it ourselves anyway.
+            // Since we strip it out, we also don't need to worry about the access key being the character after the underscore
+            _content = _originalContent.Replace("_", "");
+        }
+
+        public bool TryHighlightSearchString(string searchTerm)
+        {
+            var index = _content.IndexOf(searchTerm, StringComparison.CurrentCultureIgnoreCase);
+            if (index == -1 || string.IsNullOrWhiteSpace(searchTerm))
+            {
+                if (_accessKeyIndex != -1)
+                {
+                    // Unregister and let the content control handle access keys
+                    AccessKeyManager.Unregister(_content[_accessKeyIndex].ToString(), _control);
+                }
+
+                _control.Content = _originalContent;
+                return false;
+            }
+
+            if (_accessKeyIndex != -1)
+            {
+                // Because we are overriding the content entirely, we have to handle access keys
+                AccessKeyManager.Register(_content[_accessKeyIndex].ToString(), _control);
+            }
+
+            _control.Content = CreateHighlightingTextRun(index, searchTerm.Length);
+            return true;
+        }
+
+        public void EnsureVisible()
+        {
+            _control.BringIntoView();
+        }
+
+        private TextBlock CreateHighlightingTextRun(int highlightStart, int length)
+        {
+            var textBlock = new TextBlock();
+            AddTextRun(textBlock, 0, highlightStart, highlight: false);
+            AddTextRun(textBlock, highlightStart, length, highlight: true);
+
+            var highlightEnd = highlightStart + length;
+            AddTextRun(textBlock, highlightEnd, _content.Length - highlightEnd, highlight: false);
+
+            return textBlock;
+        }
+
+        private void AddTextRun(TextBlock textBlock, int start, int length, bool highlight)
+        {
+            if (length <= 0)
+                return;
+
+            // If the access key is in this run, then we actually need to add three runs
+            if (_accessKeyIndex >= start && _accessKeyIndex < start + length)
+            {
+                var firstPartLength = _accessKeyIndex - start;
+                var lastPartLength = length - firstPartLength - 1;
+
+                if (firstPartLength > 0)
+                    textBlock.Inlines.Add(CreateRun(start, firstPartLength, highlight, underline: false));
+
+                textBlock.Inlines.Add(CreateRun(_accessKeyIndex, 1, highlight, underline: true));
+
+                if (lastPartLength > 0)
+                    textBlock.Inlines.Add(CreateRun(_accessKeyIndex + 1, lastPartLength, highlight, underline: false));
+            }
+            else
+            {
+                textBlock.Inlines.Add(CreateRun(start, length, highlight, underline: false));
+            }
+        }
+
+        private Run CreateRun(int start, int length, bool highlight, bool underline)
+        {
+            var run = new Run(_content.Substring(start, length));
+
+            if (highlight)
+            {
+                run.Background = HighlightBackground;
+                run.Foreground = HighlightForeground;
+            }
+
+            if (underline)
+                run.TextDecorations.Add(TextDecorations.Underline);
+
+            return run;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Test/Options/OptionPageSearchHandlerTests.vb b/src/VisualStudio/Core/Test/Options/OptionPageSearchHandlerTests.vb
new file mode 100644
index 0000000000000..28a4d33068211
--- /dev/null
+++ b/src/VisualStudio/Core/Test/Options/OptionPageSearchHandlerTests.vb
@@ -0,0 +1,208 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Documents
+Imports System.Windows.Input
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.Options
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
+    Public Class OptionPageSearchHandlerTests
+        <WpfFact>
+        Public Sub SearchStringNotFound()
+            TestSearchString("Show _marshmallows", "frogs")
+        End Sub
+
+        <WpfFact>
+        Public Sub Middle()
+            TestSearchString("Show _marshmallows", "mallow",
+                Normal("Show "),
+                Underline("m"),
+                Normal("arsh"),
+                Highlight("mallow"),
+                Normal("s"))
+        End Sub
+
+        <WpfFact>
+        Public Sub OverlapUnderline()
+            TestSearchString("Show mar_shmallows", "rsh",
+                Normal("Show ma"),
+                Highlight("r"),
+                Highlight(Underline("s")),
+                Highlight("h"),
+                Normal("mallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub CaseInsensitive()
+            TestSearchString("Show mar_shmallows", "show",
+                Highlight("Show"),
+                Normal(" mar"),
+                Underline("s"),
+                Normal("hmallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub HighlightAtStart()
+            TestSearchString("Show mar_shmallows", "Show",
+                Highlight("Show"),
+                Normal(" mar"),
+                Underline("s"),
+                Normal("hmallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub HighlightAtStart_NoUnderline()
+            TestSearchString("Show marshmallows", "Show",
+                Highlight("Show"),
+                Normal(" marshmallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub HighlightAtEnd()
+            TestSearchString("Show mar_shmallows", "lows",
+                Normal("Show mar"),
+                Underline("s"),
+                Normal("hmal"),
+                Highlight("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub HighlightAtEnd_NoUnderline()
+            TestSearchString("Show marshmallows", "lows",
+                Normal("Show marshmal"),
+                Highlight("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAfterEndOfHighlight()
+            TestSearchString("Show marshma_llows", "arshma",
+                Normal("Show m"),
+                Highlight("arshma"),
+                Underline("l"),
+                Normal("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAtEndOfHighlight()
+            TestSearchString("Show marshma_llows", "arshmal",
+                Normal("Show m"),
+                Highlight("arshma"),
+                Highlight(Underline("l")),
+                Normal("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAtStartOfHighlight()
+            TestSearchString("Show m_arshmallows", "arshmal",
+                Normal("Show m"),
+                Highlight(Underline("a")),
+                Highlight("rshmal"),
+                Normal("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineBeforeStartOfHighlight()
+            TestSearchString("Show m_arshmallows", "rshmal",
+                Normal("Show m"),
+                Underline("a"),
+                Highlight("rshmal"),
+                Normal("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAfterStartOfHighlight()
+            TestSearchString("Show ma_rshmallows", "arshmal",
+                Normal("Show m"),
+                Highlight("a"),
+                Highlight(Underline("r")),
+                Highlight("shmal"),
+                Normal("lows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAndHighlightFirstChar()
+            TestSearchString("_Show marshmallows", "show",
+                Highlight(Underline("S")),
+                Highlight("how"),
+                Normal(" marshmallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineFirstHighlightSecondChar()
+            TestSearchString("_Show marshmallows", "how",
+                Underline("S"),
+                Highlight("how"),
+                Normal(" marshmallows"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineLastHighlightSecondLastChar()
+            TestSearchString("Show marshmallow_s", "allow",
+                Normal("Show marshm"),
+                Highlight("allow"),
+                Underline("s"))
+        End Sub
+
+        <WpfFact>
+        Public Sub UnderlineAndHighlightLastChar()
+            TestSearchString("Show marshmallow_s", "allows",
+                Normal("Show marshm"),
+                Highlight("allow"),
+                Highlight(Underline("s")))
+        End Sub
+
+        <WpfFact>
+        Public Sub HighlightEntireContent()
+            TestSearchString("Show marshmallows", "Show marshmallows",
+                Highlight("Show marshmallows"))
+        End Sub
+
+        Private Shared Sub TestSearchString(controlContent As String, searchString As String, ParamArray runs As Run())
+            Dim control = New Label With
+            {
+                .Content = controlContent
+            }
+
+            Dim handler = New OptionPageSearchHandler(control, controlContent)
+
+            If runs.Length = 0 Then
+                Assert.False(handler.TryHighlightSearchString(searchString))
+            Else
+                Assert.True(handler.TryHighlightSearchString(searchString))
+                Dim textBlock = Assert.IsType(Of TextBlock)(control.Content)
+                Dim actualRuns = textBlock.Inlines.OfType(Of Run).ToArray()
+
+                Assert.Equal(runs.Length, actualRuns.Length)
+
+                For i = 0 To runs.Length - 1
+                    Assert.Equal(runs(i).Text, actualRuns(i).Text)
+                    Assert.Equal(runs(i).TextDecorations, actualRuns(i).TextDecorations)
+                    Assert.Equal(runs(i).Background, actualRuns(i).Background)
+                Next
+            End If
+        End Sub
+
+        Private Shared Function Normal(content As String) As Run
+            Return New Run(content)
+        End Function
+
+        Private Shared Function Underline(content As String) As Run
+            Dim run = Normal(content)
+            run.TextDecorations.Add(TextDecorations.Underline)
+            Return run
+        End Function
+
+        Private Shared Function Highlight(content As String) As Run
+            Return Highlight(Normal(content))
+        End Function
+
+        Private Shared Function Highlight(run As Run) As Run
+            run.Background = OptionPageSearchHandler.HighlightBackground
+            Return run
+        End Function
+    End Class
+End Namespace
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
index 5c53caf4c73c0..2645c3e4402b7 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
@@ -15,7 +15,7 @@
             <GroupBox x:Uid="AnalysisGroupBox"
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Analysis}">
                 <StackPanel>
-                    <Label Content="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}"/>
+                    <Label x:Name="Run_background_code_analysis_for_label" Content="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}"/>
                     <StackPanel>
                         <ComboBox x:Name="Run_background_code_analysis_for" IsEditable="false" AutomationProperties.Name="{x:Static local:AdvancedOptionPageStrings.Option_Run_background_code_analysis_for}">
                             <ComboBoxItem Content="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_None}" Tag="{x:Static local:AdvancedOptionPageStrings.Option_Background_Analysis_Scope_None_Tag}" />
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
index 9f73b6bacb304..25732a08a3391 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
@@ -47,7 +47,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             ' Keep this code in sync with the actual order options appear in Tools | Options
 
             ' Analysis
-            BindToOption(Run_background_code_analysis_for, SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.VisualBasic)
+            BindToOption(Run_background_code_analysis_for, SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.VisualBasic, label:=Run_background_code_analysis_for_label)
             BindToOption(Show_compiler_errors_and_warnings_for, SolutionCrawlerOptionsStorage.CompilerDiagnosticsScopeOption, LanguageNames.VisualBasic)
             BindToOption(DisplayDiagnosticsInline, InlineDiagnosticsOptions.EnableInlineDiagnostics, LanguageNames.VisualBasic)
             BindToOption(at_the_end_of_the_line_of_code, InlineDiagnosticsOptions.Location, InlineDiagnosticsLocations.PlacedAtEndOfCode, LanguageNames.VisualBasic)

From 699ee2d6954f77e29d1be8e32dc195d70cbb11b4 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Thu, 30 Jun 2022 16:54:03 +1000
Subject: [PATCH 2/2] Add assert to ensure future controls are searchable

---
 src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs b/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
index daabe5e2cf87b..5482b7a231651 100644
--- a/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
+++ b/src/VisualStudio/Core/Impl/Options/AbstractOptionPageControl.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
@@ -246,6 +247,7 @@ private protected void AddSearchHandler(ComboBox comboBox)
 
         private protected void AddSearchHandler(ContentControl control)
         {
+            Debug.Assert(control.Content is string, $"I don't know how to add keyword search support for the '{control.GetType().Name}' control with content type '{control.Content?.GetType().Name ?? "null"}'");
             if (control.Content is string content)
             {
                 _searchHandlers.Add(new OptionPageSearchHandler(control, content));