Skip to content

Commit ce27831

Browse files
committed
C#: Fix nullable warnings and some code quality issues
1 parent a666a69 commit ce27831

File tree

24 files changed

+32
-46
lines changed

24 files changed

+32
-46
lines changed

csharp/extractor/Semmle.Extraction.CIL/Entities/ConstructedType.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using Microsoft.CodeAnalysis;
32
using System.Linq;
43
using System.Collections.Generic;
54
using System.IO;

csharp/extractor/Semmle.Extraction.CIL/Entities/Instruction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ public IEnumerable<IExtractionProduct> JumpContents(Dictionary<int, Instruction>
481481
// TODO: Find a solution to this.
482482

483483
// For now, just log the error
484-
Cx.Cx.ExtractionError("A CIL instruction jumps outside the current method", "", Extraction.Entities.GeneratedLocation.Create(Cx.Cx), "", Util.Logging.Severity.Warning);
484+
Cx.Cx.ExtractionError("A CIL instruction jumps outside the current method", null, Extraction.Entities.GeneratedLocation.Create(Cx.Cx), "", Util.Logging.Severity.Warning);
485485
}
486486
}
487487
}

csharp/extractor/Semmle.Extraction.CIL/Entities/NamedTypeIdWriter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Microsoft.CodeAnalysis;
21
using System.Linq;
32
using System.IO;
43

csharp/extractor/Semmle.Extraction.CIL/Entities/NoMetadataHandleType.FullyQualifiedNameParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal sealed partial class NoMetadataHandleType
2222
private class FullyQualifiedNameParser
2323
{
2424
public string ShortName { get; internal set; }
25-
public string? AssemblyName { get; internal set; }
25+
public string? AssemblyName { get; private set; }
2626
public IEnumerable<string>? TypeArguments { get; internal set; }
2727
public string? UnboundGenericTypeName { get; internal set; }
2828
public string ContainerName { get; internal set; }

csharp/extractor/Semmle.Extraction.CIL/Entities/NoMetadataHandleType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public NoMetadataHandleType(Context cx, string originalName) : base(cx)
6666

6767
private void Populate()
6868
{
69-
if (isContainerNamespace)
69+
if (ContainingNamespace is object)
7070
{
7171
Cx.Populate(ContainingNamespace);
7272
}

csharp/extractor/Semmle.Extraction.CIL/Entities/SignatureDecoder.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Reflection.Metadata;
22
using System.Collections.Immutable;
33
using System.IO;
4-
using System.Linq;
54

65
namespace Semmle.Extraction.CIL.Entities
76
{

csharp/extractor/Semmle.Extraction.CIL/Entities/TypeDefinitionType.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System;
2-
using Microsoft.CodeAnalysis;
3-
using System.Reflection.Metadata;
4-
using System.Collections.Immutable;
52
using System.Linq;
63
using System.Collections.Generic;
74
using System.Reflection;
85
using System.IO;
96
using System.Reflection.Metadata.Ecma335;
7+
using System.Reflection.Metadata;
108

119
namespace Semmle.Extraction.CIL.Entities
1210
{

csharp/extractor/Semmle.Extraction.CIL/Entities/TypeReferenceType.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
2-
using Microsoft.CodeAnalysis;
32
using System.Reflection.Metadata;
4-
using System.Collections.Immutable;
53
using System.Linq;
64
using System.Collections.Generic;
75
using System.IO;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public MetadataPdbReader(MetadataReaderProvider provider)
7676
out provider,
7777
out _))
7878
{
79-
return new MetadataPdbReader(provider);
79+
return new MetadataPdbReader(provider!);
8080
}
8181
}
8282

csharp/extractor/Semmle.Extraction.CIL/PDB/Method.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using System.Reflection.Metadata;
32
using System.Linq;
43

54
namespace Semmle.Extraction.PDB

0 commit comments

Comments
 (0)