address feedback; winget integration still in progress

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -174,6 +174,23 @@
  </ItemGroup>
  </Target>
 
+ <!-- We need to include some additional files in the package for things like WinGet's Command Not Found -->
+ <Target Name="IncludeAdditionalFilesInPackage">
+ <PropertyGroup>
+ <WinGetAdditionalPackageFileRoot>$(SolutionDir)\src\cascadia\TerminalControl</WinGetAdditionalPackageFileRoot>
+ </PropertyGroup>
+ <ItemGroup>
+ <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\Microsoft.Management.Deployment.winmd">
+ <PackagePath>Microsoft.Management.Deployment.winmd</PackagePath>
+ </WinGetAdditionalPackageFile>
+ </ItemGroup>
+ <ItemGroup>
+ <AppxPackagePayload Include="%(WinGetAdditionalPackageFile.Identity))">
+ <TargetPath>%(WinGetAdditionalPackageFile.PackagePath)</TargetPath>
+ </AppxPackagePayload>
+ </ItemGroup>
+ </Target>
+
  <!-- This is required to get the package dependency in the AppXManifest. -->
  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
 

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -1308,7 +1308,7 @@ namespace winrt::TerminalApp::implementation
  // requires context from the control)
  // then get that here.
  const bool shouldGetContext = realArgs.UseCommandline() ||
