Skip to content

Commit 294ad06

Browse files
DanielRosenwasserDanielRosenwasser
committed
Merge branch 'getOccurrences' of https://github.com/Microsoft/TypeScript into getOccurrences
2 parents 4381f72 + e060a8e commit 294ad06

File tree

7 files changed

+258
-12
lines changed

7 files changed

+258
-12
lines changed

‎src/services/services.ts

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,6 +2165,12 @@ module ts {
21652165
}
21662166

21672167
switch (node.kind) {
2168+
case SyntaxKind.IfKeyword:
2169+
case SyntaxKind.ElseKeyword:
2170+
if (hasKind(node.parent, SyntaxKind.IfStatement)) {
2171+
return getIfElseOccurrences(<IfStatement>node.parent);
2172+
}
2173+
break;
21682174
case SyntaxKind.TryKeyword:
21692175
case SyntaxKind.CatchKeyword:
21702176
case SyntaxKind.FinallyKeyword:
@@ -2192,6 +2198,66 @@ module ts {
21922198

21932199
return undefined;
21942200

2201+
function getIfElseOccurrences(ifStatement: IfStatement): ReferenceEntry[] {
2202+
var keywords: Node[] = [];
2203+
2204+
// Traverse upwards through all parent if-statements linked by their else-branches.
2205+
while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (<IfStatement>ifStatement.parent).elseStatement === ifStatement) {
2206+
ifStatement = <IfStatement>ifStatement.parent;
2207+
}
2208+
2209+
// Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
2210+
while (ifStatement) {
2211+
var children = ifStatement.getChildren();
2212+
pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword);
2213+
2214+
// Generally the 'else' keyword is second-to-last, so we traverse backwards.
2215+
for (var i = children.length - 1; i >= 0; i--) {
2216+
if (pushKeywordIf(keywords, children[i], SyntaxKind.ElseKeyword)) {
2217+
break;
2218+
}
2219+
}
2220+
2221+
if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) {
2222+
break
2223+
}
2224+
2225+
ifStatement = <IfStatement>ifStatement.elseStatement;
2226+
}
2227+
2228+
var result: ReferenceEntry[] = [];
2229+
2230+
// We'd like to highlight else/ifs together if they are only separated by whitespace
2231+
// (i.e. the keywords are separated by no comments, no newlines).
2232+
for (var i = 0; i < keywords.length; i++) {
2233+
if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) {
2234+
var elseKeyword = keywords[i];
2235+
var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
2236+
2237+
var shouldHighlightNextKeyword = true;
2238+
2239+
// Avoid recalculating getStart() by iterating backwards.
2240+
for (var j = ifKeyword.getStart() - 1; j >= elseKeyword.end; j--) {
2241+
if (!isWhiteSpace(sourceFile.text.charCodeAt(j))) {
2242+
shouldHighlightNextKeyword = false;
2243+
break;
2244+
}
2245+
}
2246+
2247+
if (shouldHighlightNextKeyword) {
2248+
result.push(new ReferenceEntry(filename, TypeScript.TextSpan.fromBounds(elseKeyword.getStart(), ifKeyword.end), /* isWriteAccess */ false));
2249+
i++; // skip the next keyword
2250+
continue;
2251+
}
2252+
}
2253+
2254+
// Ordinary case: just highlight the keyword.
2255+
result.push(keywordToReferenceEntry(keywords[i]));
2256+
}
2257+
2258+
return result;
2259+
}
2260+
21952261
function getTryCatchFinallyOccurrences(tryStatement: TryStatement): ReferenceEntry[] {
21962262
var keywords: Node[] = [];
21972263

@@ -2205,7 +2271,7 @@ module ts {
22052271
pushKeywordIf(keywords, tryStatement.finallyBlock.getFirstToken(), SyntaxKind.FinallyKeyword);
22062272
}
22072273

2208-
return keywordsToReferenceEntries(keywords);
2274+
return map(keywords, keywordToReferenceEntry);
22092275
}
22102276

22112277
function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement) {
@@ -2241,7 +2307,7 @@ module ts {
22412307
});
22422308
});
22432309

2244-
return keywordsToReferenceEntries(keywords);
2310+
return map(keywords, keywordToReferenceEntry);
22452311
}
22462312

