smaller refactors

microsoft · Jun 2, 2024 · 5a029f0 · 5a029f0
1 parent bba8aac
commit 5a029f0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 35 deletions.
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -1371,7 +1371,7 @@ namespace winrt::TerminalApp::implementation
         // their settings file. Ask the ActionMap for those.
         if (WI_IsFlagSet(source, SuggestionsSource::Tasks))
         {
-            const auto tasks = _settings.GlobalSettings().ActionMap().FilterToSnippets(currentCommandline, currentWorkingDirectory);
+            const auto tasks = co_await _settings.GlobalSettings().ActionMap().FilterToSnippets(currentCommandline, currentWorkingDirectory);
             for (const auto& t : tasks)
             {
                 commandsCollection.push_back(t);
@@ -1391,28 +1391,6 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        // if (WI_IsFlagSet(source, SuggestionsSource::Local) &&
-        //     context != nullptr)
-        // {
-        //     // TODO! this is wack. CurrentWorkingDirectory should be it's own
-        //     // property, or a property of ControlCore.DirectoryHistory() or
-        //     // something. I only have 5 minutes to pch tho so garbage will do
-        //     auto cwd = context.CurrentWorkingDirectory();// strongControl.CommandHistory().CurrentWorkingDirectory();
-        //     if (!cwd.empty())
-        //     {
-        //         co_await winrt::resume_background();
-        //         auto localTasksFileContents = CascadiaSettings::ReadFile(cwd + L"\\.wt.json");
-        //         if (!localTasksFileContents.empty())
-        //         {
-        //             const auto localCommands = Command::ParseLocalCommands(localTasksFileContents);
-        //             for (const auto& t : localCommands)
-        //             {
-        //                 commandsCollection.push_back(t);
-        //             }
-        //         }
-        //     }
-        // }
-
         co_await wil::resume_foreground(Dispatcher());
 
         // Open the palette with all these commands in it.

diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.idl b/src/cascadia/TerminalSettingsModel/ActionArgs.idl
@@ -119,7 +119,6 @@ namespace Microsoft.Terminal.Settings.Model
         Tasks = 0x1,
         CommandHistory = 0x2,
         DirectoryHistory = 0x4,
-        Local = 0x8,
         All = 0xffffffff,
     };
 

diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp
@@ -828,7 +828,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                                                winrt::hstring currentCommandline,
                                                winrt::hstring currentWorkingDirectory)
     {
-        auto results = winrt::single_threaded_vector<Model::Command>();
+        std::vector<Model::Command> results{};
 
         const auto numBackspaces = currentCommandline.size();
         // Helper to clone a sendInput command into a new Command, with the
@@ -860,7 +860,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                 command.ActionAndArgs().Action() == ShortcutAction::SendInput)
             {
                 // copy it into the results.
-                results.Append(createInputAction(command));
+                results.push_back(createInputAction(command));
             }
             // If this is nested...
             else if (command.HasNestedCommands())
@@ -879,15 +879,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                     auto copy = cmdImpl->Copy();
                     copy->NestedCommands(innerResults.GetView());
 
-                    results.Append(*copy);
+                    results.push_back(*copy);
                 }
             }
         }
 
-        return results;
+        return winrt::single_threaded_vector<Model::Command>(std::move(results));
     }
 
-    IVector<Model::Command> ActionMap::FilterToSnippets(
+    winrt::Windows::Foundation::IAsyncOperation<IVector<Model::Command>> ActionMap::FilterToSnippets(
         winrt::hstring currentCommandline,
         winrt::hstring currentWorkingDirectory)
     {
@@ -944,6 +944,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             }
         }
 
-        return results;
+        co_return results;
     }
 }
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.h b/src/cascadia/TerminalSettingsModel/ActionMap.h
@@ -83,7 +83,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         void ExpandCommands(const Windows::Foundation::Collections::IVectorView<Model::Profile>& profiles,
                             const Windows::Foundation::Collections::IMapView<winrt::hstring, Model::ColorScheme>& schemes);
 
-        winrt::Windows::Foundation::Collections::IVector<Model::Command> FilterToSnippets(winrt::hstring currentCommandline, winrt::hstring currentWorkingDirectory);
+        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVector<Model::Command>> FilterToSnippets(winrt::hstring currentCommandline, winrt::hstring currentWorkingDirectory);
 
     private:
         Model::Command _GetActionByID(const winrt::hstring actionID) const;

diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.idl b/src/cascadia/TerminalSettingsModel/ActionMap.idl
@@ -22,7 +22,7 @@ namespace Microsoft.Terminal.Settings.Model
 
         IVector<Command> ExpandedCommands { get; };
 
-        IVector<Command> FilterToSnippets(String CurrentCommandline, String CurrentWorkingDirectory);
+        Windows.Foundation.IAsyncOperation<IVector<Command> > FilterToSnippets(String CurrentCommandline, String CurrentWorkingDirectory);
     };
 
     [default_interface] runtimeclass ActionMap : IActionMapView

diff --git a/src/cascadia/TerminalSettingsModel/Command.idl b/src/cascadia/TerminalSettingsModel/Command.idl
@@ -46,6 +46,5 @@ namespace Microsoft.Terminal.Settings.Model
 
         static IVector<Command> ParsePowerShellMenuComplete(String json, Int32 replaceLength);
         static IVector<Command> HistoryToCommands(IVector<String> commandHistory, String commandline, Boolean directories);
-        static IVector<Command> ParseLocalCommands(String localTasksFileContents);
     }
 }
diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h
@@ -501,13 +501,12 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::FindMatchDirecti
 
 JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::SuggestionsSource)
 {
-    static constexpr std::array<pair_type, 7> mappings = {
+    static constexpr std::array<pair_type, 6> mappings = {
         pair_type{ "none", AllClear },
         pair_type{ "tasks", ValueType::Tasks },
         pair_type{ "snippets", ValueType::Tasks },
         pair_type{ "commandHistory", ValueType::CommandHistory },
         pair_type{ "directoryHistory", ValueType::DirectoryHistory },
-        pair_type{ "local", ValueType::Local },
         pair_type{ "all", AllSet },
     };
 };