Fix bug with PipelineIndentationStyle.None where break instead of continue statement was used (#1497)

* Fix bug with PipelineIndentationStyle.None where break instead of continue statement was used. TODO: Fix test that starts to fail because of this now

* fix last failing test to make None not touch existing indendation

* empty commit since Azure Pipelines did not trigger

* empty commit since Azure Pipelines did not trigger

* Apply suggestions from code review

Co-authored-by: Robert Holt <[email protected]>

* Apply suggestions from code review

Co-authored-by: Christoph Bergmeister <[email protected]>
Co-authored-by: Robert Holt <[email protected]>

Author: 3 people

Rules/UseConsistentIndentation.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 using System;
@@ -220,14 +220,19 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
                                 }
                             }
 
-                            bool lineHasPipelineBeforeToken = LineHasPipelineBeforeToken(tokens, tokenIndex, token);
+                            if (pipelineIndentationStyle == PipelineIndentationStyle.None && PreviousLineEndedWithPipe(tokens, tokenIndex, token))
+                            {
+                                continue;
+                            }
 
+                            bool lineHasPipelineBeforeToken = LineHasPipelineBeforeToken(tokens, tokenIndex, token);
                             AddViolation(token, tempIndentationLevel, diagnosticRecords, ref onNewLine, lineHasPipelineBeforeToken);
                         }
                         break;
                 }
 
-                if (pipelineIndentationStyle == PipelineIndentationStyle.None) { break; }
+                if (pipelineIndentationStyle == PipelineIndentationStyle.None) { continue; }
+
                 // Check if the current token matches the end of a PipelineAst
                 PipelineAst matchingPipeLineAstEnd = MatchingPipelineAstEnd(pipelineAsts, ref minimumPipelineAstIndex, token);
                 if (matchingPipeLineAstEnd == null)
@@ -284,6 +289,35 @@ private static bool PipelineIsFollowedByNewlineOrLineContinuation(Token[] tokens
             return false;
         }
 
+        private static bool PreviousLineEndedWithPipe(Token[] tokens, int tokenIndex, Token token)
+        {
+            if (tokenIndex < 2 || token.Extent.StartLineNumber == 1)
+            {
+                return false;
+            }
+
+            int searchIndex = tokenIndex - 2;
+            int searchLine;
+            do
+            {
+                searchLine = tokens[searchIndex].Extent.StartLineNumber;
+                if (tokens[searchIndex].Kind == TokenKind.Comment)
+                {
+                    searchIndex--;
+                }
+                else if (tokens[searchIndex].Kind == TokenKind.Pipe)
+                {
+                    return true;
+                }
+                else
+                {
+                    break;
+                }
+            } while (searchLine == token.Extent.StartLineNumber - 1 && searchIndex >= 0);
+
+            return false;
+        }
+
         private static bool LineHasPipelineBeforeToken(Token[] tokens, int tokenIndex, Token token)
         {
             int searchIndex = tokenIndex;

Tests/Rules/UseConsistentIndentation.tests.ps1

@@ -239,6 +239,40 @@ baz
             Test-CorrectionExtentFromContent @params
         }
 
+        It "Should indent hashtable correctly using <PipelineIndentation> option" -TestCases @(
+            @{
+                PipelineIndentation = 'IncreaseIndentationForFirstPipeline'
+            },
+            @{
+                PipelineIndentation = 'IncreaseIndentationAfterEveryPipeline'
+            },
+            @{
+                PipelineIndentation = 'NoIndentation'
+            }
+            @{
+                PipelineIndentation = 'None'
+            }
+        ) {
+            Param([string] $PipelineIndentation)
+            $scriptDefinition = @'
+@{
+        foo = "value1"
+    bar = "value2"
+}
+'@
+            $settings = @{
+                IncludeRules = @('PSUseConsistentIndentation')
+                Rules = @{ PSUseConsistentIndentation = @{ Enable = $true; PipelineIndentation = $PipelineIndentation } }
+            }
+            Invoke-Formatter -Settings $settings -ScriptDefinition $scriptDefinition | Should -Be @'
+@{
+    foo = "value1"
+    bar = "value2"
+}
+'@
+
+        }
+
         It "Should indent pipelines correctly using <PipelineIndentation> option" -TestCases @(
             @{
                 PipelineIndentation = 'IncreaseIndentationForFirstPipeline'