hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Address review comments

Browse Source
This commit is contained in:
Tom Hvitved
2019-09-16 10:45:37 +02:00
parent 8f3f9406e2
commit 4f897b2628
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs
View File

@@ -36,40 +36,40 @@ namespace Semmle.Extraction.CSharp
CSharpCompilation compilation;
Layout layout;
private bool init;
/// <summary>
/// Initialize the analyser.
/// Start initialization of the analyser.
/// </summary>
/// <param name="roslynArgs">The arguments passed to Roslyn.</param>
/// <returns>A Boolean indicating whether to proceed with extraction.</returns>
public bool BeginInitialize(string[] roslynArgs)
{
return init = LogRoslynArgs(roslynArgs, Extraction.Extractor.Version);
}
/// <summary>
/// End initialization of the analyser.
/// </summary>
/// <param name="commandLineArguments">Arguments passed to csc.</param>
/// <param name="options">Extractor options.</param>
/// <param name="roslynArgs">The arguments passed to Roslyn.</param>
/// <param name="finalizeInit">A continuation for finalizing initialization based on a Roslyn compilation.</param>
/// <param name="compilation">The Roslyn compilation.</param>
/// <returns>A Boolean indicating whether to proceed with extraction.</returns>
public bool Initialize(
CSharpCommandLineArguments commandLineArguments,
Options options,
string[] roslynArgs,
out Action<CSharpCompilation> finalizeInit)
public void EndInitialize(
CSharpCommandLineArguments commandLineArguments,
Options options,
CSharpCompilation compilation)
{
if (!LogRoslynArgs(roslynArgs, Extraction.Extractor.Version))
{
finalizeInit = null;
return false;
}
if (!init)
throw new InternalError("EndInitialize called without BeginInitialize returning true");
layout = new Layout();
this.options = options;
this.compilation = compilation;
extractor = new Extraction.Extractor(false, GetOutputName(compilation, commandLineArguments), Logger);
LogDiagnostics();
finalizeInit = comp =>
{
compilation = comp;
extractor = new Extraction.Extractor(false, GetOutputName(comp, commandLineArguments), Logger);
LogDiagnostics();
SetReferencePaths();
SetReferencePaths();
CompilationErrors += FilteredDiagnostics.Count();
};
return true;
CompilationErrors += FilteredDiagnostics.Count();
}
/// <summary>
@@ -444,7 +444,7 @@ namespace Semmle.Extraction.CSharp
/// Logs information about the extractor, as well as the arguments to Roslyn.
/// </summary>
/// <param name="roslynArgs">The arguments passed to Roslyn.</param>
/// <returns>A Boolean indicating whether to proceed with extraction.</returns>
/// <returns>A Boolean indicating whether the same arguments have been logged previously.</returns>
public bool LogRoslynArgs(string[] roslynArgs, string extractorVersion)
{
LogExtractorInfo(extractorVersion);
@@ -456,7 +456,7 @@ namespace Semmle.Extraction.CSharp
bool argsWritten;
using (var streamWriter = new StreamWriter(new FileStream(tempFile, FileMode.Append, FileAccess.Write)))
{
streamWriter.WriteLine($"Arguments to Roslyn: {string.Join(' ', roslynArgs)}");
streamWriter.WriteLine($"# Arguments to Roslyn: {string.Join(' ', roslynArgs)}");
argsWritten = roslynArgs.WriteCommandLine(streamWriter);
}

4
csharp/extractor/Semmle.Extraction.CSharp/Extractor.cs
View File

@@ -109,7 +109,7 @@ namespace Semmle.Extraction.CSharp
return ExitCode.Failed;
}
if (!analyser.Initialize(compilerArguments, commandLineArguments, compilerVersion.ArgsWithResponse, out var finalizeInit))
if (!analyser.BeginInitialize(compilerVersion.ArgsWithResponse))
{
logger.Log(Severity.Info, "Skipping extraction since files have already been extracted");
return ExitCode.Ok;
@@ -154,7 +154,7 @@ namespace Semmle.Extraction.CSharp
// already.
);
finalizeInit(compilation);
analyser.EndInitialize(compilerArguments, commandLineArguments, compilation);
analyser.AnalyseCompilation(cwd, args);
analyser.AnalyseReferences();