maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support outlining for arbitrary blocks

Browse source
This commit is contained in:
Vladimir Matveev 2014-08-12 15:47:57 -07:00
parent 911cb2b1fb
commit ccaf904cfa
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/services/outliningElementsCollector.ts
View file

@ -36,11 +36,11 @@ module ts {
export function collectElements(sourceFile: SourceFile): OutliningSpan[] {
var elements: OutliningSpan[] = [];
function addOutlineRange(node: Node, startElement: Node, endElement: Node) {
if (node && startElement && endElement) {
function addOutlineRange(hintSpanNode: Node, startElement: Node, endElement: Node) {
if (hintSpanNode && startElement && endElement) {
var span: OutliningSpan = {
textSpan: TypeScript.TextSpan.fromBounds(startElement.pos, endElement.end),
hintSpan: TypeScript.TextSpan.fromBounds(node.getStart(), node.end),
hintSpan: TypeScript.TextSpan.fromBounds(hintSpanNode.getStart(), hintSpanNode.end),
bannerText: "...",
autoCollapse: false
};
@ -49,33 +49,31 @@ module ts {
}
var depth = 0;
var maxDepth = 10;
var maxDepth = 20;
function walk(n: Node): void {
if (depth >= maxDepth) {
if (depth > maxDepth) {
return;
}
switch (n.kind) {
case SyntaxKind.Block:
case SyntaxKind.FunctionBlock:
case SyntaxKind.ModuleBlock:
case SyntaxKind.TryBlock:
case SyntaxKind.TryBlock:
case SyntaxKind.CatchBlock:
case SyntaxKind.FinallyBlock:
var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
addOutlineRange(n.parent, openBrace, closeBrace);
break;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.InterfaceDeclaration:
case SyntaxKind.ModuleDeclaration:
case SyntaxKind.EnumDeclaration:
case SyntaxKind.ObjectLiteral:
var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
addOutlineRange(n, openBrace, closeBrace);
break;
case SyntaxKind.Constructor:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.Method:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
var body = (<FunctionDeclaration>n).body;
if (body) {
var openBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
var closeBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
addOutlineRange(n, openBrace, closeBrace);
}
break;
}
depth++;
forEachChild(n, walk);

2
src/services/shims.ts
View file

@ -728,7 +728,7 @@ module ts {
var items = this.languageService.getOutliningRegions(fileName);
// return just the part of data that language service v2 can understand
// language service v2 will use the entire OutliningSpan
var spans = forEach(items, i => i.textSpan);
var spans = map(items, i => i.textSpan);
return spans;
});
}

4
tests/cases/fourslash/getOutliningSpans.ts
View file

@ -63,10 +63,10 @@
////}|] /* even more */
////
////// object literals
////var x = [|{
////var x =[|{
//// a:1,
//// b:2,
//// get foo() [|{
//// get foo()[| {
//// return 1;
//// }|]
////}|]