Fix an issue where the specified array dim (e.g. local string a, b[6];) of a local variable could go missing if it is merged with another local variable of the same type.

(cherry picked from commit 69b9b68f9f51b87b8a13ea215484b523b5cb5e01)

# Conflicts:
#	src/Core/Classes/Props/UPropertyDecompiler.cs

Author: EliotVU

src/Core/Classes/Props/UPropertyDecompiler.cs

@@ -18,11 +18,24 @@ public virtual string PreDecompile()
 
         public override string Decompile()
         {
-            return FormatFlags() + GetFriendlyType()
-                                 + " " + Name
-                                 + FormatSize()
-                                 + DecompileEditorData()
-                                 + DecompileMeta();
+            // Decompile without the declaring keyword, as the caller will handle that.
+            return FormatDeclaration();
+        }
+
+        private string FormatDeclaration()
+        {
+            return FormatFlags()
+                + GetFriendlyType()
+                + " "
+                + FormatVariable();
+        }
+
+        internal string FormatVariable()
+        {
+            return Name
+                + FormatSize()
+                + DecompileEditorData()
+                + DecompileMeta();
         }
 
         // Post semicolon ";".

src/Core/Classes/UStructDecompiler.cs

@@ -317,7 +317,7 @@ protected string FormatLocals()
                 // If previous is the same as the one now then format the params as one line until another type is reached
                 if (curType == lastType)
                 {
-                    output += locals[i].Name +
+                    output += locals[i].FormatVariable() +
                               (
                                   curType == nextType
                                       ? ((numParms >= 5 && numParms % 5 == 0)