Skip to content

Commit 9d052bf

Browse files
committed
Remove trailing new line
1 parent 0fc95f8 commit 9d052bf

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

src/CSharpScriptSerializer/CSScriptSerializer.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ public static string Serialize(object obj, Func<OptionSet, OptionSet> applyForma
6969
workspace,
7070
applyFormattingOptions == null
7171
? workspace.Options
72+
.WithChangedOption(FormattingOptions.SmartIndent, LanguageNames.CSharp, FormattingOptions.IndentStyle.Smart)
73+
.WithChangedOption(CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine, false)
74+
.WithChangedOption(CSharpFormattingOptions.WrappingPreserveSingleLine, false)
75+
.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInObjectCollectionArrayInitializers, true)
76+
.WithChangedOption(CSharpFormattingOptions.NewLineForMembersInObjectInit, true)
7277
: applyFormattingOptions(workspace.Options))
7378
.ToFullString();
7479
}
@@ -538,7 +543,6 @@ private static IEnumerable<ArrayRankSpecifierSyntax> GetArrayRanks(Type type)
538543
protected static TSyntax AddNewLine<TSyntax>(TSyntax expression)
539544
where TSyntax : SyntaxNode => expression.FullSpan.Length > 120
540545
? expression.WithLeadingTrivia(CarriageReturnLineFeed)
541-
.WithTrailingTrivia(CarriageReturnLineFeed)
542546
: expression;
543547
}
544548
}

src/CSharpScriptSerializer/CSharpScriptSerializer.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageId>CSharpScriptSerializer</PackageId>
66
<AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
77
<Title>CSharpScriptSerializer</Title>
8-
<VersionPrefix>3.0.1</VersionPrefix>
8+
<VersionPrefix>3.0.2</VersionPrefix>
99
<TargetFrameworks>netstandard2.1</TargetFrameworks>
1010
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
1111
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@@ -15,6 +15,8 @@
1515
<PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
1616
<PackageReleaseNotes>
1717
<![CDATA[
18+
Version 3.0.2
19+
* Remove trailing new line
1820
Version 3.0.0
1921
* Update to Roslyn V4.2.0
2022
Version 2.0.0

src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public PropertyCSScriptSerializer(IReadOnlyDictionary<string, Func<T, object, bo
8484
typeInfo = typeInfo.BaseType.GetTypeInfo();
8585
}
8686

87-
propertyConditions = propertyConditions ?? new Dictionary<string, Func<T, object, bool>>();
88-
propertyValueGetters = propertyValueGetters ?? new Dictionary<string, Func<T, object>>();
87+
propertyConditions ??= new Dictionary<string, Func<T, object, bool>>();
88+
propertyValueGetters ??= new Dictionary<string, Func<T, object>>();
8989

9090
_propertyData =
9191
GetProperties(propertyConditions.Keys.Concat(propertyValueGetters.Keys).Distinct(),
@@ -101,8 +101,8 @@ public PropertyCSScriptSerializer(IReadOnlyDictionary<string, Func<T, object, bo
101101
(o, v) => !Equals(v, GetDefault(p.PropertyType)))))
102102
.ToArray();
103103

104-
hiddenPropertyConditions = hiddenPropertyConditions ?? new Dictionary<string, Func<T, object, bool>>();
105-
hiddenPropertyValueGetters = hiddenPropertyValueGetters ?? new Dictionary<string, Func<T, object>>();
104+
hiddenPropertyConditions ??= new Dictionary<string, Func<T, object, bool>>();
105+
hiddenPropertyValueGetters ??= new Dictionary<string, Func<T, object>>();
106106

107107
_hiddenPropertyData =
108108
GetProperties(hiddenPropertyConditions.Keys.Concat(hiddenPropertyValueGetters.Keys).Distinct(),

test/CSharpScriptSerializer.Tests/NegativeScenarioTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using CSharpScriptSerialization;
43
using Xunit;
54

6-
namespace CSharpScriptSerializer.Tests
5+
namespace CSharpScriptSerialization.Tests
76
{
87
public class NegativeScenarioTest
98
{

0 commit comments

Comments
 (0)