Make emoji icons work again too... NOTE RELATED 8583

Author: DHowett

src/cascadia/TerminalApp/CommandPaletteItems.h

@@ -31,7 +31,7 @@ namespace winrt::TerminalApp::implementation
 
         winrt::hstring Icon()
         {
-            return _Command.IconPath();
+            return _Command.ResolvedIcon();
         }
 
         WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);

src/cascadia/TerminalSettingsModel/ActionEntry.cpp

@@ -52,7 +52,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (!_Icon.empty())
         {
-            ResolveMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
+            ResolveIconMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
         }
     }
 }

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

@@ -488,7 +488,7 @@ void CascadiaSettings::_validateAllSchemesExist()
     }
 }
 
-void CascadiaSettings::_resolveSingleMediaResource(Model::OriginTag /*origin*/, std::wstring_view basePath, const Model::IMediaResource& resource)
+void CascadiaSettings::_resolveSingleMediaResource(std::wstring_view basePath, const Model::IMediaResource& resource)
 {
     auto resourcePath{ resource.Path() };
 

src/cascadia/TerminalSettingsModel/CascadiaSettings.h

@@ -210,7 +210,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         void _validateSettings();
         void _validateAllSchemesExist();
-        void _resolveSingleMediaResource(Model::OriginTag origin, std::wstring_view basePath, const Model::IMediaResource& resource);
+        void _resolveSingleMediaResource(std::wstring_view basePath, const Model::IMediaResource& resource);
         void _validateMediaResources();
         void _validateProfileEnvironmentVariables();
         void _validateKeybindings() const;

src/cascadia/TerminalSettingsModel/Command.cpp

@@ -594,7 +594,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (_iconPath && !_iconPath->empty())
         {
-            ResolveMediaResourceIntoPath(basePath, hstring{ *_iconPath }, resolver, _resolvedIcon);
+            ResolveIconMediaResourceIntoPath(basePath, hstring{ *_iconPath }, resolver, _resolvedIcon);
         }
     }
 

src/cascadia/TerminalSettingsModel/FolderEntry.cpp

@@ -147,7 +147,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (!_Icon.empty())
         {
-            ResolveMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
+            ResolveIconMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
         }
 
         if (_RawEntries)

src/cascadia/TerminalSettingsModel/MediaResourceSupport.h

@@ -61,3 +61,18 @@ _TIL_INLINEPREFIX void ResolveMediaResourceIntoPath(const winrt::hstring& basePa
     resolver(basePath, *mediaResource); // populates MediaResourcePath
     resolvedPath = std::move(mediaResource->path);
 }
+
+_TIL_INLINEPREFIX void ResolveIconMediaResourceIntoPath(const winrt::hstring& basePath, const winrt::hstring& unresolvedPath, const winrt::Microsoft::Terminal::Settings::Model::MediaResourceResolver& resolver, MediaResourcePath& resolvedPath)
+{
+    std::wstring_view unresolvedPathAsView{ unresolvedPath };
+    if (unresolvedPath.size() <= 2 || unresolvedPathAsView.find_first_of(L'\u200D') <= 8)
+    {
+        // **HEURISTIC**
+        // If it's 2 code units long or contains a zero-width joiner in the first 8 code units, it is
+        // PROBABLY an Emoji. Just pass it through.
+        resolvedPath = { unresolvedPath, true, true };
+        return;
+    }
+
+    ResolveMediaResourceIntoPath(basePath, unresolvedPath, resolver, resolvedPath);
+}

src/cascadia/TerminalSettingsModel/Profile.cpp

@@ -558,7 +558,7 @@ void Profile::ResolveMediaResources(const Model::MediaResourceResolver& resolver
     if (const auto icon{ _getIconImpl() })
     {
         const auto iconSource{ _getIconOverrideSourceImpl() };
-        ResolveMediaResourceIntoPath(iconSource->SourceBasePath, *icon, resolver, _resolvedIcon);
+        ResolveIconMediaResourceIntoPath(iconSource->SourceBasePath, *icon, resolver, _resolvedIcon);
     }
 
     if (const auto container{ _DefaultAppearance.as<IMediaResourceContainer>() })

src/cascadia/TerminalSettingsModel/ProfileEntry.cpp

@@ -77,7 +77,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (!_Icon.empty())
         {
-            ResolveMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
+            ResolveIconMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
         }
     }
 }

src/cascadia/UIHelpers/IconPathConverter.cpp

@@ -135,7 +135,8 @@ namespace winrt::Microsoft::Terminal::UI::implementation
             //
             // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol, so
             // don't do this if it's just an invalid path.
-            if (!iconSource && iconPath.size() <= 2)
+            std::wstring_view iconPathAsView{ iconPath };
+            if (!iconSource && (iconPath.size() <= 2 || iconPathAsView.find_first_of(L'\u200D') <= 8))
             {
                 try
                 {