From 9e4d7f963de1410aec2c62c4383a1a8f5675feb7 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Fri, 4 Jan 2019 10:47:51 -0500
Subject: [PATCH 1/9] Starting to implement autocomplete functionality

---
 .../GitHubPane/PullRequestCreationView.xaml   | 41 +++++++++++++------
 .../PullRequestCreationViewModelTests.cs      | 21 ++++++----
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
index ba748d1eef..e3d1c4b224 100644
--- a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
@@ -149,18 +149,35 @@
                             SpellCheck.IsEnabled="True"
                             AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationTitleTextBox}"/>
 
-        <ghfvs:PromptTextBox Grid.Row="2"
-                            MinHeight="100"
-                            Margin="10,5"
-                            AcceptsReturn="True"
-                            PromptText="{x:Static ghfvs:Resources.Description}"
-                            Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{DynamicResource GitHubVsPromptTextBox}"
-                            VerticalScrollBarVisibility="Auto"
-                            TextWrapping="Wrap"
-                            SpellCheck.IsEnabled="True"
-                            AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
-        
+        <ghfvs:AutoCompleteBox
+            x:Name="commitMessageTextBox"
+            ScrollViewer.CanContentScroll="False"
+            Margin="0"
+            HorizontalAlignment="Stretch"
+            TabIndex="0"
+            TextBoxStyle="{StaticResource GitHubPromptRichText}">
+            <ghfvs:AutoCompleteBox.ItemTemplate>
+                <DataTemplate>
+                    <ghfvs:AutoCompleteSuggestionView ViewModel="{Binding}" />
+                </DataTemplate>
+            </ghfvs:AutoCompleteBox.ItemTemplate>
+            <ghfvs:AutoCompleteBox.InputElement>
+                <ghfvs:TextBoxAutoCompleteTextInput>
+                    <ghfvs:PromptTextBox Grid.Row="2"
+                                         MinHeight="100"
+                                         Margin="10,5"
+                                         AcceptsReturn="True"
+                                         PromptText="{x:Static ghfvs:Resources.Description}"
+                                         Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
+                                         Style="{DynamicResource GitHubVsPromptTextBox}"
+                                         VerticalScrollBarVisibility="Auto"
+                                         TextWrapping="Wrap"
+                                         SpellCheck.IsEnabled="True"
+                                         AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
+                </ghfvs:TextBoxAutoCompleteTextInput>
+            </ghfvs:AutoCompleteBox.InputElement>
+        </ghfvs:AutoCompleteBox>
+
         <ghfvs:ValidationMessage x:Name="titleValidationMessage"
                                 Grid.Row="3"
                                 Fill="{StaticResource GitHubWarningBrush}"
diff --git a/test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestCreationViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestCreationViewModelTests.cs
index dc7b82fa73..43c4144fba 100644
--- a/test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestCreationViewModelTests.cs
+++ b/test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestCreationViewModelTests.cs
@@ -55,6 +55,7 @@ struct TestData
         public IConnection Connection;
         public IApiClient ApiClient;
         public IModelService ModelService;
+        public IAutoCompleteAdvisor AutoCompleteAdvisor { get; set; }
 
         public IModelServiceFactory GetModelServiceFactory()
         {
@@ -78,6 +79,7 @@ static TestData PrepareTestData(
         var connection = Substitute.For<IConnection>();
         var api = Substitute.For<IApiClient>();
         var ms = Substitute.For<IModelService>();
+        var autoCompleteAdvisor = Substitute.For<IAutoCompleteAdvisor>();
 
         connection.HostAddress.Returns(HostAddress.Create("https://github.com"));
 
@@ -121,7 +123,8 @@ static TestData PrepareTestData(
             NotificationService = notifications,
             Connection = connection,
             ApiClient = api,
-            ModelService = ms
+            ModelService = ms,
+            AutoCompleteAdvisor = autoCompleteAdvisor
         };
     }
 
@@ -147,7 +150,7 @@ public async Task TargetBranchDisplayNameIncludesRepoOwnerWhenForkAsync()
         var prservice = new PullRequestService(data.GitClient, data.GitService, Substitute.For<IVSGitExt>(), Substitute.For<IGraphQLClientFactory>(), data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
         prservice.GetPullRequestTemplate(data.ActiveRepo).Returns(Observable.Empty<string>());
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            Substitute.For<IMessageDraftStore>(), data.GitService);
+            Substitute.For<IMessageDraftStore>(), data.GitService, data.AutoCompleteAdvisor);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
         Assert.That("octokit/master", Is.EqualTo(vm.TargetBranch.DisplayName));
     }
