Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7f86768

Browse files
tamasvajktamasvajk
committed
C#: Reformat LINQ extension method call-chains
1 parent 115a216 commit 7f86768

27 files changed

Lines changed: 197 additions & 188 deletions

File tree

‎csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public BuildScript Analyse(Autobuilder builder, bool auto)
2323

2424
if (auto)
2525
{
26-
var notDotNetProject = builder.ProjectsOrSolutionsToBuild.
27-
SelectMany(p => Enumerators.Singleton(p).Concat(p.IncludedProjects)).
28-
OfType<Project>().
29-
FirstOrDefault(p => !p.DotNetProject);
26+
var notDotNetProject = builder.ProjectsOrSolutionsToBuild
27+
.SelectMany(p => Enumerators.Singleton(p).Concat(p.IncludedProjects))
28+
.OfType<Project>()
29+
.FirstOrDefault(p => !p.DotNetProject);
3030
if (notDotNetProject != null)
3131
{
3232
builder.Log(Severity.Info, "Not using .NET Core because of incompatible project {0}", notDotNetProject);
@@ -94,11 +94,11 @@ static BuildScript WithDotNet(Autobuilder builder, Func<string?, IDictionary<str
9494
{
9595
var minimumVersion = new Version(3, 0);
9696
var regex = new Regex(@"Microsoft\.NETCore\.App (\d\.\d\.\d)");
97-
compatibleClr = runtimes.
98-
Select(runtime => regex.Match(runtime)).
99-
Where(m => m.Success).
100-
Select(m => m.Groups[1].Value).
101-
Any(m => Version.TryParse(m, out var v) && v >= minimumVersion);
97+
compatibleClr = runtimes
98+
.Select(runtime => regex.Match(runtime))
99+
.Where(m => m.Success)
100+
.Select(m => m.Groups[1].Value)
101+
.Any(m => Version.TryParse(m, out var v) && v >= minimumVersion);
102102
}
103103

104104
if (!compatibleClr)

‎csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results
125125

126126
IEnumerable<IProjectOrSolution>? FindFiles(string extension, Func<string, ProjectOrSolution> create)
127127
{
128-
var matchingFiles = GetExtensions(extension).
129-
Select(p => (ProjectOrSolution: create(p.Item1), DistanceFromRoot: p.Item2)).
130-
Where(p => p.ProjectOrSolution.HasLanguage(this.Options.Language)).
131-
ToArray();
128+
var matchingFiles = GetExtensions(extension)
129+
.Select(p => (ProjectOrSolution: create(p.Item1), DistanceFromRoot: p.Item2))
130+
.Where(p => p.ProjectOrSolution.HasLanguage(this.Options.Language))
131+
.ToArray();
132132

133133
if (matchingFiles.Length == 0)
134134
return null;
135135

136136
if (Options.AllSolutions)
137137
return matchingFiles.Select(p => p.ProjectOrSolution);
138138

139-
return matchingFiles.
140-
Where(f => f.DistanceFromRoot == matchingFiles[0].DistanceFromRoot).
141-
Select(f => f.ProjectOrSolution);
139+
return matchingFiles
140+
.Where(f => f.DistanceFromRoot == matchingFiles[0].DistanceFromRoot)
141+
.Select(f => f.ProjectOrSolution);
142142
}
143143

144144
/// <summary>

‎csharp/autobuilder/Semmle.Autobuild.Shared/Solution.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,11 @@ public Solution(Autobuilder builder, string path, bool allowProject) : base(buil
7777
return;
7878
}
7979

80-
includedProjects =
81-
solution.ProjectsInOrder.
82-
Where(p => p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat).
83-
Select(p => builder.Actions.PathCombine(DirectoryName, builder.Actions.PathCombine(p.RelativePath.Split('\\', StringSplitOptions.RemoveEmptyEntries)))).
84-
Select(p => new Project(builder, p)).
85-
ToArray();
80+
includedProjects = solution.ProjectsInOrder
81+
.Where(p => p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat)
82+
.Select(p => builder.Actions.PathCombine(DirectoryName, builder.Actions.PathCombine(p.RelativePath.Split('\\', StringSplitOptions.RemoveEmptyEntries))))
83+
.Select(p => new Project(builder, p))
84+
.ToArray();
8685
}
8786

8887
IEnumerable<Version> ToolsVersions => includedProjects.Where(p => p.ValidToolsVersion).Select(p => p.ToolsVersion);

‎csharp/extractor/Semmle.Extraction.CIL.Driver/ExtractorOptions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public AssemblyInfo(string path)
7575
// Get our own assembly name
7676
name = CreateAssemblyName(mdReader, mdReader.GetAssemblyDefinition());
7777

78-
references = mdReader.AssemblyReferences.
79-
Select(r => mdReader.GetAssemblyReference(r)).
80-
Select(ar => CreateAssemblyName(mdReader, ar)).
81-
ToArray();
78+
references = mdReader.AssemblyReferences
79+
.Select(r => mdReader.GetAssemblyReference(r))
80+
.Select(ar => CreateAssemblyName(mdReader, ar))
81+
.ToArray();
8282
}
8383
catch (System.BadImageFormatException)
8484
{

‎csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ static void Main(string[] args)
4141
var layout = new Layout();
4242
using var logger = new ConsoleLogger(options.Verbosity);
4343

44-
var actions = options.
45-
AssembliesToExtract.Select(asm => asm.filename).
46-
Select<string, Action>(filename => () => ExtractAssembly(layout, filename, logger, options.NoCache, options.PDB, options.TrapCompression)).
47-
ToArray();
44+
var actions = options.AssembliesToExtract
45+
.Select(asm => asm.filename)
46+
.Select<string, Action>(filename =>
47+
() => ExtractAssembly(layout, filename, logger, options.NoCache, options.PDB, options.TrapCompression))
48+
.ToArray();
4849

4950
foreach (var missingRef in options.MissingReferences)
5051
logger.Log(Severity.Info, " Missing assembly " + missingRef);

‎csharp/extractor/Semmle.Extraction.CIL/PDB/MetadataPdbReader.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ public MetadataPdbReader(MetadataReaderProvider provider)
4545
{
4646
var debugInfo = reader.GetMethodDebugInformation(handle);
4747

48-
var sequencePoints = debugInfo.GetSequencePoints().
49-
Where(p => !p.Document.IsNil && !p.IsHidden).
50-
Select(p => new SequencePoint(p.Offset, new Location(new SourceFile(reader, p.Document), p.StartLine, p.StartColumn, p.EndLine, p.EndColumn))).
51-
Where(p => p.Location.File.Path != null).
52-
ToArray();
48+
var sequencePoints = debugInfo.GetSequencePoints()
49+
.Where(p => !p.Document.IsNil && !p.IsHidden)
50+
.Select(p => new SequencePoint(p.Offset, new Location(
51+
new SourceFile(reader, p.Document), p.StartLine, p.StartColumn, p.EndLine, p.EndColumn)))
52+
.Where(p => p.Location.File.Path != null)
53+
.ToArray();
5354

5455
return sequencePoints.Any() ? new Method(sequencePoints) : null;
5556
}

‎csharp/extractor/Semmle.Extraction.CIL/PDB/NativePdbReader.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ public override bool Equals(object? obj)
6565
if (method.GetSequencePointCount(out var count) != 0 || count == 0)
6666
return null;
6767

68-
var s = method.GetSequencePoints().
69-
Where(sp => !sp.IsHidden).
70-
Select(sp => new SequencePoint(sp.Offset, new Location(new Document(sp.Document), sp.StartLine, sp.StartColumn, sp.EndLine, sp.EndColumn))).
71-
ToArray();
68+
var s = method.GetSequencePoints()
69+
.Where(sp => !sp.IsHidden)
70+
.Select(sp => new SequencePoint(sp.Offset, new Location(
71+
new Document(sp.Document), sp.StartLine, sp.StartColumn, sp.EndLine, sp.EndColumn)))
72+
.ToArray();
7273

7374
return s.Any() ? new Method(s) : null;
7475
}

‎csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ public BuildAnalysis(Options options, IProgressMonitor progress)
7272

7373
progressMonitor.FindingFiles(options.SrcDir);
7474

75-
allSources = sourceDir.GetFiles("*.cs", SearchOption.AllDirectories).
76-
Select(d => d.FullName).
77-
Where(d => !options.ExcludesFile(d)).
78-
ToArray();
75+
allSources = sourceDir.GetFiles("*.cs", SearchOption.AllDirectories)
76+
.Select(d => d.FullName)
77+
.Where(d => !options.ExcludesFile(d))
78+
.ToArray();
7979

8080
var dllDirNames = options.DllDirs.Select(Path.GetFullPath).ToList();
8181
PackageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName));

