Pass cancellation token

Author: GrahamTheCoder

CodeConverter/CSharp/ClashingMemberRenamer.cs

@@ -8,12 +8,12 @@ internal static class ClashingMemberRenamer
     /// Renames symbols in a VB project so that they don't clash with rules for C# member names, attempting to rename the least public ones first.
     /// See https://github.com/icsharpcode/CodeConverter/issues/420
     /// </summary>
-    public static async Task<Project> RenameClashingSymbolsAsync(Project project)
+    public static async Task<Project> RenameClashingSymbolsAsync(Project project, CancellationToken cancellationToken)
     {
-        var compilation = await project.GetCompilationAsync();
+        var compilation = await project.GetCompilationAsync(cancellationToken);
         var memberRenames = SymbolRenamer.GetNamespacesAndTypesInAssembly(project, compilation)
             .SelectMany(x => GetSymbolsWithNewNames(x, compilation));
-        return await SymbolRenamer.PerformRenamesAsync(project, memberRenames.ToList());
+        return await SymbolRenamer.PerformRenamesAsync(project, memberRenames.ToList(), cancellationToken);
     }
 
     private static IEnumerable<(ISymbol Original, string NewName)> GetSymbolsWithNewNames(INamespaceOrTypeSymbol containerSymbol, Compilation compilation)

CodeConverter/CSharp/VBToCSProjectContentsConverter.cs

@@ -40,7 +40,7 @@ public VBToCSProjectContentsConverter(ConversionOptions conversionOptions,
 
     public async Task InitializeSourceAsync(Project project)
     {
-        project = await ClashingMemberRenamer.RenameClashingSymbolsAsync(project);
+        project = await ClashingMemberRenamer.RenameClashingSymbolsAsync(project, _cancellationToken);
         var cSharpCompilationOptions = CSharpCompiler.CreateCompilationOptions();
         _convertedCsProject = project.ToProjectFromAnyOptions(cSharpCompilationOptions, CSharpCompiler.ParseOptions);
         _csharpReferenceProject = project.CreateReferenceOnlyProjectFromAnyOptions(cSharpCompilationOptions, CSharpCompiler.ParseOptions);

CodeConverter/Common/SymbolRenamer.cs

@@ -26,7 +26,7 @@ public static string GetName(ISymbol m) {
         return m.Name;
     }
 
-    public static async Task<Project> PerformRenamesAsync(Project project, IEnumerable<(ISymbol Original, string NewName)> symbolsWithNewNames)
+    public static async Task<Project> PerformRenamesAsync(Project project, IEnumerable<(ISymbol Original, string NewName)> symbolsWithNewNames, CancellationToken cancellationToken)
     {
         var solution = project.Solution;
         foreach (var (originalSymbol, newName) in symbolsWithNewNames.OrderByDescending(s => s.Original.DeclaringSyntaxReferences.Select(x => x.Span.End).Max())) {

CodeConverter/VB/CSToVBProjectContentsConverter.cs

@@ -45,7 +45,7 @@ public CSToVBProjectContentsConverter(ConversionOptions conversionOptions, IProg
     public async Task InitializeSourceAsync(Project project)
     {
         // TODO: Don't throw away solution-wide effects - write them to referencing files, and use in conversion of any other projects being converted at the same time.
-        project = await ClashingMemberRenamer.RenameClashingSymbolsAsync(project);
+        project = await ClashingMemberRenamer.RenameClashingSymbolsAsync(project, _cancellationToken);
         _convertedVbProject = project.ToProjectFromAnyOptions(_vbCompilationOptions, _vbParseOptions);
         _vbReferenceProject = project.CreateReferenceOnlyProjectFromAnyOptions(_vbCompilationOptions, _vbParseOptions);
         _vbViewOfCsSymbols = (VisualBasicCompilation)await _vbReferenceProject.GetCompilationAsync(_cancellationToken);

CodeConverter/VB/ClashingMemberRenamer.cs

@@ -10,12 +10,12 @@ internal static class ClashingMemberRenamer
     /// Cases in different named scopes should be dealt with by <seealso cref="DocumentExtensions.ExpandAsync"/>.
     /// For names scoped within a type member, see <seealso cref="SemanticModelSymbolSetExtensions.GetCsLocalSymbolsPerScope"/>.
     /// </remarks>
-    public static async Task<Project> RenameClashingSymbolsAsync(Project project)
+    public static async Task<Project> RenameClashingSymbolsAsync(Project project, CancellationToken cancellationToken)
     {
-        var compilation = await project.GetCompilationAsync();
+        var compilation = await project.GetCompilationAsync(cancellationToken);
         var memberRenames = SymbolRenamer.GetNamespacesAndTypesInAssembly(project, compilation)
             .SelectMany(x => GetSymbolsWithNewNames(x, compilation));
-        return await SymbolRenamer.PerformRenamesAsync(project, memberRenames.ToList());
+        return await SymbolRenamer.PerformRenamesAsync(project, memberRenames.ToList(), cancellationToken);
     }
 
     private static IEnumerable<(ISymbol Original, string NewName)> GetSymbolsWithNewNames(INamespaceOrTypeSymbol containerSymbol, Compilation compilation)