- WI_IsAnyFlagSet(source, SuggestionsSource::CommandHistory | SuggestionsSource::WinGetCommandNotFound);
+ WI_IsAnyFlagSet(source, SuggestionsSource::CommandHistory | SuggestionsSource::QuickFixes);
  if (shouldGetContext)
  {
  if (const auto& control{ _GetActiveControl() })
@@ -1341,18 +1341,19 @@ namespace winrt::TerminalApp::implementation
  if (WI_IsFlagSet(source, SuggestionsSource::CommandHistory) &&
  context != nullptr)
  {
- const auto recentCommands = Command::HistoryToCommands(context.History(), currentCommandline, false);
+ // \ue81c --> History icon
+ const auto recentCommands = Command::HistoryToCommands(context.History(), currentCommandline, false, hstring{ L"\ue81c" });
  for (const auto& t : recentCommands)
  {
  commandsCollection.push_back(t);
  }
  }
 
- if (WI_IsFlagSet(source, SuggestionsSource::WinGetCommandNotFound) &&
+ if (WI_IsFlagSet(source, SuggestionsSource::QuickFixes) &&
  context != nullptr)
  {
- // use OEM icon
- const auto recentCommands = Command::ToSendInputCommands(context.WinGetSuggestions(), hstring{ L"\ue74c" });
+ // \ue74c --> OEM icon
+ const auto recentCommands = Command::HistoryToCommands(context.QuickFixes(), hstring{ L"" }, false, hstring{ L"\ue74c" });
  for (const auto& t : recentCommands)
  {
  commandsCollection.push_back(t);

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -439,11 +439,6 @@
  <ResolvedFrom>CppWinRTImplicitlyExpandTargetPlatform</ResolvedFrom>
  <IsSystemReference>True</IsSystemReference>
  </Reference>
- <Reference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\Microsoft.Management.Deployment.winmd">
- <IsWinMDFile>true</IsWinMDFile>
- <Private>false</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- </Reference>
  </ItemGroup>
  <!-- ====================== Compiler & Linker Flags ===================== -->
  <ItemDefinitionGroup>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -11,7 +11,6 @@
 #include "RequestReceiveContentArgs.g.cpp"
 
 #include <filesystem>
-#include <winrt/Microsoft.Management.Deployment.h>
 
 #include <inc/WindowingBehavior.h>
 #include <LibraryResources.h>
@@ -27,7 +26,6 @@
 #include "Utils.h"
 
 using namespace winrt;
-using namespace winrt::Microsoft::Management::Deployment;
 using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;

src/cascadia/TerminalControl/ControlCore.cpp

@@ -13,6 +13,7 @@
 #include <utils.hpp>
 #include <WinUser.h>
 #include <LibraryResources.h>
+//#include <winrt/Microsoft.Management.Deployment.h>
 
 #include "EventArgs.h"
 #include "../../buffer/out/search.h"
@@ -21,6 +22,7 @@
 #include "ControlCore.g.cpp"
 #include "SelectionColor.g.cpp"
 
+//using namespace winrt::Microsoft::Management::Deployment;
 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Console::VirtualTerminal;
 using namespace ::Microsoft::Terminal::Core;
@@ -125,7 +127,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
  auto pfnCompletionsChanged = [=](auto&& menuJson, auto&& replaceLength) { _terminalCompletionsChanged(menuJson, replaceLength); };
  _terminal->CompletionsChangedCallback(pfnCompletionsChanged);
 
- auto pfnSearchMissingCommand = std::bind(&ControlCore::_terminalSearchMissingCommand, this, std::placeholders::_1);
+ auto pfnSearchMissingCommand = [this](auto&& PH1) { _terminalSearchMissingCommand(std::forward<decltype(PH1)>(PH1)); };
  _terminal->SetSearchMissingCommandCallback(pfnSearchMissingCommand);
 
  // MSFT 33353327: Initialize the renderer in the ctor instead of Initialize().
@@ -1745,7 +1747,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
  suggestions.emplace_back(fmt::format(L"winget install --id {}", pkg));
  }
 
- _cachedWinGetSuggestions = winrt::single_threaded_vector<hstring>(std::move(suggestions));
+ _cachedQuickFixes = winrt::single_threaded_vector<hstring>(std::move(suggestions));
 #endif
  }
 
@@ -2288,7 +2290,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
  // TODO CARLOS: should we delete this after a new command is run? Or delete it after a suggestion is used? Or just after the next winget suggestion (current impl)?
  // No clue which we should do. Thoughts?
- context->WinGetSuggestions(_cachedWinGetSuggestions);
+ context->QuickFixes(_cachedQuickFixes);
 
  return *context;
  }

src/cascadia/TerminalControl/ControlCore.h

@@ -58,7 +58,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
  {
  til::property<Windows::Foundation::Collections::IVector<winrt::hstring>> History;
  til::property<winrt::hstring> CurrentCommandline;
- til::property<Windows::Foundation::Collections::IVector<winrt::hstring>> WinGetSuggestions;
+ til::property<Windows::Foundation::Collections::IVector<winrt::hstring>> QuickFixes;
 
  CommandHistoryContext(std::vector<winrt::hstring>&& history)
  {
@@ -347,7 +347,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
  til::point _contextMenuBufferPosition{ 0, 0 };
 
  Windows::Foundation::Collections::IVector<int32_t> _cachedSearchResultRows{ nullptr };
- Windows::Foundation::Collections::IVector<hstring> _cachedWinGetSuggestions{ nullptr };
+ Windows::Foundation::Collections::IVector<hstring> _cachedQuickFixes{ nullptr };
 
  void _setupDispatcherAndCallbacks();
 

src/cascadia/TerminalControl/ControlCore.idl

@@ -62,7 +62,7 @@ namespace Microsoft.Terminal.Control
  {
  IVector<String> History { get; };
  String CurrentCommandline { get; };
- IVector<String> WinGetSuggestions { get; };
+ IVector<String> QuickFixes { get; };
  };
 
  [default_interface] runtimeclass ControlCore : ICoreState

src/cascadia/TerminalControl/EventArgs.cpp

@@ -20,4 +20,3 @@
 #include "KeySentEventArgs.g.cpp"
 #include "CharSentEventArgs.g.cpp"
 #include "StringSentEventArgs.g.cpp"
-#include "SearchMissingCommandEventArgs.g.cpp"

src/cascadia/TerminalControl/TerminalControlLib.vcxproj

@@ -182,6 +182,13 @@
  <Private>false</Private>
  </ProjectReference>
  </ItemGroup>
+ <ItemGroup>
+ <Reference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\Microsoft.Management.Deployment.winmd">
+ <IsWinMDFile>true</IsWinMDFile>
+ <Private>false</Private>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ </Reference>
+ </ItemGroup>
  <!-- ====================== Compiler & Linker Flags ===================== -->
  <ItemDefinitionGroup>
  <ClCompile>

src/cascadia/TerminalSettingsModel/ActionArgs.idl

@@ -119,7 +119,7 @@ namespace Microsoft.Terminal.Settings.Model
  Tasks = 0x1,
  CommandHistory = 0x2,
  DirectoryHistory = 0x4,
- WinGetCommandNotFound = 0x8,
+ QuickFixes = 0x8,
  All = 0xffffffff,
  };
 

src/cascadia/TerminalSettingsModel/Command.cpp

@@ -756,7 +756,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
  // the command will be run as a directory change instead.
  IVector<Model::Command> Command::HistoryToCommands(IVector<winrt::hstring> history,
  winrt::hstring currentCommandline,
- bool directories)
+ bool directories,
+ hstring iconPath)
  {
  std::wstring cdText = directories ? L"cd " : L"";
  auto result = std::vector<Model::Command>();
@@ -788,36 +789,11 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
  auto command = winrt::make_self<Command>();
  command->_ActionAndArgs = actionAndArgs;
  command->_name = winrt::hstring{ line };
- command->_iconPath = directories ?
- L"\ue8da" : // OpenLocal (a folder with an arrow pointing up)
- L"\ue81c"; // History icon
+ command->_iconPath = iconPath;
  result.push_back(*command);
  foundCommands[line] = true;
  }
 
  return winrt::single_threaded_vector<Model::Command>(std::move(result));
  }
