feat: support Jagged arrays

simplify the code for checking for multidimentional arrays and lift the restriction on jagged arrays
MirageNet · Sep 30, 2020 · 0267dbe · 0267dbe
1 parent 5e2d876
commit 0267dbe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Extensions.cs b/Assets/Mirror/Editor/Weaver/Extensions.cs
@@ -79,14 +79,9 @@ public static bool ImplementsInterface<TInterface>(this TypeDefinition td)
             return false;
         }
 
-        public static bool IsArrayType(this TypeReference tr)
+        public static bool IsMultidimensionalArray(this TypeReference tr)
         {
-            // jagged array
-            if ((tr.IsArray && ((ArrayType)tr).ElementType.IsArray) ||
-                // multidimensional array
-                (tr.IsArray && ((ArrayType)tr).Rank > 1))
-                return false;
-            return true;
+            return tr is ArrayType arrayType && arrayType.Rank > 1;
         }
 
         public static bool CanBeResolved(this TypeReference parent)

diff --git a/Assets/Mirror/Editor/Weaver/Readers.cs b/Assets/Mirror/Editor/Weaver/Readers.cs
@@ -105,9 +105,9 @@ static void RegisterReadFunc(TypeReference typeReference, MethodDefinition newRe
 
         static MethodDefinition GenerateArrayReadFunc(TypeReference variable)
         {
-            if (!variable.IsArrayType())
+            if (variable.IsMultidimensionalArray())
             {
-                Weaver.Error($"{variable.Name} is an unsupported type. Jagged and multidimensional arrays are not supported", variable);
+                Weaver.Error($"{variable.Name} is an unsupported type. Multidimensional arrays are not supported", variable);
                 return null;
             }
 

diff --git a/Assets/Mirror/Editor/Weaver/Writers.cs b/Assets/Mirror/Editor/Weaver/Writers.cs
@@ -230,9 +230,9 @@ static bool WriteAllFields(TypeReference variable, ILProcessor worker)
 
         static MethodDefinition GenerateArrayWriteFunc(TypeReference variable)
         {
-            if (!variable.IsArrayType())
+            if (variable.IsMultidimensionalArray())
             {
-                throw new GenerateWriterException($"{variable.Name} is an unsupported type. Jagged and multidimensional arrays are not supported", variable);
+                throw new GenerateWriterException($"{variable.Name} is an unsupported type. Multidimensional arrays are not supported", variable);
             }
             MethodDefinition writerFunc = GenerateWriterFunc(variable);
 

diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverGeneratedReaderWriterTests.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverGeneratedReaderWriterTests.cs
@@ -184,14 +184,13 @@ public void CreatesForStructArraySegment()
         [Test]
         public void GivesErrorForJaggedArray()
         {
-            HasError("Int32[][] is an unsupported type. Jagged and multidimensional arrays are not supported",
-                "System.Int32[][]");
+            IsSuccess();
         }
 
         [Test]
         public void GivesErrorForMultidimensionalArray()
         {
-            HasError("Int32[0...,0...] is an unsupported type. Jagged and multidimensional arrays are not supported",
+            HasError("Int32[0...,0...] is an unsupported type. Multidimensional arrays are not supported",
                 "System.Int32[0...,0...]");
         }