Merge pull request microsoft#8957 from Microsoft/navbar_indent

Andy · Andy · commit 3aaa4ea8337c · 2016-06-03T10:57:29.000-07:00
Include indent in navigation bar protocol
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -459,7 +459,7 @@ namespace ts.server {
                 kindModifiers: item.kindModifiers || "",
                 spans: item.spans.map(span => createTextSpanFromBounds(this.lineOffsetToPosition(fileName, span.start), this.lineOffsetToPosition(fileName, span.end))),
                 childItems: this.decodeNavigationBarItems(item.childItems, fileName),
-                indent: 0,
+                indent: item.indent,
                 bolded: false,
                 grayed: false
             }));
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
@@ -1242,6 +1242,11 @@ declare namespace ts.server.protocol {
           * Optional children.
           */
         childItems?: NavigationBarItem[];
+
+        /**
+          * Number of levels deep this item should appear.
+          */
+        indent: number;
     }
 
     export interface NavBarResponse extends Response {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -872,7 +872,8 @@ namespace ts.server {
                     start: compilerService.host.positionToLineOffset(fileName, span.start),
                     end: compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(span))
                 })),
-                childItems: this.decorateNavigationBarItem(project, fileName, item.childItems)
+                childItems: this.decorateNavigationBarItem(project, fileName, item.childItems),
+                indent: item.indent
             }));
         }
 
diff --git a/tests/cases/fourslash/server/navbar01.ts b/tests/cases/fourslash/server/navbar01.ts
@@ -85,7 +85,8 @@ verify.navigationBar([
                 "text": "prop",
                 "kind": "property"
             }
-        ]
+        ],
+        "indent": 1
     },
     {
         "text": "Shapes",
@@ -100,7 +101,8 @@ verify.navigationBar([
                 "text": "Values",
                 "kind": "enum"
             }
-        ]
+        ],
+        "indent": 1
     },
     {
         "text": "Point",
@@ -143,7 +145,8 @@ verify.navigationBar([
                 "kind": "property",
                 "kindModifiers": "public"
             }
-        ]
+        ],
+        "indent": 2
     },
     {
         "text": "Values",
@@ -161,6 +164,7 @@ verify.navigationBar([
                 "text": "value3",
                 "kind": "property"
             }
-        ]
+        ],
+        "indent": 2
     }
 ]);

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,8 @@ namespace ts.server {`
`872`	`872`	`start: compilerService.host.positionToLineOffset(fileName, span.start),`
`873`	`873`	`end: compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(span))`
`874`	`874`	`})),`
`875`		`- childItems: this.decorateNavigationBarItem(project, fileName, item.childItems)`
	`875`	`+ childItems: this.decorateNavigationBarItem(project, fileName, item.childItems),`
	`876`	`+ indent: item.indent`
`876`	`877`	`}));`
`877`	`878`	`}`
`878`	`879`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ verify.navigationBar([`
`85`	`85`	`"text": "prop",`
`86`	`86`	`"kind": "property"`
`87`	`87`	`}`
`88`		`- ]`
	`88`	`+ ],`
	`89`	`+ "indent": 1`
`89`	`90`	`},`
`90`	`91`	`{`
`91`	`92`	`"text": "Shapes",`
`@@ -100,7 +101,8 @@ verify.navigationBar([`
`100`	`101`	`"text": "Values",`
`101`	`102`	`"kind": "enum"`
`102`	`103`	`}`
`103`		`- ]`
	`104`	`+ ],`
	`105`	`+ "indent": 1`
`104`	`106`	`},`
`105`	`107`	`{`
`106`	`108`	`"text": "Point",`
`@@ -143,7 +145,8 @@ verify.navigationBar([`
`143`	`145`	`"kind": "property",`
`144`	`146`	`"kindModifiers": "public"`
`145`	`147`	`}`
`146`		`- ]`
	`148`	`+ ],`
	`149`	`+ "indent": 2`
`147`	`150`	`},`
`148`	`151`	`{`
`149`	`152`	`"text": "Values",`
`@@ -161,6 +164,7 @@ verify.navigationBar([`
`161`	`164`	`"text": "value3",`
`162`	`165`	`"kind": "property"`
`163`	`166`	`}`
`164`		`- ]`
	`167`	`+ ],`
	`168`	`+ "indent": 2`
`165`	`169`	`}`
`166`	`170`	`]);`