Only convert additional documents in whole project conversion

Author: GrahamTheCoder

CodeConverter/CSharp/VBToCSProjectContentsConverter.cs

@@ -76,10 +76,10 @@ private static string GetPathRelativeToProject(string projDirPath, string p)
             return p.Replace(projDirPath, "").TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         }
 
-        public async IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults([EnumeratorCancellation] CancellationToken cancellationToken)
+        public async IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults(IReadOnlyCollection<TextDocument> additionalDocumentsToConvert, [EnumeratorCancellation] CancellationToken cancellationToken)
         {
             string projDirPath = Project.GetDirectoryPath();
-            foreach (var doc in Project.AdditionalDocuments) {
+            foreach (var doc in additionalDocumentsToConvert) {
                 string newPath = Path.Combine(projDirPath, Path.GetFileName(doc.FilePath));
                 if (newPath != doc.FilePath) {
                     string newText = RebaseResxPaths(projDirPath, Path.GetDirectoryName(doc.FilePath), (await doc.GetTextAsync(cancellationToken)).ToString());

CodeConverter/Shared/IProjectContentsConverter.cs

@@ -14,6 +14,6 @@ public interface IProjectContentsConverter
         Project Project { get; }
         Task<SyntaxNode> SingleFirstPass(Document document);
         Task<(Project project, List<WipFileConversion<DocumentId>> firstPassDocIds)> GetConvertedProject(WipFileConversion<SyntaxNode>[] firstPassResults);
-        public IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults(CancellationToken cancellationToken);
+        public IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults(IReadOnlyCollection<TextDocument> additionalDocumentsToConvert, CancellationToken cancellationToken);
     }
 }

CodeConverter/Shared/ProjectConversion.cs

@@ -17,20 +17,22 @@ namespace ICSharpCode.CodeConverter.Shared
 {
     public class ProjectConversion
     {
+        private readonly IProjectContentsConverter _projectContentsConverter;
         private readonly IReadOnlyCollection<Document> _documentsToConvert;
+        private readonly IReadOnlyCollection<TextDocument> _additionalDocumentsToConvert;
         private readonly ILanguageConversion _languageConversion;
         private readonly bool _showCompilationErrors;
         private readonly bool _returnSelectedNode;
         private static readonly string[] BannedPaths = new[] { ".AssemblyAttributes.", "\\bin\\", "\\obj\\" };
-        private readonly IProjectContentsConverter _projectContentsConverter;
         private readonly CancellationToken _cancellationToken;
 
-        private ProjectConversion(IProjectContentsConverter projectContentsConverter, IEnumerable<Document> documentsToConvert,
+        private ProjectConversion(IProjectContentsConverter projectContentsConverter, IEnumerable<Document> documentsToConvert, IEnumerable<TextDocument> additionalDocumentsToConvert,
             ILanguageConversion languageConversion, CancellationToken cancellationToken, bool showCompilationErrors, bool returnSelectedNode = false)
         {
             _projectContentsConverter = projectContentsConverter;
             _languageConversion = languageConversion;
             _documentsToConvert = documentsToConvert.ToList();
+            _additionalDocumentsToConvert = additionalDocumentsToConvert.ToList();
             _showCompilationErrors = showCompilationErrors;
             _returnSelectedNode = returnSelectedNode;
             _cancellationToken = cancellationToken;
@@ -65,7 +67,7 @@ private ProjectConversion(IProjectContentsConverter projectContentsConverter, IE
 
             document = projectContentsConverter.Project.GetDocument(document.Id);
 
-            var conversion = new ProjectConversion(projectContentsConverter, new[] { document }, languageConversion, cancellationToken, conversionOptions.ShowCompilationErrors, returnSelectedNode);
+            var conversion = new ProjectConversion(projectContentsConverter, new[] { document }, Enumerable.Empty<TextDocument>(), languageConversion, cancellationToken, conversionOptions.ShowCompilationErrors, returnSelectedNode);
             var conversionResults = await conversion.Convert(progress).ToArrayAsync();
             var codeResult = conversionResults.SingleOrDefault(x => !string.IsNullOrWhiteSpace(x.ConvertedCode))
                              ?? conversionResults.First();
@@ -163,7 +165,7 @@ private static async IAsyncEnumerable<ConversionResult> ConvertProjectContents(
             //Perf heuristic: Decrease memory pressure on the simplification phase by converting large files first https://github.com/icsharpcode/CodeConverter/issues/524#issuecomment-590301594
             var documentsToConvert = documentsWithLengths.OrderByDescending(d => d.Length).Select(d => d.Doc);
 
-            var projectConversion = new ProjectConversion(projectContentsConverter, documentsToConvert, languageConversion, cancellationToken, false);
+            var projectConversion = new ProjectConversion(projectContentsConverter, documentsToConvert, projectContentsConverter.Project.AdditionalDocuments, languageConversion, cancellationToken, false);
 
             var results = projectConversion.Convert(progress);
             await foreach (var result in results) yield return result;
@@ -187,7 +189,7 @@ private async IAsyncEnumerable<ConversionResult> Convert(IProgress<ConversionPro
             await foreach (var result in secondPassResults.Select(CreateConversionResult)) {
                 yield return result;
             }
-            await foreach (var result in _projectContentsConverter.GetAdditionalConversionResults(_cancellationToken)) {
+            await foreach (var result in _projectContentsConverter.GetAdditionalConversionResults(_additionalDocumentsToConvert, _cancellationToken)) {
                 yield return result;
             }
         }

CodeConverter/VB/CSToVBProjectContentsConverter.cs

@@ -71,7 +71,7 @@ public async Task<SyntaxNode> SingleFirstPass(Document document)
             return _convertedVbProject.WithDocuments(firstPassResults);
         }
 
-        public async IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults([EnumeratorCancellation] CancellationToken cancellationToken)
+        public async IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults(IReadOnlyCollection<TextDocument> additionalDocumentsToConvert, [EnumeratorCancellation] CancellationToken cancellationToken)
         {
             yield break;
         }