Rename verbosity property to legacy

Author: tamasvajk

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

@@ -38,7 +38,7 @@ public static void Main(string[] 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
                 .Select(asm => asm.Filename)

csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs

@@ -136,7 +136,7 @@ public static ExitCode Run(Options options)
             var stopwatch = new Stopwatch();
             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");
             using var a = new Analysis(logger, options);
             var sourceFileCount = a.Extraction.Sources.Count;
@@ -147,7 +147,7 @@ public static ExitCode Run(Options options)
                 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, "Extracting...");

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs

@@ -97,7 +97,7 @@ public static ExitCode Run(string[] args)
             var options = Options.CreateWithEnvironment(args);
             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 pathTransformer = new PathTransformer(canonicalPathCache);

csharp/extractor/Semmle.Extraction.Tests/Options.cs

@@ -27,7 +27,7 @@ public void DefaultOptions()
             Assert.Null(options.CompilerName);
             Assert.Empty(options.CompilerArguments);
             Assert.True(options.Threads >= 1);
-            Assert.Equal(Verbosity.Info, options.Verbosity);
+            Assert.Equal(Verbosity.Info, options.LegacyVerbosity);
             Assert.False(options.Console);
             Assert.False(options.PDB);
             Assert.False(options.Fast);
@@ -80,25 +80,25 @@ public void CompilerArguments()
         public void VerbosityTests()
         {
             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" });
-            Assert.Equal(Verbosity.Off, options.Verbosity);
+            Assert.Equal(Verbosity.Off, options.LegacyVerbosity);
 
             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" });
-            Assert.Equal(Verbosity.Warning, options.Verbosity);
+            Assert.Equal(Verbosity.Warning, options.LegacyVerbosity);
 
             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" });
-            Assert.Equal(Verbosity.Debug, options.Verbosity);
+            Assert.Equal(Verbosity.Debug, options.LegacyVerbosity);
 
             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" }));
         }
@@ -142,7 +142,7 @@ public void StandaloneDefaults()
         public void StandaloneOptions()
         {
             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.Help);
         }

csharp/extractor/Semmle.Extraction/Options.cs

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