From b73128c50fae09473f1314bdf998df787d80cd1d Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 16 Dec 2014 16:17:48 -0800 Subject: [PATCH] CR feedback. --- src/services/outliningElementsCollector.ts | 10 ++++------ src/services/services.ts | 8 ++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts index f482419250..0b39f54ca2 100644 --- a/src/services/outliningElementsCollector.ts +++ b/src/services/outliningElementsCollector.ts @@ -79,12 +79,10 @@ module ts { break; } else if (tryStatement.finallyBlock === n) { - var children = tryStatement.getChildren(); - for (var i = 0, m = children.length; i < m; i++) { - if (children[i].kind === SyntaxKind.FinallyKeyword) { - addOutliningSpan(children[i], openBrace, closeBrace, autoCollapse(n)); - break; - } + var finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + if (finallyKeyword) { + addOutliningSpan(finallyKeyword, openBrace, closeBrace, autoCollapse(n)); + break; } } diff --git a/src/services/services.ts b/src/services/services.ts index ed17b59cf0..70921f73ae 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3510,12 +3510,8 @@ module ts { } if (tryStatement.finallyBlock) { - var children = tryStatement.getChildren(); - for (var i = 0, n = children.length; i < n; i++) { - if (pushKeywordIf(keywords, children[i], SyntaxKind.FinallyKeyword)) { - break; - } - } + var finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword); } return map(keywords, getReferenceEntryFromNode);