Shaders are searched for #include_with_pragmas references in addition to #include references

Author: yasirkula

Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs

@@ -1121,7 +1121,7 @@ private ReferenceNode SearchShaderGraph( Object unityObject )
 			{
 				// New Shader Graph serialization format is used: https://github.com/Unity-Technologies/Graphics/pull/222
 				// Iterate over all these occurrences:   "guid\": \"GUID_VALUE\" (\" is used instead of " because it is a nested JSON)
-				IterateOverValuesInString( graphJson, "\"guid\\\"", '"', ( guid ) =>
+				IterateOverValuesInString( graphJson, new string[] { "\"guid\\\"" }, '"', ( guid ) =>
 				{
 					if( guid.Length > 1 )
 					{
@@ -1141,7 +1141,7 @@ private ReferenceNode SearchShaderGraph( Object unityObject )
 				if( shaderIncludesToSearchSet.Count > 0 )
 				{
 					// Iterate over all these occurrences:   "m_FunctionSource": "GUID_VALUE" (this one is not nested JSON)
-					IterateOverValuesInString( graphJson, "\"m_FunctionSource\"", '"', ( guid ) =>
+					IterateOverValuesInString( graphJson, new string[] { "\"m_FunctionSource\"" }, '"', ( guid ) =>
 					{
 						string referencePath = AssetDatabase.GUIDToAssetPath( guid );
 						if( !string.IsNullOrEmpty( referencePath ) && assetsToSearchPathsSet.Contains( referencePath ) )
@@ -1324,8 +1324,8 @@ private void SearchShaderSourceCodeForCGIncludes( ReferenceNode referenceNode )
 		{
 			string shaderPath = AssetDatabase.GetAssetPath( (Object) referenceNode.nodeObject );
 
-			// Iterate over all these occurrences:   #include: "INCLUDE_REFERENCE"
-			IterateOverValuesInString( File.ReadAllText( shaderPath ), "#include ", '"', ( include ) =>
+			// Iterate over all these occurrences:    #include "INCLUDE_REFERENCE"   or   #include_with_pragmas "INCLUDE_REFERENCE"
+			IterateOverValuesInString( File.ReadAllText( shaderPath ), new string[] { "#include ", "#include_with_pragmas " }, '"', ( include ) =>
 			{
 				bool isIncludePotentialReference = shaderIncludesToSearchSet.Contains( include );
 				if( !isIncludePotentialReference )
@@ -1744,26 +1744,30 @@ private object GetFieldValue( object source, string fieldName, int arrayIndex )
 		// Iterates over all occurrences of specific key-value pairs in string
 		// Example1: #include "VALUE"  valuePrefix=#include, valueWrapperChar="
 		// Example2: "guid": "VALUE"  valuePrefix="guid", valueWrapperChar="
-		private void IterateOverValuesInString( string str, string valuePrefix, char valueWrapperChar, Action<string> valueAction )
+		private void IterateOverValuesInString( string str, string[] valuePrefixes, char valueWrapperChar, Action<string> valueAction )
 		{
-			int valueStartIndex, valueEndIndex = 0;
-			while( true )
+			for( int i = 0; i < valuePrefixes.Length; i++ )
 			{
-				valueStartIndex = str.IndexOf( valuePrefix, valueEndIndex );
-				if( valueStartIndex < 0 )
-					return;
+				string valuePrefix = valuePrefixes[i];
+				int valueStartIndex, valueEndIndex = 0;
+				while( true )
+				{
+					valueStartIndex = str.IndexOf( valuePrefix, valueEndIndex );
+					if( valueStartIndex < 0 )
+						break;
 
-				valueStartIndex = str.IndexOf( valueWrapperChar, valueStartIndex + valuePrefix.Length );
-				if( valueStartIndex < 0 )
-					return;
+					valueStartIndex = str.IndexOf( valueWrapperChar, valueStartIndex + valuePrefix.Length );
+					if( valueStartIndex < 0 )
+						break;
 
-				valueStartIndex++;
-				valueEndIndex = str.IndexOf( valueWrapperChar, valueStartIndex );
-				if( valueEndIndex < 0 )
-					return;
+					valueStartIndex++;
+					valueEndIndex = str.IndexOf( valueWrapperChar, valueStartIndex );
+					if( valueEndIndex < 0 )
+						break;
 
-				if( valueEndIndex > valueStartIndex )
-					valueAction( str.Substring( valueStartIndex, valueEndIndex - valueStartIndex ) );
+					if( valueEndIndex > valueStartIndex )
+						valueAction( str.Substring( valueStartIndex, valueEndIndex - valueStartIndex ) );
+				}
 			}
 		}
 

Plugins/AssetUsageDetector/README.txt

@@ -1,4 +1,4 @@
-= Asset Usage Detector =
+= Asset Usage Detector (v2.2.3) =
 
 Online documentation available at: https://github.com/yasirkula/UnityAssetUsageDetector
 E-mail: yasirkula@gmail.com

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.assetusagedetector",
   "displayName": "Asset Usage Detector",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
   "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",