Revert "Add support for "workspaces" based on window names (#20162)" (#20291)

This reverts commit 4b8b6ff: Add
support for "workspaces" based on window names (#20162)

@DHowett found the following blocking issues:
-
#20162 (comment)
- unrelated changes in `tools/runformat.cmd` and `OpenConsole.psm1`

Author: carlos-zamora

doc/cascadia/profiles.schema.json

@@ -441,7 +441,6 @@
         "openTabColorPicker",
         "openTabRenamer",
         "openWindowRenamer",
-        "openWorkspace",
         "paste",
         "prevTab",
         "quakeMode",
@@ -480,7 +479,6 @@
         "toggleReadOnlyMode",
         "toggleShaderEffects",
         "toggleSplitOrientation",
-        "workspaces",
         "wt",
         "unbound"
       ],
@@ -1723,28 +1721,6 @@
         }
       ]
     },
-    "OpenWorkspaceAction": {
-      "description": "Arguments corresponding to an openWorkspace Action",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "openWorkspace"
-            },
-            "name": {
-              "type": "string",
-              "default": "",
-              "description": "The name of the workspace to open. If omitted, the workspaces UI will be shown so the user can pick one."
-            }
-          }
-        }
-      ]
-    },
     "FocusPaneAction": {
       "description": "Arguments corresponding to a focusPane Action",
       "allOf": [
@@ -2064,11 +2040,6 @@
         "unfocusedFrame": {
           "description": "The color of the window frame when the window is inactive. This only works on Windows 11",
           "$ref": "#/$defs/ThemeColor"
-        },
-        "showWorkspacesButton": {
-          "description": "When set to true, the workspaces button will be shown in the tab row.",
-          "type": "boolean",
-          "default": true
         }
       }
     },
@@ -2237,9 +2208,6 @@
             {
               "$ref": "#/$defs/RenameWindowAction"
             },
-            {
-              "$ref": "#/$defs/OpenWorkspaceAction"
-            },
             {
               "$ref": "#/$defs/FocusPaneAction"
             },

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -938,30 +938,6 @@ namespace winrt::TerminalApp::implementation
         co_return;
     }
 
-    // Launch `wt -w <name>` so the monarch can either summon an existing
-    // window with that name or restore a persisted workspace.
-    safe_void_coroutine TerminalPage::_OpenWorkspaceWindow(const winrt::hstring name)
-    {
-        co_await winrt::resume_background();
-
-        const auto exePath{ GetWtExePath() };
-        // Quote/escape the window name so that ShellExecute -> CommandLineToArgvW
-        // round-trips it as a single argument even when it contains spaces or
-        // other characters that need escaping.
-        const auto cmdline = fmt::format(FMT_COMPILE(L"-w {}"), QuoteAndEscapeCommandlineArg(std::wstring_view{ name }));
-
-        SHELLEXECUTEINFOW seInfo{ 0 };
-        seInfo.cbSize = sizeof(seInfo);
-        seInfo.fMask = SEE_MASK_NOASYNC;
-        seInfo.lpVerb = L"open";
-        seInfo.lpFile = exePath.c_str();
-        seInfo.lpParameters = cmdline.c_str();
-        seInfo.nShow = SW_SHOWNORMAL;
-        LOG_IF_WIN32_BOOL_FALSE(ShellExecuteExW(&seInfo));
-
-        co_return;
-    }
-
     void TerminalPage::_HandleNewWindow(const IInspectable& /*sender*/,
                                         const ActionEventArgs& actionArgs)
     {
@@ -1082,7 +1058,6 @@ namespace winrt::TerminalApp::implementation
         // Fun!
         // WindowRenamerTextBox().Focus(FocusState::Programmatic);
         _renamerLayoutUpdatedRevoker.revoke();
-        _renamerLayoutCount = 0;
         _renamerLayoutUpdatedRevoker = WindowRenamerTextBox().LayoutUpdated(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
             if (auto self{ weakThis.get() })
             {
@@ -1658,35 +1633,4 @@ namespace winrt::TerminalApp::implementation
             args.Handled(handled);
         }
     }
-
-    void TerminalPage::_HandleOpenWorkspace(const IInspectable& /*sender*/,
-                                            const ActionEventArgs& args)
-    {
-        // Open (or summon) a named window.  We launch a new `wt -w <name>`
-        // process which the monarch will route to the correct live window or
-        // restore from a persisted workspace.
-        if (args)
-        {
-            if (const auto& realArgs = args.ActionArgs().try_as<OpenWorkspaceArgs>())
-            {
-                const auto name = realArgs.Name();
-                if (!name.empty())
-                {
-                    _OpenWorkspaceWindow(name);
-                }
-                args.Handled(true);
-            }
-        }
-    }
-
-    void TerminalPage::_HandleWorkspaces(const IInspectable& /*sender*/,
-                                         const ActionEventArgs& args)
-    {
-        if (_workspaceFlyout && _workspaceDropdown)
-        {
-            _workspaceFlyout.ShowAt(_workspaceDropdown);
-        }
-        args.Handled(true);
-    }
-
 }

