Merge branch 'master' of github.com:aaubry/YamlDotNet into ec-1018-nullablefixes

Author: EdwardCooke

YamlDotNet.Test/Serialization/DeserializerTest.cs

@@ -258,6 +258,27 @@ public void UnquotedStringTypeDeserialization_RegularNumbers(object expected)
             Assert.Equal(expected, resultDict["Value"]);
         }
 
+        [Theory]
+        [InlineData(System.Byte.MinValue)]
+        [InlineData(System.Byte.MaxValue)]
+        [InlineData(System.Int16.MinValue)]
+        [InlineData(System.Int16.MaxValue)]
+        [InlineData(System.Int32.MinValue)]
+        [InlineData(System.Int32.MaxValue)]
+        [InlineData(System.Int64.MinValue)]
+        [InlineData(System.Int64.MaxValue)]
+        public void UnquotedStringTypeDeserialization_HexNumbers(object expected)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithAttemptingUnquotedStringTypeDeserialization().Build();
+
+            var yaml = $"Value: 0x{expected:X2}";
+
+            var resultDict = deserializer.Deserialize<IDictionary<string, object>>(yaml);
+            Assert.True(resultDict.ContainsKey("Value"));
+            Assert.Equal(expected, resultDict["Value"]);
+        }
+
         [Theory]
         [InlineData(".nan", System.Single.NaN)]
         [InlineData(".NaN", System.Single.NaN)]

YamlDotNet.Test/Serialization/SerializationTests.cs

@@ -20,6 +20,7 @@
 // SOFTWARE.
 
 using System;
+using System.CodeDom.Compiler;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -329,6 +330,35 @@ public void SerializeWithCRNewLine()
             result.Should().Be(expectedResult);
         }
 
+
+        /// <summary>
+        /// Tests the serialization of a dictionary containing a list of strings using IndentedTextWriter.
+        /// </summary>
+        [Fact]
+        public void SerializeWithTabs()
+        {
+            var tabString = " ";
+            using var writer = new StringWriter();
+            using var indentedTextWriter = new IndentedTextWriter(writer, tabString) { Indent = 2 };
+
+            //create a dictionary with a list of strings to test the tabbed serialization
+            var items = new List<string> { "item 1", "item 2" };
+            var list = new Dictionary<string, List<string>> { { "key", items } };
+
+            SerializerBuilder
+                .Build()
+                .Serialize(indentedTextWriter, list);
+
+            //split serialized output into lines
+            var lines = indentedTextWriter.InnerWriter.ToString().Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+
+            //expected indentation
+            var indent = string.Join(string.Empty, Enumerable.Repeat(tabString, indentedTextWriter.Indent).ToList());
+
+            //check that the serialized lines (excluding the first and last) start with the expected indentation
+            lines.Skip(1).Take(lines.Length - 2).Where(element => element.StartsWith(indent)).Should().HaveCount(items.Count);
+        }
+
         [Fact]
         public void DeserializeExplicitType()
         {

YamlDotNet/Core/Emitter.cs

@@ -67,7 +67,6 @@ public class Emitter : IEmitter
         private bool isIndentation;
         private readonly bool forceIndentLess;
         private readonly bool useUtf16SurrogatePair;
-        private readonly string newLine;
 
         private bool isDocumentEndWritten;
 
@@ -150,9 +149,9 @@ public Emitter(TextWriter output, EmitterSettings settings)
             this.skipAnchorName = settings.SkipAnchorName;
             this.forceIndentLess = !settings.IndentSequences;
             this.useUtf16SurrogatePair = settings.UseUtf16SurrogatePairs;
-            this.newLine = settings.NewLine;
 
             this.output = output;
+            this.output.NewLine = settings.NewLine;
             this.outputUsesUnicodeEncoding = IsUnicode(output.Encoding);
         }
 
@@ -1937,7 +1936,7 @@ private void WriteBreak(char breakCharacter = '\n')
         {
             if (breakCharacter == '\n')
             {
-                output.Write(newLine);
+                output.WriteLine();
             }
             else
             {

YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs

@@ -354,20 +354,21 @@ private static object CastInteger(ulong number, TypeCode typeCode)
                 case "FALSE":
                     return false;
                 default:
-                    if (Regex.IsMatch(v, "0x[0-9a-fA-F]+")) //base16 number
+                    if (Regex.IsMatch(v, "^0x[0-9a-fA-F]+$")) //base16 number
                     {
-                        if (TryAndSwallow(() => Convert.ToByte(v, 16), out result)) { }
-                        else if (TryAndSwallow(() => Convert.ToInt16(v, 16), out result)) { }
-                        else if (TryAndSwallow(() => Convert.ToInt32(v, 16), out result)) { }
-                        else if (TryAndSwallow(() => Convert.ToInt64(v, 16), out result)) { }
-                        else if (TryAndSwallow(() => Convert.ToUInt64(v, 16), out result)) { }
+                        v = v.Substring(2);
+                        if (byte.TryParse(v, NumberStyles.AllowHexSpecifier, formatter.NumberFormat, out var byteValue)) { result = byteValue; }
+                        else if (short.TryParse(v, NumberStyles.AllowHexSpecifier, formatter.NumberFormat, out var shortValue)) { result = shortValue; }
+                        else if (int.TryParse(v, NumberStyles.AllowHexSpecifier, formatter.NumberFormat, out var intValue)) { result = intValue; }
+                        else if (long.TryParse(v, NumberStyles.AllowHexSpecifier, formatter.NumberFormat, out var longValue)) { result = longValue; }
+                        else if (ulong.TryParse(v, NumberStyles.AllowHexSpecifier, formatter.NumberFormat, out var ulongValue)) { result = ulongValue; }
                         else
                         {
                             //we couldn't parse it, default to a string. It's probably to big.
                             result = v;
                         }
                     }
-                    else if (Regex.IsMatch(v, "0o[0-9a-fA-F]+")) //base8 number
+                    else if (Regex.IsMatch(v, "^0o[0-9a-fA-F]+$")) //base8 number
                     {
                         if (TryAndSwallow(() => Convert.ToByte(v, 8), out result)) { }
                         else if (TryAndSwallow(() => Convert.ToInt16(v, 8), out result)) { }
@@ -380,7 +381,7 @@ private static object CastInteger(ulong number, TypeCode typeCode)
                             result = v;
                         }
                     }
-                    else if (Regex.IsMatch(v, @"[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?")) //regular number
+                    else if (Regex.IsMatch(v, @"^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$")) //regular number
                     {
                         if (byte.TryParse(v, NumberStyles.Integer, formatter.NumberFormat, out var byteValue)) { result = byteValue; }
                         else if (short.TryParse(v, NumberStyles.Integer, formatter.NumberFormat, out var shortValue)) { result = shortValue; }