hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 16:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix code review findings

Browse Source
This commit is contained in:
Tamas Vajk
2023-12-14 10:15:22 +01:00
parent 728229e6e1
commit ee70de8879
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FilePathFilter.cs
View File

@@ -64,19 +64,22 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
pathFilters.Add(new PathFilter(new Regex(regex, RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline), include));
}
var includeByDefault = pathFilters.All(f => !f.Include);
var unfilteredResult = files.Select(f =>
new
{
FileInfo = f,
FileInclusion = new FileInclusion(
FileUtils.ConvertToUnix(f.FullName.ToLowerInvariant()).Replace(rootFolder, string.Empty).TrimStart('/'),
pathFilters.All(f => !f.Include))
includeByDefault)
});
// Move included pathfilters to the front of the list:
pathFilters.Sort((pf1, pf2) => -1 * pf1.Include.CompareTo(pf2.Include));
return unfilteredResult.Where(f =>
{
var include = f.FileInclusion.Include;
foreach (var pathFilter in pathFilters.OrderBy(pf => pf.Include ? 0 : 1))
foreach (var pathFilter in pathFilters)
{
if (pathFilter.Regex.IsMatch(f.FileInclusion.Path))
{