hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 20:26:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename verbosity property to legacy

Browse Source
This commit is contained in:
Tamas Vajk
2024-01-25 16:03:23 +01:00
parent 0e5e57dc56
commit bb4327294d
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
View File

@@ -38,7 +38,7 @@ namespace Semmle.Extraction.CIL.Driver
} }
var options = new ExtractorOptions(args); var options = new ExtractorOptions(args);
using ILogger logger = new ConsoleLogger(options.Verbosity, logThreadId: false); using ILogger logger = new ConsoleLogger(options.LegacyVerbosity, logThreadId: false);
var actions = options.AssembliesToExtract var actions = options.AssembliesToExtract
.Select(asm => asm.Filename) .Select(asm => asm.Filename)

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

@@ -136,7 +136,7 @@ namespace Semmle.Extraction.CSharp.Standalone
var stopwatch = new Stopwatch(); var stopwatch = new Stopwatch();
stopwatch.Start(); stopwatch.Start();
using var logger = new ConsoleLogger(options.Verbosity, logThreadId: true); using var logger = new ConsoleLogger(options.LegacyVerbosity, logThreadId: true);
logger.Log(Severity.Info, "Running C# standalone extractor"); logger.Log(Severity.Info, "Running C# standalone extractor");
using var a = new Analysis(logger, options); using var a = new Analysis(logger, options);
var sourceFileCount = a.Extraction.Sources.Count; var sourceFileCount = a.Extraction.Sources.Count;
@@ -147,7 +147,7 @@ namespace Semmle.Extraction.CSharp.Standalone
return ExitCode.Errors; return ExitCode.Errors;
} }
using var fileLogger = CSharp.Extractor.MakeLogger(options.Verbosity, false); using var fileLogger = CSharp.Extractor.MakeLogger(options.LegacyVerbosity, false);
logger.Log(Severity.Info, ""); logger.Log(Severity.Info, "");
logger.Log(Severity.Info, "Extracting..."); logger.Log(Severity.Info, "Extracting...");

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

@@ -97,7 +97,7 @@ namespace Semmle.Extraction.CSharp
var options = Options.CreateWithEnvironment(args); var options = Options.CreateWithEnvironment(args);
Entities.Compilation.Settings = (Directory.GetCurrentDirectory(), options.CompilerArguments.ToArray()); Entities.Compilation.Settings = (Directory.GetCurrentDirectory(), options.CompilerArguments.ToArray());
using var logger = MakeLogger(options.Verbosity, options.Console); using var logger = MakeLogger(options.LegacyVerbosity, options.Console);
var canonicalPathCache = CanonicalPathCache.Create(logger, 1000); var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
var pathTransformer = new PathTransformer(canonicalPathCache); var pathTransformer = new PathTransformer(canonicalPathCache);

18
csharp/extractor/Semmle.Extraction.Tests/Options.cs
View File

@@ -27,7 +27,7 @@ namespace Semmle.Extraction.Tests
Assert.Null(options.CompilerName); Assert.Null(options.CompilerName);
Assert.Empty(options.CompilerArguments); Assert.Empty(options.CompilerArguments);
Assert.True(options.Threads >= 1); Assert.True(options.Threads >= 1);
Assert.Equal(Verbosity.Info, options.Verbosity); Assert.Equal(Verbosity.Info, options.LegacyVerbosity);
Assert.False(options.Console); Assert.False(options.Console);
Assert.False(options.PDB); Assert.False(options.PDB);
Assert.False(options.Fast); Assert.False(options.Fast);
@@ -80,25 +80,25 @@ namespace Semmle.Extraction.Tests
public void VerbosityTests() public void VerbosityTests()
{ {
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbose" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbose" });
Assert.Equal(Verbosity.Debug, options.Verbosity); Assert.Equal(Verbosity.Debug, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "0" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "0" });
Assert.Equal(Verbosity.Off, options.Verbosity); Assert.Equal(Verbosity.Off, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "1" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "1" });
Assert.Equal(Verbosity.Error, options.Verbosity); Assert.Equal(Verbosity.Error, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "2" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "2" });
Assert.Equal(Verbosity.Warning, options.Verbosity); Assert.Equal(Verbosity.Warning, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "3" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "3" });
Assert.Equal(Verbosity.Info, options.Verbosity); Assert.Equal(Verbosity.Info, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "4" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "4" });
Assert.Equal(Verbosity.Debug, options.Verbosity); Assert.Equal(Verbosity.Debug, options.LegacyVerbosity);
options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "5" }); options = CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "5" });
Assert.Equal(Verbosity.Trace, options.Verbosity); Assert.Equal(Verbosity.Trace, options.LegacyVerbosity);
Assert.Throws<FormatException>(() => CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "X" })); Assert.Throws<FormatException>(() => CSharp.Options.CreateWithEnvironment(new string[] { "--verbosity", "X" }));
} }
@@ -142,7 +142,7 @@ namespace Semmle.Extraction.Tests
public void StandaloneOptions() public void StandaloneOptions()
{ {
standaloneOptions = CSharp.Standalone.Options.Create(new string[] { "--silent" }); standaloneOptions = CSharp.Standalone.Options.Create(new string[] { "--silent" });
Assert.Equal(Verbosity.Off, standaloneOptions.Verbosity); Assert.Equal(Verbosity.Off, standaloneOptions.LegacyVerbosity);
Assert.False(standaloneOptions.Errors); Assert.False(standaloneOptions.Errors);
Assert.False(standaloneOptions.Help); Assert.False(standaloneOptions.Help);
} }

10
csharp/extractor/Semmle.Extraction/Options.cs
View File

@@ -16,9 +16,9 @@ namespace Semmle.Extraction
public int Threads { get; private set; } = EnvironmentVariables.GetDefaultNumberOfThreads(); public int Threads { get; private set; } = EnvironmentVariables.GetDefaultNumberOfThreads();
/// <summary> /// <summary>
/// The verbosity used in output and logging. /// The verbosity used specified by the '--silent' or '--verbose' flags or the '--verbosity' option.
/// </summary> /// </summary>
public Verbosity Verbosity { get; protected set; } = Verbosity.Info; public Verbosity LegacyVerbosity { get; protected set; } = Verbosity.Info;
/// <summary> /// <summary>
/// Whether to output to the console. /// Whether to output to the console.
@@ -63,7 +63,7 @@ namespace Semmle.Extraction
Threads = int.Parse(value); Threads = int.Parse(value);
return true; return true;
case "verbosity": case "verbosity":
Verbosity = (Verbosity)int.Parse(value); LegacyVerbosity = (Verbosity)int.Parse(value);
return true; return true;
case "trap_compression": case "trap_compression":
if (Enum.TryParse<TrapWriter.CompressionMode>(value, true, out var mode)) if (Enum.TryParse<TrapWriter.CompressionMode>(value, true, out var mode))
@@ -87,10 +87,10 @@ namespace Semmle.Extraction
switch (flag) switch (flag)
{ {
case "silent": case "silent":
Verbosity = value ? Verbosity.Off : Verbosity.Info; LegacyVerbosity = value ? Verbosity.Off : Verbosity.Info;
return true; return true;
case "verbose": case "verbose":
Verbosity = value ? Verbosity.Debug : Verbosity.Error; LegacyVerbosity = value ? Verbosity.Debug : Verbosity.Error;
return true; return true;
case "console": case "console":
Console = value; Console = value;