Add feature flagged support for showing compilation warnings after

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/VBToCSConversion.cs

@@ -116,7 +116,7 @@ public SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs)
             return cSharpSyntaxNode;
         }
 
-        public string GetNonFatalWarningsOrNull()
+        public string GetWarningsOrNull()
         {
             var finalCompilation = CreateCompilation(_secondPassResults);
             var targetErrors = GetDiagnostics(finalCompilation);

ICSharpCode.CodeConverter/ILanguageConversion.cs

@@ -7,7 +7,7 @@ public interface ILanguageConversion
     {
         SyntaxTree SingleFirstPass(Compilation sourceCompilation, SyntaxTree tree);
         SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs);
-        string GetNonFatalWarningsOrNull();
+        string GetWarningsOrNull();
         SyntaxTree CreateTree(string text);
         Compilation CreateCompilationFromTree(SyntaxTree tree, IEnumerable<MetadataReference> references);
         List<SyntaxNode> FindSingleImportantChild(SyntaxNode annotatedNode);

ICSharpCode.CodeConverter/Shared/ProjectConversion.cs

@@ -14,6 +14,7 @@ namespace ICSharpCode.CodeConverter.Shared
 {
     public class ProjectConversion<TLanguageConversion> where TLanguageConversion : ILanguageConversion, new()
     {
+        private readonly string _solutionDir;
         private readonly Compilation _sourceCompilation;
         private readonly IEnumerable<SyntaxTree> _syntaxTreesToConvert;
         private static readonly AdhocWorkspace AdhocWorkspace = new AdhocWorkspace();
@@ -25,6 +26,7 @@ namespace ICSharpCode.CodeConverter.Shared
         private ProjectConversion(Compilation sourceCompilation, string solutionDir)
             : this(sourceCompilation, sourceCompilation.SyntaxTrees.Where(t => t.FilePath.StartsWith(solutionDir)))
         {
+            _solutionDir = solutionDir;
         }
 
         private ProjectConversion(Compilation sourceCompilation, IEnumerable<SyntaxTree> syntaxTreesToConvert)
@@ -53,7 +55,8 @@ public static async Task<ConversionResult> ConvertSingle(Compilation compilation
 
             var conversion = new ProjectConversion<TLanguageConversion>(compilation, new [] {syntaxTree});
             var conversionResults = ConvertProject(conversion).ToList();
-            var codeResult = conversionResults.Single(x => !string.IsNullOrWhiteSpace(x.ConvertedCode));
+            var codeResult = conversionResults.SingleOrDefault(x => !string.IsNullOrWhiteSpace(x.ConvertedCode)) 
+                             ?? conversionResults.First();
             codeResult.Exceptions = conversionResults.SelectMany(x => x.Exceptions).ToArray();
             return codeResult;
         }
@@ -88,6 +91,9 @@ private Dictionary<string, SyntaxNode> Convert()
         {
             FirstPass();
             var secondPassByFilePath = SecondPass();
+#if DEBUG && false
+            AddProjectWarnings();
+#endif
             return secondPassByFilePath;
         }
 
@@ -103,13 +109,19 @@ private Dictionary<string, SyntaxNode> SecondPass()
                     _errors.TryAdd(treeFilePath, e.ToString());
                 }
             }
-            var nonFatalWarningsOrNull = _languageConversion.GetNonFatalWarningsOrNull();
-            if (!string.IsNullOrWhiteSpace(nonFatalWarningsOrNull)) {
-                _errors.TryAdd("", nonFatalWarningsOrNull);
-            }
             return secondPassByFilePath;
         }
 
+        private void AddProjectWarnings()
+        {
+            var nonFatalWarningsOrNull = _languageConversion.GetWarningsOrNull();
+            if (!string.IsNullOrWhiteSpace(nonFatalWarningsOrNull))
+            {
+                var warningsDescription = Path.Combine(_solutionDir ?? "", _sourceCompilation.AssemblyName, "ConversionWarnings.txt");
+                _errors.TryAdd(warningsDescription, nonFatalWarningsOrNull);
+            }
+        }
+
         private SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs)
         {
             var secondPassNode = _languageConversion.SingleSecondPass(cs);

ICSharpCode.CodeConverter/Util/ExceptionWithNodeInformation.cs

@@ -14,7 +14,7 @@ public ExceptionWithNodeInformation(Exception innerException, SyntaxNode excepti
 
         public override string ToString()
         {
-            return $"{Message} in {ExceptionCause.GetBriefNodeDescription()}{Environment.NewLine}{StackTrace}";
+            return $"CONVERSION ERROR: {Message} in {ExceptionCause.GetBriefNodeDescription()}{Environment.NewLine}{StackTrace}";
         }
     }
 }

ICSharpCode.CodeConverter/Util/SyntaxNodeExtensions.cs

@@ -1683,7 +1683,7 @@ public static string GetBriefNodeDescription(this SyntaxNode node)
 
         public static string DescribeConversionError(this SyntaxNode node, Exception e)
         {
-            return $"CONVERSION ERROR: Cannot convert {node.GetType().Name}, {e}{Environment.NewLine}{Environment.NewLine}" +
+            return $"Cannot convert {node.GetType().Name}, {e}{Environment.NewLine}{Environment.NewLine}" +
                 $"Input: {Environment.NewLine}{node.ToFullString()}{Environment.NewLine}";
         }
 

ICSharpCode.CodeConverter/VB/CSToVBConversion.cs

@@ -83,7 +83,7 @@ public SyntaxNode SingleSecondPass(KeyValuePair<string, SyntaxTree> cs)
             return cs.Value.GetRoot();
         }
 
-        public string GetNonFatalWarningsOrNull()
+        public string GetWarningsOrNull()
         {
             return null;
         }

Vsix/CodeConversion.cs

@@ -150,6 +150,8 @@ private static string ConvertExtension(string currentExtension)
                     return ".cs";
                 case ".cs":
                     return ".vb";
+                case ".txt":
+                    return ".txt";
                 default:
                     throw new ArgumentOutOfRangeException(nameof(currentExtension), currentExtension, null);
             }