Cleanup

SonarSource · May 17, 2024 · 25b6496 · 25b6496
1 parent 2f2fc23
commit 25b6496
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/analyzers/src/SonarAnalyzer.Common/Analyzers/SonarDiagnosticAnalyzer.cs b/analyzers/src/SonarAnalyzer.Common/Analyzers/SonarDiagnosticAnalyzer.cs
@@ -26,10 +26,10 @@ public abstract class SonarDiagnosticAnalyzer : DiagnosticAnalyzer
 {
     public static readonly string EnableConcurrentExecutionVariable = "SONAR_DOTNET_ENABLE_CONCURRENT_EXECUTION";
 
-    protected virtual bool EnableConcurrentExecution => IsConcurrentExecutionEnabled();
-
     protected abstract void Initialize(SonarAnalysisContext context);
 
+    protected virtual bool EnableConcurrentExecution => IsConcurrentExecutionEnabled();
+
     public sealed override void Initialize(RoslynAnalysisContext context)
     {
         // The default values are Analyze | ReportDiagnostics. We do this call to make sure it will be still enabled even if the default values changed. (Needed for the razor analysis)
@@ -44,12 +44,7 @@ public sealed override void Initialize(RoslynAnalysisContext context)
     protected static bool IsConcurrentExecutionEnabled()
     {
         var value = Environment.GetEnvironmentVariable(EnableConcurrentExecutionVariable);
-
-        if (value != null && bool.TryParse(value, out var result))
-        {
-            return result;
-        }
-        return true;
+        return value is null || !bool.TryParse(value, out var result) || result;
     }
 }
 

diff --git a/analyzers/src/SonarAnalyzer.Common/Analyzers/TrackerHotspotDiagnosticAnalyzer.cs b/analyzers/src/SonarAnalyzer.Common/Analyzers/TrackerHotspotDiagnosticAnalyzer.cs
@@ -20,14 +20,13 @@
 
 namespace SonarAnalyzer.Analyzers;
 
-public abstract class TrackerHotspotDiagnosticAnalyzer<TSyntaxKind> : HotspotDiagnosticAnalyzer
-    where TSyntaxKind : struct
+public abstract class TrackerHotspotDiagnosticAnalyzer<TSyntaxKind> : HotspotDiagnosticAnalyzer where TSyntaxKind : struct
 {
-    protected DiagnosticDescriptor Rule { get; }
-
     protected abstract ILanguageFacade<TSyntaxKind> Language { get; }
     protected abstract void Initialize(TrackerInput input);
 
+    protected DiagnosticDescriptor Rule { get; }
+
     public sealed override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
     protected TrackerHotspotDiagnosticAnalyzer(IAnalyzerConfiguration configuration, string diagnosticId, string messageFormat) : base(configuration) =>