22472313
function getBreakStatementOccurences(breakStatement: BreakOrContinueStatement): ReferenceEntry[]{
@@ -2282,20 +2348,17 @@ module ts {
22822348
return node && node.parent;
22832349
}
22842350

2285-
function pushKeywordIf(keywordList: Node[], token: Node, ...expected: SyntaxKind[]): void {
2286-
if (!token) {
2287-
return;
2288-
}
2289-
2290-
if (contains(<SyntaxKind[]>expected, token.kind)) {
2351+
function pushKeywordIf(keywordList: Node[], token: Node, ...expected: SyntaxKind[]): boolean {
2352+
if (token && contains(expected, token.kind)) {
22912353
keywordList.push(token);
2354+
return true;
22922355
}
2356+
2357+
return false;
22932358
}
22942359

2295-
function keywordsToReferenceEntries(keywords: Node[]): ReferenceEntry[]{
2296-
return map(keywords, keyword =>
2297-
new ReferenceEntry(filename, TypeScript.TextSpan.fromBounds(keyword.getStart(), keyword.end), /* isWriteAccess */ false)
2298-
);
2360+
function keywordToReferenceEntry(keyword: Node): ReferenceEntry {
2361+
return new ReferenceEntry(filename, TypeScript.TextSpan.fromBounds(keyword.getStart(), keyword.end), /* isWriteAccess */ false);
22992362
}
23002363
}
23012364

‎tests/cases/fourslash/getOccurrencesIfElse.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////[|if|] (true) {
4+
//// if (false) {
5+
//// }
6+
//// else {
7+
//// }
8+
//// if (true) {
9+
//// }
10+
//// else {
11+
//// if (false)
12+
//// if (true)
13+
//// var x = undefined;
14+
//// }
15+
////}
16+
////[|else i/**/f|] (null) {
17+
////}
18+
////[|else|] /* whar garbl */ [|if|] (undefined) {
19+
////}
20+
////[|else|]
21+
////[|if|] (false) {
22+
////}
23+
////[|else|] { }
24+
25+
test.ranges().forEach(r => {
26+
goTo.position(r.start);
27+
28+
test.ranges().forEach(range => {
29+
verify.occurrencesAtPositionContains(range, false);
30+
});
31+
});
32+
33+
goTo.marker();
34+
test.ranges().forEach(range => {
35+
verify.occurrencesAtPositionContains(range, false);
36+
});

‎tests/cases/fourslash/getOccurrencesIfElse2.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////if (true) {
4+
//// [|if|] (false) {
5+
//// }
6+
//// [|else|]{
7+
//// }
8+
//// if (true) {
9+
//// }
10+
//// else {
11+
//// if (false)
12+
//// if (true)
13+
//// var x = undefined;
14+
//// }
15+
////}
16+
////else if (null) {
17+
////}
18+
////else /* whar garbl */ if (undefined) {
19+
////}
20+
////else
21+
////if (false) {
22+
////}
23+
////else { }
24+
25+
26+
test.ranges().forEach(r => {
27+
goTo.position(r.start);
28+
29+
test.ranges().forEach(range => {
30+
verify.occurrencesAtPositionContains(range, false);
31+
});
32+
});

‎tests/cases/fourslash/getOccurrencesIfElse3.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////if (true) {
4+
//// if (false) {
5+
//// }
6+
//// else {
7+
//// }
8+
//// [|if|] (true) {
9+
//// }
10+
//// [|else|] {
11+
//// if (false)
12+
//// if (true)
13+
//// var x = undefined;
14+
//// }
15+
////}
16+
////else if (null) {
17+
////}
18+
////else /* whar garbl */ if (undefined) {
19+
////}
20+
////else
21+
////if (false) {
22+
////}
23+
////else { }
24+
25+
26+
test.ranges().forEach(r => {
27+
goTo.position(r.start);
28+
29+
test.ranges().forEach(range => {
30+
verify.occurrencesAtPositionContains(range, false);
31+
});
32+
});

‎tests/cases/fourslash/getOccurrencesIfElse4.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////if (true) {
4+
//// if (false) {
5+
//// }
6+
//// else {
7+
//// }
8+
//// if (true) {
9+
//// }
10+
//// else {
11+
//// /*1*/if (false)
12+
//// /*2*/i/*3*/f (true)
13+
//// var x = undefined;
14+
//// }
15+
////}
16+
////else if (null) {
17+
////}
18+
////else /* whar garbl */ if (undefined) {
19+
////}
20+
////else
21+
////if (false) {
22+
////}
23+
////else { }
24+
25+
26+
for (var i = 1; i <= test.markers().length; i++) {
27+
goTo.marker("" + i);
28+
29+
verify.occurrencesAtPositionCount(1);
30+
}

‎tests/cases/fourslash/getOccurrencesIfElseBroken.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
4+
////[|if|] (true) {
5+
//// var x = 1;
6+
////}
7+
////[|else if|] ()
8+
////[|else if|]
9+
////[|else|] /* whar garbl */ [|if|] (i/**/f (true) { } else { })
10+
////else
11+
12+
// It would be nice if in the future,
13+
// We could include that last 'else'.
14+
15+
test.ranges().forEach(r => {
16+
goTo.position(r.start);
17+
18+
test.ranges().forEach(range => {
19+
verify.occurrencesAtPositionContains(range, false);
20+
});
21+
});
22+
23+
goTo.marker();
24+
verify.occurrencesAtPositionCount(2);

‎tests/cases/fourslash/getOccurrencesIfElseNegatives.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////if/*1*/ (true) {
4+
//// if/*2*/ (false) {
5+
//// }
6+
//// else/*3*/ {
7+
//// }
8+
//// if/*4*/ (true) {
9+
//// }
10+
//// else/*5*/ {
11+
//// if/*6*/ (false)
12+
//// if/*7*/ (true)
13+
//// var x = undefined;
14+
//// }
15+
////}
16+
////else/*8*/ if (null) {
17+
////}
18+
////else/*9*/ /* whar garbl */ if/*10*/ (undefined) {
19+
////}
20+
////else/*11*/
21+
////if/*12*/ (false) {
22+
////}
23+
////else/*13*/ { }
24+
25+
26+
test.markers().forEach(m => {
27+
goTo.position(m.position, m.fileName)
28+
verify.occurrencesAtPositionCount(0);
29+
});

0 commit comments

Comments
 (0)