Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
update
  • Loading branch information
josefpihrt committed Sep 12, 2024
commit fddaebaad8552ebfe64226e8a6ac0c59256564e1
12 changes: 6 additions & 6 deletions src/Formatting.Analyzers/CSharp/FixFormattingOfListAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ internal static BracesBlock GetBracesBlock(SyntaxNode node, TextLineCollection l
return default;

SyntaxToken openToken = node.FindToken(startIndex);
SyntaxNode block = null;
SyntaxNode enclosedNode = null;
var isOpenBraceAtEndOfLine = false;

if (IsOpenToken(openToken))
Expand All @@ -380,12 +380,12 @@ internal static BracesBlock GetBracesBlock(SyntaxNode node, TextLineCollection l
if (trailing.Any()
&& trailing.Span.Contains(startIndex))
{
block = openToken.Parent;
enclosedNode = openToken.Parent;
isOpenBraceAtEndOfLine = true;
}
}

if (block is null)
if (enclosedNode is null)
{
startIndex = line.EndIncludingLineBreak;
openToken = node.FindToken(startIndex);
Expand All @@ -397,18 +397,18 @@ internal static BracesBlock GetBracesBlock(SyntaxNode node, TextLineCollection l
if ((leading.Any() && leading.Span.Contains(startIndex))
|| (!leading.Any() && openToken.SpanStart == startIndex))
{
block = openToken.Parent;
enclosedNode = openToken.Parent;
}
}
}

if (block is not null)
if (enclosedNode is not null)
{
int endIndex = lines.GetLineFromPosition(node.Span.End).Start;
SyntaxToken closeToken = node.FindToken(endIndex);

if (IsCloseToken(closeToken)
&& object.ReferenceEquals(block, closeToken.Parent))
&& object.ReferenceEquals(enclosedNode, closeToken.Parent))
{
SyntaxTriviaList leading = closeToken.LeadingTrivia;

Expand Down