src/cascadia/TerminalApp/Pane.cpp

@@ -92,10 +92,6 @@ INewContentArgs Pane::GetTerminalArgsForPane(BuildStartupKind kind) const
 {
     // Leaves are the only things that have controls
     assert(_IsLeaf());
-    if (!_content)
-    {
-        return nullptr;
-    }
     return _content.GetNewTerminalArgs(kind);
 }
 

src/cascadia/TerminalApp/Remoting.h

@@ -85,7 +85,6 @@ namespace winrt::TerminalApp::implementation
         WINRT_PROPERTY(TerminalApp::CommandlineArgs, Command, nullptr);
         WINRT_PROPERTY(winrt::hstring, Content);
         WINRT_PROPERTY(Windows::Foundation::IReference<Windows::Foundation::Rect>, InitialBounds);
-        WINRT_PROPERTY(winrt::Microsoft::Terminal::Settings::Model::WindowLayout, PersistedLayout, nullptr);
     };
 }
 

src/cascadia/TerminalApp/Remoting.idl

@@ -51,6 +51,5 @@ namespace TerminalApp
         CommandlineArgs Command { get; };
         String Content { get; };
         Windows.Foundation.IReference<Windows.Foundation.Rect> InitialBounds { get; };
-        Microsoft.Terminal.Settings.Model.WindowLayout PersistedLayout;
     };
 }

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

@@ -743,42 +743,6 @@
     <value>unnamed window</value>
     <comment>text used to identify when a window hasn't been assigned a name by the user</comment>
   </data>
