VB -> C#: doc comment tidyup for differing line endings - fixes #123

At some point this method could do with a few unit-level tests since the current test framework homogenizes line endings artificially and there will be a bunch more edge cases.

Author: GrahamTheCoder

ICSharpCode.CodeConverter/Util/SyntaxTriviaExtensions.cs

@@ -148,6 +148,7 @@ public static bool IsMultiLineDocComment(this SyntaxTrivia trivia)
             return trivia.Kind() == SyntaxKind.MultiLineDocumentationCommentTrivia;
         }
 
+        /// <remarks>Good candidate for unit testing to catch newline issues hidden by the test harness</remarks>
         public static string GetCommentText(this SyntaxTrivia trivia)
         {
             var commentText = trivia.ToString();
@@ -208,8 +209,8 @@ public static string GetCommentText(this SyntaxTrivia trivia)
 
                 commentText = commentText.Trim();
 
-                var newLine = Environment.NewLine;
-                var lines = commentText.Split(new[] { newLine }, StringSplitOptions.None);
+                var newLine = commentText.Contains('\n') ? '\n' : '\r';
+                var lines = commentText.Split(new []{newLine}, StringSplitOptions.None);
                 foreach (var line in lines) {
                     var trimmedLine = line.Trim();
 
@@ -223,13 +224,10 @@ public static string GetCommentText(this SyntaxTrivia trivia)
                     textBuilder.AppendLine(trimmedLine);
                 }
 
-                // remove last line break
-                textBuilder.Remove(textBuilder.Length - newLine.Length, newLine.Length);
+                return textBuilder.ToString().TrimEnd();
+            } 
 
-                return textBuilder.ToString();
-            } else {
-                throw new InvalidOperationException();
-            }
+            throw new NotImplementedException($"Comment cannot be parsed:\r\n'{commentText}'");
         }
 
         public static string AsString(this IEnumerable<SyntaxTrivia> trivia)

Tests/CSharp/NamespaceLevelTests.cs

@@ -263,6 +263,29 @@ Inherits System.IO.InvalidDataException
 End Class",
                 @"class test : System.IO.InvalidDataException
 {
+}");
+        }
+
+        [Fact]
+        public void MultilineDocComment()
+        {
+            TestConversionVisualBasicToCSharp(@"Public Class MyTestClass
+    ''' <summary>
+    ''' Returns empty
+    ''' </summary>
+    Private Function MyFunc() As String
+        Return """"
+    End Function
+End Class",
+                @"public class MyTestClass
+{
+    /// <summary>
+    /// Returns empty
+    /// </summary>
+    private string MyFunc()
+    {
+        return """";
+    }
 }");
         }
     }