From edf08a98c2dd71f941e29f8cd820e5813edcc8ec Mon Sep 17 00:00:00 2001
From: Pankaj Bhojwani <pankaj.d.bhoj@gmail.com>
Date: Mon, 9 Sep 2024 14:07:46 -0700
Subject: [PATCH] missed this

---
 .../QueryExtension/ExtensionPalette.h         |  2 --
 src/cascadia/TerminalApp/TerminalPage.h       | 10 +++----
 .../TerminalSettingsEditor/AISettings.xaml    | 26 +++++++++----------
 src/cascadia/TerminalSettingsModel/AIConfig.h |  1 -
 .../TerminalSettingsModel/MTSMSettings.h      |  2 +-
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/cascadia/QueryExtension/ExtensionPalette.h b/src/cascadia/QueryExtension/ExtensionPalette.h
index d54d233033..15e4468106 100644
--- a/src/cascadia/QueryExtension/ExtensionPalette.h
+++ b/src/cascadia/QueryExtension/ExtensionPalette.h
@@ -7,8 +7,6 @@
 #include "ChatMessage.g.h"
 #include "GroupedChatMessages.g.h"
 
-#include "AzureLLMProvider.h"
-
 namespace winrt::Microsoft::Terminal::Query::Extension::implementation
 {
     struct ExtensionPalette : ExtensionPaletteT<ExtensionPalette>
diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
index ccbd87ff20..9b530ca7cd 100644
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -231,15 +231,16 @@ namespace winrt::TerminalApp::implementation
         winrt::TerminalApp::ColorPickupFlyout _tabColorPicker{ nullptr };
         winrt::Microsoft::Terminal::Query::Extension::ILMProvider _lmProvider{ nullptr };
 
+        winrt::Microsoft::Terminal::Query::Extension::ExtensionPalette _extensionPalette{ nullptr };
+        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _extensionPaletteLoadedRevoker;
+        Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
+
         winrt::Microsoft::Terminal::Settings::Model::LLMProvider _currentProvider;
         winrt::Microsoft::Terminal::Settings::Model::AIConfig::AzureOpenAISettingChanged_revoker _azureOpenAISettingChangedRevoker;
         void _setAzureOpenAIAuth();
         winrt::Microsoft::Terminal::Settings::Model::AIConfig::OpenAISettingChanged_revoker _openAISettingChangedRevoker;
         void _setOpenAIAuth();
-
-        winrt::Microsoft::Terminal::Query::Extension::ExtensionPalette _extensionPalette{ nullptr };
-        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _extensionPaletteLoadedRevoker;
-        Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
+        void _createAndSetAuthenticationForLMProvider(winrt::Microsoft::Terminal::Settings::Model::LLMProvider providerType);
 
         Windows::Foundation::Collections::IObservableVector<TerminalApp::TabBase> _tabs;
         Windows::Foundation::Collections::IObservableVector<TerminalApp::TabBase> _mruTabs;
@@ -580,7 +581,6 @@ namespace winrt::TerminalApp::implementation
         winrt::com_ptr<TerminalTab> _senderOrFocusedTab(const IInspectable& sender);
 
         void _loadQueryExtension();
-        void _createAndSetAuthenticationForLMProvider(winrt::Microsoft::Terminal::Settings::Model::LLMProvider providerType);
 
         void _activePaneChanged(winrt::TerminalApp::TerminalTab tab, Windows::Foundation::IInspectable args);
         safe_void_coroutine _doHandleSuggestions(Microsoft::Terminal::Settings::Model::SuggestionsArgs realArgs);
diff --git a/src/cascadia/TerminalSettingsEditor/AISettings.xaml b/src/cascadia/TerminalSettingsEditor/AISettings.xaml
index 285ad93959..71d9b1c771 100644
--- a/src/cascadia/TerminalSettingsEditor/AISettings.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AISettings.xaml
@@ -54,13 +54,13 @@
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
                                         Spacing="8">
-                                <Button Click="ClearAzureOpenAIKeyAndEndpoint_Click"
-                                        Style="{StaticResource DeleteButtonStyle}"
-                                        HorizontalAlignment="Center">
+                                <Button HorizontalAlignment="Center"
+                                        Click="ClearAzureOpenAIKeyAndEndpoint_Click"
+                                        Style="{StaticResource DeleteButtonStyle}">
                                     <TextBlock x:Uid="AISettings_ClearAzureOpenAIKeyAndEndpoint" />
                                 </Button>
-                                <Button Click="SetAzureOpenAIActive_Click"
-                                        HorizontalAlignment="Center"
+                                <Button HorizontalAlignment="Center"
+                                        Click="SetAzureOpenAIActive_Click"
                                         Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.AzureOpenAIActive), Mode=OneWay}">
                                     <TextBlock x:Uid="AISettings_SetActiveProvider" />
                                 </Button>
