Skip to content
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

Allow [CallerArgumnetExpressionAttribute] after CancellationToken #6558

Merged
merged 3 commits into from
Apr 8, 2023
Merged

Allow [CallerArgumnetExpressionAttribute] after CancellationToken #6558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8a7ee5
Allow [CallerArgumnetExpressionAttribute] after CancellationToken
Tornhoof Mar 30, 2023
3cff908
Replace #ifdef with ReferenceAssemblies.Net.Net50
Tornhoof Mar 31, 2023
75e67ec
Fix formatting
Tornhoof Mar 31, 2023
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
1 change: 1 addition & 0 deletions ...soft.CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public override void Initialize(AnalysisContext context)
builder.AddIfNotNull(compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemRuntimeCompilerServicesCallerFilePathAttribute));
builder.AddIfNotNull(compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemRuntimeCompilerServicesCallerLineNumberAttribute));
builder.AddIfNotNull(compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemRuntimeCompilerServicesCallerMemberNameAttribute));
builder.AddIfNotNull(compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemRuntimeCompilerServicesCallerArgumentExpressionAttribute));
var callerInformationAttributes = builder.ToImmutable();

if (cancellationTokenType == null)
Expand Down
60 changes: 60 additions & 0 deletions ...CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLastTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,66 @@ public Task SomeAsync([CallerMemberName] string memberName = """",
}");
}

[Fact, WorkItem(6557, "https://github.com/dotnet/roslyn-analyzers/issues/6557")]
public async Task CA1068_CallerArgumentExpressionAttributeWithOptionalCancellationTokenAsLastParameterAsync()
{
await new VerifyCS.Test
{
LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp9,
ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
TestState =
{
Sources =
{
@"
using System;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;

public class C
{
public Task SomeAsync(string input, [CallerArgumentExpression(nameof(input))] string argumentName = null,
CancellationToken cancellationToken = default)
{
throw new NotImplementedException();
}
}"
}
}
}.RunAsync();
}

[Fact, WorkItem(6557, "https://github.com/dotnet/roslyn-analyzers/issues/6557")]
public async Task CA1068_CallerArgumentExpressionAttributeWithOptionalCancellationTokenAsMiddleParameterAsync()
{
await new VerifyCS.Test
{
LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp9,
ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
TestState =
{
Sources =
{
@"
using System;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;

public class C
{
public Task SomeAsync(string input, CancellationToken cancellationToken = default,
[CallerArgumentExpression(nameof(input))] string argumentName = null)
{
throw new NotImplementedException();
}
}"
}
}
}.RunAsync();
}

[Theory, WorkItem(2851, "https://github.com/dotnet/roslyn-analyzers/issues/2851")]
// Empty editorconfig
[InlineData("public", "")]
Expand Down
1 change: 1 addition & 0 deletions src/Utilities/Compiler/WellKnownTypeNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ internal static class WellKnownTypeNames
public const string SystemRuntimeCompilerServicesCallerFilePathAttribute = "System.Runtime.CompilerServices.CallerFilePathAttribute";
public const string SystemRuntimeCompilerServicesCallerLineNumberAttribute = "System.Runtime.CompilerServices.CallerLineNumberAttribute";
public const string SystemRuntimeCompilerServicesCallerMemberNameAttribute = "System.Runtime.CompilerServices.CallerMemberNameAttribute";
public const string SystemRuntimeCompilerServicesCallerArgumentExpressionAttribute = "System.Runtime.CompilerServices.CallerArgumentExpressionAttribute";
public const string SystemRuntimeCompilerServicesCompilerGeneratedAttribute = "System.Runtime.CompilerServices.CompilerGeneratedAttribute";
public const string SystemRuntimeCompilerServicesConfiguredAsyncDisposable = "System.Runtime.CompilerServices.ConfiguredAsyncDisposable";
public const string SystemRuntimeCompilerServicesConfiguredValueTaskAwaitable1 = "System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1";
Expand Down