Merge 1748f6c into 7ca827a

src/ExtendedXmlSerializer/ContentModel/Format/FormattedContent.cs

@@ -1,18 +1,14 @@
-using System;
 using ExtendedXmlSerializer.Core.Sources;
+using System;
 
 namespace ExtendedXmlSerializer.ContentModel.Format
 {
 	sealed class FormattedContent<T> : IFormattedContent<T>
 	{
 		readonly Func<IFormatWriter, IFormatter<T>> _source;
 
-		public FormattedContent(Func<IFormatWriter, IFormatter<T>> source)
-		{
-			_source = source;
-		}
+		public FormattedContent(Func<IFormatWriter, IFormatter<T>> source) => _source = source;
 
-		public string Get(IFormatWriter writer, T instance) => _source(writer)
-			.Get(instance);
+		public string Get(IFormatWriter writer, T instance) => _source(writer).Get(instance);
 	}
 }

src/ExtendedXmlSerializer/ExtensionModel/Xml/XmlWriter.cs

@@ -11,6 +11,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
+
 // ReSharper disable TooManyDependencies
 
 namespace ExtendedXmlSerializer.ExtensionModel.Xml
@@ -55,6 +56,13 @@ public void Start(IIdentity identity)
 			var identifier = identity.Identifier.NullIfEmpty();
 			if (identifier != null)
 			{
+				switch (Count)
+				{
+					case 0:
+						Add(string.Empty, identifier);
+						break;
+				}
+
 				_writer.WriteStartElement(identity.Name, identifier);
 			}
 			else
@@ -115,16 +123,9 @@ public void Dispose()
 		string Prefix(string parameter) => Lookup(parameter) ?? CreatePrefix(parameter);
 
 		string Lookup(string parameter)
-		{
-			var lookup = _prefixes.Get(parameter);
-			if (parameter != null && lookup == string.Empty && !ContainsKey(string.Empty))
-			{
-				Add(string.Empty, parameter);
-			}
-
-			var result = parameter == this.Get(string.Empty) || parameter == null ? string.Empty : lookup;
-			return result;
-		}
+			=> parameter != null
+				   ? parameter == this.Get(string.Empty) ? string.Empty : _prefixes.Get(parameter)
+				   : string.Empty;
 
 		string CreatePrefix(string identifier)
 		{
@@ -140,7 +141,7 @@ string CreatePrefix(string identifier)
 
 		string Create(string parameter)
 		{
-			var result = _formatter.Get(Count + 1);
+			var result = _formatter.Get(Count);
 			Add(result, parameter);
 			return result;
 		}

test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue528Tests.cs

@@ -0,0 +1,43 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
+using FluentAssertions;
+using System.Collections.Generic;
+using Xunit;
+
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue528Tests
+	{
+		[Fact]
+		public void Verify()
+		{
+			var instance = new ClassWithDictionary();
+			instance.Dict.Add("key",123);
+
+			var configuration = new ConfigurationContainer();
+			var serializer    = configuration.Create().ForTesting();
+			serializer.Cycle(instance).Should().BeEquivalentTo(instance);
+		}
+
+		public class ClassWithDictionary
+		{
+			public ClassWithDictionary()
+			{
+				Dict = new Dictionary<string, object>();
+
+				ListWithItems = new List<ClassWithProperty>();
+				ListWithItems.Add(new ClassWithProperty());
+			}
+
+			public Dictionary<string,object> Dict { get; set; }
+
+			public IList<ClassWithProperty> ListWithItems { get; set; }
+		}
+
+		public class ClassWithProperty
+		{
+			public string Text { get; set; }
+		}
+
+	}
+}