-
- IVector<Model::Command> Command::ToSendInputCommands(IVector<hstring> commands, hstring iconPath)
- {
- if (!commands)
- {
- return single_threaded_vector<Model::Command>();
- }
-
- auto result = std::vector<Model::Command>();
- for (const auto& command : commands)
- {
- auto args = winrt::make_self<SendInputArgs>(command);
- Model::ActionAndArgs actionAndArgs{ ShortcutAction::SendInput, *args };
-
- auto c = winrt::make_self<Command>();
- c->_ActionAndArgs = actionAndArgs;
- c->_name = command;
- c->_iconPath = iconPath;
- result.push_back(*c);
- }
-
- return winrt::single_threaded_vector<Model::Command>(std::move(result));
- }
 }

src/cascadia/TerminalSettingsModel/Command.h

@@ -73,8 +73,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
  static Windows::Foundation::Collections::IVector<Model::Command> ParsePowerShellMenuComplete(winrt::hstring json, int32_t replaceLength);
  static Windows::Foundation::Collections::IVector<Model::Command> HistoryToCommands(Windows::Foundation::Collections::IVector<winrt::hstring> history,
  winrt::hstring currentCommandline,
- bool directories);
- static Windows::Foundation::Collections::IVector<Model::Command> ToSendInputCommands(Windows::Foundation::Collections::IVector<winrt::hstring> commands, hstring iconPath);
+ bool directories,
+   hstring iconPath);
 
  WINRT_PROPERTY(ExpandCommandType, IterateOn, ExpandCommandType::None);
  WINRT_PROPERTY(Model::ActionAndArgs, ActionAndArgs);

src/cascadia/TerminalSettingsModel/Command.idl

@@ -47,8 +47,7 @@ namespace Microsoft.Terminal.Settings.Model
  Windows.Foundation.Collections.IMapView<String, Command> NestedCommands { get; };
 
  static IVector<Command> ParsePowerShellMenuComplete(String json, Int32 replaceLength);
- static IVector<Command> HistoryToCommands(IVector<String> commandHistory, String commandline, Boolean directories);
- static IVector<Command> ToSendInputCommands(IVector<String> commands, String iconPath);
+ static IVector<Command> HistoryToCommands(IVector<String> commandHistory, String commandline, Boolean directories, String iconPath);
 
  }
 }

src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h

@@ -501,11 +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, 5> mappings = {
+ static constexpr std::array<pair_type, 6> mappings = {
  pair_type{ "none", AllClear },
  pair_type{ "tasks", ValueType::Tasks },
  pair_type{ "commandHistory", ValueType::CommandHistory },
  pair_type{ "directoryHistory", ValueType::DirectoryHistory },
+ pair_type{ "quickFix", ValueType::QuickFixes },
  pair_type{ "all", AllSet },
  };
 };