@@ -145,7 +145,7 @@
                                          Grid.Row="4"
                                          HorizontalAlignment="Stretch"
                                          VerticalAlignment="Center" />
-                                <Button Grid.Row="5"
+                            <Button Grid.Row="5"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Center"
                                     Click="StoreAzureOpenAIKeyAndEndpoint_Click"
@@ -171,13 +171,13 @@
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
                                         Spacing="8">
-                                <Button Click="ClearOpenAIKey_Click"
-                                        Style="{StaticResource DeleteButtonStyle}"
-                                        HorizontalAlignment="Center">
+                                <Button HorizontalAlignment="Center"
+                                        Click="ClearOpenAIKey_Click"
+                                        Style="{StaticResource DeleteButtonStyle}">
                                     <TextBlock x:Uid="AISettings_ClearOpenAIKey" />
                                 </Button>
-                                <Button Click="SetOpenAIActive_Click"
-                                        HorizontalAlignment="Center"
+                                <Button HorizontalAlignment="Center"
+                                        Click="SetOpenAIActive_Click"
                                         Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.OpenAIActive), Mode=OneWay}">
                                     <TextBlock x:Uid="AISettings_SetActiveProvider" />
                                 </Button>
@@ -211,8 +211,8 @@
                                                              Glyph="&#xE625;" />
                                     </muxc:InfoBadge.IconSource>
                                 </muxc:InfoBadge>
-                                <RichTextBlock TextWrapping="WrapWholeWords"
-                                               MaxWidth="900">
+                                <RichTextBlock MaxWidth="900"
+                                               TextWrapping="WrapWholeWords">
                                     <Paragraph>
                                         <Run x:Name="AISettings_OpenAIDescriptionPart1" /><Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?linkid=2251839"
                                                    TextDecorations="None">
diff --git a/src/cascadia/TerminalSettingsModel/AIConfig.h b/src/cascadia/TerminalSettingsModel/AIConfig.h
index 633865bbd7..962d7e0729 100644
--- a/src/cascadia/TerminalSettingsModel/AIConfig.h
+++ b/src/cascadia/TerminalSettingsModel/AIConfig.h
@@ -42,7 +42,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         static winrt::event_token AzureOpenAISettingChanged(const winrt::Microsoft::Terminal::Settings::Model::AzureOpenAISettingChangedHandler& handler);
         static void AzureOpenAISettingChanged(const winrt::event_token& token);
 
-
         winrt::hstring OpenAIKey() noexcept;
         void OpenAIKey(const winrt::hstring& key) noexcept;
         static winrt::event_token OpenAISettingChanged(const winrt::Microsoft::Terminal::Settings::Model::OpenAISettingChangedHandler& handler);
diff --git a/src/cascadia/TerminalSettingsModel/MTSMSettings.h b/src/cascadia/TerminalSettingsModel/MTSMSettings.h
index a7ba37258d..aab2b52b32 100644
--- a/src/cascadia/TerminalSettingsModel/MTSMSettings.h
+++ b/src/cascadia/TerminalSettingsModel/MTSMSettings.h
@@ -165,5 +165,5 @@ Author(s):
     X(winrt::Microsoft::Terminal::Settings::Model::IconStyle, IconStyle, "iconStyle", winrt::Microsoft::Terminal::Settings::Model::IconStyle::Default) \
     X(winrt::Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility, ShowCloseButton, "showCloseButton", winrt::Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility::Always)
 
-#define MTSM_AI_SETTINGS(X)                                                                         \
+#define MTSM_AI_SETTINGS(X) \
     X(winrt::Microsoft::Terminal::Settings::Model::LLMProvider, ActiveProvider, "activeProvider")