Use depthRemaining instead of maxDepth

Author: Andy Hanson

src/services/outliningElementsCollector.ts

@@ -8,10 +8,9 @@ namespace ts.OutliningElementsCollector {
     }
 
     function addNodeOutliningSpans(sourceFile: SourceFile, cancellationToken: CancellationToken, out: Push<OutliningSpan>): void {
-        let depth = 0;
-        const maxDepth = 39;
+        let depthRemaining = 40;
         sourceFile.forEachChild(function walk(n) {
-            if (depth > maxDepth) return;
+            if (depthRemaining === 0) return;
             cancellationToken.throwIfCancellationRequested();
 
             if (isDeclaration(n)) {
@@ -21,9 +20,9 @@ namespace ts.OutliningElementsCollector {
             const span = getOutliningSpanForNode(n, sourceFile);
             if (span) out.push(span);
 
-            depth++;
+            depthRemaining--;
             n.forEachChild(walk);
-            depth--;
+            depthRemaining++;
         });
     }
 

tests/cases/fourslash/getOutliningSpans.ts

@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
-////// interface 
+////// interface
 ////interface IFoo[| {
 ////    getDist(): number;
 ////}|]
@@ -63,9 +63,9 @@
 ////}|])
 ////
 ////// trivia handeling
-////class ClassFooWithTrivia[| /*  some comments */ 
+////class ClassFooWithTrivia[| /*  some comments */
 ////   /* more trivia */ {
-////    
+////
 ////
 ////    /*some trailing trivia */
 ////}|] /* even more */
@@ -85,8 +85,8 @@
 ////        [
 ////          [
 ////            [
-////              1,2,3    
-////            ]    
+////              1,2,3
+////            ]
 ////          ]
 ////        ]
 ////      ]

tests/cases/fourslash/shims-pp/getOutliningSpans.ts

@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
-////// interface 
+////// interface
 ////interface IFoo[| {
 ////    getDist(): number;
 ////}|]
@@ -63,9 +63,9 @@
 ////}|])
 ////
 ////// trivia handeling
-////class ClassFooWithTrivia[| /*  some comments */ 
+////class ClassFooWithTrivia[| /*  some comments */
 ////   /* more trivia */ {
-////    
+////
 ////
 ////    /*some trailing trivia */
 ////}|] /* even more */
@@ -85,8 +85,8 @@
 ////        [
 ////          [
 ////            [
-////              1,2,3    
-////            ]    
+////              1,2,3
+////            ]
 ////          ]
 ////        ]
 ////      ]

tests/cases/fourslash/shims/getOutliningSpans.ts

@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
-////// interface 
+////// interface
 ////interface IFoo[| {
 ////    getDist(): number;
 ////}|]
@@ -63,9 +63,9 @@
 ////}|])
 ////
 ////// trivia handeling
-////class ClassFooWithTrivia[| /*  some comments */ 
+////class ClassFooWithTrivia[| /*  some comments */
 ////   /* more trivia */ {
-////    
+////
 ////
 ////    /*some trailing trivia */
 ////}|] /* even more */
@@ -85,8 +85,8 @@
 ////        [
 ////          [
 ////            [
-////              1,2,3    
-////            ]    
+////              1,2,3
+////            ]
 ////          ]
 ////        ]
 ////      ]