Merge pull request microsoft#23437 from Microsoft/getOutliningSpansDepthElseIf

In outliningElementsCollector, treat 'else if' as having same depth as the 'if'

Author: uniqueiniquity

src/services/outliningElementsCollector.ts

@@ -21,7 +21,17 @@ namespace ts.OutliningElementsCollector {
             if (span) out.push(span);
 
             depthRemaining--;
-            n.forEachChild(walk);
+            if (isIfStatement(n) && isIfStatement(n.elseStatement)) {
+                // Consider an 'else if' to be on the same depth as the 'if'.
+                walk(n.expression);
+                walk(n.thenStatement);
+                depthRemaining++;
+                walk(n.elseStatement);
+                depthRemaining--;
+            }
+            else {
+                n.forEachChild(walk);
+            }
             depthRemaining++;
         });
     }

tests/cases/fourslash/getOutliningSpansDepthElseIf.ts

@@ -0,0 +1,89 @@
+/// <reference path="fourslash.ts"/>
+
+// Tests that each 'else if' does not count towards a higher nesting depth.
+
+////if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else[| {
+////    1;
+////}|]
+
+verify.outliningSpansInCurrentFile(test.ranges());