From 7b60eeacf7dc5a74c875109f1cec846d49d1f616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Yasir=20KULA?= Date: Wed, 17 Mar 2021 16:13:24 +0300 Subject: [PATCH] If an exception occurs while searching for references via reflection, the problematic object will be skipped and a warning will be logged to the console instead of interrupting the whole search --- .../Editor/AssetUsageDetector.cs | 86 +++++++++++-------- .../AssetUsageDetectorSearchFunctions.cs | 12 ++- package.json | 2 +- 3 files changed, 60 insertions(+), 40 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 15028d7..e551dc6 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -547,45 +547,10 @@ namespace AssetUsageDetectorNamespace } catch( Exception e ) { - StringBuilder sb = new StringBuilder( objectsToSearchSet.Count * 50 + callStack.Count * 50 + 500 ); + StringBuilder sb = new StringBuilder( objectsToSearchSet.Count * 50 + callStack.Count * 50 + 1000 ); sb.AppendLine( "AssetUsageDetector Error:" ).AppendLine().Append( e ).AppendLine(); - Object latestUnityObjectInCallStack = null; - if( callStack.Count > 0 ) - { - sb.AppendLine( "Stack contents: " ); - - for( int i = callStack.Count - 1; i >= 0; i-- ) - { - latestUnityObjectInCallStack = callStack[i] as Object; - if( latestUnityObjectInCallStack ) - { - if( !AssetDatabase.Contains( latestUnityObjectInCallStack ) ) - { - string scenePath = AssetDatabase.GetAssetOrScenePath( latestUnityObjectInCallStack ); - if( !string.IsNullOrEmpty( scenePath ) && SceneManager.GetSceneByPath( scenePath ).IsValid() ) - sb.Append( "Scene: " ).AppendLine( scenePath ); - } - - break; - } - } - - for( int i = callStack.Count - 1; i >= 0; i-- ) - { - sb.Append( i ).Append( ": " ); - - Object unityObject = callStack[i] as Object; - if( unityObject ) - sb.Append( unityObject.name ).Append( " (" ).Append( unityObject.GetType() ).AppendLine( ")" ); - else if( callStack[i] != null ) - sb.Append( callStack[i].GetType() ).AppendLine( " object" ); - else - sb.AppendLine( "<>" ); - } - - sb.AppendLine(); - } + Object latestUnityObjectInCallStack = AppendCallStackToStringBuilder( sb ); sb.AppendLine( "Searching references of: " ); foreach( Object obj in objectsToSearchSet ) @@ -635,7 +600,9 @@ namespace AssetUsageDetectorNamespace if( shouldOpenPrefabStageWithoutContext ) #endif - AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); + { + AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); + } } #endif } @@ -1106,5 +1073,48 @@ namespace AssetUsageDetectorNamespace Object.DestroyImmediate( temp ); } } + + // Appends contents of callStack to StringBuilder and returns the most recent Unity object in callStack + private Object AppendCallStackToStringBuilder( StringBuilder sb ) + { + Object latestUnityObjectInCallStack = null; + if( callStack.Count > 0 ) + { + sb.AppendLine().AppendLine( "Stack contents: " ); + + for( int i = callStack.Count - 1; i >= 0; i-- ) + { + latestUnityObjectInCallStack = callStack[i] as Object; + if( latestUnityObjectInCallStack ) + { + if( !AssetDatabase.Contains( latestUnityObjectInCallStack ) ) + { + string scenePath = AssetDatabase.GetAssetOrScenePath( latestUnityObjectInCallStack ); + if( !string.IsNullOrEmpty( scenePath ) && SceneManager.GetSceneByPath( scenePath ).IsValid() ) + sb.Append( "Scene: " ).AppendLine( scenePath ); + } + + break; + } + } + + for( int i = callStack.Count - 1; i >= 0; i-- ) + { + sb.Append( i ).Append( ": " ); + + Object unityObject = callStack[i] as Object; + if( unityObject ) + sb.Append( unityObject.name ).Append( " (" ).Append( unityObject.GetType() ).AppendLine( ")" ); + else if( callStack[i] != null ) + sb.Append( callStack[i].GetType() ).AppendLine( " object" ); + else + sb.AppendLine( "<>" ); + } + + sb.AppendLine(); + } + + return latestUnityObjectInCallStack; + } } } \ No newline at end of file diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 6e79c9e..69a68a0 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections; using System.IO; using System.Reflection; +using System.Text; using UnityEditor; using UnityEditor.Animations; using UnityEngine; @@ -1101,7 +1102,7 @@ namespace AssetUsageDetectorNamespace try { object variableValue = variables[i].Get( referenceNode.nodeObject ); - if( variableValue == null ) + if( variableValue == null || variableValue.Equals( null ) ) continue; // Values stored inside ICollection objects are searched using IEnumerable, @@ -1132,6 +1133,15 @@ namespace AssetUsageDetectorNamespace catch( MissingReferenceException ) { } catch( MissingComponentException ) { } catch( NotImplementedException ) { } + catch( Exception e ) + { + // Unknown exceptions usually occur when variableValue is an IEnumerable and its enumerator throws an unhandled exception in MoveNext or Current + StringBuilder sb = new StringBuilder( callStack.Count * 50 + 1000 ); + sb.Append( "Skipped searching " ).Append( referenceNode.nodeObject.GetType().FullName ).Append( "." ).Append( variables[i].name ).AppendLine( " because it threw exception:" ).Append( e ).AppendLine(); + + Object latestUnityObjectInCallStack = AppendCallStackToStringBuilder( sb ); + Debug.LogWarning( sb.ToString(), latestUnityObjectInCallStack ); + } } } diff --git a/package.json b/package.json index 93eeddc..6889638 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "1.9.1", + "version": "1.9.2", "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector", "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases", "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",