When the profile icon is set to null, fall back to the icon of the commandline

src/cascadia/TerminalApp/TabManagement.cpp

@@ -229,9 +229,10 @@ namespace winrt::TerminalApp::implementation
         // Set this tab's icon to the icon from the user's profile
         if (const auto profile{ newTabImpl->GetFocusedProfile() })
         {
-            if (!profile.Icon().empty())
+            const auto& icon = profile.EvaluatedIcon();
+            if (!icon.empty())
             {
-                newTabImpl->UpdateIcon(profile.Icon());
+                newTabImpl->UpdateIcon(icon);
             }
         }
 
@@ -296,7 +297,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto profile = tab.GetFocusedProfile())
         {
-            tab.UpdateIcon(profile.Icon());
+            tab.UpdateIcon(profile.EvaluatedIcon());
         }
     }
 

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -1012,9 +1012,10 @@ namespace winrt::TerminalApp::implementation
 
         // If there's an icon set for this profile, set it as the icon for
         // this flyout item
-        if (!profile.Icon().empty())
+        const auto& iconPath = profile.EvaluatedIcon();
+        if (!iconPath.empty())
         {
-            const auto icon = _CreateNewTabFlyoutIcon(profile.Icon());
+            const auto icon = _CreateNewTabFlyoutIcon(iconPath);
             profileMenuItem.Icon(icon);
         }
 

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -595,7 +595,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         MUX::Controls::NavigationViewItem profileNavItem;
         profileNavItem.Content(box_value(profile.Name()));
         profileNavItem.Tag(box_value<Editor::ProfileViewModel>(profile));
-        profileNavItem.Icon(IconPathConverter::IconWUX(profile.Icon()));
+        profileNavItem.Icon(IconPathConverter::IconWUX(profile.EvaluatedIcon()));
 
         // Update the menu item when the icon/name changes
         auto weakMenuItem{ make_weak(profileNavItem) };

src/cascadia/TerminalSettingsEditor/ProfileViewModel.h

@@ -58,6 +58,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             Padding(to_hstring(value));
         }
 
+        winrt::hstring EvaluatedIcon() const
+        {
+            return _profile.EvaluatedIcon();
+        }
+
         // starting directory
         bool UseParentProcessDirectory();
         void UseParentProcessDirectory(const bool useParent);

src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl

@@ -75,6 +75,8 @@ namespace Microsoft.Terminal.Settings.Editor
         AppearanceViewModel UnfocusedAppearance { get; };
         Boolean VtPassthroughAvailable { get; };
 
+        String EvaluatedIcon { get; };
+
         void CreateUnfocusedAppearance();
         void DeleteUnfocusedAppearance();
 

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

@@ -515,8 +515,12 @@ void CascadiaSettings::_validateMediaResources()
             }
         }
 
-        // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol,
-        // so treat it as an invalid path.
+        // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol, so treat
+        // it as an invalid path.
+        //
+        // Explicitly just use the Icon here, not the EvaluatedIcon. We don't
+        // want to blow up if we fell back to the commandline and the
+        // commandline _isn't an icon_.
         if (const auto icon = profile.Icon(); icon.size() > 2)
         {
             const auto iconPath{ wil::ExpandEnvironmentStringsW<std::wstring>(icon.c_str()) };

src/cascadia/TerminalSettingsModel/Command.cpp

@@ -602,7 +602,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
                 // - Escape the profile name for JSON appropriately
                 auto escapedProfileName = _escapeForJson(til::u16u8(p.Name()));
-                auto escapedProfileIcon = _escapeForJson(til::u16u8(p.Icon()));
+                auto escapedProfileIcon = _escapeForJson(til::u16u8(p.EvaluatedIcon()));
                 auto newJsonString = til::replace_needle_in_haystack(oldJsonString,
                                                                      ProfileNameToken,
                                                                      escapedProfileName);

src/cascadia/TerminalSettingsModel/Profile.cpp

@@ -336,3 +336,28 @@ Json::Value Profile::ToJson() const
 
     return json;
 }
+winrt::hstring Profile::EvaluatedIcon() const
+{
+    // If the profile has an icon, return it.
+    if (!Icon().empty())
+    {
+        return Icon();
+    }
+
+    // Otherwise, return the first word of the commandline - that should be the executable name.
+    std::wstring_view cmdline{ Commandline() };
+    if (cmdline.empty())
+    {
+        return {};
+    }
+
+    auto firstSpace = cmdline.find_first_of(L" ");
+    if (firstSpace == std::wstring::npos)
+    {
+        return winrt::hstring{ cmdline };
+    }
+    else
+    {
+        return winrt::hstring{ cmdline.substr(0, firstSpace) };
+    }
+}

src/cascadia/TerminalSettingsModel/Profile.h

@@ -102,6 +102,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         Model::IAppearanceConfig DefaultAppearance();
         Model::FontConfig FontInfo();
 
+        winrt::hstring EvaluatedIcon() const;
+
         void _FinalizeInheritance() override;
 
         // Special fields

src/cascadia/TerminalSettingsModel/Profile.idl

@@ -53,6 +53,10 @@ namespace Microsoft.Terminal.Settings.Model
         Boolean Deleted { get; };
         OriginTag Origin { get; };
 
+        // Helper for magically using a commandline for an icon for a profile
+        // without an explicit icon.
+        String EvaluatedIcon { get; };
+
         INHERITABLE_PROFILE_SETTING(Guid, Guid);
         INHERITABLE_PROFILE_SETTING(String, Name);
         INHERITABLE_PROFILE_SETTING(String, Source);