Skip to content

Enable SA1014, SA1015 #25023

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

Open
xtqqczze wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable SA1014, SA1015 #25023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9075936
Enable `SA1014`: Opening generic brackets should not be preceded by a…
xtqqczze Feb 15, 2025
2f8a3bb
Enable `SA1015`: Closing generic bracket should be followed by a space
xtqqczze Feb 15, 2025
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
4 changes: 2 additions & 2 deletions .globalconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,11 +1630,11 @@ dotnet_diagnostic.SA1013.severity = none

# SA1014: Opening generic brackets should be spaced correctly
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1014.md
dotnet_diagnostic.SA1014.severity = none
dotnet_diagnostic.SA1014.severity = warning

# SA1015: Closing generic brackets should be spaced correctly
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1015.md
dotnet_diagnostic.SA1015.severity = none
dotnet_diagnostic.SA1015.severity = warning

# SA1016: Opening attribute brackets should be spaced correctly
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1016.md
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4192,7 +4192,7 @@ private static void NativeCompletionMemberValue(CompletionContext context, List<
/// <summary>
/// Returns all string values bound to a parameter except the one the cursor is currently at.
/// </summary>
private static HashSet<string>GetParameterValues(AstPair parameter, int cursorOffset)
private static HashSet<string> GetParameterValues(AstPair parameter, int cursorOffset)
{
var result = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
var parameterValues = parameter.Argument.FindAll(ast => !(cursorOffset >= ast.Extent.StartOffset && cursorOffset <= ast.Extent.EndOffset) && ast is StringConstantExpressionAst, searchNestedScriptBlocks: false);
Expand Down Expand Up @@ -4808,7 +4808,7 @@ private static List<CompletionResult> GetFileSystemProviderResults(
{
basePath = null;
}
IEnumerable <FileSystemInfo> fileSystemObjects = containersOnly
IEnumerable<FileSystemInfo> fileSystemObjects = containersOnly
? dirInfo.EnumerateDirectories(filterText, enumerationOptions)
: dirInfo.EnumerateFileSystemInfos(filterText, enumerationOptions);

Expand Down
27 changes: 18 additions & 9 deletions test/xUnit/csharp/test_RemoteHyperV.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,8 @@ public async Task PerformTransportVersionAndTokenExchange_Pass(string version, s
var expectedClientSends = CreateVersionNegotiationClientSends();
expectedClientSends.Add((message: "TOKEN " + token, encoding: Encoding.ASCII));

var serverResponses = new List<(string message, Encoding encoding)>{
var serverResponses = new List<(string message, Encoding encoding)>
{
(message: version, encoding: Encoding.ASCII), // Response to VERSION
(message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII) // Response to token
Expand Down Expand Up @@ -643,13 +644,15 @@ public async Task ValidatePassesWhenTokensMatch(string token, string expectedTok
{
int port = 50000 + (int)(DateTime.Now.Ticks % 10000);

var expectedClientSends = new List<(string message, Encoding encoding)>{
var expectedClientSends = new List<(string message, Encoding encoding)>
{
(message: "VERSION", encoding: Encoding.ASCII), // Response to VERSION
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
(message: $"TOKEN {token}", encoding: Encoding.ASCII)
};

var serverResponses = new List<(string message, Encoding encoding)>{
var serverResponses = new List<(string message, Encoding encoding)>
{
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII) // Response to token
Expand Down Expand Up @@ -678,13 +681,15 @@ public async Task ValidateTokenTimeoutFails(int timeoutMs, string expectedMessag
string expectedToken = token;
int port = 50000 + (int)(DateTime.Now.Ticks % 10000);

var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>{
var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>
{
(message: "VERSION", encoding: Encoding.ASCII, delayMs: timeoutMs), // Response to VERSION
(message: "VERSION_2", encoding: Encoding.ASCII, delayMs: timeoutMs), // Response to VERSION_2
(message: $"TOKEN {token}", encoding: Encoding.ASCII, delayMs: 1)
};

var serverResponses = new List<(string message, Encoding encoding)>{
var serverResponses = new List<(string message, Encoding encoding)>
{
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII) // Response to token
Expand Down Expand Up @@ -726,7 +731,8 @@ public async Task ValidateTokenTimeoutDoesAffectSession()
string expectedToken = token;
int port = 50000 + (int)(DateTime.Now.Ticks % 10000);

var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>{
var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>
{
(message: "VERSION", encoding: Encoding.ASCII, delayMs: 1), // Response to VERSION
(message: "VERSION_2", encoding: Encoding.ASCII, delayMs: 1), // Response to VERSION_2
(message: $"TOKEN {token}", encoding: Encoding.ASCII, delayMs: 1),
Expand All @@ -737,7 +743,8 @@ public async Task ValidateTokenTimeoutDoesAffectSession()
(message: string.Empty, encoding: Encoding.ASCII, delayMs: 103) // Send some data after the handshake
};

var serverResponses = new List<(string message, Encoding encoding)>{
var serverResponses = new List<(string message, Encoding encoding)>
{
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "PASS", encoding: Encoding.ASCII), // Response to token
Expand Down Expand Up @@ -775,13 +782,15 @@ public async Task ValidateFailsWhenTokensMismatch(string token, string expectedT
{
int port = 50000 + (int)(DateTime.Now.Ticks % 10000);

var expectedClientSends = new List<(string message, Encoding encoding)>{
var expectedClientSends = new List<(string message, Encoding encoding)>
{
(message: "VERSION", encoding: Encoding.ASCII), // Initial request
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
(message: $"TOKEN {token}", encoding: Encoding.ASCII)
};

var serverResponses = new List<(string message, Encoding encoding)>{
var serverResponses = new List<(string message, Encoding encoding)>
{
(message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION
(message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
(message: "FAIL", encoding: Encoding.ASCII) // Response to token
Expand Down