@@ -183,7 +186,7 @@ public async Task CreatingPRsAsync(
 
         var prservice = new PullRequestService(data.GitClient, data.GitService, Substitute.For<IVSGitExt>(), Substitute.For<IGraphQLClientFactory>(), data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            Substitute.For<IMessageDraftStore>(), data.GitService);
+            Substitute.For<IMessageDraftStore>(), data.GitService, data.AutoCompleteAdvisor);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         // the TargetBranch property gets set to whatever the repo default is (we assume master here),
@@ -226,7 +229,7 @@ public async Task TemplateIsUsedIfPresentAsync()
         prservice.GetPullRequestTemplate(data.ActiveRepo).Returns(Observable.Return("Test PR template"));
 
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            Substitute.For<IMessageDraftStore>(), data.GitService);
+            Substitute.For<IMessageDraftStore>(), data.GitService, data.AutoCompleteAdvisor);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         Assert.That("Test PR template", Is.EqualTo(vm.Description));
@@ -246,7 +249,7 @@ public async Task LoadsDraft()
 
         var prservice = Substitute.For<IPullRequestService>();
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            draftStore, data.GitService);
+            draftStore, data.GitService, data.AutoCompleteAdvisor);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         Assert.That(vm.PRTitle, Is.EqualTo("This is a Title."));
@@ -261,7 +264,7 @@ public async Task UpdatesDraftWhenDescriptionChanges()
         var draftStore = Substitute.For<IMessageDraftStore>();
         var prservice = Substitute.For<IPullRequestService>();
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            draftStore, data.GitService, scheduler);
+            draftStore, data.GitService, data.AutoCompleteAdvisor, scheduler);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         vm.Description = "Body changed.";
@@ -284,7 +287,7 @@ public async Task UpdatesDraftWhenTitleChanges()
         var draftStore = Substitute.For<IMessageDraftStore>();
         var prservice = Substitute.For<IPullRequestService>();
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService,
-            draftStore, data.GitService, scheduler);
+            draftStore, data.GitService, data.AutoCompleteAdvisor, scheduler);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         vm.PRTitle = "Title changed.";
@@ -307,7 +310,7 @@ public async Task DeletesDraftWhenPullRequestSubmitted()
         var draftStore = Substitute.For<IMessageDraftStore>();
         var prservice = Substitute.For<IPullRequestService>();
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService, draftStore,
-            data.GitService, scheduler);
+            data.GitService, data.AutoCompleteAdvisor, scheduler);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         await vm.CreatePullRequest.Execute();
@@ -323,7 +326,7 @@ public async Task DeletesDraftWhenCanceled()
         var draftStore = Substitute.For<IMessageDraftStore>();
         var prservice = Substitute.For<IPullRequestService>();
         var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService, draftStore,
-            data.GitService, scheduler);
+            data.GitService, data.AutoCompleteAdvisor, scheduler);
         await vm.InitializeAsync(data.ActiveRepo, data.Connection);
 
         await vm.Cancel.Execute();

From 8906c54b4faf2a10d15cf782881d5617f42f98e3 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Fri, 4 Jan 2019 10:59:41 -0500
Subject: [PATCH 2/9] Revert "Undoing changes to PullRequestCreationViewModel"

This reverts commit 653cc79c6cb098417f69b608af19edea82aaf4a0.
---
 .../GitHubPane/PullRequestCreationViewModel.cs     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
