Extract commonality

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/VBToCSConversion.cs

@@ -120,18 +120,8 @@ public SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs)
 
         public string GetWarningsOrNull()
         {
-            var finalCompilation = CreateCompilation(_secondPassResults);
-            var targetErrors = GetDiagnostics(finalCompilation);
-            return targetErrors.Any() ? $"{targetErrors.Count} resulting compilation errors:{Environment.NewLine}{string.Join(Environment.NewLine, targetErrors)}" : null;
-        }
-
-        private static List<string> GetDiagnostics(Compilation compilation)
-        {
-            var diagnostics = compilation.GetDiagnostics()
-                .Where(d => d.Severity == DiagnosticSeverity.Error)
-                .Select(d => $"{d.Id}: {d.GetMessage()}")
-                .ToList();
-            return diagnostics;
+            var finalCompilation = CreateCompilation(_firstPassResults);
+            return CompilationWarnings.WarningsForCompilation(_sourceCompilation, "source") + CompilationWarnings.WarningsForCompilation(finalCompilation, "target");
         }
 
         public SyntaxTree CreateTree(string text)

ICSharpCode.CodeConverter/Util/CompilationWarnings.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.CodeConverter.Util
+{
+    internal static class CompilationWarnings
+    {
+        public static string WarningsForCompilation(Compilation finalCompilation, string compilationDescription)
+        {
+            var targetErrors = GetDiagnostics(finalCompilation);
+            return targetErrors.Any()
+                ? $"{targetErrors.Count} {compilationDescription} compilation errors:{Environment.NewLine}{String.Join(Environment.NewLine, targetErrors)}"
+                : null;
+        }
+
+        private static List<string> GetDiagnostics(Compilation compilation)
+        {
+            var diagnostics = compilation.GetDiagnostics()
+                .Where(d => d.Severity == DiagnosticSeverity.Error)
+                .Select(d => $"{d.Id}: {d.GetMessage()}")
+                .ToList();
+            return diagnostics;
+        }
+    }
+}

ICSharpCode.CodeConverter/VB/CSToVBConversion.cs

@@ -116,17 +116,7 @@ public SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs)
         public string GetWarningsOrNull()
         {
             var finalCompilation = CreateCompilation(_firstPassResults);
-            var targetErrors = GetDiagnostics(finalCompilation);
-            return targetErrors.Any() ? $"{targetErrors.Count} resulting compilation errors:{Environment.NewLine}{string.Join(Environment.NewLine, targetErrors)}" : null;
-        }
-
-        private static List<string> GetDiagnostics(Compilation compilation)
-        {
-            var diagnostics = compilation.GetDiagnostics()
-                .Where(d => d.Severity == DiagnosticSeverity.Error)
-                .Select(d => $"{d.Id}: {d.GetMessage()}")
-                .ToList();
-            return diagnostics;
+            return CompilationWarnings.WarningsForCompilation(_sourceCompilation, "source") + CompilationWarnings.WarningsForCompilation(finalCompilation, "target");
         }
 
         public SyntaxTree CreateTree(string text)