Merge pull request microsoft#8815 from Microsoft/navbar_debug

Andy · Andy · commit c9050db2595e · 2016-05-25T10:12:47.000-07:00
Show indent and childItems when debugging the navigation bar
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1096,14 +1096,6 @@ namespace FourSlash {
             }
             addSpanInfoString();
             return resultString;
-
-            function repeatString(count: number, char: string) {
-                let result = "";
-                for (let i = 0; i < count; i++) {
-                    result += char;
-                }
-                return result;
-            }
         }
 
         public getBreakpointStatementLocation(pos: number) {
@@ -2055,7 +2047,7 @@ namespace FourSlash {
 
             for (let i = 0; i < length; i++) {
                 const item = items[i];
-                Harness.IO.log(`name: ${item.text}, kind: ${item.kind}`);
+                Harness.IO.log(`${repeatString(item.indent, " ")}name: ${item.text}, kind: ${item.kind}, childItems: ${item.childItems.map(child => child.text)}`);
             }
         }
 
@@ -2742,6 +2734,14 @@ ${code}
             fileName: fileName
         };
     }
+
+    function repeatString(count: number, char: string) {
+        let result = "";
+        for (let i = 0; i < count; i++) {
+            result += char;
+        }
+        return result;
+    }
 }
 
 namespace FourSlashInterface {

Original file line number	Diff line number	Diff line change
`@@ -1096,14 +1096,6 @@ namespace FourSlash {`
`1096`	`1096`	`}`
`1097`	`1097`	`addSpanInfoString();`
`1098`	`1098`	`return resultString;`
`1099`		`-`
`1100`		`- function repeatString(count: number, char: string) {`
`1101`		`- let result = "";`
`1102`		`- for (let i = 0; i < count; i++) {`
`1103`		`- result += char;`
`1104`		`- }`
`1105`		`- return result;`
`1106`		`- }`
`1107`	`1099`	`}`
`1108`	`1100`
`1109`	`1101`	`public getBreakpointStatementLocation(pos: number) {`
`@@ -2055,7 +2047,7 @@ namespace FourSlash {`
`2055`	`2047`
`2056`	`2048`	`for (let i = 0; i < length; i++) {`
`2057`	`2049`	`const item = items[i];`
`2058`		- Harness.IO.log(`name: ${item.text}, kind: ${item.kind}`);
	`2050`	+ Harness.IO.log(`${repeatString(item.indent, " ")}name: ${item.text}, kind: ${item.kind}, childItems: ${item.childItems.map(child => child.text)}`);
`2059`	`2051`	`}`
`2060`	`2052`	`}`
`2061`	`2053`
`@@ -2742,6 +2734,14 @@ ${code}`
`2742`	`2734`	`fileName: fileName`
`2743`	`2735`	`};`
`2744`	`2736`	`}`
	`2737`	`+`
	`2738`	`+ function repeatString(count: number, char: string) {`
	`2739`	`+ let result = "";`
	`2740`	`+ for (let i = 0; i < count; i++) {`
	`2741`	`+ result += char;`
	`2742`	`+ }`
	`2743`	`+ return result;`
	`2744`	`+ }`
`2745`	`2745`	`}`
`2746`	`2746`
`2747`	`2747`	`namespace FourSlashInterface {`