‎csharp/extractor/Semmle.Extraction.CSharp.Standalone/CsProjFile.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ private static (string[] csFiles, string[] references) ReadMsBuildProject(FileIn
5959
{
6060
var msbuildProject = new Microsoft.Build.Execution.ProjectInstance(filename.FullName);
6161

62-
var references = msbuildProject.
63-
Items.
64-
Where(item => item.ItemType == "Reference").
65-
Select(item => item.EvaluatedInclude).
66-
ToArray();
62+
var references = msbuildProject.Items
63+
.Where(item => item.ItemType == "Reference")
64+
.Select(item => item.EvaluatedInclude)
65+
.ToArray();
6766

6867
var csFiles = msbuildProject.Items
6968
.Where(item => item.ItemType == "Compile")
@@ -95,33 +94,34 @@ private static (string[] csFiles, string[] references) ReadProjectFileAsXml(File
9594

9695
if (netCoreProjectFile)
9796
{
98-
var explicitCsFiles = root.SelectNodes("/Project/ItemGroup/Compile/@Include", mgr).
99-
NodeList().
100-
Select(node => node.Value).
101-
Select(cs => Path.DirectorySeparatorChar == '/' ? cs.Replace("\\", "/") : cs).
102-
Select(f => Path.GetFullPath(Path.Combine(projDir.FullName, f)));
97+
var explicitCsFiles = root
98+
.SelectNodes("/Project/ItemGroup/Compile/@Include", mgr)
99+
.NodeList()
100+
.Select(node => node.Value)
101+
.Select(cs => Path.DirectorySeparatorChar == '/' ? cs.Replace("\\", "/") : cs)
102+
.Select(f => Path.GetFullPath(Path.Combine(projDir.FullName, f)));
103103

104104
var additionalCsFiles = System.IO.Directory.GetFiles(directoryName, "*.cs", SearchOption.AllDirectories);
105105

106106
return (explicitCsFiles.Concat(additionalCsFiles).ToArray(), Array.Empty<string>());
107107
}
108108

109-
var references =
110-
root.SelectNodes("/msbuild:Project/msbuild:ItemGroup/msbuild:Reference/@Include", mgr).
111-
NodeList().
112-
Select(node => node.Value).
113-
ToArray();
114-
115-
var relativeCsIncludes =
116-
root.SelectNodes("/msbuild:Project/msbuild:ItemGroup/msbuild:Compile/@Include", mgr).
117-
NodeList().
118-
Select(node => node.Value).
119-
ToArray();
120-
121-
var csFiles = relativeCsIncludes.
122-
Select(cs => Path.DirectorySeparatorChar == '/' ? cs.Replace("\\", "/") : cs).
123-
Select(f => Path.GetFullPath(Path.Combine(projDir.FullName, f))).
124-
ToArray();
109+
var references = root
110+
.SelectNodes("/msbuild:Project/msbuild:ItemGroup/msbuild:Reference/@Include", mgr)
111+
.NodeList()
112+
.Select(node => node.Value)
113+
.ToArray();
114+
115+
var relativeCsIncludes = root
116+
.SelectNodes("/msbuild:Project/msbuild:ItemGroup/msbuild:Compile/@Include", mgr)
117+
.NodeList()
118+
.Select(node => node.Value)
119+
.ToArray();
120+
121+
var csFiles = relativeCsIncludes
122+
.Select(cs => Path.DirectorySeparatorChar == '/' ? cs.Replace("\\", "/") : cs)
123+
.Select(f => Path.GetFullPath(Path.Combine(projDir.FullName, f)))
124+
.ToArray();
125125

126126
return (csFiles, references);
127127
}

‎csharp/extractor/Semmle.Extraction.CSharp.Standalone/SolutionFile.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public IEnumerable<string> MsBuildProjects
3232
{
3333
get
3434
{
35-
return solutionFile.ProjectsInOrder.
36-
Where(p => p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat).
37-
Select(p => p.AbsolutePath).
38-
Select(p => Path.DirectorySeparatorChar == '/' ? p.Replace("\\", "/") : p);
35+
return solutionFile.ProjectsInOrder
36+
.Where(p => p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat)
37+
.Select(p => p.AbsolutePath)
38+
.Select(p => Path.DirectorySeparatorChar == '/' ? p.Replace("\\", "/") : p);
3939
}
4040
}
4141

@@ -46,11 +46,11 @@ public IEnumerable<string> NestedProjects
4646
{
4747
get
4848
{
49-
return solutionFile.ProjectsInOrder.
50-
Where(p => p.ProjectType == SolutionProjectType.SolutionFolder).
51-
Where(p => Directory.Exists(p.AbsolutePath)).
52-
SelectMany(p => new DirectoryInfo(p.AbsolutePath).EnumerateFiles("*.csproj", SearchOption.AllDirectories)).
53-
Select(f => f.FullName);
49+
return solutionFile.ProjectsInOrder
50+
.Where(p => p.ProjectType == SolutionProjectType.SolutionFolder)
51+
.Where(p => Directory.Exists(p.AbsolutePath))
52+
.SelectMany(p => new DirectoryInfo(p.AbsolutePath).EnumerateFiles("*.csproj", SearchOption.AllDirectories))
53+
.Select(f => f.FullName);
5454
}
5555
}
5656

0 commit comments

Comments
 (0)