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

Skip to content

Commit df9d54c

Browse files
tamasvajktamasvajk
committed
Fix code review findings
1 parent bd2b3e7 commit df9d54c

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎csharp/extractor/Semmle.Extraction.CIL/Analyser.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL
77
{
88
public static class Analyser
99
{
10-
private static void ExtractCIL(NonStandaloneExtractor extractor, TrapWriter trapWriter, bool extractPdbs)
10+
private static void ExtractCIL(TracingExtractor extractor, TrapWriter trapWriter, bool extractPdbs)
1111
{
1212
using var cilContext = new Context(extractor, trapWriter, extractor.OutputPath, extractPdbs);
1313
cilContext.Populate(new Assembly(cilContext));
@@ -33,7 +33,7 @@ public static void ExtractCIL(Layout layout, string assemblyPath, ILogger logger
3333
{
3434
var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
3535
var pathTransformer = new PathTransformer(canonicalPathCache);
36-
var extractor = new NonStandaloneExtractor(assemblyPath, logger, pathTransformer);
36+
var extractor = new TracingExtractor(assemblyPath, logger, pathTransformer);
3737
var transformedAssemblyPath = pathTransformer.Transform(assemblyPath);
3838
var project = layout.LookupProjectOrDefault(transformedAssemblyPath);
3939
using var trapWriter = project.CreateTrapWriter(logger, transformedAssemblyPath.WithSuffix(".cil"), trapCompression, discardDuplicates: true);

‎csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private Assembly(Context cx, Microsoft.CodeAnalysis.Location? init)
1717
if (init == null)
1818
{
1919
// This is the output assembly
20-
assemblyPath = ((NonStandaloneExtractor)cx.Extractor).OutputPath;
20+
assemblyPath = ((TracingExtractor)cx.Extractor).OutputPath;
2121
assembly = cx.Compilation.Assembly;
2222
}
2323
else

‎csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedEntity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Semmle.Extraction.CSharp.Entities
22
{
3-
internal abstract class CachedEntity<T> : Extraction.CachedEntity<T> where T : class
3+
internal abstract class CachedEntity<T> : Extraction.CachedEntity<T> where T : notnull
44
{
55
public override Context Context => (Context)base.Context;
66

‎csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Semmle.Extraction.CSharp.Entities
66
{
7-
internal class CommentLine : CachedEntity<Tuple<Microsoft.CodeAnalysis.Location, string>>
7+
internal class CommentLine : CachedEntity<(Microsoft.CodeAnalysis.Location, string)>
88
{
99
private CommentLine(Context cx, Microsoft.CodeAnalysis.Location loc, CommentLineType type, string text, string raw)
10-
: base(cx, new Tuple<Microsoft.CodeAnalysis.Location, string>(loc, text))
10+
: base(cx, (loc, text))
1111
{
1212
Type = type;
1313
RawText = raw;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static ExitCode Run(string[] args)
8686
var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
8787
var pathTransformer = new PathTransformer(canonicalPathCache);
8888

89-
using var analyser = new NonStandaloneAnalyser(new LogProgressMonitor(logger), logger, options.AssemblySensitiveTrap, pathTransformer);
89+
using var analyser = new TracingAnalyser(new LogProgressMonitor(logger), logger, options.AssemblySensitiveTrap, pathTransformer);
9090

9191
try
9292
{
@@ -120,7 +120,7 @@ public static ExitCode Run(string[] args)
120120
return ExitCode.Ok;
121121
}
122122

123-
return AnalyseNonStandalone(analyser, compilerArguments, options, canonicalPathCache, stopwatch);
123+
return AnalyseTracing(analyser, compilerArguments, options, canonicalPathCache, stopwatch);
124124
}
125125
catch (Exception ex) // lgtm[cs/catch-of-all-exceptions]
126126
{
@@ -291,7 +291,7 @@ private static ExitCode Analyse(Stopwatch stopwatch, Analyser analyser, CommonOp
291291
{
292292
analyser.Logger.Log(Severity.Error, " No source files");
293293
++analyser.CompilationErrors;
294-
if (analyser is NonStandaloneAnalyser)
294+
if (analyser is TracingAnalyser)
295295
{
296296
return ExitCode.Failed;
297297
}
@@ -369,8 +369,8 @@ private static void AnalyseStandalone(
369369
});
370370
}
371371

372-
private static ExitCode AnalyseNonStandalone(
373-
NonStandaloneAnalyser analyser,
372+
private static ExitCode AnalyseTracing(
373+
TracingAnalyser analyser,
374374
CSharpCommandLineArguments compilerArguments,
375375
Options options,
376376
CanonicalPathCache canonicalPathCache,

csharp/extractor/Semmle.Extraction.CSharp/Extractor/NonStandaloneAnalyser.cs renamed to csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
namespace Semmle.Extraction.CSharp
1212
{
13-
public class NonStandaloneAnalyser : Analyser, IDisposable
13+
public class TracingAnalyser : Analyser, IDisposable
1414
{
1515
private Entities.Compilation? compilationEntity;
1616
private IDisposable? compilationTrapFile;
1717

1818
private bool init;
1919

20-
public NonStandaloneAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
20+
public TracingAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
2121
: base(pm, logger, addAssemblyTrapPrefix, pathTransformer)
2222
{
2323
}
@@ -49,7 +49,7 @@ public void EndInitialize(
4949
this.layout = new Layout();
5050
this.options = options;
5151
this.compilation = compilation;
52-
this.extractor = new NonStandaloneExtractor(GetOutputName(compilation, commandLineArguments), Logger, PathTransformer);
52+
this.extractor = new TracingExtractor(GetOutputName(compilation, commandLineArguments), Logger, PathTransformer);
5353
LogDiagnostics();
5454

5555
SetReferencePaths();
@@ -199,7 +199,7 @@ private void DoAnalyseCompilation()
199199
{
200200
try
201201
{
202-
var assemblyPath = ((NonStandaloneExtractor?)extractor).OutputPath;
202+
var assemblyPath = ((TracingExtractor?)extractor).OutputPath;
203203
var transformedAssemblyPath = PathTransformer.Transform(assemblyPath);
204204
var assembly = compilation.Assembly;
205205
var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);

‎csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected CachedEntity(Context context) : base(context)
2828
/// An abstract symbol, which encapsulates a data type (such as a C# symbol).
2929
/// </summary>
3030
/// <typeparam name="TSymbol">The type of the symbol.</typeparam>
31-
public abstract class CachedEntity<TSymbol> : CachedEntity where TSymbol : class
31+
public abstract class CachedEntity<TSymbol> : CachedEntity where TSymbol : notnull
3232
{
3333
public TSymbol Symbol { get; }
3434

csharp/extractor/Semmle.Extraction/Extractor/NonStandaloneExtractor.cs renamed to csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Semmle.Extraction
44
{
5-
public class NonStandaloneExtractor : Extractor
5+
public class TracingExtractor : Extractor
66
{
77
public override bool Standalone => false;
88

@@ -14,7 +14,7 @@ public class NonStandaloneExtractor : Extractor
1414
/// <param name="outputPath">The name of the output DLL/EXE, or null if not specified (standalone extraction).</param>
1515
/// <param name="logger">The object used for logging.</param>
1616
/// <param name="pathTransformer">The object used for path transformations.</param>
17-
public NonStandaloneExtractor(string outputPath, ILogger logger, PathTransformer pathTransformer) : base(logger, pathTransformer)
17+
public TracingExtractor(string outputPath, ILogger logger, PathTransformer pathTransformer) : base(logger, pathTransformer)
1818
{
1919
OutputPath = outputPath;
2020
}

0 commit comments

Comments
 (0)