Skip to content

Commit 0d0124f

Browse files
committed
Add specific scalar styling constructors
1 parent 7d04936 commit 0d0124f

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

YamlDotNet/Serialization/EventEmitters/TypeAssigningEventEmitter.cs

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,16 @@ public sealed class TypeAssigningEventEmitter : ChainedEventEmitter
6565
+ @"|\.(nan|NaN|NAN)"
6666
+ @")$";
6767

68-
private readonly ScalarStyle defaultScalarStyle;
68+
private readonly ScalarStyle defaultScalarStyle = ScalarStyle.Any;
6969

70-
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings, bool quoteYaml1_1Strings, ScalarStyle defaultScalarStyle = ScalarStyle.Any)
71-
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings, defaultScalarStyle: defaultScalarStyle)
70+
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings, bool quoteYaml1_1Strings, ScalarStyle defaultScalarStyle)
71+
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings, quoteNecessaryStrings, quoteYaml1_1Strings)
72+
{
73+
this.defaultScalarStyle = defaultScalarStyle;
74+
}
75+
76+
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings, bool quoteYaml1_1Strings)
77+
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings)
7278
{
7379
this.quoteNecessaryStrings = quoteNecessaryStrings;
7480

@@ -82,8 +88,14 @@ public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenS
8288
#endif
8389
}
8490

85-
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings, ScalarStyle defaultScalarStyle = ScalarStyle.Any)
86-
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings, defaultScalarStyle: defaultScalarStyle)
91+
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings, ScalarStyle defaultScalarStyle)
92+
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings, quoteNecessaryStrings)
93+
{
94+
this.defaultScalarStyle = defaultScalarStyle;
95+
}
96+
97+
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, bool quoteNecessaryStrings)
98+
: this(nextEmitter, requireTagWhenStaticAndActualTypesAreDifferent, tagMappings)
8799
{
88100
this.quoteNecessaryStrings = quoteNecessaryStrings;
89101

@@ -94,12 +106,11 @@ public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenS
94106
#endif
95107
}
96108

97-
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings, ScalarStyle defaultScalarStyle = ScalarStyle.Any)
109+
public TypeAssigningEventEmitter(IEventEmitter nextEmitter, bool requireTagWhenStaticAndActualTypesAreDifferent, IDictionary<Type, TagName> tagMappings)
98110
: base(nextEmitter)
99111
{
100112
this.requireTagWhenStaticAndActualTypesAreDifferent = requireTagWhenStaticAndActualTypesAreDifferent;
101113
this.tagMappings = tagMappings ?? throw new ArgumentNullException(nameof(tagMappings));
102-
this.defaultScalarStyle = defaultScalarStyle;
103114
}
104115

105116
public override void Emit(ScalarEventInfo eventInfo, IEmitter emitter)

YamlDotNet/Serialization/SerializerBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public SerializerBuilder WithQuotingNecessaryStrings(bool quoteYaml1_1Strings =
124124
/// </summary>
125125
public SerializerBuilder WithDefaultScalarStyle(ScalarStyle style)
126126
{
127-
return WithEventEmitter(inner => new TypeAssigningEventEmitter(inner, false, tagMappings, quoteNecessaryStrings, quoteYaml1_1Strings, defaultScalarStyle: style), loc => loc.InsteadOf<TypeAssigningEventEmitter>());
127+
return WithEventEmitter(inner => new TypeAssigningEventEmitter(inner, false, tagMappings, quoteNecessaryStrings, quoteYaml1_1Strings, style), loc => loc.InsteadOf<TypeAssigningEventEmitter>());
128128
}
129129

130130
/// <summary>

0 commit comments

Comments
 (0)