index 89f8e37c50..5450fb970e 100644
--- a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
+++ b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
@@ -18,6 +18,7 @@
 using GitHub.Models.Drafts;
 using GitHub.Primitives;
 using GitHub.Services;
+using GitHub.UI;
 using GitHub.Validation;
 using Octokit;
 using ReactiveUI;
@@ -51,8 +52,9 @@ public PullRequestCreationViewModel(
             IPullRequestService service,
             INotificationService notifications,
             IMessageDraftStore draftStore,
-            IGitService gitService)
-            : this(modelServiceFactory, service, notifications, draftStore, gitService, DefaultScheduler.Instance)
+            IGitService gitService,
+            IAutoCompleteAdvisor autoCompleteAdvisor)
+            : this(modelServiceFactory, service, notifications, draftStore, gitService, autoCompleteAdvisor, DefaultScheduler.Instance)
         {
         }
 
@@ -62,6 +64,7 @@ public PullRequestCreationViewModel(
             INotificationService notifications,
             IMessageDraftStore draftStore,
             IGitService gitService,
+            IAutoCompleteAdvisor autoCompleteAdvisor,
             IScheduler timerScheduler)
         {
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
@@ -69,12 +72,14 @@ public PullRequestCreationViewModel(
             Guard.ArgumentNotNull(notifications, nameof(notifications));
             Guard.ArgumentNotNull(draftStore, nameof(draftStore));
             Guard.ArgumentNotNull(gitService, nameof(gitService));
+            Guard.ArgumentNotNull(autoCompleteAdvisor, nameof(autoCompleteAdvisor));
             Guard.ArgumentNotNull(timerScheduler, nameof(timerScheduler));
 
             this.service = service;
             this.modelServiceFactory = modelServiceFactory;
             this.draftStore = draftStore;
             this.gitService = gitService;
+            this.AutoCompleteAdvisor = autoCompleteAdvisor;
             this.timerScheduler = timerScheduler;
 
             this.WhenAnyValue(x => x.Branches)
@@ -334,8 +339,9 @@ protected string GetDraftKey()
                 SourceBranch.Name);
         }
 
-        public RemoteRepositoryModel GitHubRepository { get { return githubRepository?.Value; } }
-        bool IsExecuting { get { return isExecuting.Value; } }
+        public RemoteRepositoryModel GitHubRepository => githubRepository?.Value;
+        bool IsExecuting => isExecuting.Value;
+        public IAutoCompleteAdvisor AutoCompleteAdvisor { get; }
 
         bool initialized;
         bool Initialized

From bfa18c619ec6a02b9689b6b31a0c40672a7324c0 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Fri, 4 Jan 2019 11:09:03 -0500
Subject: [PATCH 3/9] Undoing some changes

---
 .../ViewModels/GitHubPane/PullRequestCreationViewModel.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
index 5450fb970e..bd25c85c52 100644
--- a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
+++ b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs
@@ -339,8 +339,8 @@ protected string GetDraftKey()
                 SourceBranch.Name);
         }
 
-        public RemoteRepositoryModel GitHubRepository => githubRepository?.Value;
-        bool IsExecuting => isExecuting.Value;
+        public RemoteRepositoryModel GitHubRepository { get { return githubRepository?.Value; } }
+        bool IsExecuting { get { return isExecuting.Value; } }
         public IAutoCompleteAdvisor AutoCompleteAdvisor { get; }
 
         bool initialized;

From 2c947487771d7038b02013b342785462b9269626 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Sat, 5 Jan 2019 10:43:14 -0500
Subject: [PATCH 4/9] Trying to display the control correctly

---
 .../GitHubPane/PullRequestCreationView.xaml   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
index e3d1c4b224..9b1c35db1f 100644
--- a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
@@ -149,13 +149,24 @@
                             SpellCheck.IsEnabled="True"
                             AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationTitleTextBox}"/>
 
