microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 10:58:20 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #4203 from hoanhtien/fixOccurrenceTypos

Browse Source 
Fix occurrence typos
This commit is contained in:
tien
2015-08-06 16:55:15 -07:00
parent 24aa58ebee 013b92c3e7
commit 2f9248386e
7 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/harness/fourslash.ts
View File

@@ -2115,17 +2115,17 @@ module FourSlash {
}
}
private getOccurancesAtCurrentPosition() {
private getOccurrencesAtCurrentPosition() {
return this.languageService.getOccurrencesAtPosition(this.activeFile.fileName, this.currentCaretPosition);
}
public verifyOccurrencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) {
this.taoInvalidReason = "verifyOccurrencesAtPositionListContains NYI";
let occurrences = this.getOccurancesAtCurrentPosition();
let occurrences = this.getOccurrencesAtCurrentPosition();
if (!occurrences || occurrences.length === 0) {
this.raiseError('verifyOccurancesAtPositionListContains failed - found 0 references, expected at least one.');
this.raiseError('verifyOccurrencesAtPositionListContains failed - found 0 references, expected at least one.');
}
for (let occurrence of occurrences) {
@@ -2144,7 +2144,7 @@ module FourSlash {
public verifyOccurrencesAtPositionListCount(expectedCount: number) {
this.taoInvalidReason = "verifyOccurrencesAtPositionListCount NYI";
let occurrences = this.getOccurancesAtCurrentPosition();
let occurrences = this.getOccurrencesAtCurrentPosition();
let actualCount = occurrences ? occurrences.length : 0;
if (expectedCount !== actualCount) {
this.raiseError(`verifyOccurrencesAtPositionListCount failed - actual: ${actualCount}, expected:${expectedCount}`);
@@ -2172,7 +2172,7 @@ module FourSlash {
for (let highlight of highlightSpans) {
if (highlight && highlight.textSpan.start === start && ts.textSpanEnd(highlight.textSpan) === end) {
if (typeof kind !== "undefined" && highlight.kind !== kind) {
this.raiseError('verifyDocumentHighlightsAtPositionListContains failed - item "kind" value does not match, actual: ' + highlight.kind + ', expected: ' + kind + '.');
this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - item "kind" value does not match, actual: ${highlight.kind}, expected: ${kind}.`);
}
return;
}
@@ -2181,7 +2181,7 @@ module FourSlash {
}
let missingItem = { fileName: fileName, start: start, end: end, kind: kind };
this.raiseError('verifyOccurancesAtPositionListContains failed - could not find the item: ' + JSON.stringify(missingItem) + ' in the returned list: (' + JSON.stringify(documentHighlights) + ')');
this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(documentHighlights)})`);
}
public verifyDocumentHighlightsAtPositionListCount(expectedCount: number, fileNamesToSearch: string[]) {

4
src/services/services.ts
View File

@@ -4620,7 +4620,7 @@ namespace ts {
case SyntaxKind.BreakKeyword:
case SyntaxKind.ContinueKeyword:
if (hasKind(node.parent, SyntaxKind.BreakStatement) || hasKind(node.parent, SyntaxKind.ContinueStatement)) {
return getBreakOrContinueStatementOccurences(<BreakOrContinueStatement>node.parent);
return getBreakOrContinueStatementOccurrences(<BreakOrContinueStatement>node.parent);
}
break;
case SyntaxKind.ForKeyword:
@@ -4946,7 +4946,7 @@ namespace ts {
return map(keywords, getHighlightSpanForNode);
}
function getBreakOrContinueStatementOccurences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] {
function getBreakOrContinueStatementOccurrences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] {
let owner = getBreakOrContinueOwner(breakOrContinueStatement);
if (owner) {

28
tests/cases/fourslash/getOccurrencesIfElse5.ts
View File

@@ -22,21 +22,21 @@
////}
////else/*13*/ { }
function verifyOccurencesAtMarker(marker: string, count: number) {
function verifyOccurrencesAtMarker(marker: string, count: number) {
goTo.marker(marker);
verify.occurrencesAtPositionCount(count);
}
verifyOccurencesAtMarker("1", 7);
verifyOccurencesAtMarker("2", 2);
verifyOccurencesAtMarker("3", 2);
verifyOccurencesAtMarker("4", 2);
verifyOccurencesAtMarker("5", 2);
verifyOccurencesAtMarker("6", 1);
verifyOccurencesAtMarker("7", 1);
verifyOccurencesAtMarker("8", 7);
verifyOccurencesAtMarker("9", 7);
verifyOccurencesAtMarker("10", 7);
verifyOccurencesAtMarker("11", 7);
verifyOccurencesAtMarker("12", 7);
verifyOccurencesAtMarker("13", 7);
verifyOccurrencesAtMarker("1", 7);
verifyOccurrencesAtMarker("2", 2);
verifyOccurrencesAtMarker("3", 2);
verifyOccurrencesAtMarker("4", 2);
verifyOccurrencesAtMarker("5", 2);
verifyOccurrencesAtMarker("6", 1);
verifyOccurrencesAtMarker("7", 1);
verifyOccurrencesAtMarker("8", 7);
verifyOccurrencesAtMarker("9", 7);
verifyOccurrencesAtMarker("10", 7);
verifyOccurrencesAtMarker("11", 7);
verifyOccurrencesAtMarker("12", 7);
verifyOccurrencesAtMarker("13", 7);

16
tests/cases/fourslash/getOccurrencesReturn4.ts
View File

@@ -19,15 +19,15 @@
//// return/*7*/ true;
////}
function verifyOccurencesAtMarker(marker: string, count: number) {
function verifyOccurrencesAtMarker(marker: string, count: number) {
goTo.marker(marker);
verify.occurrencesAtPositionCount(count);
}
verifyOccurencesAtMarker("1", 4);
verifyOccurencesAtMarker("2", 4);
verifyOccurencesAtMarker("3", 4);
verifyOccurencesAtMarker("4", 4);
verifyOccurencesAtMarker("5", 1);
verifyOccurencesAtMarker("6", 3);
verifyOccurencesAtMarker("7", 3);
verifyOccurrencesAtMarker("1", 4);
verifyOccurrencesAtMarker("2", 4);
verifyOccurrencesAtMarker("3", 4);
verifyOccurrencesAtMarker("4", 4);
verifyOccurrencesAtMarker("5", 1);
verifyOccurrencesAtMarker("6", 3);
verifyOccurrencesAtMarker("7", 3);

30
tests/cases/fourslash/getOccurrencesSwitchCaseDefault5.ts
View File

@@ -18,23 +18,23 @@
//// case 16/*14*/:
////}
function verifyOccurencesAtMarker(marker: string, count: number) {
function verifyOccurrencesAtMarker(marker: string, count: number) {
goTo.marker(marker);
verify.occurrencesAtPositionCount(count);
}
verifyOccurencesAtMarker("1", 9);
verifyOccurencesAtMarker("2", 9);
verifyOccurencesAtMarker("3", 9);
verifyOccurencesAtMarker("4", 9);
verifyOccurencesAtMarker("5", 9);
verifyOccurencesAtMarker("6", 6);
verifyOccurencesAtMarker("7", 6);
verifyOccurencesAtMarker("8", 6);
verifyOccurencesAtMarker("9", 6);
verifyOccurencesAtMarker("10", 6);
verifyOccurencesAtMarker("11", 9);
verifyOccurencesAtMarker("12", 9);
verifyOccurencesAtMarker("13", 9);
verifyOccurencesAtMarker("14", 0);
verifyOccurrencesAtMarker("1", 9);
verifyOccurrencesAtMarker("2", 9);
verifyOccurrencesAtMarker("3", 9);
verifyOccurrencesAtMarker("4", 9);
verifyOccurrencesAtMarker("5", 9);
verifyOccurrencesAtMarker("6", 6);
verifyOccurrencesAtMarker("7", 6);
verifyOccurrencesAtMarker("8", 6);
verifyOccurrencesAtMarker("9", 6);
verifyOccurrencesAtMarker("10", 6);
verifyOccurrencesAtMarker("11", 9);
verifyOccurrencesAtMarker("12", 9);
verifyOccurrencesAtMarker("13", 9);
verifyOccurrencesAtMarker("14", 0);

14
tests/cases/fourslash/getOccurrencesThis6.ts
View File

@@ -142,14 +142,14 @@
////}
function verifyOccurencesAtMarker(marker: string, count: number) {
function verifyOccurrencesAtMarker(marker: string, count: number) {
goTo.marker(marker);
verify.occurrencesAtPositionCount(count);
}
verifyOccurencesAtMarker("1", 2);
verifyOccurencesAtMarker("2", 6);
verifyOccurencesAtMarker("3", 1);
verifyOccurencesAtMarker("4", 1);
verifyOccurencesAtMarker("5", 1);
verifyOccurencesAtMarker("6", 0);
verifyOccurrencesAtMarker("1", 2);
verifyOccurrencesAtMarker("2", 6);
verifyOccurrencesAtMarker("3", 1);
verifyOccurrencesAtMarker("4", 1);
verifyOccurrencesAtMarker("5", 1);
verifyOccurrencesAtMarker("6", 0);

18
tests/cases/fourslash/getOccurrencesTryCatchFinally4.ts
View File

@@ -15,16 +15,16 @@
////}
////finally/*7*/ {
////}
function verifyOccurencesAtMarker(marker: string, count: number) {
function verifyOccurrencesAtMarker(marker: string, count: number) {
goTo.marker(marker);
verify.occurrencesAtPositionCount(count);
}
verifyOccurencesAtMarker("1", 3);
verifyOccurencesAtMarker("2", 2);
verifyOccurencesAtMarker("3", 2);
verifyOccurencesAtMarker("4", 2);
verifyOccurencesAtMarker("5", 2);
verifyOccurencesAtMarker("6", 3);
verifyOccurencesAtMarker("7", 3);
verifyOccurencesAtMarker("8", 0);
verifyOccurrencesAtMarker("1", 3);
verifyOccurrencesAtMarker("2", 2);
verifyOccurrencesAtMarker("3", 2);
verifyOccurrencesAtMarker("4", 2);
verifyOccurrencesAtMarker("5", 2);
verifyOccurrencesAtMarker("6", 3);
verifyOccurrencesAtMarker("7", 3);
verifyOccurrencesAtMarker("8", 0);