Add some polish to nested commands in the command palette

src/cascadia/TerminalApp/Command.idl

@@ -15,7 +15,7 @@ namespace TerminalApp
 
         Windows.UI.Xaml.Controls.IconSource IconSource;
 
-        Boolean HasNestedCommands();
+        Boolean HasNestedCommands { get; };
         Windows.Foundation.Collections.IMapView<String, Command> NestedCommands { get; };
     }
 }

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -343,6 +343,7 @@ namespace winrt::TerminalApp::implementation
                 // action. Instead, display a new list of commands for the user
                 // to pick from.
                 _nestedActionStack.Append(command);
+                ParentCommandName(command.Name());
                 _currentNestedCommands.Clear();
                 for (const auto& nameAndCommand : command.NestedCommands())
                 {
@@ -764,6 +765,8 @@ namespace winrt::TerminalApp::implementation
         _searchBox().Text(L"");
 
         _nestedActionStack.Clear();
+
+        ParentCommandName(L"");
         _currentNestedCommands.Clear();
     }
 

src/cascadia/TerminalApp/CommandPalette.h

@@ -33,6 +33,7 @@ namespace winrt::TerminalApp::implementation
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxText, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);
 
     private:
         friend struct CommandPaletteT<CommandPalette>; // for Xaml to bind events

src/cascadia/TerminalApp/CommandPalette.idl

@@ -12,6 +12,7 @@ namespace TerminalApp
         String NoMatchesText { get; };
         String SearchBoxText { get; };
         String ControlName { get; };
+        String ParentCommandName { get; };
 
         Windows.Foundation.Collections.IObservableVector<Command> FilteredActions { get; };
 

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -9,8 +9,8 @@ the MIT License. See LICENSE in the project root for license information. -->
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
-    TabNavigation="Cycle"
-    IsTabStop="True"
+    TabNavigation="Cycle"
+    IsTabStop="True"
     AllowFocusOnInteraction="True"
     PointerPressed="_rootPointerPressed"
     PreviewKeyDown="_previewKeyDownHandler"
@@ -27,7 +27,9 @@ the MIT License. See LICENSE in the project root for license information. -->
             <Windows10version1903:ThemeShadow x:Name="CommandPaletteShadow" />
 
             <!-- This creates an instance of our CommandKeyChordVisibilityConverter we can reference below -->
-            <local:CommandKeyChordVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
+            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
+            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter"/>
+            <local:HasNestedCommandsVisibilityConverter x:Key="HasNestedCommandsVisibilityConverter"/>
 
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
@@ -170,12 +172,23 @@ the MIT License. See LICENSE in the project root for license information. -->
             </TextBox>
 
             <TextBlock
-            Padding="16"
-            x:Name="_noMatchesText"
-            FontStyle="Italic"
-            Visibility="Collapsed"
-            Grid.Row="1"
-            Text="{x:Bind NoMatchesText, Mode=OneWay}">
+                Padding="16, 0, 16, 4"
+                x:Name="_parentCommandText"
+                FontStyle="Italic"
+                Visibility="{x:Bind ParentCommandName,
+                             Mode=OneWay,
+                             Converter={StaticResource ParentCommandVisibilityConverter}}"
+                Grid.Row="1"
+                Text="{x:Bind ParentCommandName, Mode=OneWay}">
+            </TextBlock>
+
+            <TextBlock
+                Padding="16"
+                x:Name="_noMatchesText"
+                FontStyle="Italic"
+                Visibility="Collapsed"
+                Grid.Row="1"
+                Text="{x:Bind NoMatchesText, Mode=OneWay}">
             </TextBlock>
 
             <ListView
@@ -236,6 +249,21 @@ the MIT License. See LICENSE in the project root for license information. -->
                                     Text="{x:Bind KeyChordText, Mode=OneWay}" />
                                 </Border>
 
+                                <!-- xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_ -->
+                                <FontIcon
+                                    FontFamily="Segoe MDL2 Assets"
+                                    Glyph="&#xE70E;"
+                                    HorizontalAlignment="Right"
+                                    Visibility="{x:Bind HasNestedCommands,
+                                                 Mode=OneWay,
+                                                 Converter={StaticResource HasNestedCommandsVisibilityConverter}}"
+                                    Grid.Column="2">
+
+                                    <FontIcon.RenderTransform>
+                                        <RotateTransform CenterX="0.5" CenterY="0.5" Angle="90"/>
+                                    </FontIcon.RenderTransform>
+                                </FontIcon>
+
                             </Grid>
                         </ListViewItem>
                     </DataTemplate>

src/cascadia/TerminalApp/CommandKeyChordVisibilityConverter.cpp → src/cascadia/TerminalApp/EmptyStringVisibilityConverter.cpp

