A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fix in YAML to JSON involving boolean conversion (#579)
Etienne Baudouxc16f7a26cc13
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csprojindex 21c90eade..b78818271 100644--- a/src/dev/impl/DevToys/DevToys.csproj+++ b/src/dev/impl/DevToys/DevToys.csproj@@ -30,6 +30,7 @@<Compile Include="Core\OOP\AppService.cs" /><Compile Include="Core\QueueWorkerViewModelBase.cs" /><Compile Include="Core\Threading\AsyncLazy.cs" />+ <Compile Include="Helpers\JsonYaml\Core\BooleanYamlTypeResolver.cs" /><Compile Include="Helpers\StorageFileHelper.cs" /><Compile Include="Helpers\ImageHelper.cs" /><Compile Include="Helpers\ColorBlindnessSimulatorHelper.cs" />diff --git a/src/dev/impl/DevToys/Helpers/JsonYaml/Core/BooleanYamlTypeResolver.cs b/src/dev/impl/DevToys/Helpers/JsonYaml/Core/BooleanYamlTypeResolver.csnew file mode 100644index 000000000..877408780--- /dev/null+++ b/src/dev/impl/DevToys/Helpers/JsonYaml/Core/BooleanYamlTypeResolver.cs@@ -0,0 +1,30 @@+#nullable enable++using System;+using YamlDotNet.Core;+using YamlDotNet.Core.Events;+using YamlDotNet.Serialization;++namespace DevToys.Helpers.JsonYaml.Core+{+ internal class BooleanYamlTypeResolver : INodeTypeResolver+ {+ public bool Resolve(NodeEvent? nodeEvent, ref Type currentType)+ {+ if (nodeEvent is Scalar scalar)+ {+ // avoid unnecessary parsing attempts+ bool couldBeBoolean+ = scalar.Style is ScalarStyle.Plain+ && (string.Equals(scalar.Value, bool.FalseString, StringComparison.OrdinalIgnoreCase) || string.Equals(scalar.Value, bool.TrueString, StringComparison.OrdinalIgnoreCase));++ if (couldBeBoolean && bool.TryParse(scalar.Value, out _))+ {+ currentType = typeof(bool);+ return true;+ }+ }+ return false;+ }+ }+}diff --git a/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs b/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.csindex cf4fe2a6f..2458e87b1 100644--- a/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs+++ b/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs@@ -146,6 +146,7 @@ namespace DevToys.Helpers.JsonYamlIDeserializer deserializer = new DeserializerBuilder().WithNodeTypeResolver(new DecimalYamlTypeResolver())+ .WithNodeTypeResolver(new BooleanYamlTypeResolver()).Build();object? yamlObject = deserializer.Deserialize(stringReader);