mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-11-18 20:11:14 +00:00
Addressed code review feedback.
This commit is contained in:
1 parent
384d77197e
commit
1be4fe1b61
1 file changed
+14
-16
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user