@@ -1,6 +1,6 @@
 #include "pch.h"
-#include "CommandKeyChordVisibilityConverter.h"
-#include "CommandKeyChordVisibilityConverter.g.cpp"
+#include "EmptyStringVisibilityConverter.h"
+#include "EmptyStringVisibilityConverter.g.cpp"
 
 using namespace winrt::Windows;
 using namespace winrt::Windows::UI::Xaml;
@@ -9,7 +9,7 @@ namespace winrt::TerminalApp::implementation
 {
     // Method Description:
     // - Attempt to convert something into another type. For the
-    //   CommandKeyChordVisibilityConverter, we're gonna check if `value` is a
+    //   EmptyStringVisibilityConverter, we're gonna check if `value` is a
     //   string, and try and convert it into a Visibility value. If the input
     //   param wasn't a string, or was the empty string, we'll return
     //   Visibility::Collapsed. Otherwise, we'll return Visible.
@@ -18,20 +18,20 @@ namespace winrt::TerminalApp::implementation
     // - value: the input object to attempt to convert into a Visibility.
     // Return Value:
     // - Visible if the object was a string and wasn't the empty string.
-    Foundation::IInspectable CommandKeyChordVisibilityConverter::Convert(Foundation::IInspectable const& value,
-                                                                         Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                         Foundation::IInspectable const& /* parameter */,
-                                                                         hstring const& /* language */)
+    Foundation::IInspectable EmptyStringVisibilityConverter::Convert(Foundation::IInspectable const& value,
+                                                                     Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                                     Foundation::IInspectable const& /* parameter */,
+                                                                     hstring const& /* language */)
     {
         const auto& name = winrt::unbox_value_or<hstring>(value, L"");
         return winrt::box_value(name.empty() ? Visibility::Collapsed : Visibility::Visible);
     }
 
     // unused for one-way bindings
-    Foundation::IInspectable CommandKeyChordVisibilityConverter::ConvertBack(Foundation::IInspectable const& /* value */,
-                                                                             Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                             Foundation::IInspectable const& /* parameter */,
-                                                                             hstring const& /* language */)
+    Foundation::IInspectable EmptyStringVisibilityConverter::ConvertBack(Foundation::IInspectable const& /* value */,
+                                                                         Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                                         Foundation::IInspectable const& /* parameter */,
+                                                                         hstring const& /* language */)
     {
         throw hresult_not_implemented();
     }

src/cascadia/TerminalApp/CommandKeyChordVisibilityConverter.h → src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "CommandKeyChordVisibilityConverter.g.h"
+#include "EmptyStringVisibilityConverter.g.h"
 #include "..\inc\cppwinrt_utils.h"
 
 namespace winrt::TerminalApp::implementation
 {
-    struct CommandKeyChordVisibilityConverter : CommandKeyChordVisibilityConverterT<CommandKeyChordVisibilityConverter>
+    struct EmptyStringVisibilityConverter : EmptyStringVisibilityConverterT<EmptyStringVisibilityConverter>
     {
-        CommandKeyChordVisibilityConverter() = default;
+        EmptyStringVisibilityConverter() = default;
 
         Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value,
                                                   Windows::UI::Xaml::Interop::TypeName const& targetType,
@@ -23,5 +23,5 @@ namespace winrt::TerminalApp::implementation
 
 namespace winrt::TerminalApp::factory_implementation
 {
-    BASIC_FACTORY(CommandKeyChordVisibilityConverter);
+    BASIC_FACTORY(EmptyStringVisibilityConverter);
 }

src/cascadia/TerminalApp/CommandKeyChordVisibilityConverter.idl → src/cascadia/TerminalApp/EmptyStringVisibilityConverter.idl

@@ -6,14 +6,14 @@ namespace TerminalApp
     // See https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-quickstart
 
     // We use the default attribute to declare IValueConverter as the default
-    // interface. In the listing, CommandKeyChordVisibilityConverter has only a
+    // interface. In the listing, EmptyStringVisibilityConverter has only a
     // constructor, and no methods, so no default interface is generated for it.
     // The default attribute is optimal if you won't be adding instance members
-    // to CommandKeyChordVisibilityConverter, because no QueryInterface will be
+    // to EmptyStringVisibilityConverter, because no QueryInterface will be
     // required to call the IValueConverter methods
-    runtimeclass CommandKeyChordVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    runtimeclass EmptyStringVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
     {
-        CommandKeyChordVisibilityConverter();
+        EmptyStringVisibilityConverter();
     };
 
 }

src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.cpp

@@ -0,0 +1,38 @@
+#include "pch.h"
+#include "HasNestedCommandsVisibilityConverter.h"
+#include "HasNestedCommandsVisibilityConverter.g.cpp"
+
+using namespace winrt::Windows;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::TerminalApp::implementation
+{
+    // Method Description:
+    // - Attempt to convert something into another type. For the
+    //   HasNestedCommandsVisibilityConverter, we're gonna check if `value` is a
+    //   string, and try and convert it into a Visibility value. If the input
+    //   param wasn't a string, or was the empty string, we'll return
+    //   Visibility::Collapsed. Otherwise, we'll return Visible.
+
+    // Arguments:
+    // - value: the input object to attempt to convert into a Visibility.
+    // Return Value:
+    // - Visible if the object was a string and wasn't the empty string.
+    Foundation::IInspectable HasNestedCommandsVisibilityConverter::Convert(Foundation::IInspectable const& value,
+                                                                           Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                                           Foundation::IInspectable const& /* parameter */,
+                                                                           hstring const& /* language */)
+    {
+        const auto& hasNestedCommands = winrt::unbox_value_or<bool>(value, false);
+        return winrt::box_value(hasNestedCommands ? Visibility::Visible : Visibility::Collapsed);
+    }
+
+    // unused for one-way bindings
+    Foundation::IInspectable HasNestedCommandsVisibilityConverter::ConvertBack(Foundation::IInspectable const& /* value */,
+                                                                               Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                                               Foundation::IInspectable const& /* parameter */,
+                                                                               hstring const& /* language */)
+    {
+        throw hresult_not_implemented();
+    }
+}

src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "HasNestedCommandsVisibilityConverter.g.h"
+#include "..\inc\cppwinrt_utils.h"
+
+namespace winrt::TerminalApp::implementation
+{
+    struct HasNestedCommandsVisibilityConverter : HasNestedCommandsVisibilityConverterT<HasNestedCommandsVisibilityConverter>
+    {
+        HasNestedCommandsVisibilityConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value,
+                                                  Windows::UI::Xaml::Interop::TypeName const& targetType,
+                                                  Windows::Foundation::IInspectable const& parameter,
+                                                  hstring const& language);
+
+        Windows::Foundation::IInspectable ConvertBack(Windows::Foundation::IInspectable const& value,
+                                                      Windows::UI::Xaml::Interop::TypeName const& targetType,
+                                                      Windows::Foundation::IInspectable const& parameter,
+                                                      hstring const& language);
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(HasNestedCommandsVisibilityConverter);
+}

src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.idl

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+    // See https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-quickstart
+
+    // We use the default attribute to declare IValueConverter as the default
+    // interface. In the listing, HasNestedCommandsVisibilityConverter has only a
+    // constructor, and no methods, so no default interface is generated for it.
+    // The default attribute is optimal if you won't be adding instance members
+    // to HasNestedCommandsVisibilityConverter, because no QueryInterface will be
+    // required to call the IValueConverter methods
+    runtimeclass HasNestedCommandsVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        HasNestedCommandsVisibilityConverter();
+    };
+
+}

