Skip to content

Commit 73396d3

Browse files
sharwellsharwell
committed
Replace the term "curly bracket" with "curly brace"
Fixes #989
1 parent 23c6efe commit 73396d3

76 files changed

Lines changed: 403 additions & 404 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1500CodeFixProvider.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ namespace StyleCop.Analyzers.LayoutRules
1818
using Microsoft.CodeAnalysis.Text;
1919

2020
/// <summary>
21-
/// Implements a code fix for <see cref="SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine"/>.
21+
/// Implements a code fix for <see cref="SA1500CurlyBracesForMultiLineStatementsMustNotShareLine"/>.
2222
/// </summary>
2323
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1500CodeFixProvider))]
2424
[Shared]
2525
internal class SA1500CodeFixProvider : CodeFixProvider
2626
{
2727
/// <inheritdoc/>
2828
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
29-
ImmutableArray.Create(SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine.DiagnosticId);
29+
ImmutableArray.Create(SA1500CurlyBracesForMultiLineStatementsMustNotShareLine.DiagnosticId);
3030

3131
/// <inheritdoc/>
3232
public override FixAllProvider GetFixAllProvider()
@@ -88,7 +88,7 @@ private static Dictionary<SyntaxToken, SyntaxToken> GenerateBraceFixes(Document
8888
}
8989
else
9090
{
91-
// Check if we need to apply a fix before the curly bracket
91+
// Check if we need to apply a fix before the curly brace
9292
if (LocationHelpers.GetLineSpan(previousToken).StartLinePosition.Line == braceLine)
9393
{
9494
if (!braceTokens.Contains(previousToken))
@@ -105,8 +105,8 @@ private static Dictionary<SyntaxToken, SyntaxToken> GenerateBraceFixes(Document
105105
braceReplacementToken = braceReplacementToken.WithLeadingTrivia(IndentationHelper.GenerateWhitespaceTrivia(indentationOptions, indentationSteps));
106106
}
107107

108-
// Check if we need to apply a fix after the curly bracket
109-
// if a closing curly bracket is followed by a semi-colon or closing paren, no fix is needed.
108+
// Check if we need to apply a fix after the curly brace
109+
// if a closing curly brace is followed by a semi-colon or closing paren, no fix is needed.
110110
if ((LocationHelpers.GetLineSpan(nextToken).StartLinePosition.Line == braceLine) &&
111111
(!braceToken.IsKind(SyntaxKind.CloseBraceToken) || !IsValidFollowingToken(nextToken)))
112112
{
@@ -145,9 +145,9 @@ private static Dictionary<SyntaxToken, SyntaxToken> GenerateBraceFixes(Document
145145
return tokenReplacements;
146146
}
147147

148-
private static bool IsAccessorWithSingleLineBlock(SyntaxToken previousToken, SyntaxToken curlyBracketToken)
148+
private static bool IsAccessorWithSingleLineBlock(SyntaxToken previousToken, SyntaxToken curlyBraceToken)
149149
{
150-
if (!curlyBracketToken.IsKind(SyntaxKind.OpenBraceToken))
150+
if (!curlyBraceToken.IsKind(SyntaxKind.OpenBraceToken))
151151
{
152152
return false;
153153
}
@@ -164,7 +164,7 @@ private static bool IsAccessorWithSingleLineBlock(SyntaxToken previousToken, Syn
164164
return false;
165165
}
166166

167-
var token = curlyBracketToken;
167+
var token = curlyBraceToken;
168168
var depth = 1;
169169

170170
while (depth > 0)
@@ -182,7 +182,7 @@ private static bool IsAccessorWithSingleLineBlock(SyntaxToken previousToken, Syn
182182
}
183183
}
184184

185-
return LocationHelpers.GetLineSpan(curlyBracketToken).StartLinePosition.Line == LocationHelpers.GetLineSpan(token).StartLinePosition.Line;
185+
return LocationHelpers.GetLineSpan(curlyBraceToken).StartLinePosition.Line == LocationHelpers.GetLineSpan(token).StartLinePosition.Line;
186186
}
187187

188188
private static bool IsValidFollowingToken(SyntaxToken nextToken)
@@ -201,7 +201,7 @@ private static bool IsValidFollowingToken(SyntaxToken nextToken)
201201

202202
private static int DetermineIndentationSteps(IndentationOptions indentationOptions, SyntaxToken token)
203203
{
204-
// For a closing curly bracket use the indentation of the corresponding opening curly bracket
204+
// For a closing curly brace use the indentation of the corresponding opening curly bracket
205205
if (token.IsKind(SyntaxKind.CloseBraceToken))
206206
{
207207
var depth = 1;

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1503CodeFixProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace StyleCop.Analyzers.LayoutRules
1616
using Microsoft.CodeAnalysis.CSharp.Syntax;
1717

1818
/// <summary>
19-
/// Implements a code fix for <see cref="SA1503CurlyBracketsMustNotBeOmitted"/>.
19+
/// Implements a code fix for <see cref="SA1503CurlyBracesMustNotBeOmitted"/>.
2020
/// </summary>
2121
/// <remarks>
2222
/// <para>To fix a violation of this rule, the violating statement will be converted to a block statement.</para>
@@ -27,7 +27,7 @@ internal class SA1503CodeFixProvider : CodeFixProvider
2727
{
2828
/// <inheritdoc/>
2929
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
30-
ImmutableArray.Create(SA1503CurlyBracketsMustNotBeOmitted.DiagnosticId, SA1519CurlyBracketsMustNotBeOmittedFromMultiLineChildStatement.DiagnosticId, SA1520UseCurlyBracketsConsistently.DiagnosticId);
30+
ImmutableArray.Create(SA1503CurlyBracesMustNotBeOmitted.DiagnosticId, SA1519CurlyBracesMustNotBeOmittedFromMultiLineChildStatement.DiagnosticId, SA1520UseCurlyBracesConsistently.DiagnosticId);
3131

3232
/// <inheritdoc/>
3333
public override FixAllProvider GetFixAllProvider()

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1505CodeFixProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ namespace StyleCop.Analyzers.LayoutRules
1616
using Microsoft.CodeAnalysis.CSharp;
1717

1818
/// <summary>
19-
/// Implements a code fix for <see cref="SA1505OpeningCurlyBracketsMustNotBeFollowedByBlankLine"/>.
19+
/// Implements a code fix for <see cref="SA1505OpeningCurlyBracesMustNotBeFollowedByBlankLine"/>.
2020
/// </summary>
2121
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1505CodeFixProvider))]
2222
[Shared]
2323
internal class SA1505CodeFixProvider : CodeFixProvider
2424
{
2525
/// <inheritdoc/>
2626
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
27-
ImmutableArray.Create(SA1505OpeningCurlyBracketsMustNotBeFollowedByBlankLine.DiagnosticId);
27+
ImmutableArray.Create(SA1505OpeningCurlyBracesMustNotBeFollowedByBlankLine.DiagnosticId);
2828

2929
/// <inheritdoc/>
3030
public override FixAllProvider GetFixAllProvider()

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1508CodeFixProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ namespace StyleCop.Analyzers.LayoutRules
1616
using Microsoft.CodeAnalysis.CSharp;
1717

1818
/// <summary>
19-
/// Implements a code fix for <see cref="SA1508ClosingCurlyBracketsMustNotBePrecededByBlankLine"/>.
19+
/// Implements a code fix for <see cref="SA1508ClosingCurlyBracesMustNotBePrecededByBlankLine"/>.
2020
/// </summary>
2121
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1508CodeFixProvider))]
2222
[Shared]
2323
internal class SA1508CodeFixProvider : CodeFixProvider
2424
{
2525
/// <inheritdoc/>
2626
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
27-
ImmutableArray.Create(SA1508ClosingCurlyBracketsMustNotBePrecededByBlankLine.DiagnosticId);
27+
ImmutableArray.Create(SA1508ClosingCurlyBracesMustNotBePrecededByBlankLine.DiagnosticId);
2828

2929
/// <inheritdoc/>
3030
public override FixAllProvider GetFixAllProvider()

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1509CodeFixProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ namespace StyleCop.Analyzers.LayoutRules
1616
using Microsoft.CodeAnalysis.CSharp;
1717

1818
/// <summary>
19-
/// Implements a code fix for <see cref="SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine"/>.
19+
/// Implements a code fix for <see cref="SA1509OpeningCurlyBracesMustNotBePrecededByBlankLine"/>.
2020
/// </summary>
2121
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1509CodeFixProvider))]
2222
[Shared]
2323
internal class SA1509CodeFixProvider : CodeFixProvider
2424
{
2525
/// <inheritdoc/>
2626
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
27-
ImmutableArray.Create(SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine.DiagnosticId);
27+
ImmutableArray.Create(SA1509OpeningCurlyBracesMustNotBePrecededByBlankLine.DiagnosticId);
2828

2929
/// <inheritdoc/>
3030
public override FixAllProvider GetFixAllProvider()

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1513CodeFixProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ namespace StyleCop.Analyzers.LayoutRules
1414
using Microsoft.CodeAnalysis.CSharp;
1515

1616
/// <summary>
17-
/// Implements a code fix for <see cref="SA1513ClosingCurlyBracketMustBeFollowedByBlankLine"/>.
17+
/// Implements a code fix for <see cref="SA1513ClosingCurlyBraceMustBeFollowedByBlankLine"/>.
1818
/// </summary>
1919
/// <remarks>
20-
/// <para>To fix a violation of this rule, ensure a blank line follows closing curly brackets.</para>
20+
/// <para>To fix a violation of this rule, ensure a blank line follows closing curly braces.</para>
2121
/// </remarks>
2222
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1513CodeFixProvider))]
2323
[Shared]
2424
internal class SA1513CodeFixProvider : CodeFixProvider
2525
{
2626
/// <inheritdoc/>
2727
public override ImmutableArray<string> FixableDiagnosticIds { get; } =
28-
ImmutableArray.Create(SA1513ClosingCurlyBracketMustBeFollowedByBlankLine.DiagnosticId);
28+
ImmutableArray.Create(SA1513ClosingCurlyBraceMustBeFollowedByBlankLine.DiagnosticId);
2929

3030
/// <inheritdoc/>
3131
public override FixAllProvider GetFixAllProvider()

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/SpacingRules/TokenSpacingCodeFixProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ internal class TokenSpacingCodeFixProvider : CodeFixProvider
3535
SA1009ClosingParenthesisMustBeSpacedCorrectly.DiagnosticId,
3636
SA1010OpeningSquareBracketsMustBeSpacedCorrectly.DiagnosticId,
3737
SA1011ClosingSquareBracketsMustBeSpacedCorrectly.DiagnosticId,
38-
SA1012OpeningCurlyBracketsMustBeSpacedCorrectly.DiagnosticId,
39-
SA1013ClosingCurlyBracketsMustBeSpacedCorrectly.DiagnosticId,
38+
SA1012OpeningCurlyBracesMustBeSpacedCorrectly.DiagnosticId,
39+
SA1013ClosingCurlyBracesMustBeSpacedCorrectly.DiagnosticId,
4040
SA1014OpeningGenericBracketsMustBeSpacedCorrectly.DiagnosticId,
4141
SA1015ClosingGenericBracketsMustBeSpacedCorrectly.DiagnosticId,
4242
SA1016OpeningAttributeBracketsMustBeSpacedCorrectly.DiagnosticId,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Blocks.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules
1010
using Xunit;
1111

1212
/// <summary>
13-
/// Unit tests for <see cref="SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine"/>.
13+
/// Unit tests for <see cref="SA1500CurlyBracesForMultiLineStatementsMustNotShareLine"/>.
1414
/// </summary>
1515
public partial class SA1500UnitTests
1616
{

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Classes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules
1010
using Xunit;
1111

1212
/// <summary>
13-
/// Unit tests for <see cref="SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine"/>.
13+
/// Unit tests for <see cref="SA1500CurlyBracesForMultiLineStatementsMustNotShareLine"/>.
1414
/// </summary>
1515
public partial class SA1500UnitTests
1616
{

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Constructors.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules
1010
using Xunit;
1111

1212
/// <summary>
13-
/// Unit tests for <see cref="SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine"/>.
13+
/// Unit tests for <see cref="SA1500CurlyBracesForMultiLineStatementsMustNotShareLine"/>.
1414
/// </summary>
1515
public partial class SA1500UnitTests
1616
{

0 commit comments

Comments
 (0)