[Copilot]

PSUseConsistentIndentation flattened commented-out code by aligning each comment marker independently, erasing indentation that represented nested structure. Comment runs should retain their relative indentation, while still allowing the run to align with its surrounding code.

• Comment-run indentation: Preserve column offsets across adjacent standalone comment lines when applying indentation corrections. Inline comments are not grouped into a run.
• Regression coverage: Cover space and tab indentation, shifting a run as a unit, and code following the run.

For example, the nested comment remains nested after formatting:

if ($a) {
    # if ($b) {
        # doThing
    # }
    Write-Output 'after'
}

• Fixes PSUseConsistentIndentation flattens the indentation of commented-out code #2217

[Copilot]

🟡 Changes recommended

Some comment runs still lose relative indentation, and repeated backward scans introduce quadratic processing.

3 open issues

• Avoid quadratic rescanning of comment runs · New
• Handle comment runs after backtick continuations · New
• Preserve relative indentation across comment runs · New

What changed in this PR

This PR addresses #2217 by updating PSUseConsistentIndentation to preserve relative indentation in adjacent standalone comments instead of flattening commented-out code.

Changes:

• Calculates comment-run offsets and applies them to indentation corrections.
• Adds space- and tab-based regression tests for preserving runs, shifting runs together, and retaining following code.

File	Description
Tests/​Rules/​UseConsistentIndentation.tests.ps1	Adds comment-run formatting regression tests.
Rules/​UseConsistentIndentation.cs	Incorporates relative comment offsets into indentation corrections.

_{Review effort: Balanced}

[Copilot]

🟡 Changes recommended

Inline block comments and comment runs after pipes still have unresolved indentation errors.

2 open issues

• Preserve comment-run indentation when pipeline indentation is disabled · New
• Exclude inline executable comments from indentation correction · New

3 resolved since last review

• Preserve relative indentation across comment runs
• Handle comment runs after backtick continuations
• Avoid quadratic rescanning of comment runs

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

Confidence in all multiline comment-group boundaries remains limited, and the regression tests have not been run.

No open issues 🎉

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

Stateful interactions between comment grouping, continuations, and pipelines warrant human validation of formatter correctness and repeated-formatting stability.

No open issues 🎉

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

Inline comments after line-leading pipes can still join standalone comment runs and incorrectly shift pipeline indentation.

No open issues 🎉

1 previously missed issue

In code that hasn't changed since last review

Exclude trailing comments from pipeline indentation offset calculation

Rules/​UseConsistentIndentation.cs:373

With PipelineIndentation = 'NoIndentation', a line-leading pipe's trailing comment reaches this scan and is incorrectly grouped with following standalone comments. For a function containing a four-space-indented, backtick-continued foo, then | # trailing, # standalone, and bar, formatting moves the pipe from column 5 to column 11. Exclude comments with code before them as well as code after them from run-offset calculation.

_{Review effort: Balanced}

[Christoph Bergmeister (bergmeister)]

🔵 Needs a closer look

Inline comments after line-leading pipes can still join standalone comment runs and incorrectly shift pipeline indentation.

No open issues 🎉

1 previously missed issue
In code that hasn't changed since last review

Exclude trailing comments from pipeline indentation offset calculation
Rules/​UseConsistentIndentation.cs:373

With PipelineIndentation = 'NoIndentation', a line-leading pipe's trailing comment reaches this scan and is incorrectly grouped with following standalone comments. For a function containing a four-space-indented, backtick-continued foo, then | # trailing, # standalone, and bar, formatting moves the pipe from column 5 to column 11. Exclude comments with code before them as well as code after them from run-offset calculation.

Review effort: Balanced

Copilot fix and add regression test. create new pr instead of pushing to this branch

[Copilot]

Christoph Bergmeister (@bergmeister) I've opened a new pull request, #2257, to work on those changes. Once the pull request is ready, I'll request review from you.

[Copilot]

🟢 Approval recommended

The implementation and regression coverage address the reported indentation loss, with no unresolved blocking findings.

No open issues 🎉

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

Recursive comment scanning interacts with continuation and pipeline indentation, warranting final human validation despite the extensive regression coverage.

No open issues 🎉

_{Review effort: Balanced}