Merge pull request #86 from hadashiA/ku/fix-unity-assets

Update unity missing unity assets
hadashiA · Jan 24, 2024 · cadd128 · cadd128
2 parents dc1454a + b1de306
commit cadd128
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Plugins/VYaml.SourceGenerator.dll b/VYaml.Unity/Assets/VYaml/Runtime/Plugins/VYaml.SourceGenerator.dll
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/YamlSerializationContext.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/YamlSerializationContext.cs
@@ -17,15 +17,17 @@ public readonly struct ScalarStyleScope
 
     public class YamlSerializationContext : IDisposable
     {
-        public IYamlFormatterResolver Resolver { get; }
-        public YamlEmitOptions EmitOptions { get; }
+        public YamlSerializerOptions Options { get; set; }
+        public IYamlFormatterResolver Resolver { get; set; }
+        public YamlEmitOptions EmitOptions { get; set; }
 
         readonly byte[] primitiveValueBuffer;
         ArrayBufferWriter<byte>? arrayBufferWriter;
 
         public YamlSerializationContext(YamlSerializerOptions options)
         {
             primitiveValueBuffer = ArrayPool<byte>.Shared.Rent(64);
+            Options = options;
             Resolver = options.Resolver;
             EmitOptions = options.EmitOptions;
         }

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlDeserializationContext.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlDeserializationContext.cs
@@ -6,12 +6,14 @@ namespace VYaml.Serialization
 {
     public class YamlDeserializationContext
     {
-        public IYamlFormatterResolver Resolver { get; }
+        public YamlSerializerOptions Options { get; set; }
+        public IYamlFormatterResolver Resolver { get; set; }
 
         readonly Dictionary<Anchor, object?> aliases = new();
 
         public YamlDeserializationContext(YamlSerializerOptions options)
         {
+            Options = options;
             Resolver = options.Resolver;
         }
 

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlSerializer.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlSerializer.cs
@@ -39,6 +39,23 @@ public static partial class YamlSerializer
         [ThreadStatic]
         static YamlSerializationContext? serializationContext;
 
+        static YamlDeserializationContext GetThreadLocalDeserializationContext(YamlSerializerOptions? options = null)
+        {
+            options ??= DefaultOptions;
+            var contextLocal = deserializationContext ??= new YamlDeserializationContext(options);
+            contextLocal.Resolver = options.Resolver;
+            return contextLocal;
+        }
+
+        static YamlSerializationContext GetThreadLocalSerializationContext(YamlSerializerOptions? options = null)
+        {
+            options ??= DefaultOptions;
+            var contextLocal = serializationContext ??= new YamlSerializationContext(options);
+            contextLocal.Resolver = options.Resolver;
+            contextLocal.EmitOptions = options.EmitOptions;
+            return contextLocal;
+        }
+
         public static YamlSerializerOptions DefaultOptions
         {
             get => defaultOptions ??= YamlSerializerOptions.Standard;
@@ -50,7 +67,7 @@ public static YamlSerializerOptions DefaultOptions
         public static ReadOnlyMemory<byte> Serialize<T>(T value, YamlSerializerOptions? options = null)
         {
             options ??= DefaultOptions;
-            var contextLocal = serializationContext ??= new YamlSerializationContext(options);
+            var contextLocal = GetThreadLocalSerializationContext(options);
             var writer = contextLocal.GetArrayBufferWriter();
             var emitter = new Utf8YamlEmitter(writer);
             contextLocal.Reset();
@@ -68,7 +85,7 @@ public static void Serialize<T>(IBufferWriter<byte> writer, T value, YamlSeriali
         public static void Serialize<T>(ref Utf8YamlEmitter emitter, T value, YamlSerializerOptions? options = null)
         {
             options ??= DefaultOptions;
-            var contextLocal = serializationContext ??= new YamlSerializationContext(options);
+            var contextLocal = GetThreadLocalSerializationContext(options);
             contextLocal.Reset();
 
             var formatter = contextLocal.Resolver.GetFormatterWithVerify<T>();
@@ -110,7 +127,7 @@ public static async ValueTask<T> DeserializeAsync<T>(Stream stream, YamlSerializ
         public static T Deserialize<T>(ref YamlParser parser, YamlSerializerOptions? options = null)
         {
             options ??= DefaultOptions;
-            var contextLocal = deserializationContext ??= new YamlDeserializationContext(options);
+            var contextLocal = GetThreadLocalDeserializationContext(options);
             contextLocal.Reset();
 
             parser.SkipAfter(ParseEventType.DocumentStart);
@@ -150,7 +167,7 @@ public static IEnumerable<T> DeserializeMultipleDocuments<T>(ref YamlParser pars
             // try
             // {
                 options ??= DefaultOptions;
-                var contextLocal = deserializationContext ??= new YamlDeserializationContext(options);
+                var contextLocal = GetThreadLocalDeserializationContext(options);
                 var formatter = options.Resolver.GetFormatterWithVerify<T>();
                 var documents = new List<T>();