Fix issues with storing arrays of UdonSharpBehaviour and accessing elements

- Fix storing arrays of UdonSharpBehaviour
- Fix accessing elements on UdonSharpBehaviour arrays not propagating the user type correctly in some cases
- Partially fix the component type restrictions on drawing arrays of UdonSharpBehaviours. This still needs more work to restrict to the correct type of UdonSharpBehaviour.

Author: MerlinVR

Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs

@@ -866,6 +866,15 @@ public System.Type GetReturnType(bool getUserType = false)
                 if (!accessSymbol.symbolCsType.IsArray)
                     throw new System.Exception("Type is not an array type");
 
+                if (getUserType)
+                    return accessSymbol.userCsType.GetElementType();
+
+                if (accessSymbol.IsUserDefinedBehaviour() && accessSymbol.userCsType.IsArray)
+                {
+                    // Special case for arrays since the symbolCsType needs to return a Component[], but we need to get the element type of the UdonBehaviour[]
+                    return typeof(VRC.Udon.UdonBehaviour);
+                }
+
                 return accessSymbol.symbolCsType.GetElementType();
             }
             else
@@ -930,7 +939,7 @@ public bool ResolveAccessToken(string accessToken)
                                 HandleExternUserMethodLookup(accessToken) ||
                                 HandleMemberPropertyAccess(accessToken) ||
                                 HandleMemberFieldAccess(accessToken) ||
-                                HandleMemberMethodLookup(accessToken);
+                                HandleMemberMethodLookup(accessToken); 
             }
 
 

Assets/UdonSharp/Editor/UdonSharpProgramAsset.cs

@@ -267,7 +267,7 @@ private object DrawUnityObjectField(string fieldName, string symbol, (object val
             objectRect = EditorGUI.PrefixLabel(objectRect, new GUIContent(fieldName));
 
             currentUserScript = fieldDefinition.userBehaviourSource;
-
+            
             UnityEngine.Object objectFieldValue = (UnityEngine.Object)doObjectFieldMethod.Invoke(null, new object[] {
                 objectRect,
                 objectRect,
@@ -345,6 +345,11 @@ private object DrawFieldForType(string fieldName, string symbol, (object value,
 
                         Type elementType = declaredType.GetElementType();
 
+                        if (fieldDefinition != null && (fieldDefinition.fieldSymbol.IsUserDefinedBehaviour() || fieldDefinition.fieldSymbol.userCsType == typeof(UdonBehaviour[])))
+                        {
+                            elementType = typeof(UdonBehaviour);
+                        }
+
                         for (int i = 0; i < valueArray.Length; ++i)
                         {
                             var elementData = (valueArray.GetValue(i), elementType);

Assets/UdonSharp/Editor/UdonSharpResolverContext.cs

@@ -372,12 +372,20 @@ public string GetUdonMethodName(MethodBase externMethod, bool validate = true, L
 
             methodSourceType = RemapBaseType(methodSourceType);
 
+            bool isUdonSharpBehaviour = false;
+
+            if (methodSourceType == typeof(UdonSharpBehaviour) || methodSourceType.IsSubclassOf(typeof(UdonSharpBehaviour)))
+            {
+                methodSourceType = typeof(VRC.Udon.UdonBehaviour);
+                isUdonSharpBehaviour = true;
+            }
+
             string functionNamespace = SanitizeTypeName(methodSourceType.FullName).Replace("VRCUdonUdonBehaviour", "VRCUdonCommonInterfacesIUdonEventReceiver");
 
             string methodName = $"__{externMethod.Name.Trim('_').TrimStart('.')}";
             ParameterInfo[] methodParams = externMethod.GetParameters();
 
-            if ((functionNamespace == "UdonSharpUdonSharpBehaviour")
+            if (isUdonSharpBehaviour
                 && methodName == "__VRCInstantiate")
             {
                 functionNamespace = "VRCInstantiate";

Assets/UdonSharp/Editor/UdonSharpSymbolTable.cs

@@ -375,7 +375,7 @@ private SymbolDefinition CreateNamedSymbolInternal(string symbolName, System.Typ
             }
 
             System.Type typeForName = resolvedSymbolType;
-            if (resolvedSymbolType.IsSubclassOf(typeof(UdonSharpBehaviour)))
+            if (resolvedSymbolType == typeof(UdonSharpBehaviour) || resolvedSymbolType.IsSubclassOf(typeof(UdonSharpBehaviour)))
                 typeForName = typeof(VRC.Udon.UdonBehaviour);
             else if (resolvedSymbolType.IsArray && (resolvedSymbolType.GetElementType() == typeof(UdonSharpBehaviour) || resolvedSymbolType.GetElementType().IsSubclassOf(typeof(UdonSharpBehaviour))))
                 typeForName = typeof(Component[]); // Hack because VRC doesn't expose UdonBehaviour array type