+        <ghfvs:PromptTextBox Grid.Row="2"
+                            MinHeight="100"
+                            Margin="10,5"
+                            AcceptsReturn="True"
+                            PromptText="{x:Static ghfvs:Resources.Description}"
+                            Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{DynamicResource GitHubVsPromptTextBox}"
+                            VerticalScrollBarVisibility="Auto"
+                            TextWrapping="Wrap"
+                            SpellCheck.IsEnabled="True"
+                            AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
+
         <ghfvs:AutoCompleteBox
-            x:Name="commitMessageTextBox"
-            ScrollViewer.CanContentScroll="False"
-            Margin="0"
-            HorizontalAlignment="Stretch"
-            TabIndex="0"
-            TextBoxStyle="{StaticResource GitHubPromptRichText}">
+            Grid.Row="3"
+            MinHeight="100"
+            Margin="10,5"
+            Advisor="{Binding AutoCompleteAdvisor}"
+            >
             <ghfvs:AutoCompleteBox.ItemTemplate>
                 <DataTemplate>
                     <ghfvs:AutoCompleteSuggestionView ViewModel="{Binding}" />
@@ -163,17 +174,13 @@
             </ghfvs:AutoCompleteBox.ItemTemplate>
             <ghfvs:AutoCompleteBox.InputElement>
                 <ghfvs:TextBoxAutoCompleteTextInput>
-                    <ghfvs:PromptTextBox Grid.Row="2"
-                                         MinHeight="100"
-                                         Margin="10,5"
-                                         AcceptsReturn="True"
+                    <ghfvs:PromptTextBox AcceptsReturn="True"
                                          PromptText="{x:Static ghfvs:Resources.Description}"
                                          Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
                                          Style="{DynamicResource GitHubVsPromptTextBox}"
                                          VerticalScrollBarVisibility="Auto"
                                          TextWrapping="Wrap"
-                                         SpellCheck.IsEnabled="True"
-                                         AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
+                                         SpellCheck.IsEnabled="True"/>
                 </ghfvs:TextBoxAutoCompleteTextInput>
             </ghfvs:AutoCompleteBox.InputElement>
         </ghfvs:AutoCompleteBox>

From 9d2ee84e80dd415819719bd1db6c79d7a92b2be5 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 24 Jan 2019 11:06:34 -0500
Subject: [PATCH 5/9] Including missing themes

---
 .../Assets/Controls/AutoCompleteBox.xaml      | 20 +++----
 .../Styles/ThemeBlue.xaml                     | 52 +++++++++++++++++++
 .../Styles/ThemeDark.xaml                     | 52 +++++++++++++++++++
 .../Styles/ThemeLight.xaml                    | 52 +++++++++++++++++++
 4 files changed, 166 insertions(+), 10 deletions(-)

diff --git a/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml b/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
index 1a1a950e6b..2283b4b9a1 100644
--- a/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
+++ b/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
@@ -65,11 +65,11 @@
         <Setter Property="Padding" Value="5,0,10,0"/>
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Background" Value="{StaticResource GHBoxBackgroundBrush}"/>
-        <Setter Property="Foreground" Value="{StaticResource GHBoxTextBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource GHBoxBackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource GHBoxTextBrush}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{StaticResource NoMarginFocusVisual}"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource NoMarginFocusVisual}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -81,23 +81,23 @@
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource GHBoxHoverBackgroundBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GHBoxHoverBackgroundBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="Selector.IsSelectionActive" Value="False"/>
                                 <Condition Property="IsSelected" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{StaticResource GHBoxSelectedBackgroundBrush}"/>
-                            <Setter Property="Foreground" Value="{StaticResource GHBoxSelectedTextBrush}"/>
+                            <Setter Property="Background" Value="{DynamicResource GHBoxSelectedBackgroundBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource GHBoxSelectedTextBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="Selector.IsSelectionActive" Value="True"/>
                                 <Condition Property="IsSelected" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{StaticResource GHBoxActiveSelectionBackgroundBrush}"/>
