Fix potential packagecache directory issues

Author: wallstop

Editor/DataVisualizer/DataVisualizer.cs

@@ -1037,55 +1037,73 @@ private static void TryLoadStyleSheet(VisualElement root)
                 );
 
                 const string packageCache = "PackageCache";
-                int packageCacheIndex = unityRelativeStyleSheetPath.IndexOf(
-                    packageCache,
-                    StringComparison.OrdinalIgnoreCase
-                );
-                if (0 <= packageCacheIndex)
-                {
-                    unityRelativeStyleSheetPath = unityRelativeStyleSheetPath[
-                        (packageCacheIndex + packageCache.Length)..
-                    ];
-                    unityRelativeStyleSheetPath = "Packages" + unityRelativeStyleSheetPath;
-                }
+                int packageCacheIndex;
                 if (!string.IsNullOrWhiteSpace(unityRelativeStyleSheetPath))
                 {
                     styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
                         unityRelativeStyleSheetPath
                     );
-                    if (styleSheet == null)
+                }
+
+                if (styleSheet == null)
+                {
+                    packageCacheIndex = unityRelativeStyleSheetPath.IndexOf(
+                        packageCache,
+                        StringComparison.OrdinalIgnoreCase
+                    );
+                    if (0 <= packageCacheIndex)
+                    {
+                        unityRelativeStyleSheetPath = unityRelativeStyleSheetPath[
+                            (packageCacheIndex + packageCache.Length)..
+                        ];
+                        unityRelativeStyleSheetPath = "Packages" + unityRelativeStyleSheetPath;
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(unityRelativeStyleSheetPath))
+                    {
+                        styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                            unityRelativeStyleSheetPath
+                        );
+                        if (styleSheet == null)
+                        {
+                            Debug.LogError(
+                                $"Failed to load Data Visualizer style sheet (package root: '{packageRoot}'), relative path '{unityRelativeStyleSheetPath}'."
+                            );
+                        }
+                    }
+                    else
                     {
                         Debug.LogError(
-                            $"Failed to load Data Visualizer style sheet (package root: '{packageRoot}'), relative path '{unityRelativeStyleSheetPath}'."
+                            $"Failed to convert absolute path '{styleSheetPath}' to Unity relative path."
                         );
                     }
                 }
-                else
-                {
-                    Debug.LogError(
-                        $"Failed to convert absolute path '{styleSheetPath}' to Unity relative path."
-                    );
-                }
 
                 string fontPath =
                     $"{packageRoot}{pathSeparator}Editor{pathSeparator}Fonts{pathSeparator}IBMPlexMono-Regular.ttf";
                 string unityRelativeFontPath = DirectoryHelper.AbsoluteToUnityRelativePath(
                     fontPath
                 );
-                packageCacheIndex = unityRelativeFontPath.IndexOf(
-                    packageCache,
-                    StringComparison.OrdinalIgnoreCase
-                );
-                if (0 <= packageCacheIndex)
-                {
-                    unityRelativeFontPath = unityRelativeFontPath[
-                        (packageCacheIndex + packageCache.Length)..
-                    ];
-                    unityRelativeFontPath = "Packages" + unityRelativeFontPath;
-                }
-                if (!string.IsNullOrWhiteSpace(unityRelativeFontPath))
+
+                font = AssetDatabase.LoadAssetAtPath<Font>(unityRelativeFontPath);
+                if (font == null)
                 {
-                    font = AssetDatabase.LoadAssetAtPath<Font>(unityRelativeFontPath);
+                    packageCacheIndex = unityRelativeFontPath.IndexOf(
+                        packageCache,
+                        StringComparison.OrdinalIgnoreCase
+                    );
+                    if (0 <= packageCacheIndex)
+                    {
+                        unityRelativeFontPath = unityRelativeFontPath[
+                            (packageCacheIndex + packageCache.Length)..
+                        ];
+                        unityRelativeFontPath = "Packages" + unityRelativeFontPath;
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(unityRelativeFontPath))
+                    {
+                        font = AssetDatabase.LoadAssetAtPath<Font>(unityRelativeFontPath);
+                    }
                 }
             }
             else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.data-visualizer",
-  "version": "0.0.35-rc03.2",
+  "version": "0.0.35-rc03.3",
   "displayName": "Data Visualizer",
   "description": "Data Management UI for Unity's Scriptable Objects",
   "dependencies": {},
@@ -40,3 +40,4 @@
 
 
 
+