Skip to content

Preserve tab indentation when formatting branches #2275

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
Christoph Bergmeister (bergmeister) merged 2 commits into from
Oct 28, 2026
Merged

Preserve tab indentation when formatting branches #2275

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
4bad4ca
Initial plan
Copilot Oct 28, 2026
3affc3b
Preserve tab indentation when formatting branches
Copilot Oct 28, 2026
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
2 changes: 1 addition & 1 deletion Rules/PlaceCloseBrace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private List<CorrectionExtent> GetCorrectionsForBraceShouldHaveNewLineAfter(
var nextToken = tokens[closeBracePos + 1];
var closeBraceToken = tokens[closeBracePos];
var indentation = tokens[closeBracePos - 1].Kind == TokenKind.NewLine
? new String(' ', closeBraceToken.Extent.StartColumnNumber - 1)
? closeBraceToken.Extent.StartScriptPosition.Line.Substring(0, closeBraceToken.Extent.StartColumnNumber - 1)
: GetIndentation(tokens, closeBracePos, openBracePos);

// Also remove the whitespace between the close brace and the next token
Expand Down
19 changes: 19 additions & 0 deletions Tests/Rules/PlaceCloseBrace.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,25 @@ function Test {
Invoke-Formatter -ScriptDefinition $def -Settings $settings | Should -Be $expected
}

It "Should preserve tab indentation before a close brace" {
$def = @'
if ($true) {
$true
} else {
$false
}
'@
$expected = @'
if ($true) {
$true
}
else {
$false
}
'@
Invoke-Formatter -ScriptDefinition $def -Settings $settings | Should -Be $expected
}

It "Should find a violation for a close brace followed by elseif" {
$def = @'
if (Test-Path "blah") {
Expand Down
Loading