runtime object indexing

Author: carlos-zamora

src/cascadia/TerminalSettingsEditor/Actions.cpp

@@ -30,7 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToActionsArgs>();
         _ViewModel = args.ViewModel();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         // Subscribe to the view model's FocusContainer event.

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -39,7 +39,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _ViewModel = args.ViewModel();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {

src/cascadia/TerminalSettingsEditor/Extensions.cpp

@@ -41,7 +41,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         vmImpl->LazyLoadExtensions();
         vmImpl->MarkAsVisited();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         if (vmImpl->IsExtensionView())

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -71,7 +71,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         bool IsNoResultsPlaceholder() const
         {
-            return _overrideLabel.has_value();
+            return _overrideLabel.has_value() && !_NavigationArgOverride;
         }
 
         const LocalizedIndexEntry& SearchIndexEntry() const noexcept
@@ -94,7 +94,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     private:
         const std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
-        const Windows::Foundation::IInspectable& _NavigationArgOverride{ nullptr };
+        const Windows::Foundation::IInspectable _NavigationArgOverride{ nullptr };
         const LocalizedIndexEntry* _SearchIndexEntry{ nullptr };
     };
 
@@ -164,14 +164,31 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
 
-        std::vector<LocalizedIndexEntry> _searchIndex;
-        std::vector<LocalizedIndexEntry> _searchProfileIndex;
-        std::vector<LocalizedIndexEntry> _searchNTMFolderIndex;
-        std::vector<LocalizedIndexEntry> _searchColorSchemeIndex;
-        til::generational<std::vector<const LocalizedIndexEntry*>> _filteredSearchIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchProfileIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchNTMFolderIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchColorSchemeIndex;
+        struct SearchIndex
+        {
+            SearchIndex& operator=(const SearchIndex& other) = default;
+
+            std::vector<LocalizedIndexEntry> mainIndex;
+            std::vector<LocalizedIndexEntry> profileIndex;
+            std::vector<LocalizedIndexEntry> ntmFolderIndex;
+            std::vector<LocalizedIndexEntry> colorSchemeIndex;
+
+            // Links to main page; used when searching runtime objects (i.e. profile/extension name --> Profile_Base/Extension View)
+            LocalizedIndexEntry profileIndexEntry;
+            LocalizedIndexEntry ntmFolderIndexEntry;
+            LocalizedIndexEntry colorSchemeIndexEntry;
+            LocalizedIndexEntry extensionIndexEntry;
+        };
+        til::generational<SearchIndex> _searchIndex;
+
+        struct FilteredSearchIndex
+        {
+            std::vector<const LocalizedIndexEntry*> mainIndex;
+            std::vector<const LocalizedIndexEntry*> profileIndex;
+            std::vector<const LocalizedIndexEntry*> ntmFolderIndex;
+            std::vector<const LocalizedIndexEntry*> colorSchemeIndex;
+        };
+        til::generational<FilteredSearchIndex> _filteredSearchIndex;
 
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -46,7 +46,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToNewTabMenuArgs>();
         _ViewModel = args.ViewModel();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(

src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp

@@ -2472,7 +2472,7 @@
     <comment>Placeholder text for the main search box in the settings editor.</comment>
   </data>
   <data name="Search_NoResults" xml:space="preserve">
-    <value>No results for {}</value>
-    <comment>{Locked="{}"} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
+    <value>No results for "{}"</value>
+    <comment>{Locked=""{}""} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
   </data>
 </root>

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "SettingContainer.h"
+
 // This macro must be used alongside GETSET_BINDABLE_ENUM_SETTING.
 // Use this in your class's constructor after Initialize_Component().
 // It sorts and initializes the observable list of enum entries with the enum name

src/cascadia/TerminalSettingsEditor/Utils.h

@@ -428,6 +428,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     const std::array<IndexEntry, $($schemeEntries.Count)>& LoadColorSchemeIndex();
 
     const IndexEntry& PartialProfileIndexEntry();
+    const IndexEntry& PartialNTMFolderIndexEntry();
+    const IndexEntry& PartialColorSchemeIndexEntry();
+    const IndexEntry& PartialExtensionIndexEntry();
 }
 "@
 
@@ -483,6 +486,24 @@ $( ($schemeEntries -join "`r`n") )
         static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Profiles_Base>(), nullptr, BreadcrumbSubPage::None, L"" };
         return entry;
     }
+
+    const IndexEntry& PartialNTMFolderIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::NewTabMenu>(), nullptr, BreadcrumbSubPage::NewTabMenu_Folder, L"" };
+        return entry;
+    }
+
+    const IndexEntry& PartialColorSchemeIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::EditColorScheme>(), nullptr, BreadcrumbSubPage::ColorSchemes_Edit, L"" };
+        return entry;
+    }
+
+    const IndexEntry& PartialExtensionIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>(), nullptr, BreadcrumbSubPage::Extensions_Extension, L"" };
+        return entry;
+    }
 }
 "@