Add support for the newWindow action

.github/actions/spelling/dictionary/apis.txt

@@ -43,6 +43,7 @@ IPeasant
 IStorage
 ITab
 ITaskbar
+IVirtual
 LCID
 llabs
 llu
@@ -56,6 +57,7 @@ NCHITTEST
 NCLBUTTONDBLCLK
 NCRBUTTONDBLCLK
 NOAGGREGATION
+NOASYNC
 NOPROGRESS
 NOREDIRECTIONBITMAP
 ntprivapi
@@ -80,6 +82,7 @@ shobjidl
 SIZENS
 smoothstep
 GETDESKWALLPAPER
+SHELLEXECUTEINFOW
 snprintf
 spsc
 sregex

doc/cascadia/profiles.schema.json

@@ -838,6 +838,16 @@
               "type": "string"
             }
           ]
+        },
+        "windowingBehavior": {
+          "default": "useNew",
+          "description": "Controls how new terminal instances attach to existing windows. \"useNew\" will always create a new window. \"useExisting\" will create new tabs in the most recently used window on this virtual desktop, and \"useAnyExisting\" will create tabs in the most recent window on any desktop.",
+          "enum": [
+            "useNew",
+            "useExisting",
+            "useAnyExisting"
+          ],
+          "type": "string"
         }
       },
       "required": [

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -42,6 +42,8 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestAutogeneratedName);
         TEST_METHOD(TestLayerOnAutogeneratedName);
 
+        TEST_METHOD(TestGenerateCommandline);
+
         TEST_CLASS_SETUP(ClassSetup)
         {
             InitializeJsonReader();
@@ -361,4 +363,145 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
         }
     }
+
+    void CommandTests::TestGenerateCommandline()
+    {
+        const WEX::TestExecution::DisableVerifyExceptions disableExceptionsScope;
+
+        const std::string commands0String{ R"([
+            {
+                "name":"action0",
+                "command": { "action": "newWindow" }
+            },
+            {
+                "name":"action1",
+                "command": { "action": "newTab", "profile": "foo" }
+            },
+            {
+                "name":"action2",
+                "command": { "action": "newWindow", "profile": "foo" }
+            },
+            {
+                "name":"action3",
+                "command": { "action": "newWindow", "commandline": "bar.exe" }
+            },
+            {
+                "name":"action4",
+                "command": { "action": "newWindow", "commandline": "pop.exe ya ha ha" }
+            },
+            {
+                "name":"action5",
+                "command": { "action": "newWindow", "commandline": "pop.exe \"ya ha ha\"" }
+            },
+            {
+                "name":"action6",
+                "command": { "action": "newWindow", "startingDirectory":"C:\\foo", "commandline": "bar.exe" }
+            },
+        ])" };
+
+        const auto commands0Json = VerifyParseSucceeded(commands0String);
+
+        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        VERIFY_ARE_EQUAL(0u, commands.Size());
+        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
+        VERIFY_ARE_EQUAL(0u, warnings.size());
+        VERIFY_ARE_EQUAL(7u, commands.Size());
+
+        {
+            auto command = commands.Lookup(L"action0");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action1");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"--profile \"foo\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action2");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"--profile \"foo\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action3");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"-- \"bar.exe\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action4");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"-- \"pop.exe ya ha ha\"", terminalArgs.ToCommandline());
+        }
+
+        {
+            auto command = commands.Lookup(L"action5");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"-- \"pop.exe \"ya ha ha\"\"", terminalArgs.ToCommandline());
+        }
+
+        {
+            auto command = commands.Lookup(L"action6");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"--startingDirectory \"C:\\foo\" -- \"bar.exe\"", terminalArgs.ToCommandline());
+        }
+    }
 }