-                            <Setter Property="Foreground" Value="{StaticResource GHBoxActiveSelectionTextBrush}"/>
+                            <Setter Property="Background" Value="{DynamicResource GHBoxActiveSelectionBackgroundBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource GHBoxActiveSelectionTextBrush}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" TargetName="Bd" Value="0.3"/>
@@ -113,8 +113,8 @@
     <Style TargetType="ui:AutoCompleteBox">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Padding" Value="2" />
-        <Setter Property="Background" Value="{StaticResource DefaultBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{StaticResource GHTextBrush}" />
+        <Setter Property="Background" Value="{DynamicResource DefaultBackgroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
         <Setter Property="MinWidth" Value="45" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteListItemContainerStyle}" />
 
diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
index 02e1b632f4..ffe2f879fa 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
@@ -66,4 +66,56 @@
   <SolidColorBrush x:Key="GitHubPendingReviewBackground" Color="#FFF8C7" />
   <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB" />
   <SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FFD6DBE9" />
+
+    <!-- Not selected, nor focused -->
+    <Color x:Key="GHBoxTextColor">#333333</Color>
+    <SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected, not active (focused) -->
+    <Color x:Key="GHBoxSelectedTextColor">#333333</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedBackgroundColor">#e7e7e7</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected and active (focused) -->
+    <Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Hovered (should never be used for selected or active items) -->
+    <Color x:Key="GHBoxHoverTextColor">#0a0a0a</Color>
+    <SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverIconColor">#909090</Color>
+    <SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
index b9994994e7..fa7c04f331 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
@@ -66,4 +66,56 @@
   <SolidColorBrush x:Key="GitHubPendingReviewBackground" Color="#26384D" />
   <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FF3F3F46"/>
   <SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FF2D2D30" />
+
+    <!-- Not selected, nor focused -->
+    <Color x:Key="GHBoxTextColor">#cccccc</Color>
+    <SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected, not active (focused) -->
+    <Color x:Key="GHBoxSelectedTextColor">#cccccc</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedBackgroundColor">#3e3e3e</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected and active (focused) -->
+    <Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Hovered (should never be used for selected or active items) -->
+    <Color x:Key="GHBoxHoverTextColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverIconColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
index 85fcdf79b5..77dddbe4f0 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
@@ -66,4 +66,56 @@
   <SolidColorBrush x:Key="GitHubPendingReviewBackground" Color="#FFF8C7" />
   <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
   <SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FFEEEEF2" />
+
+    <!-- Not selected, nor focused -->
+    <Color x:Key="GHBoxTextColor">#333333</Color>
+    <SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected, not active (focused) -->
+    <Color x:Key="GHBoxSelectedTextColor">#333333</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxSelectedBackgroundColor">#e7e7e7</Color>
+    <SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Selected and active (focused) -->
+    <Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
+    <SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <!-- Hovered (should never be used for selected or active items) -->
+    <Color x:Key="GHBoxHoverTextColor">#0a0a0a</Color>
+    <SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverIconColor">#909090</Color>
+    <SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
+                     PresentationOptions:Freeze="true" />
+
+    <Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
+    <SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
+                     PresentationOptions:Freeze="true" />
 </ResourceDictionary>
\ No newline at end of file

From 161b85e25b30201401ad6cc9c9eb807e8c15f6de Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 24 Jan 2019 11:24:01 -0500
Subject: [PATCH 6/9] Commenting out event subscriptions

---
 .../AutoCompleteBox/AutoCompleteBox.cs        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs b/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
index c96b73c2ee..f89d6bd51b 100644
--- a/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
+++ b/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
@@ -632,7 +632,7 @@ void UpdateTextBox(IAutoCompleteTextInput value)
             if (textInput != null)
             {
                 UnsubscribeToEvent("SelectionChanged");
-                UnsubscribeToEvent("OnTextBoxTextChanged");
+//                UnsubscribeToEvent("OnTextBoxTextChanged");
             }
 
             textInput = value;
@@ -646,18 +646,18 @@ void UpdateTextBox(IAutoCompleteTextInput value)
                     supportsShortcutOriginalValue = shortcutContainer.SupportsKeyboardShortcuts;
                 }
 
