NET-1035 AnalysisContext: Rename CancellationToken to Cancel

SonarSource · Jan 24, 2025 · a11f629 · a11f629
1 parent 90bd7dc
commit a11f629
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/ConditionalSimplificationCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/ConditionalSimplificationCodeFix.cs
@@ -35,7 +35,7 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
                 oldNode = globalStatementSyntax.Statement;
             }
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var newNode = Simplify(diagnostic, semanticModel, oldNode);
             if (newNode != null)
             {

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/EmptyMethodCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/EmptyMethodCodeFix.cs
@@ -69,7 +69,7 @@ private static async Task RegisterCodeFixesForMethodsAsync(SonarCodeFixContext c
                 },
                 context.Diagnostics);
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
 
             var systemNeedsToBeAdded = NamespaceNeedsToBeAdded(methodBody, semanticModel);
 

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/ForeachLoopExplicitConversionCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/ForeachLoopExplicitConversionCodeFix.cs
@@ -36,7 +36,7 @@ protected override Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeFixCont
                 return Task.CompletedTask;
             }
 
-            var semanticModel = context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false).GetAwaiter().GetResult();
+            var semanticModel = context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false).GetAwaiter().GetResult();
             var enumerableHelperType = semanticModel.Compilation.GetTypeByMetadataName(KnownType.System_Linq_Enumerable);
 
             if (enumerableHelperType != null)

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/GenericReadonlyFieldPropertyAssignmentCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/GenericReadonlyFieldPropertyAssignmentCodeFix.cs
@@ -35,13 +35,13 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
             var diagnosticSpan = diagnostic.Location.SourceSpan;
             var memberAccess = (MemberAccessExpressionSyntax)root.FindNode(diagnosticSpan, getInnermostNodeForTie: true);
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var fieldSymbol = (IFieldSymbol)semanticModel.GetSymbolInfo(memberAccess.Expression).Symbol;
             var typeParameterSymbol = (ITypeParameterSymbol)fieldSymbol.Type;
             var genericType = typeParameterSymbol.ContainingType;
 
             var classDeclarationTasks = genericType.DeclaringSyntaxReferences
-                .Select(reference => reference.GetSyntaxAsync(context.CancellationToken))
+                .Select(reference => reference.GetSyntaxAsync(context.Cancel))
                 .ToList();
 
             var taskResults = await Task.WhenAll(classDeclarationTasks).ConfigureAwait(false);
@@ -60,7 +60,7 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
                         foreach (var classes in mapping)
                         {
                             var document = currentSolution.GetDocument(classes.Key);
-                            var docRoot = await document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+                            var docRoot = await document.GetSyntaxRootAsync(context.Cancel).ConfigureAwait(false);
                             var newDocRoot = GetNewDocumentRoot(docRoot, typeParameterSymbol, classes);
                             currentSolution = currentSolution.WithDocumentSyntaxRoot(classes.Key, newDocRoot);
                         }

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/GenericTypeParameterEmptinessCheckingCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/GenericTypeParameterEmptinessCheckingCodeFix.cs
@@ -34,7 +34,7 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
                 ? binary.Right
                 : binary.Left;
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var typeSymbol = (ITypeParameterSymbol)semanticModel.GetTypeInfo(otherNode).Type;
             var defaultExpression = SyntaxFactory.DefaultExpression(SyntaxFactory.ParseTypeName(typeSymbol.Name));
 

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeMutableCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeMutableCodeFix.cs
@@ -42,10 +42,10 @@ protected  override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCode
             }
 
             var semanticModel = await context.Document
