more nits

microsoft · Mar 19, 2024 · 052dc78 · 052dc78
1 parent fd8b083
commit 052dc78
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 deletions.
diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp
@@ -1081,30 +1081,16 @@ TermControl Pane::GetLastFocusedTerminalControl()
             {
                 if (p->_IsLeaf())
                 {
-                    if (const auto& terminalPane{ p->_content.try_as<TerminalPaneContent>() })
-                    {
-                        return terminalPane.GetTerminal();
-                    }
-                    else
-                    {
-                        return nullptr;
-                    }
+                    return p->GetTerminalControl();
                 }
                 pane = p;
             }
             // We didn't find our child somehow, they might have closed under us.
         }
         return _firstChild->GetLastFocusedTerminalControl();
     }
-
-    if (const auto& terminalPane{ _content.try_as<TerminalPaneContent>() })
-    {
-        return terminalPane.GetTerminal();
-    }
-    else
-    {
-        return nullptr;
-    }
+    // we _are_ a leaf.
+    return GetTerminalControl();
 }
 
 // Method Description:
@@ -1118,7 +1104,7 @@ TermControl Pane::GetTerminalControl() const
 {
     if (const auto& terminalPane{ _getTerminalContent() })
     {
-        return terminalPane.GetTerminal();
+        return terminalPane.GetTermControl();
     }
     else
     {

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1306,7 +1306,7 @@ namespace winrt::TerminalApp::implementation
             return nullptr;
         }
 
-        const auto& control{ paneContent.GetTerminal() };
+        const auto& control{ paneContent.GetTermControl() };
         if (control == nullptr)
         {
             return nullptr;
@@ -3219,7 +3219,7 @@ namespace winrt::TerminalApp::implementation
         // for nulls
         if (const auto& connection{ _duplicateConnectionForRestart(paneContent) })
         {
-            paneContent.GetTerminal().Connection(connection);
+            paneContent.GetTermControl().Connection(connection);
             connection.Start();
         }
     }

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.cpp b/src/cascadia/TerminalApp/TerminalPaneContent.cpp
@@ -46,7 +46,7 @@ namespace winrt::TerminalApp::implementation
     {
         return _control;
     }
-    winrt::Microsoft::Terminal::Control::TermControl TerminalPaneContent::GetTerminal()
+    winrt::Microsoft::Terminal::Control::TermControl TerminalPaneContent::GetTermControl()
     {
         return _control;
     }

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.h b/src/cascadia/TerminalApp/TerminalPaneContent.h
@@ -22,7 +22,7 @@ namespace winrt::TerminalApp::implementation
                             const winrt::Microsoft::Terminal::Control::TermControl& control);
 
         winrt::Windows::UI::Xaml::FrameworkElement GetRoot();
-        winrt::Microsoft::Terminal::Control::TermControl GetTerminal();
+        winrt::Microsoft::Terminal::Control::TermControl GetTermControl();
         winrt::Windows::Foundation::Size MinimumSize();
         void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic);
         void Close();

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.idl b/src/cascadia/TerminalApp/TerminalPaneContent.idl
@@ -7,7 +7,7 @@ namespace TerminalApp
 {
     [default_interface] runtimeclass TerminalPaneContent : IPaneContent, ISnappable
     {
-        Microsoft.Terminal.Control.TermControl GetTerminal();
+        Microsoft.Terminal.Control.TermControl GetTermControl();
 
         void UpdateSettings(const Microsoft.Terminal.Settings.Model.TerminalSettingsCreateResult settings,
                             const Microsoft.Terminal.Settings.Model.Profile profile);

diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -1040,7 +1040,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto& termContent{ content.try_as<TerminalApp::TerminalPaneContent>() })
             {
-                _addBroadcastHandlers(termContent.GetTerminal(), events);
+                _addBroadcastHandlers(termContent.GetTermControl(), events);
             }
         }
 
@@ -1722,7 +1722,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto termContent{ content.try_as<winrt::TerminalApp::TerminalPaneContent>() })
             {
-                return termContent.GetTerminal();
+                return termContent.GetTermControl();
             }
         }
         return nullptr;