Skip to content

Fix typo #9342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/harness/fourslash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ namespace FourSlash {
});
}

public verifyBraceCompletionAtPostion(negative: boolean, openingBrace: string) {
public verifyBraceCompletionAtPosition(negative: boolean, openingBrace: string) {

const openBraceMap: ts.Map<ts.CharacterCodes> = {
"(": ts.CharacterCodes.openParen,
Expand All @@ -1915,7 +1915,7 @@ namespace FourSlash {

const position = this.currentCaretPosition;

const validBraceCompletion = this.languageService.isValidBraceCompletionAtPostion(this.activeFile.fileName, position, charCode);
const validBraceCompletion = this.languageService.isValidBraceCompletionAtPosition(this.activeFile.fileName, position, charCode);

if (!negative && !validBraceCompletion) {
this.raiseError(`${position} is not a valid brace completion position for ${openingBrace}`);
Expand Down Expand Up @@ -2919,8 +2919,8 @@ namespace FourSlashInterface {
this.state.verifyDefinitionsName(this.negative, name, containerName);
}

public isValidBraceCompletionAtPostion(openingBrace: string) {
this.state.verifyBraceCompletionAtPostion(this.negative, openingBrace);
public isValidBraceCompletionAtPosition(openingBrace: string) {
this.state.verifyBraceCompletionAtPosition(this.negative, openingBrace);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/harness/harnessLanguageService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ namespace Harness.LanguageService {
getDocCommentTemplateAtPosition(fileName: string, position: number): ts.TextInsertion {
return unwrapJSONCallResult(this.shim.getDocCommentTemplateAtPosition(fileName, position));
}
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
return unwrapJSONCallResult(this.shim.isValidBraceCompletionAtPostion(fileName, position, openingBrace));
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {
return unwrapJSONCallResult(this.shim.isValidBraceCompletionAtPosition(fileName, position, openingBrace));
}
getEmitOutput(fileName: string): ts.EmitOutput {
return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));
Expand Down
2 changes: 1 addition & 1 deletion src/server/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ namespace ts.server {
throw new Error("Not Implemented Yet.");
}

isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {
throw new Error("Not Implemented Yet.");
}

Expand Down
6 changes: 3 additions & 3 deletions src/services/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ namespace ts {

getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;

isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean;
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;

getEmitOutput(fileName: string): EmitOutput;

Expand Down Expand Up @@ -7769,7 +7769,7 @@ namespace ts {
return { newText: result, caretOffset: preamble.length };
}

function isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
function isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {

// '<' is currently not supported, figuring out if we're in a Generic Type vs. a comparison is too
// expensive to do during typing scenarios
Expand Down Expand Up @@ -8137,7 +8137,7 @@ namespace ts {
getFormattingEditsForDocument,
getFormattingEditsAfterKeystroke,
getDocCommentTemplateAtPosition,
isValidBraceCompletionAtPostion,
isValidBraceCompletionAtPosition,
getEmitOutput,
getNonBoundSourceFile,
getProgram
Expand Down
8 changes: 4 additions & 4 deletions src/services/shims.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ namespace ts {
* at the current position.
* E.g. we don't want brace completion inside string-literals, comments, etc.
*/
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string;
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string;

getEmitOutput(fileName: string): string;
}
Expand Down Expand Up @@ -773,10 +773,10 @@ namespace ts {
);
}

public isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string {
public isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string {
return this.forwardJSONCall(
`isValidBraceCompletionAtPostion('${fileName}', ${position}, ${openingBrace})`,
() => this.languageService.isValidBraceCompletionAtPostion(fileName, position, openingBrace)
`isValidBraceCompletionAtPosition('${fileName}', ${position}, ${openingBrace})`,
() => this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace)
);
}

Expand Down
6 changes: 3 additions & 3 deletions tests/cases/fourslash/commentBraceCompletionPosition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
//// }

goTo.marker('1');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('2');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('3');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');
2 changes: 1 addition & 1 deletion tests/cases/fourslash/fourslash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ declare namespace FourSlashInterface {
typeDefinitionCountIs(expectedCount: number): void;
definitionLocationExists(): void;
verifyDefinitionsName(name: string, containerName: string): void;
isValidBraceCompletionAtPostion(openingBrace?: string): void;
isValidBraceCompletionAtPosition(openingBrace?: string): void;
}
class verify extends verifyNegatable {
assertHasRanges(ranges: Range[]): void;
Expand Down
28 changes: 14 additions & 14 deletions tests/cases/fourslash/jsxBraceCompletionPosition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@
//// </div>

goTo.marker('1');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');

goTo.marker('2');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.not.isValidBraceCompletionAtPosition('{');

goTo.marker('3');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');

goTo.marker('4');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');

goTo.marker('5');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');

goTo.marker('6');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');

goTo.marker('7');
verify.not.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPostion('{');
verify.not.isValidBraceCompletionAtPosition('(');
verify.isValidBraceCompletionAtPosition('{');
6 changes: 3 additions & 3 deletions tests/cases/fourslash/stringBraceCompletionPosition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
//// /*3*/";

goTo.marker('1');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('2');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('3');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
//// var y = `hello /*2*/world, ${100}how /*3*/are you{ 200 } to/*4*/day!?`

goTo.marker('1');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('2');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('3');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');

goTo.marker('4');
verify.not.isValidBraceCompletionAtPostion('(');
verify.not.isValidBraceCompletionAtPosition('(');
10 changes: 5 additions & 5 deletions tests/cases/fourslash/validBraceCompletionPosition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
//// var x = /*5*/{ a:true }

goTo.marker('1');
verify.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPosition('(');

goTo.marker('2');
verify.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPosition('(');

goTo.marker('3');
verify.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPosition('(');

goTo.marker('4');
verify.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPosition('(');

goTo.marker('5');
verify.isValidBraceCompletionAtPostion('(');
verify.isValidBraceCompletionAtPosition('(');