From 1be4fe1b619f966759f9100665dd835f2dcfe57a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 22 Sep 2014 12:00:45 -0700 Subject: [PATCH] Addressed code review feedback. --- src/services/braceMatcher.ts | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/services/braceMatcher.ts b/src/services/braceMatcher.ts index e222125fc19..c26be522694 100644 --- a/src/services/braceMatcher.ts +++ b/src/services/braceMatcher.ts @@ -25,32 +25,30 @@ module ts.BraceMatcher { var token = getTokenAtPosition(sourceFile, position); - if (token.getStart() === position) { + if (token.getStart(sourceFile) === position) { var matchKind = getMatchingTokenKind(token); // Ensure that there is a corresponding token to match ours. if (matchKind) { var parentElement = token.parent; - var childNodes = parentElement.getChildren(); + var childNodes = parentElement.getChildren(sourceFile); for (var i = 0, n = childNodes.length; i < n; i++) { var current = childNodes[i]; - // TODO(drosen): Check if we need the check on 'current'. - if (current && current.getFullWidth() > 0) { - if (current.kind === matchKind) { - var range1 = new TypeScript.TextSpan(token.getStart(), token.getWidth()); - var range2 = new TypeScript.TextSpan(current.getStart(), current.getWidth()); - // TODO(drosen): Does order *really* matter here? - if (range1.start() < range2.start()) { - result.push(range1, range2); - } - else { - result.push(range2, range1); - } - - break; + if (current.kind === matchKind) { + var range1 = new TypeScript.TextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); + var range2 = new TypeScript.TextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); + + // We want to order the braces when we return the result. + if (range1.start() < range2.start()) { + result.push(range1, range2); } + else { + result.push(range2, range1); + } + + break; } } }