microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-25 12:40:05 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Addressed CR feedback, no longer highlighting elseifs with comments between.

Browse Source
This commit is contained in:
Daniel Rosenwasser
2014-08-29 13:08:48 -07:00
parent 24f6e41de1
commit 0632d0c38c
6 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/services/services.ts
View File

@@ -2210,7 +2210,15 @@ module ts {
// Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
while (ifStatement) {
pushIfAndElseKeywords();
var children = ifStatement.getChildren();
pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword);
// Generally the 'else' keyword is second-to-last, so we traverse backwards.
for (var i = children.length - 1; i >= 0; i--) {
if (pushKeywordIf(keywords, children[i], SyntaxKind.ElseKeyword)) {
break;
}
}
if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) {
break
@@ -2221,42 +2229,36 @@ module ts {
var result: ReferenceEntry[] = [];
// Here we do a little extra.
// We'd like to make else/ifs on the same line to be highlighted together
// We'd like to highlight else/ifs together if they are only separated by spaces/tabs
// (i.e. the keywords are separated by no comments, no newlines).
for (var i = 0; i < keywords.length; i++) {
if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) {
var elseKeyword = keywords[i];
var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
// Ensure that the keywords are only separated by trivia.
if (elseKeyword.end === ifKeyword.getFullStart()) {
var elseLine = sourceFile.getLineAndCharacterFromPosition(elseKeyword.end);
var ifLine = sourceFile.getLineAndCharacterFromPosition(ifKeyword.getStart());
var shouldHighlightNextKeyword = true;
if (elseLine.line === ifLine.line) {
result.push(new ReferenceEntry(filename, TypeScript.TextSpan.fromBounds(elseKeyword.getStart(), ifKeyword.end), /* isWriteAccess */ false));
i++; // skip the next keyword
continue;
// Avoid recalculating getStart() by iterating backwards.
for (var j = ifKeyword.getStart() - 1; j >= elseKeyword.end; j--) {
var c = sourceFile.text.charCodeAt(j);
if (c !== CharacterCodes.space && c !== CharacterCodes.tab) {
shouldHighlightNextKeyword = false;
break;
}
}
if (shouldHighlightNextKeyword) {
result.push(new ReferenceEntry(filename, TypeScript.TextSpan.fromBounds(elseKeyword.getStart(), ifKeyword.end), /* isWriteAccess */ false));
i++; // skip the next keyword
continue;
}
}
// Ordinary case: just highlight the keyword.
result.push(keywordToReferenceEntry(keywords[i]));
}
return result;
function pushIfAndElseKeywords() {
var children = ifStatement.getChildren();
pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword);
// Generally the 'else' keyword is second-to-last, so we traverse backwards.
for (var i = children.length - 1; i >= 0; i--) {
if (pushKeywordIf(keywords, children[i], SyntaxKind.ElseKeyword)) {
break;
}
}
}
}
function getTryCatchFinallyOccurrences(tryStatement: TryStatement): ReferenceEntry[] {
@@ -2350,7 +2352,7 @@ module ts {
}
function pushKeywordIf(keywordList: Node[], token: Node, ...expected: SyntaxKind[]): boolean {
if (token && contains(<SyntaxKind[]>expected, token.kind)) {
if (token && contains(expected, token.kind)) {
keywordList.push(token);
return true;
}

4
tests/cases/fourslash/getOccurrencesIfElse.ts
View File

@@ -13,9 +13,9 @@
//// var x = undefined;
//// }
////}
////[|else i/**/f|] (null) {
////[|else i/**/f|] (null) {
////}
////[|else /* whar garbl */ if|] (undefined) {
////[|else|] /* whar garbl */ [|if|] (undefined) {
////}
////[|else|]
////[|if|] (false) {

2
tests/cases/fourslash/getOccurrencesIfElse2.ts
View File

@@ -13,7 +13,7 @@
//// var x = undefined;
//// }
////}
////else if (null) {
////else if (null) {
////}
////else /* whar garbl */ if (undefined) {
////}

2
tests/cases/fourslash/getOccurrencesIfElse3.ts
View File

@@ -13,7 +13,7 @@
//// var x = undefined;
//// }
////}
////else if (null) {
////else if (null) {
////}
////else /* whar garbl */ if (undefined) {
////}

2
tests/cases/fourslash/getOccurrencesIfElse4.ts
View File

@@ -13,7 +13,7 @@
//// var x = undefined;
//// }
////}
////else if (null) {
////else if (null) {
////}
////else /* whar garbl */ if (undefined) {
////}

8
tests/cases/fourslash/getOccurrencesIfElseNegatives.ts
View File

@@ -13,7 +13,7 @@
//// var x = undefined;
//// }
////}
////else/*8*/ if (null) {
////else/*8*/ if (null) {
////}
////else/*9*/ /* whar garbl */ if/*10*/ (undefined) {
////}
@@ -23,7 +23,7 @@
////else/*13*/ { }
for (var i = 1; i <= test.markers().length; i++) {
goTo.marker("" + i);
test.markers().forEach(m => {
goTo.position(m.position, m.fileName)
verify.occurrencesAtPositionCount(0);
}
});