-                SubscribeToEvent("OnTextBoxTextChanged", ObserveTextBoxChanges()
-                    .Subscribe(shouldPopulate =>
-                    {
-                        if (shouldPopulate)
-                        {
-                            PopulateDropDown();
-                        }
-                        else
-                        {
-                            DismissDropDown();
-                        }
-                    }));
+//                SubscribeToEvent("OnTextBoxTextChanged", ObserveTextBoxChanges()
+//                    .Subscribe(shouldPopulate =>
+//                    {
+//                        if (shouldPopulate)
+//                        {
+//                            PopulateDropDown();
+//                        }
+//                        else
+//                        {
+//                            DismissDropDown();
+//                        }
+//                    }));
 
                 if (Text != null)
                 {
@@ -777,7 +777,7 @@ public override void OnApplyTemplate()
         {
             if (TextBox != null)
             {
-                UnsubscribeToEvent("PreviewKeyDown");
+//                UnsubscribeToEvent("PreviewKeyDown");
             }
 
             if (DropDownPopup != null)
@@ -811,7 +811,7 @@ public override void OnApplyTemplate()
 
             if (TextBox != null)
             {
-                SubscribeToEvent("PreviewKeyDown", TextBox.PreviewKeyDown.Subscribe(OnTextBoxPreviewKeyDown));
+//                SubscribeToEvent("PreviewKeyDown", TextBox.PreviewKeyDown.Subscribe(OnTextBoxPreviewKeyDown));
             }
 
             Interaction.OnApplyTemplateBase();

From 0dbabcd50c10a2e5b0dcee2d0b4d1951893262d9 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Tue, 26 Feb 2019 10:13:27 -0500
Subject: [PATCH 7/9] Removing extra control

---
 .../Views/GitHubPane/PullRequestCreationView.xaml    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
index 9b1c35db1f..cc5a0ff92b 100644
--- a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
@@ -149,18 +149,6 @@
                             SpellCheck.IsEnabled="True"
                             AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationTitleTextBox}"/>
 
-        <ghfvs:PromptTextBox Grid.Row="2"
-                            MinHeight="100"
-                            Margin="10,5"
-                            AcceptsReturn="True"
-                            PromptText="{x:Static ghfvs:Resources.Description}"
-                            Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{DynamicResource GitHubVsPromptTextBox}"
-                            VerticalScrollBarVisibility="Auto"
-                            TextWrapping="Wrap"
-                            SpellCheck.IsEnabled="True"
-                            AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
-
         <ghfvs:AutoCompleteBox
             Grid.Row="3"
             MinHeight="100"

From 3a84e78018c51e237c1e07e4ea49b822e46bb107 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 26 Mar 2019 13:03:39 +0000
Subject: [PATCH 8/9] Use VS theme colors for AutoCompleteBox

---
 .../Assets/Controls/AutoCompleteBox.xaml      | 91 +++++++++----------
 .../Views/AutoCompleteSuggestionView.xaml     |  4 +-
 2 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml b/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
index 2283b4b9a1..6d10b00ade 100644
--- a/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
+++ b/src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml
@@ -9,6 +9,7 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
     xmlns:ui="clr-namespace:GitHub.UI">
 
     <!--  CommonValidationToolTipTemplate  -->
@@ -59,62 +60,51 @@
         </Grid>
     </ControlTemplate>
 
-
+    <ControlTemplate x:Key="ListViewItemControlTemplate" TargetType="{x:Type ListBoxItem}">
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                SnapsToDevicePixels="True"
+                Padding="{TemplateBinding Padding}">
+            <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+        </Border>
+    </ControlTemplate>
+    
     <Style x:Key="AutoCompleteListItemContainerStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="Padding" Value="5,0,10,0"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Background" Value="{DynamicResource GHBoxBackgroundBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource GHBoxTextBrush}"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource NoMarginFocusVisual}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GHBoxHoverBackgroundBrush}"/>
