Fixed icsharpcode#365.

stark-lang · Jun 29, 2014 · db1d106 · db1d106
1 parent c1fb133
commit db1d106
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ILSpy.BamlDecompiler/CecilTypeResolver.cs b/ILSpy.BamlDecompiler/CecilTypeResolver.cs
@@ -39,12 +39,13 @@ string MakeShort(string name)
 
 		public IType GetTypeByAssemblyQualifiedName(string name)
 		{
-			int comma = name.IndexOf(',');
+			int bracket = name.LastIndexOf(']');
+			int comma = bracket > -1 ? name.IndexOf(',', bracket) : name.IndexOf(',');
 
 			if (comma == -1)
 				throw new ArgumentException("invalid name");
-			
-			string fullName = name.Substring(0, comma);
+
+			string fullName = bracket > -1 ? name.Substring(0, name.IndexOf('[')) : name.Substring(0, comma);
 			string assemblyName = name.Substring(comma + 1).Trim();
 
 			var type = thisAssembly.MainModule.GetType(fullName);

diff --git a/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/TypeDeclaration.cs b/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/TypeDeclaration.cs
@@ -131,7 +131,8 @@ public ResolverTypeDeclaration(ITypeResolver resolver, string assemblyQualifiedN
 
 		void ParseName(string assemblyQualifiedName, out string name, out string @namespace, out string assembly)
 		{
-			int commaSeparator = assemblyQualifiedName.IndexOf(", ");
+			int bracket = assemblyQualifiedName.LastIndexOf(']');
+			int commaSeparator = bracket > -1 ? assemblyQualifiedName.IndexOf(", ", bracket) : assemblyQualifiedName.IndexOf(", ");
 			assembly = "";
 			if (commaSeparator >= 0) {
 				assembly = assemblyQualifiedName.Substring(commaSeparator + 2);

diff --git a/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs b/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs
@@ -1316,7 +1316,7 @@ void ReadContentProperty()
 		{
 			reader.ReadInt16();
 
-			// Non serve aprire niente, è il default
+			// Non serve aprire niente, ?il default
 		}
 
 		static void ReadConstructorParametersStart()
@@ -1588,7 +1588,8 @@ void ReadTypeInfo()
 			string fullName = reader.ReadString();
 			assemblyId = (short)(assemblyId & 0xfff);
 			TypeDeclaration declaration;
-			int length = fullName.LastIndexOf('.');
+			int bracket = fullName.IndexOf('[');
+			int length = bracket > -1 ? fullName.LastIndexOf('.', bracket) : fullName.LastIndexOf('.');
 			if (length != -1)
 			{
 				string name = fullName.Substring(length + 1);