Skip to content

Fix syntax node scope and nullable warnings #2900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agocke merged 5 commits into from
Jul 20, 2022
Merged

Fix syntax node scope and nullable warnings #2900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
136c2c6
Fix syntax node scope and nullable warnings
agocke Jul 19, 2022
3e56848
Adjust null checks
agocke Jul 19, 2022
828b438
Lint and fix issue with fields
agocke Jul 19, 2022
3b0b4be
Update src/ILLink.CodeFix/BaseAttributeCodeFixProvider.cs
agocke Jul 19, 2022
3ab5878
Update BaseAttributeCodeFixProvider.cs
agocke Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/ILLink.CodeFix/BaseAttributeCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@ public sealed override FixAllProvider GetFixAllProvider ()
protected async Task BaseRegisterCodeFixesAsync (CodeFixContext context)
{
var document = context.Document;
var root = await document.GetSyntaxRootAsync (context.CancellationToken).ConfigureAwait (false);
if (await document.GetSyntaxRootAsync (context.CancellationToken).ConfigureAwait (false) is not { } root)
return;
var diagnostic = context.Diagnostics.First ();
SyntaxNode targetNode = root!.FindNode (diagnostic.Location.SourceSpan);
SyntaxNode targetNode = root.FindNode (diagnostic.Location.SourceSpan, getInnermostNodeForTie: true);
if (FindAttributableParent (targetNode, AttributableParentTargets) is not SyntaxNode attributableNode)
return;

var model = await document.GetSemanticModelAsync (context.CancellationToken).ConfigureAwait (false);
var targetSymbol = model!.GetSymbolInfo (targetNode).Symbol!;
if (await document.GetSemanticModelAsync (context.CancellationToken).ConfigureAwait (false) is not { } model)
return;
if (model.GetSymbolInfo (targetNode).Symbol is not { } targetSymbol)
return;
if (model.Compilation.GetTypeByMetadataName (FullyQualifiedAttributeName) is not { } attributeSymbol)
return;
// N.B. May be null for FieldDeclaration, since field declarations can declare multiple variables
var attributableSymbol = model.GetDeclaredSymbol (attributableNode);

var attributableSymbol = model!.GetDeclaredSymbol (attributableNode)!;
var attributeSymbol = model!.Compilation.GetTypeByMetadataName (FullyQualifiedAttributeName)!;
var attributeArguments = GetAttributeArguments (attributableSymbol, targetSymbol, SyntaxGenerator.GetGenerator (document), diagnostic);
var codeFixTitle = CodeFixTitle.ToString ();

Expand Down Expand Up @@ -104,7 +109,7 @@ protected enum AttributeableParentTargets
}

protected abstract SyntaxNode[] GetAttributeArguments (
ISymbol attributableSymbol,
ISymbol? attributableSymbol,
ISymbol targetSymbol,
SyntaxGenerator syntaxGenerator,
Diagnostic diagnostic);
Expand Down
2 changes: 1 addition & 1 deletion src/ILLink.CodeFix/RequiresAssemblyFilesCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class RequiresAssemblyFilesCodeFixProvider : BaseAttributeCodeFixProvider

public sealed override Task RegisterCodeFixesAsync (CodeFixContext context) => BaseRegisterCodeFixesAsync (context);

protected override SyntaxNode[] GetAttributeArguments (ISymbol attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
{
var symbolDisplayName = targetSymbol.GetDisplayName ();
if (string.IsNullOrEmpty (symbolDisplayName) || HasPublicAccessibility (attributableSymbol))
Expand Down
2 changes: 1 addition & 1 deletion src/ILLink.CodeFix/RequiresDynamicCodeCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class RequiresDynamicCodeCodeFixProvider : BaseAttributeCodeFixProvider

public sealed override Task RegisterCodeFixesAsync (CodeFixContext context) => BaseRegisterCodeFixesAsync (context);

protected override SyntaxNode[] GetAttributeArguments (ISymbol attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
{
var symbolDisplayName = targetSymbol.GetDisplayName ();
if (string.IsNullOrEmpty (symbolDisplayName) || HasPublicAccessibility (attributableSymbol))
Expand Down
2 changes: 1 addition & 1 deletion src/ILLink.CodeFix/RequiresUnreferencedCodeCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class RequiresUnreferencedCodeCodeFixProvider : BaseAttributeCodeFixProvi

public sealed override Task RegisterCodeFixesAsync (CodeFixContext context) => BaseRegisterCodeFixesAsync (context);

protected override SyntaxNode[] GetAttributeArguments (ISymbol attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
{
var symbolDisplayName = targetSymbol.GetDisplayName ();
if (string.IsNullOrEmpty (symbolDisplayName) || HasPublicAccessibility (attributableSymbol))
Expand Down
2 changes: 1 addition & 1 deletion src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public sealed override ImmutableArray<string> FixableDiagnosticIds

public sealed override Task RegisterCodeFixesAsync (CodeFixContext context) => BaseRegisterCodeFixesAsync (context);

protected override SyntaxNode[] GetAttributeArguments (ISymbol attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymbol, ISymbol targetSymbol, SyntaxGenerator syntaxGenerator, Diagnostic diagnostic)
{
// Category of the attribute
var ruleCategory = syntaxGenerator.AttributeArgument (
Expand Down
37 changes: 37 additions & 0 deletions test/ILLink.RoslynAnalyzer.Tests/RequiresUnreferencedCodeAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,43 @@ static Task VerifyRequiresUnreferencedCodeCodeFix (
}


[Fact]
public async Task WarningInArgument ()
{
var test = """
using System.Diagnostics.CodeAnalysis;
public class C
{
[RequiresUnreferencedCode("message")]
public int M1() => 0;
public void M2(int x)
{
}
public void M3() => M2(M1());
}
""";
var fixtest = """
using System.Diagnostics.CodeAnalysis;
public class C
{
[RequiresUnreferencedCode("message")]
public int M1() => 0;
public void M2(int x)
{
}

[RequiresUnreferencedCode()]
public void M3() => M2(M1());
}
""";
await VerifyRequiresUnreferencedCodeCodeFix (test, fixtest, new[] {
// /0/Test0.cs(9,25): warning IL2026: Using member 'C.M1()' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. message.
VerifyCS.Diagnostic(DiagnosticId.RequiresUnreferencedCode).WithSpan(9, 25, 9, 29).WithArguments("C.M1()", " message.", ""),
}, new[] {
// /0/Test0.cs(10,6): error CS7036: There is no argument given that corresponds to the required formal parameter 'message' of 'RequiresUnreferencedCodeAttribute.RequiresUnreferencedCodeAttribute(string)'
DiagnosticResult.CompilerError("CS7036").WithSpan(10, 6, 10, 32).WithArguments("message", "System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute.RequiresUnreferencedCodeAttribute(string)"),
});
}

[Fact]
public async Task SimpleDiagnosticFix ()
Expand Down