-                        </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="Selector.IsSelectionActive" Value="False"/>
-                                <Condition Property="IsSelected" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource GHBoxSelectedBackgroundBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource GHBoxSelectedTextBrush}"/>
-                        </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="Selector.IsSelectionActive" Value="True"/>
-                                <Condition Property="IsSelected" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource GHBoxActiveSelectionBackgroundBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource GHBoxActiveSelectionTextBrush}"/>
-                        </MultiTrigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="Bd" Value="0.3"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="5,3,3,3" />
+        <Setter Property="Template" Value="{StaticResource ListViewItemControlTemplate}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource {x:Static vs:ThemedDialogColors.ListItemMouseOverBrushKey}}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.ListItemMouseOverTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="true">
+                <Setter Property="Background" Value="{DynamicResource {x:Static vs:ThemedDialogColors.SelectedItemInactiveBrushKey}}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.SelectedItemInactiveTextBrushKey}}" />
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsSelected" Value="True" />
+                    <Condition Property="Selector.IsSelectionActive" Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter Property="Background" Value="{DynamicResource {x:Static vs:ThemedDialogColors.SelectedItemActiveBrushKey}}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.SelectedItemActiveTextBrushKey}}" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.ListItemDisabledTextBrushKey}}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
-
     
     <!--  input:AutoCompleteBox  -->
     <Style TargetType="ui:AutoCompleteBox">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Padding" Value="2" />
-        <Setter Property="Background" Value="{DynamicResource DefaultBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}" />
         <Setter Property="MinWidth" Value="45" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteListItemContainerStyle}" />
 
@@ -125,6 +115,7 @@
                         <ContentPresenter
                             x:Name="Text"
                             Content="{Binding InputElement.Control, RelativeSource={RelativeSource TemplatedParent}}"/>
+                        <!-- TODO: What should we use for validation BorderBrush? -->
                         <Border
                             x:Name="ValidationErrorElement"
                             Visibility="Collapsed"
@@ -174,7 +165,7 @@
                                     x:Name="PopupBorder"
                                     HorizontalAlignment="Stretch"
                                     Opacity="0"
-                                    BorderBrush="#B0B0B0"
+                                    BorderBrush="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}"
                                     BorderThickness="1">
                                     <ListBox
                                         x:Name="Selector"
diff --git a/src/GitHub.UI/Views/AutoCompleteSuggestionView.xaml b/src/GitHub.UI/Views/AutoCompleteSuggestionView.xaml
index 40485128ac..d0f48cfe2d 100644
--- a/src/GitHub.UI/Views/AutoCompleteSuggestionView.xaml
+++ b/src/GitHub.UI/Views/AutoCompleteSuggestionView.xaml
@@ -20,8 +20,8 @@
                 <RectangleGeometry Rect="0,0,24,24" RadiusX="2" RadiusY="2" />
             </Image.Clip>
         </Image>
-        <TextBlock x:Name="suggestionText" Style="{DynamicResource GitHubTextBlock}" VerticalAlignment="Center">
-            <Run x:Name="name" Foreground="{DynamicResource GHTextBrush}" Text="Name" /> <Run x:Name="description" Foreground="{DynamicResource GHTextSecondaryBrush}" Text="Description" />
+        <TextBlock x:Name="suggestionText" VerticalAlignment="Center">
+            <Run x:Name="name" Text="Name" /> <Run x:Name="description" Text="Description" />
         </TextBlock>
     </StackPanel>
 </UserControl>

From 2027b5cae5af5a1c4734ebe8a2222138c18cee5a Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Mon, 8 Apr 2019 09:05:39 -0400
Subject: [PATCH 9/9] Undoing change

---
 src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs b/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
index cf2ee21e4e..9698514e94 100644
--- a/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
+++ b/src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteBox.cs
@@ -632,7 +632,7 @@ void UpdateTextBox(IAutoCompleteTextInput value)
             if (textInput != null)
             {
                 UnsubscribeToEvent("SelectionChanged");
-//                UnsubscribeToEvent("OnTextBoxTextChanged");
+                UnsubscribeToEvent("OnTextBoxTextChanged");
             }
 
             textInput = value;