src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj

@@ -94,8 +94,11 @@
     <ClInclude Include="../Command.h">
       <DependentUpon>../Command.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../CommandKeyChordVisibilityConverter.h">
-      <DependentUpon>../CommandKeyChordVisibilityConverter.idl</DependentUpon>
+    <ClInclude Include="../EmptyStringVisibilityConverter.h">
+      <DependentUpon>../EmptyStringVisibilityConverter.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../HasNestedCommandsVisibilityConverter.h">
+      <DependentUpon>../HasNestedCommandsVisibilityConverter.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="../Tab.h">
       <DependentUpon>../Tab.idl</DependentUpon>
@@ -168,8 +171,11 @@
     <ClCompile Include="../Command.cpp">
       <DependentUpon>../Command.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../CommandKeyChordVisibilityConverter.cpp">
-      <DependentUpon>../CommandKeyChordVisibilityConverter.idl</DependentUpon>
+    <ClCompile Include="../EmptyStringVisibilityConverter.cpp">
+      <DependentUpon>../EmptyStringVisibilityConverter.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../HasNestedCommandsVisibilityConverter.cpp">
+      <DependentUpon>../HasNestedCommandsVisibilityConverter.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="../Tab.cpp">
       <DependentUpon>../Tab.idl</DependentUpon>
@@ -261,7 +267,8 @@
       <SubType>Code</SubType>
     </Midl>
     <Midl Include="../Command.idl" />
-    <Midl Include="../CommandKeyChordVisibilityConverter.idl" />
+    <Midl Include="../EmptyStringVisibilityConverter.idl" />
+    <Midl Include="../HasNestedCommandsVisibilityConverter.idl" />
     <Midl Include="../Tab.idl" />
     <Midl Include="../TerminalSettings.idl" />
   </ItemGroup>