implement detection of implicit elements and static resources

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/BamlBinaryReader.cs

@@ -17,22 +17,15 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 
 		public virtual double ReadCompressedDouble()
 		{
-			switch (this.ReadByte())
-			{
+			switch (this.ReadByte()) {
 				case 1:
 					return 0;
-
 				case 2:
 					return 1;
-
 				case 3:
 					return -1;
-
 				case 4:
-					{
-						double num = this.ReadInt32();
-						return (num * 1E-06);
-					}
+					return ReadInt32() * 1E-06;
 				case 5:
 					return this.ReadDouble();
 			}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlElement.cs

@@ -9,19 +9,16 @@ using System.Xml;
 
 namespace Ricciolo.StylesExplorer.MarkupReflection
 {
-	internal class XmlBamlElement : XmlBamlNode
+	class XmlBamlElement : XmlBamlNode
 	{
-		private ArrayList _arguments = new ArrayList();
-		private XmlNamespaceCollection _namespaces = new XmlNamespaceCollection();
-		private TypeDeclaration _typeDeclaration;
-		private KeysResourcesCollection _keysResources = new KeysResourcesCollection();
-		private long _position;
+		ArrayList _arguments = new ArrayList();
+		XmlNamespaceCollection _namespaces = new XmlNamespaceCollection();
+		KeysResourcesCollection _keysResources = new KeysResourcesCollection();
 
 		public XmlBamlElement()
 		{
 		}
 
-
 		public XmlBamlElement(XmlBamlElement parent)
 		{
 			this.Namespaces.AddRange(parent.Namespaces);
@@ -32,31 +29,15 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			get { return _namespaces; }
 		}
 
-		public TypeDeclaration TypeDeclaration
-		{
-			get
-			{
-				return this._typeDeclaration;
-			}
-			set
-			{
-				this._typeDeclaration = value;
-			}
-		}
+		public TypeDeclaration TypeDeclaration { get; set; }
 
-		public override XmlNodeType NodeType
-		{
-			get
-			{
-				return XmlNodeType.Element;
-			}
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Element; }
 		}
 
-		public long Position
-		{
-			get { return _position; }
-			set { _position = value; }
-		}
+		public long Position { get; set; }
+		
+		public bool IsImplicit { get; set; }
 
 		public override string ToString()
 		{

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs

@@ -26,6 +26,7 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 		Dictionary<short, string> stringTable = new Dictionary<short, string>();
 		Dictionary<short, TypeDeclaration> typeTable = new Dictionary<short, TypeDeclaration>();
 		Dictionary<short, PropertyDeclaration> propertyTable = new Dictionary<short, PropertyDeclaration>();
+		List<TypeDeclaration> staticResources = new List<TypeDeclaration>();
 
 		readonly ITypeResolver _resolver;
 
@@ -48,6 +49,8 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 
 		bool isPartialDefKeysClosed = true;
 		bool isDefKeysClosed = true;
+		
+		int currentKey;
 
 		int bytesToSkip;
 
@@ -950,8 +953,10 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 		{
 			// Guardo se la dichiarazione delle chiavi risulta chiusa
 			// Se è aperta c'è un sotto ResourceDictionary oppure è il root ResourceDictionary
-			if (isDefKeysClosed)
+			if (isDefKeysClosed) {
+				currentKey = 0;
 				keysResources.Push(new KeysResourcesCollection());
+			}
 
 			// Guardo se è stata chiusa la dichiarazione parziale (mediante dichiarazione OptimizedStaticResource)
 			// Si chiude il ciclo di chiavi
@@ -1061,30 +1066,30 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			CloseElement();
 
 			complexPropertyOpened--;
-			// Valuto se contiene tutte extension
-			int start = nodes.IndexOf(propertyElement) + 1;
-			IEnumerator enumerator = nodes.GetEnumerator();
-
-			int c = 0;
-			while (c < start && enumerator.MoveNext())
-				c++;
-
-			if (IsExtension(enumerator))
-			{
-				start--;
-				nodes.RemoveAt(start);
-				nodes.RemoveLast();
-
-				StringBuilder sb = new StringBuilder();
-				FormatElementExtension((XmlBamlElement) nodes[start], sb);
-
-				XmlBamlProperty property =
-					new XmlBamlProperty(PropertyType.Complex, propertyElement.PropertyDeclaration);
-				property.Value = sb.ToString();
-				nodes.Add(property);
-
-				return;
-			}
+//			// Valuto se contiene tutte extension
+//			int start = nodes.IndexOf(propertyElement) + 1;
+//			IEnumerator enumerator = nodes.GetEnumerator();
+//
+//			int c = 0;
+//			while (c < start && enumerator.MoveNext())
+//				c++;
+//
+//			if (IsExtension(enumerator))
+//			{
+//				start--;
+//				nodes.RemoveAt(start);
+//				nodes.RemoveLast();
+//
+//				StringBuilder sb = new StringBuilder();
+//				FormatElementExtension((XmlBamlElement) nodes[start], sb);
+//
+//				XmlBamlProperty property =
+//					new XmlBamlProperty(PropertyType.Complex, propertyElement.PropertyDeclaration);
+//				property.Value = sb.ToString();
+//				nodes.Add(property);
+//
+//				return;
+//			}
 		}
 
 		void FormatElementExtension(XmlBamlElement element, StringBuilder sb)
@@ -1145,24 +1150,22 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			}
 		}
 
-		static bool IsExtension(IEnumerator enumerator)
+		bool IsExtension(IEnumerator enumerator)
 		{
-			bool r = true;
-			while (enumerator.MoveNext() && r)
-			{
+			while (enumerator.MoveNext()) {
 				object node = enumerator.Current;
 				if (node is XmlBamlElement && !(node is XmlBamlEndElement) && !((XmlBamlElement)node).TypeDeclaration.IsExtension)
-				{
-					r = false;
-				}
+					return false;
 			}
 
-			return r;
+			return true;
 		}
 
 		void CloseElement()
 		{
-			nodes.Enqueue(new XmlBamlEndElement(elements.Pop()));
+			var e = elements.Pop();
+			if (!e.IsImplicit)
+				nodes.Enqueue(new XmlBamlEndElement(e));
 		}
 
 		void ReadElementStart()
@@ -1171,6 +1174,8 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			sbyte flags = reader.ReadSByte();
 			if (flags < 0 || flags > 3)
 				throw new NotImplementedException();
+			Debug.Print("ElementFlags: " + flags);
+			
 			TypeDeclaration declaration = GetTypeDeclaration(identifier);
 
 			XmlBamlElement element;
@@ -1195,10 +1200,11 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 				oldDeclaration = declaration;
 				declaration = GetKnownTypeDeclarationByName(declaration.Type.BaseType.AssemblyQualifiedName);
 			}
-
 			element.TypeDeclaration = declaration;
+			 element.IsImplicit = (flags & 2) == 2;
 			elements.Push(element);
-			nodes.Enqueue(element);
+			if (!element.IsImplicit)
+				nodes.Enqueue(element);
 			
 			if (oldDeclaration != null) {
 				nodes.Enqueue(new XmlBamlSimpleProperty(XWPFNamespace, "Class", string.Format("{0}.{1}", oldDeclaration.Namespace, oldDeclaration.Name)));
@@ -1207,15 +1213,15 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			if (parentElement != null && complexPropertyOpened == 0)
 			{
 				// Calcolo la posizione dell'elemento rispetto al padre
-				long position = element.Position - parentElement.Position;
 				KeysResource keysResource = (keysResources.Count > 0) ? keysResources.Peek().First : null;
-				if (keysResource != null && keysResource.Keys.HasKey(position))
+				if (keysResource != null && keysResource.Keys.HasKey(currentKey))
 				{
-					string key = keysResource.Keys[position];
+					string key = keysResource.Keys[currentKey];
 					// Rimuovo la chiave perché è stata usata
-					keysResource.Keys.Remove(position);
+//					keysResource.Keys.Remove(currentKey);
 
 					AddKeyToElement(key);
+					currentKey++;
 				}
 			}
 		}
@@ -1330,28 +1336,32 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			}
 		}
 
