Fix Inconsistent line endings in Service.g.cs - #3694

icerpc · Oct 18, 2023 · c877f02 · c877f02
1 parent 715f18b
commit c877f02
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/src/IceRpc.Protobuf.Generators/Internal/Emitter.cs b/src/IceRpc.Protobuf.Generators/Internal/Emitter.cs
@@ -78,7 +78,7 @@ internal string Emit(IReadOnlyList<ServiceClass> serviceClasses, CancellationTok
 
         string generated = string.Join("\n\n", generatedClasses).Trim();
         generated += "\n";
-        return generated;
+        return generated.ReplaceLineEndings();
     }
 
     private static string GenerateContainer(string header, string body)

diff --git a/src/IceRpc.Protobuf.Generators/Internal/StringExtensions.cs b/src/IceRpc.Protobuf.Generators/Internal/StringExtensions.cs
@@ -1,12 +1,30 @@
 // Copyright (c) ZeroC, Inc.
 
+using System.Runtime.InteropServices;
+
 namespace IceRpc.Protobuf.Generators.Internal;
 
 internal static class StringExtensions
 {
+    private static readonly string _newLine = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "\r\n" : "\n";
+
     internal static string WithIndent(this string contents, string indent) =>
         string.Join("\n", contents.Split('\n').Select(value => $"{indent}{value}")).Trim();
 
     internal static string TrimTrailingWhiteSpaces(this string contents) =>
         string.Join("\n", contents.Split('\n').Select(value => value.TrimEnd()));
+
+    // TODO Once generators can target .NET 8 we can use String.ReplaceLineEndings and remove this implementation.
+    internal static string ReplaceLineEndings(this string contents)
+    {
+        if (contents.IndexOf("\r\n") != -1)
+        {
+            contents = contents.Replace("\r\n", "\n");
+        }
+        if (_newLine != "\n")
+        {
+            contents = contents.Replace("\n", _newLine);
+        }
+        return contents;
+    }
 }
diff --git a/src/IceRpc.Slice.Generators/Internal/Emitter.cs b/src/IceRpc.Slice.Generators/Internal/Emitter.cs
@@ -79,7 +79,7 @@ internal string Emit(IReadOnlyList<ServiceClass> serviceClasses, CancellationTok
 
         string generated = string.Join("\n\n", generatedClasses).Trim();
         generated += "\n";
-        return generated;
+        return generated.ReplaceLineEndings();
     }
 
     private static string GenerateContainer(string header, string body)

diff --git a/src/IceRpc.Slice.Generators/Internal/StringExtensions.cs b/src/IceRpc.Slice.Generators/Internal/StringExtensions.cs
@@ -1,12 +1,30 @@
 // Copyright (c) ZeroC, Inc.
 
+using System.Runtime.InteropServices;
+
 namespace IceRpc.Slice.Generators.Internal;
 
 internal static class StringExtensions
 {
+    private static readonly string _newLine = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "\r\n" : "\n";
+
     internal static string WithIndent(this string contents, string indent) =>
         string.Join("\n", contents.Split('\n').Select(value => $"{indent}{value}")).Trim();
 
     internal static string TrimTrailingWhiteSpaces(this string contents) =>
         string.Join("\n", contents.Split('\n').Select(value => value.TrimEnd()));
+
+    // TODO Once generators can target .NET 8 we can use String.ReplaceLineEndings and remove this implementation.
+    internal static string ReplaceLineEndings(this string contents)
+    {
+        if (contents.IndexOf("\r\n") != -1)
+        {
+            contents = contents.Replace("\r\n", "\n");
+        }
+        if (_newLine != "\n")
+        {
+            contents = contents.Replace("\n", _newLine);
+        }
+        return contents;
+    }
 }