-  <data name="NameThisWindowMenuItem" xml:space="preserve">
-    <value>Name this window...</value>
-    <comment>Menu item text shown when the current window has no name assigned</comment>
-  </data>
-  <data name="RenameThisWindowMenuItem" xml:space="preserve">
-    <value>Rename this window...</value>
-    <comment>Menu item text shown when the current window already has a name</comment>
-  </data>
-  <data name="WindowListUnnamedEntry" xml:space="preserve">
-    <value>#{0} (unnamed)</value>
-    <comment>{locked="{0}"}{0} is the window ID number. Shown in the workspace flyout for windows that have no name assigned.</comment>
-  </data>
-  <data name="DeleteWorkspaceMenuItem" xml:space="preserve">
-    <value>Delete workspace?</value>
-    <comment>Menu item text shown in the right-click context menu on a saved workspace</comment>
-  </data>
-  <data name="OpenWorkspaceMenuItem" xml:space="preserve">
-    <value>Open workspace</value>
-    <comment>Menu item text for opening a saved workspace</comment>
-  </data>
-  <data name="ConfirmDeleteWorkspaceTitle" xml:space="preserve">
-    <value>Delete "{0}"?</value>
-    <comment>{locked="{0}"}{0} is the workspace name. Shown as the title of a confirmation dialog when the user tries to delete a saved workspace.</comment>
-  </data>
-  <data name="ConfirmDeleteWorkspaceBody" xml:space="preserve">
-    <value>Are you sure you want to delete "{0}"? Sessions associated with this workspace will also be deleted.</value>
-    <comment>{locked="{0}"}{0} is the workspace name. Body text of the confirmation dialog shown when the user tries to delete a saved workspace.</comment>
-  </data>
-  <data name="ConfirmDeleteWorkspaceDelete" xml:space="preserve">
-    <value>Delete</value>
-    <comment>Primary button text on the delete workspace confirmation dialog</comment>
-  </data>
-  <data name="ConfirmDeleteWorkspaceCancel" xml:space="preserve">
-    <value>Cancel</value>
-    <comment>Cancel button text on the delete workspace confirmation dialog</comment>
-  </data>
   <data name="WindowRenamer.Subtitle" xml:space="preserve">
     <value>Enter a new name:</value>
   </data>
@@ -837,9 +801,6 @@
   <data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>This Terminal window is running as administrator</value>
   </data>
-  <data name="WorkspaceDropdown.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Workspaces</value>
-  </data>
   <data name="CommandPalette_MatchesAvailable" xml:space="preserve">
     <value>Suggestions found: {0}</value>
     <comment>{0} will be replaced with a number.</comment>

src/cascadia/TerminalApp/TabManagement.cpp

@@ -403,22 +403,6 @@ namespace winrt::TerminalApp::implementation
         _previouslyClosedPanesAndTabs.emplace_back(args);
     }
 
-    // Method Description:
-    // - If this window has a name, persist its current workspace layout to
-    //   ApplicationState. Intended to be called from the close-pane / close-tab
-    //   paths while tab/pane content is still alive (before it gets torn down).
-    void TerminalPage::_SaveWorkspaceIfNeeded()
-    {
-        const auto& windowName = _WindowProperties.WindowName();
-        if (!windowName.empty())
-        {
-            if (const auto layout = GetWindowLayout())
-            {
-                ApplicationState::SharedInstance().SaveWorkspace(windowName, layout);
-            }
-        }
-    }
-
     // Method Description:
     // - Removes the tab (both TerminalControl and XAML) after prompting for approval
     // Arguments:
@@ -466,14 +450,6 @@ namespace winrt::TerminalApp::implementation
         auto actions = t->BuildStartupActions(BuildStartupKind::None);
         _AddPreviouslyClosedPaneOrTab(std::move(actions));
 
-        // If this is the last tab in a named window, persist the workspace
-        // layout now while tab content is still alive. After tab.Close()
-        // the pane content will be torn down by the time _RemoveTab runs.
-        if (_tabs.Size() == 1)
-        {
-            _SaveWorkspaceIfNeeded();
-        }
-
         tab.Close();
     }
 
@@ -495,13 +471,6 @@ namespace winrt::TerminalApp::implementation
 
         const auto focusedTabIndex{ _GetFocusedTabIndex() };
 
-        // NOTE: Workspace persistence for named windows used to live here,
-        // but by the time _RemoveTab runs the pane content may already be
-        // torn down (e.g. from the close-pane path). Instead, workspace
-        // saves are handled earlier:
-        //  - Close-pane (last pane): in _HandleClosePaneRequested
-        //  - Close-tab: in _HandleCloseTabRequested
-
         // Removing the tab from the collection should destroy its control and disconnect its connection,
         // but it doesn't always do so. The UI tree may still be holding the control and preventing its destruction.
         tab.Shutdown();
@@ -829,21 +798,6 @@ namespace winrt::TerminalApp::implementation
         }
         _AddPreviouslyClosedPaneOrTab(std::move(state.args));
 
