Rename this, so the code doesn't reflect the old name

zadjii-msft · zadjii-msft · commit 5fd110016f87 · 2024-05-28T14:31:28.000-05:00
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -6,7 +6,6 @@
 
 #include "TerminalPage.h"
 #include "ScratchpadContent.h"
-#include "TasksPaneContent.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
 #include "../../types/inc/utils.hpp"
 #include "Utils.h"
diff --git a/src/cascadia/TerminalApp/SnippetsPaneContent.cpp b/src/cascadia/TerminalApp/SnippetsPaneContent.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include "TasksPaneContent.h"
-#include "TasksPaneContent.g.cpp"
+#include "SnippetsPaneContent.h"
+#include "SnippetsPaneContent.g.cpp"
 #include "FilteredTask.g.cpp"
 
 using namespace winrt::Windows::Foundation;
@@ -19,7 +19,7 @@ namespace winrt
 
 namespace winrt::TerminalApp::implementation
 {
-    TasksPaneContent::TasksPaneContent()
+    SnippetsPaneContent::SnippetsPaneContent()
     {
         InitializeComponent();
 
@@ -28,7 +28,7 @@ namespace winrt::TerminalApp::implementation
         Background(bg.try_as<WUX::Media::Brush>());
     }
 
-    void TasksPaneContent::_updateFilteredCommands()
+    void SnippetsPaneContent::_updateFilteredCommands()
     {
         const auto& queryString = _filterBox().Text();
 
@@ -41,7 +41,7 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TasksPaneContent::UpdateSettings(const CascadiaSettings& settings)
+    void SnippetsPaneContent::UpdateSettings(const CascadiaSettings& settings)
     {
         _settings = settings;
 
@@ -62,53 +62,53 @@ namespace winrt::TerminalApp::implementation
         _updateFilteredCommands();
     }
 
-    void TasksPaneContent::_filterTextChanged(const IInspectable& /*sender*/,
-                                              const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
+    void SnippetsPaneContent::_filterTextChanged(const IInspectable& /*sender*/,
+                                                 const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
     {
         _updateFilteredCommands();
     }
 
-    winrt::Windows::UI::Xaml::FrameworkElement TasksPaneContent::GetRoot()
+    winrt::Windows::UI::Xaml::FrameworkElement SnippetsPaneContent::GetRoot()
     {
         return *this;
     }
-    winrt::Windows::Foundation::Size TasksPaneContent::MinimumSize()
+    winrt::Windows::Foundation::Size SnippetsPaneContent::MinimumSize()
     {
         return { 1, 1 };
     }
-    void TasksPaneContent::Focus(winrt::Windows::UI::Xaml::FocusState reason)
+    void SnippetsPaneContent::Focus(winrt::Windows::UI::Xaml::FocusState reason)
     {
         reason;
         // _box.Focus(reason);
     }
-    void TasksPaneContent::Close()
+    void SnippetsPaneContent::Close()
     {
         CloseRequested.raise(*this, nullptr);
     }
 
-    INewContentArgs TasksPaneContent::GetNewTerminalArgs(BuildStartupKind /*kind*/) const
+    INewContentArgs SnippetsPaneContent::GetNewTerminalArgs(BuildStartupKind /*kind*/) const
     {
         return BaseContentArgs(L"snippets");
     }
 
-    winrt::hstring TasksPaneContent::Icon() const
+    winrt::hstring SnippetsPaneContent::Icon() const
     {
         static constexpr std::wstring_view glyph{ L"\xe70b" }; // QuickNote
         return winrt::hstring{ glyph };
     }
 
-    winrt::Windows::UI::Xaml::Media::Brush TasksPaneContent::BackgroundBrush()
+    winrt::Windows::UI::Xaml::Media::Brush SnippetsPaneContent::BackgroundBrush()
     {
         return Background();
     }
 
-    void TasksPaneContent::SetLastActiveControl(const Microsoft::Terminal::Control::TermControl& control)
+    void SnippetsPaneContent::SetLastActiveControl(const Microsoft::Terminal::Control::TermControl& control)
     {
         _control = control;
     }
 
-    void TasksPaneContent::_runCommandButtonClicked(const Windows::Foundation::IInspectable& sender,
-                                                    const Windows::UI::Xaml::RoutedEventArgs&)
+    void SnippetsPaneContent::_runCommandButtonClicked(const Windows::Foundation::IInspectable& sender,
+                                                       const Windows::UI::Xaml::RoutedEventArgs&)
     {
         if (const auto& taskVM{ sender.try_as<WUX::Controls::Button>().DataContext().try_as<FilteredTask>() })
         {
diff --git a/src/cascadia/TerminalApp/SnippetsPaneContent.h b/src/cascadia/TerminalApp/SnippetsPaneContent.h
@@ -2,17 +2,17 @@
 // Licensed under the MIT license.
 
 #pragma once
-#include "TasksPaneContent.g.h"
+#include "SnippetsPaneContent.g.h"
 #include "FilteredTask.g.h"
 #include "FilteredCommand.h"
 #include "ActionPaletteItem.h"
 #include <LibraryResources.h>
 
 namespace winrt::TerminalApp::implementation
 {
-    struct TasksPaneContent : TasksPaneContentT<TasksPaneContent>
+    struct SnippetsPaneContent : SnippetsPaneContentT<SnippetsPaneContent>
     {
-        TasksPaneContent();
+        SnippetsPaneContent();
 
         winrt::Windows::UI::Xaml::FrameworkElement GetRoot();
 
@@ -45,7 +45,7 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<winrt::Windows::Foundation::IInspectable, Microsoft::Terminal::Settings::Model::Command> DispatchCommandRequested;
 
     private:
-        friend struct TasksPaneContentT<TasksPaneContent>; // for Xaml to bind events
+        friend struct SnippetsPaneContentT<SnippetsPaneContent>; // for Xaml to bind events
 
         winrt::weak_ref<Microsoft::Terminal::Control::TermControl> _control{ nullptr };
         winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
@@ -136,5 +136,5 @@ namespace winrt::TerminalApp::implementation
 
 namespace winrt::TerminalApp::factory_implementation
 {
-    BASIC_FACTORY(TasksPaneContent);
+    BASIC_FACTORY(SnippetsPaneContent);
 }
diff --git a/src/cascadia/TerminalApp/SnippetsPaneContent.xaml b/src/cascadia/TerminalApp/SnippetsPaneContent.xaml
@@ -2,7 +2,7 @@
     Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
     the MIT License. See LICENSE in the project root for license information.
 -->
-<UserControl x:Class="TerminalApp.TasksPaneContent"
+<UserControl x:Class="TerminalApp.SnippetsPaneContent"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -71,7 +71,7 @@
     <Page Include="SuggestionsControl.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="TasksPaneContent.xaml">
+    <Page Include="SnippetsPaneContent.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
@@ -164,8 +164,8 @@
     <ClInclude Include="ScratchpadContent.h">
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="TasksPaneContent.h">
-      <DependentUpon>TasksPaneContent.xaml</DependentUpon>
+    <ClInclude Include="SnippetsPaneContent.h">
+      <DependentUpon>SnippetsPaneContent.xaml</DependentUpon>
     </ClInclude>
     <ClInclude Include="SettingsPaneContent.h">
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
@@ -280,8 +280,8 @@
     <ClCompile Include="ScratchpadContent.cpp">
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="TasksPaneContent.cpp">
-      <DependentUpon>TasksPaneContent.xaml</DependentUpon>
+    <ClCompile Include="SnippetsPaneContent.cpp">
+      <DependentUpon>SnippetsPaneContent.xaml</DependentUpon>
     </ClCompile>
     <ClCompile Include="SettingsPaneContent.cpp">
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -23,7 +23,7 @@
 #include "DebugTapConnection.h"
 #include "SettingsPaneContent.h"
 #include "ScratchpadContent.h"
-#include "TasksPaneContent.h"
+#include "SnippetsPaneContent.h"
 #include "TabRowControl.h"
 #include "Utils.h"
 
@@ -3183,7 +3183,7 @@ namespace winrt::TerminalApp::implementation
         }
         else if (paneType == L"snippets")
         {
-            const auto& tasksContent{ winrt::make_self<TasksPaneContent>() };
+            const auto& tasksContent{ winrt::make_self<SnippetsPaneContent>() };
             tasksContent->UpdateSettings(_settings);
             tasksContent->GetRoot().KeyDown({ this, &TerminalPage::_KeyDownHandler });
             tasksContent->DispatchCommandRequested({ this, &TerminalPage::_OnDispatchCommandRequested });
diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.idl b/src/cascadia/TerminalApp/TerminalPaneContent.idl
@@ -26,9 +26,9 @@ namespace TerminalApp
         Windows.UI.Xaml.Visibility Visibility { get; };
     }
 
-    [default_interface] runtimeclass TasksPaneContent : Windows.UI.Xaml.Controls.UserControl, IPaneContent
+    [default_interface] runtimeclass SnippetsPaneContent : Windows.UI.Xaml.Controls.UserControl, IPaneContent
     {
-        TasksPaneContent();
+        SnippetsPaneContent();
         void SetLastActiveControl(Microsoft.Terminal.Control.TermControl control);
 
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;
diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -1255,7 +1255,7 @@ namespace winrt::TerminalApp::implementation
         {
             const auto& termControl{ termContent.GetTermControl() };
             _rootPane->WalkTree([termControl](const auto& p) {
-                if (const auto& taskPane{ p->GetContent().try_as<TasksPaneContent>() })
+                if (const auto& taskPane{ p->GetContent().try_as<SnippetsPaneContent>() })
                 {
                     taskPane.SetLastActiveControl(termControl);
                 }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`#include "pch.h"`
`5`		`-#include "TasksPaneContent.h"`
`6`		`-#include "TasksPaneContent.g.cpp"`
	`5`	`+#include "SnippetsPaneContent.h"`
	`6`	`+#include "SnippetsPaneContent.g.cpp"`
`7`	`7`	`#include "FilteredTask.g.cpp"`
`8`	`8`
`9`	`9`	`using namespace winrt::Windows::Foundation;`
`@@ -19,7 +19,7 @@ namespace winrt`
`19`	`19`
`20`	`20`	`namespace winrt::TerminalApp::implementation`
`21`	`21`	`{`
`22`		`- TasksPaneContent::TasksPaneContent()`
	`22`	`+ SnippetsPaneContent::SnippetsPaneContent()`
`23`	`23`	`{`
`24`	`24`	`InitializeComponent();`
`25`	`25`
`@@ -28,7 +28,7 @@ namespace winrt::TerminalApp::implementation`
`28`	`28`	`Background(bg.try_as<WUX::Media::Brush>());`
`29`	`29`	`}`
`30`	`30`
`31`		`- void TasksPaneContent::_updateFilteredCommands()`
	`31`	`+ void SnippetsPaneContent::_updateFilteredCommands()`
`32`	`32`	`{`
`33`	`33`	`const auto& queryString = _filterBox().Text();`
`34`	`34`
`@@ -41,7 +41,7 @@ namespace winrt::TerminalApp::implementation`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- void TasksPaneContent::UpdateSettings(const CascadiaSettings& settings)`
	`44`	`+ void SnippetsPaneContent::UpdateSettings(const CascadiaSettings& settings)`
`45`	`45`	`{`
`46`	`46`	`_settings = settings;`
`47`	`47`
`@@ -62,53 +62,53 @@ namespace winrt::TerminalApp::implementation`
`62`	`62`	`_updateFilteredCommands();`
`63`	`63`	`}`
`64`	`64`
`65`		`- void TasksPaneContent::_filterTextChanged(const IInspectable& /sender/,`
`66`		`- const Windows::UI::Xaml::RoutedEventArgs& /args/)`
	`65`	`+ void SnippetsPaneContent::_filterTextChanged(const IInspectable& /sender/,`
	`66`	`+ const Windows::UI::Xaml::RoutedEventArgs& /args/)`
`67`	`67`	`{`
`68`	`68`	`_updateFilteredCommands();`
`69`	`69`	`}`
`70`	`70`
`71`		`- winrt::Windows::UI::Xaml::FrameworkElement TasksPaneContent::GetRoot()`
	`71`	`+ winrt::Windows::UI::Xaml::FrameworkElement SnippetsPaneContent::GetRoot()`
`72`	`72`	`{`
`73`	`73`	`return *this;`
`74`	`74`	`}`
`75`		`- winrt::Windows::Foundation::Size TasksPaneContent::MinimumSize()`
	`75`	`+ winrt::Windows::Foundation::Size SnippetsPaneContent::MinimumSize()`
`76`	`76`	`{`
`77`	`77`	`return { 1, 1 };`
`78`	`78`	`}`
`79`		`- void TasksPaneContent::Focus(winrt::Windows::UI::Xaml::FocusState reason)`
	`79`	`+ void SnippetsPaneContent::Focus(winrt::Windows::UI::Xaml::FocusState reason)`
`80`	`80`	`{`
`81`	`81`	`reason;`
`82`	`82`	`// _box.Focus(reason);`
`83`	`83`	`}`
`84`		`- void TasksPaneContent::Close()`
	`84`	`+ void SnippetsPaneContent::Close()`
`85`	`85`	`{`
`86`	`86`	`CloseRequested.raise(*this, nullptr);`
`87`	`87`	`}`
`88`	`88`
`89`		`- INewContentArgs TasksPaneContent::GetNewTerminalArgs(BuildStartupKind /kind/) const`
	`89`	`+ INewContentArgs SnippetsPaneContent::GetNewTerminalArgs(BuildStartupKind /kind/) const`
`90`	`90`	`{`
`91`	`91`	`return BaseContentArgs(L"snippets");`
`92`	`92`	`}`
`93`	`93`
`94`		`- winrt::hstring TasksPaneContent::Icon() const`
	`94`	`+ winrt::hstring SnippetsPaneContent::Icon() const`
`95`	`95`	`{`
`96`	`96`	`static constexpr std::wstring_view glyph{ L"\xe70b" }; // QuickNote`
`97`	`97`	`return winrt::hstring{ glyph };`
`98`	`98`	`}`
`99`	`99`
`100`		`- winrt::Windows::UI::Xaml::Media::Brush TasksPaneContent::BackgroundBrush()`
	`100`	`+ winrt::Windows::UI::Xaml::Media::Brush SnippetsPaneContent::BackgroundBrush()`
`101`	`101`	`{`
`102`	`102`	`return Background();`
`103`	`103`	`}`
`104`	`104`
`105`		`- void TasksPaneContent::SetLastActiveControl(const Microsoft::Terminal::Control::TermControl& control)`
	`105`	`+ void SnippetsPaneContent::SetLastActiveControl(const Microsoft::Terminal::Control::TermControl& control)`
`106`	`106`	`{`
`107`	`107`	`_control = control;`
`108`	`108`	`}`
`109`	`109`
`110`		`- void TasksPaneContent::_runCommandButtonClicked(const Windows::Foundation::IInspectable& sender,`
`111`		`- const Windows::UI::Xaml::RoutedEventArgs&)`
	`110`	`+ void SnippetsPaneContent::_runCommandButtonClicked(const Windows::Foundation::IInspectable& sender,`
	`111`	`+ const Windows::UI::Xaml::RoutedEventArgs&)`
`112`	`112`	`{`
`113`	`113`	`if (const auto& taskVM{ sender.try_as<WUX::Controls::Button>().DataContext().try_as<FilteredTask>() })`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ namespace TerminalApp`
`26`	`26`	`Windows.UI.Xaml.Visibility Visibility { get; };`
`27`	`27`	`}`
`28`	`28`
`29`		`- [default_interface] runtimeclass TasksPaneContent : Windows.UI.Xaml.Controls.UserControl, IPaneContent`
	`29`	`+ [default_interface] runtimeclass SnippetsPaneContent : Windows.UI.Xaml.Controls.UserControl, IPaneContent`
`30`	`30`	`{`
`31`		`- TasksPaneContent();`
	`31`	`+ SnippetsPaneContent();`
`32`	`32`	`void SetLastActiveControl(Microsoft.Terminal.Control.TermControl control);`
`33`	`33`
`34`	`34`	`event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;`
Original file line number	Diff line number	Diff line change
`@@ -1255,7 +1255,7 @@ namespace winrt::TerminalApp::implementation`
`1255`	`1255`	`{`
`1256`	`1256`	`const auto& termControl{ termContent.GetTermControl() };`
`1257`	`1257`	`_rootPane->WalkTree([termControl](const auto& p) {`
`1258`		`- if (const auto& taskPane{ p->GetContent().try_as<TasksPaneContent>() })`
	`1258`	`+ if (const auto& taskPane{ p->GetContent().try_as<SnippetsPaneContent>() })`
`1259`	`1259`	`{`
`1260`	`1260`	`taskPane.SetLastActiveControl(termControl);`
`1261`	`1261`	`}`