-		static void ReadStaticResourceStart()
+		void ReadStaticResourceStart()
 		{
-			//short identifier = reader.ReadInt16();
-			//byte n = reader.ReadByte();
-			//TypeDeclaration declaration = this.GetTypeDeclaration(identifier);
-			//this.staticResourceTable.Add(declaration);
-
-			throw new NotImplementedException("StaticResourceStart");
+			short identifier = reader.ReadInt16();
+			byte flags = reader.ReadByte();
+			TypeDeclaration declaration = GetTypeDeclaration(identifier);
+			staticResources.Add(declaration);
+			
+			XmlBamlElement element;
+			if (elements.Any())
+				element = new XmlBamlElement(elements.Peek());
+			else
+				element = new XmlBamlElement();
+			element.TypeDeclaration = declaration;
+			elements.Push(element);
+			nodes.Enqueue(element);
 		}
 
-		static void ReadStaticResourceEnd()
+		void ReadStaticResourceEnd()
 		{
-			throw new NotImplementedException("ReadStaticResourceEnd");
+			CloseElement();
 		}
 
-		static void ReadStaticResourceId()
+		void ReadStaticResourceId()
 		{
-			//short identifier = reader.ReadInt16();
-			//object staticResource = this.GetStaticResource(identifier);
-			//TypeDeclaration declaration = this.GetTypeDeclaration(-603);
-
-			throw new NotImplementedException("StaticResourceId");
+			short identifier = reader.ReadInt16();
+			object staticResource = GetStaticResource(identifier);
 		}
 
 		void ReadPresentationOptionsAttribute()
