Refine comment-run handling

Co-authored-by: bergmeister <9250262+bergmeister@users.noreply.github.com>

Author: Copilot

Rules/UseConsistentIndentation.cs

@@ -349,7 +349,8 @@ private static int GetCommentRunIndentationOffset(Token[] tokens, int tokenIndex
                 precedingIndex--;
                 if (precedingIndex < 0 ||
                     tokens[precedingIndex].Kind != TokenKind.Comment ||
-                    tokens[precedingIndex].Extent.EndLineNumber != currentLine - 1)
+                    tokens[precedingIndex].Extent.EndLineNumber != currentLine - 1 ||
+                    (precedingIndex > 0 && tokens[precedingIndex - 1].Kind != TokenKind.NewLine))
                 {
                     break;
                 }
@@ -706,9 +707,5 @@ private int GetIndentation(int indentationLevel)
             return indentationLevel * indentationLevelMultiplier;
         }
 
-        private string GetIndentationString(int indentationLevel)
-        {
-            return new string(indentationChar, GetIndentation(indentationLevel));
-        }
     }
 }

Tests/Rules/UseConsistentIndentation.tests.ps1

@@ -204,7 +204,7 @@ function foo {
         }
     }
 
-    Context "When a multi-line command is given" {
+    Context "When a commented-out code block is provided" {
 
         It 'Should preserve relative indentation in commented-out code with <Kind> indentation' -TestCases @(
             @{ Kind = 'space'; Indentation = '    ' }
@@ -219,17 +219,8 @@ function foo {
                 "$($Indentation)Write-Output 'after'"
                 '}'
             ) -join "`n"
-            $settings = @{
-                IncludeRules = @('PSUseConsistentIndentation')
-                Rules = @{
-                    PSUseConsistentIndentation = @{
-                        Enable = $true
-                        IndentationSize = 4
-                        PipelineIndentation = 'NoIndentation'
-                        Kind = $Kind
-                    }
-                }
-            }
+            $settings.Rules.PSUseConsistentIndentation.Kind = $Kind
+            $settings.Rules.PSUseConsistentIndentation.PipelineIndentation = 'NoIndentation'
 
             Invoke-Formatter -ScriptDefinition $scriptDefinition -Settings $settings |
                 Should -Be $scriptDefinition
@@ -256,22 +247,15 @@ function foo {
                 "$($Indentation)Write-Output 'after'"
                 '}'
             ) -join "`n"
-            $settings = @{
-                IncludeRules = @('PSUseConsistentIndentation')
-                Rules = @{
-                    PSUseConsistentIndentation = @{
-                        Enable = $true
-                        IndentationSize = 4
-                        PipelineIndentation = 'NoIndentation'
-                        Kind = $Kind
-                    }
-                }
-            }
+            $settings.Rules.PSUseConsistentIndentation.Kind = $Kind
+            $settings.Rules.PSUseConsistentIndentation.PipelineIndentation = 'NoIndentation'
 
             Invoke-Formatter -ScriptDefinition $scriptDefinition -Settings $settings |
                 Should -Be $expectedScriptDefinition
         }
+    }
 
+    Context "When a multi-line command is given" {
         It "When a comment is in the middle of a multi-line statement with preceding and succeeding line continuations" {
             $scriptDefinition = @'
 foo `