Fixes issue for which folder shortcuts open in explorer (#3276)

Author: gave92

Files/Interacts/Interaction.cs

@@ -448,11 +448,7 @@ public async Task<bool> OpenPath(string path, FilesystemItemType? itemType = nul
 
             if (itemType == null || isShortcutItem || isHiddenItem)
             {
-                if (isHiddenItem)
-                {
-                    itemType = NativeFileOperationsHelper.HasFileAttribute(path, System.IO.FileAttributes.Directory) ? FilesystemItemType.Directory : FilesystemItemType.File;
-                }
-                else if (isShortcutItem)
+                if (isShortcutItem)
                 {
                     AppServiceResponse response = await Connection.SendMessageAsync(new ValueSet()
                     {
@@ -469,13 +465,17 @@ public async Task<bool> OpenPath(string path, FilesystemItemType? itemType = nul
                         shortcutRunAsAdmin = response.Message.Get("RunAsAdmin", false);
                         shortcutIsFolder = response.Message.Get("IsFolder", false);
 
-                        itemType = FilesystemItemType.File; // Set to file here, because the logic is the same in both scenarios
+                        itemType = shortcutIsFolder ? FilesystemItemType.Directory : FilesystemItemType.File;
                     }
                     else
                     {
                         return false;
                     }
                 }
+                else if (isHiddenItem)
+                {
+                    itemType = NativeFileOperationsHelper.HasFileAttribute(path, System.IO.FileAttributes.Directory) ? FilesystemItemType.Directory : FilesystemItemType.File;
+                }
                 else
                 {
                     itemType = await StorageItemHelpers.GetTypeFromPath(path, AssociatedInstance);
@@ -486,7 +486,26 @@ public async Task<bool> OpenPath(string path, FilesystemItemType? itemType = nul
 
             if (itemType == FilesystemItemType.Directory) // OpenDirectory
             {
-                if (isHiddenItem)
+                if (isShortcutItem)
+                {
+                    if (string.IsNullOrEmpty(shortcutTargetPath))
+                    {
+                        await InvokeWin32ComponentAsync(path);
+                        return true;
+                    }
+                    else
+                    {
+                        AssociatedInstance.NavigationToolbar.PathControlDisplayText = shortcutTargetPath;
+                        AssociatedInstance.ContentFrame.Navigate(AssociatedInstance.InstanceViewModel.FolderSettings.GetLayoutType(shortcutTargetPath), new NavigationArguments()
+                        {
+                            NavPathParam = shortcutTargetPath,
+                            AssociatedTabInstance = AssociatedInstance
+                        }, new SuppressNavigationTransitionInfo());
+
+                        return true;
+                    }
+                }
+                else if (isHiddenItem)
                 {
                     AssociatedInstance.NavigationToolbar.PathControlDisplayText = path;
                     AssociatedInstance.ContentFrame.Navigate(AssociatedInstance.InstanceViewModel.FolderSettings.GetLayoutType(path), new NavigationArguments()
@@ -522,11 +541,7 @@ public async Task<bool> OpenPath(string path, FilesystemItemType? itemType = nul
             }
             else if (itemType == FilesystemItemType.File) // OpenFile
             {
-                if (isHiddenItem)
-                {
-                    await InvokeWin32ComponentAsync(path);
-                }
-                else if (isShortcutItem)
+                if (isShortcutItem)
                 {
                     if (string.IsNullOrEmpty(shortcutTargetPath))
                     {
@@ -547,6 +562,10 @@ public async Task<bool> OpenPath(string path, FilesystemItemType? itemType = nul
                     }
                     opened = (FilesystemResult)true;
                 }
+                else if (isHiddenItem)
+                {
+                    await InvokeWin32ComponentAsync(path);
+                }
                 else
                 {
                     opened = await AssociatedInstance.FilesystemViewModel.GetFileWithPathFromPathAsync(path)