@@ -1490,7 +1500,7 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 			short staticIdentifier = reader.ReadInt16();
 
 			PropertyDeclaration pd = this.GetPropertyDeclaration(identifier);
-			object staticResource = this.GetStaticResource(staticIdentifier);
+			object staticResource = GetStaticResource(staticIdentifier);
 
 			string prefix = this.LookupPrefix(XmlPIMapping.PresentationNamespace, false);
 			string value = String.Format("{{{0}{1}StaticResource {2}}}", prefix, (String.IsNullOrEmpty(prefix)) ? String.Empty : ":", staticResource);
@@ -1518,9 +1528,12 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 							return resourceGroup.StaticResources[identifier];
 				}
 			}
+			
+			if (identifier < staticResources.Count)
+				return staticResources[identifier];
 
-			//return "???";
-			throw new ArgumentException("Cannot find StaticResource", "identifier");
+			return "???" + identifier  +"???";
+//			throw new ArgumentException("Cannot find StaticResource", "identifier");
 		}
 
 		void ReadTextWithConverter()

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlSimpleProperty.cs

@@ -30,5 +30,11 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 		public override XmlNodeType NodeType {
 			get { return XmlNodeType.Attribute; }
 		}
+		
+		public override string ToString()
+		{
+			return string.Format("{{{0}}}{1}=\"{2}\"", NamespaceName, LocalName, Value);
+		}
+
 	}
 }

ILSpy.BamlDecompiler/Tests/Cases/Resources.xaml

@@ -3,13 +3,13 @@
 		<Canvas>
 			<FrameworkElement.Resources>
 				<ResourceDictionary>
-					<BooleanToVisibilityConverter x:Key="b"/>
+					<BooleanToVisibilityConverter x:Key="b" />
 				</ResourceDictionary>
 			</FrameworkElement.Resources>
 		</Canvas>
 		<Canvas>
 			<FrameworkElement.Resources>
-				<BooleanToVisibilityConverter x:Key="b"/>
+				<BooleanToVisibilityConverter x:Key="b" />
 			</FrameworkElement.Resources>
 		</Canvas>
 	</Grid>

ILSpy.BamlDecompiler/Tests/TestRunner.cs

@@ -31,7 +31,7 @@ namespace ILSpy.BamlDecompiler.Tests
 			RunTest("cases/simpledictionary");
 		}
 		
-		[Test, Ignore]
+		[Test]
 		public void Resources()
 		{
 			RunTest("cases/resources");