nits, schema

microsoft · May 31, 2024 · 0dff336 · 0dff336
1 parent 51528e9
commit 0dff336
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json
@@ -629,7 +629,8 @@
         "folder",
         "separator",
         "remainingProfiles",
-        "matchProfiles"
+        "matchProfiles",
+        "action"
       ]
     },
     "NewTabMenuEntry": {
@@ -781,6 +782,28 @@
         }
       ]
     },
+    "ActionEntry": {
+      "description": "An action in the new tab dropdown",
+      "allOf": [
+        {
+          "$ref": "#/$defs/NewTabMenuEntry"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "action"
+            },
+            "profile": {
+              "type": "string",
+              "default": "",
+              "description": "The ID of the action to show in this entry"
+            }
+          }
+        }
+      ]
+    },
     "SwitchToAdjacentTabArgs": {
       "oneOf": [
         {
@@ -2054,6 +2077,9 @@
           },
           {
             "$ref": "#/$defs/RemainingProfilesEntry"
+          },
+          {
+            "$ref": "#/$defs/ActionEntry"
           }
         ]
       }

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1008,13 +1008,12 @@ namespace winrt::TerminalApp::implementation
             {
                 const auto actionEntry = entry.as<ActionEntry>();
                 const auto actionId = actionEntry.ActionId();
-                if (_settings.ActionMap().GetActionById(actionId) == nullptr)
+                if (_settings.ActionMap().GetActionById(actionId))
                 {
-                    break;
+                    auto actionItem = _CreateNewTabFlyoutAction(actionId);
+                    items.push_back(actionItem);
                 }
 
-                auto actionItem = _CreateNewTabFlyoutAction(actionId);
-                items.push_back(actionItem);
                 break;
             }
             }
@@ -1121,7 +1120,7 @@ namespace winrt::TerminalApp::implementation
             _SetAcceleratorForMenuItem(actionMenuItem, actionKeyChord);
         }
 
-        auto actionName = action.Name();
+        const auto actionName = action.Name();
         actionMenuItem.Text(actionName);
 
         // If there's an icon set for this action, set it as the icon for