transport methods from SonarAnalysisContext to SonarLintXmlReader

SonarSource · Mar 14, 2023 · 920f751 · 920f751
1 parent e841ab6
commit 920f751
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs b/analyzers/src/SonarAnalyzer.Common/AnalysisContext/SonarAnalysisContextBase.cs
@@ -127,25 +127,8 @@ public bool HasMatchingScope(DiagnosticDescriptor descriptor)
 
     private bool ShouldAnalyzeFile(SonarLintXmlReader sonarLintXml, string filePath) =>
         ProjectConfiguration().ProjectType != ProjectType.Unknown // Not SonarLint context, NuGet or Scanner <= 5.0
-        || (FileInclusionCache.GetValue(Compilation, _ => new()) is var cache
-            && cache.GetOrAdd(filePath, _ => IsFileIncluded(sonarLintXml, filePath)));
+        || FileInclusionCache.GetValue(Compilation, _ => new()).GetOrAdd(filePath, _ => sonarLintXml.IsFileIncluded(filePath, IsTestProject()));
 
     private ImmutableHashSet<string> CreateUnchangedFilesHashSet() =>
         ImmutableHashSet.Create(StringComparer.OrdinalIgnoreCase, ProjectConfiguration().AnalysisConfig?.UnchangedFiles() ?? Array.Empty<string>());
-
-    private bool IsFileIncluded(SonarLintXmlReader sonarLintXml, string filePath) =>
-        IsTestProject()
-        ? IsFileIncluded(sonarLintXml.TestInclusions, sonarLintXml.TestExclusions, sonarLintXml.GlobalTestExclusions, filePath)
-        : IsFileIncluded(sonarLintXml.Inclusions, sonarLintXml.Exclusions, sonarLintXml.GlobalExclusions, filePath);
-
-    private static bool IsFileIncluded(string[] inclusions, string[] exclusions, string[] globalExclusions, string filePath) =>
-        IsIncluded(inclusions, filePath)
-        && !IsExcluded(exclusions, filePath)
-        && !IsExcluded(globalExclusions, filePath);
-
-    private static bool IsIncluded(string[] inclusions, string filePath) =>
-        inclusions is { Length: 0 } || inclusions.Any(x => WildcardPatternMatcher.IsMatch(x, filePath));
-
-    private static bool IsExcluded(string[] exclusions, string filePath) =>
-        exclusions.Any(x => WildcardPatternMatcher.IsMatch(x, filePath));
 }
diff --git a/analyzers/src/SonarAnalyzer.Common/Helpers/SonarLintXmlReader.cs b/analyzers/src/SonarAnalyzer.Common/Helpers/SonarLintXmlReader.cs
@@ -66,6 +66,22 @@ public SonarLintXmlReader(SourceText sonarLintXml, string language = LanguageNam
         propertyLanguage = language == LanguageNames.CSharp ? "cs" : "vbnet";
     }
 
+    public bool IsFileIncluded(string filePath, bool isTestProject) =>
+        isTestProject
+        ? IsFileIncluded(TestInclusions, TestExclusions, GlobalTestExclusions, filePath)
+        : IsFileIncluded(Inclusions, Exclusions, GlobalExclusions, filePath);
+
+    private static bool IsFileIncluded(string[] inclusions, string[] exclusions, string[] globalExclusions, string filePath) =>
+    IsIncluded(inclusions, filePath)
+    && !IsExcluded(exclusions, filePath)
+    && !IsExcluded(globalExclusions, filePath);
+
+    private static bool IsIncluded(string[] inclusions, string filePath) =>
+        inclusions is { Length: 0 } || inclusions.Any(x => WildcardPatternMatcher.IsMatch(x, filePath));
+
+    private static bool IsExcluded(string[] exclusions, string filePath) =>
+        exclusions.Any(x => WildcardPatternMatcher.IsMatch(x, filePath));
+
     private static SonarLintXml ParseContent(SourceText sonarLintXml)
     {
         try