-                .GetSemanticModelAsync(context.CancellationToken)
+                .GetSemanticModelAsync(context.Cancel)
                 .ConfigureAwait(false);
             var allFieldDeclarationTasks = identifiersToFix.Select(identifier =>
-                GetFieldDeclarationSyntaxAsync(semanticModel, identifier, context.CancellationToken));
+                GetFieldDeclarationSyntaxAsync(semanticModel, identifier, context.Cancel));
             var allFieldDeclarations = await Task.WhenAll(allFieldDeclarationTasks).ConfigureAwait(false);
             allFieldDeclarations = allFieldDeclarations.WhereNotNull().ToArray();
 

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/MethodOverrideChangedDefaultValueCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/MethodOverrideChangedDefaultValueCodeFix.cs
@@ -39,7 +39,7 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
                 return;
             }
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var parameterSymbol = semanticModel.GetDeclaredSymbol(parameter);
             if (!(parameterSymbol?.ContainingSymbol is IMethodSymbol methodSymbol))
             {

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/NonFlagsEnumInBitwiseOperationCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/NonFlagsEnumInBitwiseOperationCodeFix.cs
@@ -31,10 +31,10 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
             var diagnosticSpan = diagnostic.Location.SourceSpan;
             var node = root.FindNode(diagnosticSpan, getInnermostNodeForTie: true);
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var operation = semanticModel.GetSymbolInfo(node).Symbol as IMethodSymbol;
 
-            if (!(operation?.ReturnType?.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax(context.CancellationToken) is EnumDeclarationSyntax enumDeclaration))
+            if (!(operation?.ReturnType?.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax(context.Cancel) is EnumDeclarationSyntax enumDeclaration))
             {
                 return;
             }

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/RedundantArgumentCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/RedundantArgumentCodeFix.cs
@@ -37,7 +37,7 @@ protected override async Task RegisterCodeFixesAsync(SyntaxNode root, SonarCodeF
                 return;
             }
 
-            var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+            var semanticModel = await context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false);
             var methodParameterLookup = new CSharpMethodParameterLookup(invocation, semanticModel);
             var argumentMappings = methodParameterLookup.GetAllArgumentParameterMappings().ToList();
 

diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/UseUnixEpochCodeFix.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/UseUnixEpochCodeFix.cs
@@ -26,7 +26,7 @@ protected override SyntaxNode ReplaceConstructorWithField(SyntaxNode root, Synta
             ExpressionSyntax typeNode;
             if (node.IsKind(SyntaxKindEx.ImplicitObjectCreationExpression))
             {
-                var semanticModel = context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false).GetAwaiter().GetResult();
+                var semanticModel = context.Document.GetSemanticModelAsync(context.Cancel).ConfigureAwait(false).GetAwaiter().GetResult();
                 typeNode = SyntaxFactory.IdentifierName(semanticModel.GetTypeInfo(node).Type.Name);
             }
             else

diff --git a/analyzers/src/SonarAnalyzer.Core/AnalysisContext/SonarCodeFixContext.cs b/analyzers/src/SonarAnalyzer.Core/AnalysisContext/SonarCodeFixContext.cs
@@ -24,7 +24,7 @@ public readonly struct SonarCodeFixContext
 {
     private readonly CodeFixContext context;
 
-    public readonly CancellationToken CancellationToken => context.CancellationToken;
+    public readonly CancellationToken Cancel => context.CancellationToken;
     public readonly Document Document => context.Document;
     public readonly ImmutableArray<Diagnostic> Diagnostics => context.Diagnostics;
     public readonly TextSpan Span => context.Span;

diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCodeFixContextTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCodeFixContextTest.cs
@@ -34,7 +34,7 @@ public async Task SonarCodeFixContext_Properties_ReturnRoslynCodeFixContextPrope
         var diagnostic = Diagnostic.Create(new DiagnosticDescriptor("1", "title", "format", "category", DiagnosticSeverity.Hidden, false), literal.GetLocation());
         var sonarCodefix = new SonarCodeFixContext(new CodeFixContext(document, diagnostic, (_, _) => { }, cancel));
 
-        sonarCodefix.CancellationToken.Should().Be(cancel);
+        sonarCodefix.Cancel.Should().Be(cancel);
         sonarCodefix.Document.Should().Be(document);
         sonarCodefix.Diagnostics.Should().Contain(diagnostic);
         sonarCodefix.Span.Should().Be(new TextSpan(18, 13));