Fix: nested indenting for offsetTernaryExpressions: true (fixes #13971)…

… (#13972) * reproduce extra nested ternary indentation with a test * add a similar test with proper indenting of nested ternary * apply condition to avoid extra indenting with offsetTernaryExpressions Co-authored-by: Adam Stankiewicz <sheerun@sher.pl> Co-authored-by: Adam Stankiewicz <sheerun@sher.pl>
eslint · Jan 30, 2021 · e1da90f · e1da90f
1 parent 1a078b9
commit e1da90f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/lib/rules/indent.js b/lib/rules/indent.js
@@ -1178,6 +1178,7 @@ module.exports = {
                     offsets.setDesiredOffset(colonToken, firstToken, 1);
 
                     offsets.setDesiredOffset(firstConsequentToken, firstToken,
+                        firstConsequentToken.type === "Punctuator" &&
                         options.offsetTernaryExpressions ? 2 : 1);
 
                     /*

diff --git a/tests/lib/rules/indent.js b/tests/lib/rules/indent.js
@@ -2204,6 +2204,26 @@ ruleTester.run("indent", rule, {
             `,
             options: [4, { offsetTernaryExpressions: true }]
         },
+        {
+            code: unIndent`
+              condition1
+                ? condition2
+                  ? Promise.resolve(1)
+                  : Promise.resolve(2)
+                : Promise.resolve(3)
+            `,
+            options: [2, { offsetTernaryExpressions: true }]
+        },
+        {
+            code: unIndent`
+              condition1
+                ? Promise.resolve(1)
+                : condition2
+                  ? Promise.resolve(2)
+                  : Promise.resolve(3)
+            `,
+            options: [2, { offsetTernaryExpressions: true }]
+        },
         {
             code: unIndent`
               condition