-        // If this is the last pane on the last tab of a named window, persist
-        // the workspace layout now while the pane content is still alive.
-        // We can't wait until _RemoveTab, because pane->Close() below will
-        // destroy the content before _RemoveTab is reached.
-        if (_tabs.Size() == 1)
-        {
-            if (const auto activeTab{ _GetFocusedTabImpl() })
-            {
-                if (activeTab->GetLeafPaneCount() == 1)
-                {
-                    _SaveWorkspaceIfNeeded();
-                }
-            }
-        }
-
         // If specified, detach before closing to directly update the pane structure
         pane->Close();
     }

src/cascadia/TerminalApp/TabRowControl.h

@@ -19,8 +19,6 @@ namespace winrt::TerminalApp::implementation
 
         til::property_changed_event PropertyChanged;
         WINRT_OBSERVABLE_PROPERTY(bool, ShowElevationShield, PropertyChanged.raise, false);
-        WINRT_OBSERVABLE_PROPERTY(bool, ShowWorkspacesButton, PropertyChanged.raise, true);
-        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, WorkspaceName, PropertyChanged.raise, L"");
     };
 }
 

src/cascadia/TerminalApp/TabRowControl.idl

@@ -9,7 +9,5 @@ namespace TerminalApp
         TabRowControl();
         Microsoft.UI.Xaml.Controls.TabView TabView { get; };
         Boolean ShowElevationShield;
-        Boolean ShowWorkspacesButton;
-        String WorkspaceName;
     }
 }

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -8,7 +8,6 @@
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                   xmlns:local="using:TerminalApp"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                  xmlns:mtu="using:Microsoft.Terminal.UI"
                   xmlns:mux="using:Microsoft.UI.Xaml.Controls"
                   Background="{ThemeResource TabViewBackground}"
                   mc:Ignorable="d">
@@ -36,45 +35,14 @@
                  TabWidthMode="Equal">
 
         <mux:TabView.TabStripHeader>
-            <StackPanel Orientation="Horizontal">
-                <!--  EA18 is the "Shield" glyph  -->
-                <FontIcon x:Uid="ElevationShield"
-                          Margin="9,4,0,4"
-                          FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                          FontSize="16"
-                          Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-                          Glyph="&#xEA18;"
-                          Visibility="{x:Bind ShowElevationShield, Mode=OneWay}" />
-
-                <!--  Workspace/windows button  -->
-                <Button x:Name="WorkspaceDropdown"
-                        x:Uid="WorkspaceDropdown"
-                        Margin="4,0,0,4"
-                        Padding="8,0,0,0"
-                        VerticalAlignment="Stretch"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Visibility="{x:Bind ShowWorkspacesButton, Mode=OneWay}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <!--  EE40 is the "TaskViewSettings" glyph  -->
-                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                      FontSize="12"
-                                      Glyph="&#xEE40;" />
-                            <TextBlock x:Name="WorkspaceNameText"
-                                       Padding="0,0,8,0"
-                                       VerticalAlignment="Center"
-                                       FontSize="12"
-                                       Text="{x:Bind WorkspaceName, Mode=OneWay}"
-                                       Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(WorkspaceName), Mode=OneWay}" />
-                        </StackPanel>
-                    </Button.Content>
-                    <Button.Flyout>
-                        <MenuFlyout x:Name="WorkspaceFlyout" />
-                    </Button.Flyout>
-                </Button>
-            </StackPanel>
+            <!--  EA18 is the "Shield" glyph  -->
+            <FontIcon x:Uid="ElevationShield"
+                      Margin="9,4,0,4"
+                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                      FontSize="16"
+                      Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
+                      Glyph="&#xEA18;"
+                      Visibility="{x:Bind ShowElevationShield, Mode=OneWay}" />
         </mux:TabView.TabStripHeader>
 
         <mux:TabView.TabStripFooter>