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

Merge pull request #9342 from Microsoft/typoinbracecompletion

Browse Source 
Fix typo
This commit is contained in:
Paul van Brenk 2016-06-24 14:41:10 -07:00 committed by GitHub
commit cca7000032
11 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/harness/fourslash.ts
View File

@ -1894,7 +1894,7 @@ namespace FourSlash {
});
}
public verifyBraceCompletionAtPostion(negative: boolean, openingBrace: string) {
public verifyBraceCompletionAtPosition(negative: boolean, openingBrace: string) {
const openBraceMap: ts.Map<ts.CharacterCodes> = {
"(": ts.CharacterCodes.openParen,
@ -1914,7 +1914,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}`);
@ -2922,8 +2922,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);
}
}

4
src/harness/harnessLanguageService.ts
View File

@ -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));

2
src/server/client.ts
View File

@ -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.");
}

6
src/services/services.ts
View File

@ -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;
@ -7785,7 +7785,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
@ -8153,7 +8153,7 @@ namespace ts {
getFormattingEditsForDocument,
getFormattingEditsAfterKeystroke,
getDocCommentTemplateAtPosition,
isValidBraceCompletionAtPostion,
isValidBraceCompletionAtPosition,
getEmitOutput,
getNonBoundSourceFile,
getProgram

8
src/services/shims.ts
View File

@ -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;
}
@ -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)
);
}

6
tests/cases/fourslash/commentBraceCompletionPosition.ts
View File

@ -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
tests/cases/fourslash/fourslash.ts
View File

@ -136,7 +136,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;

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

@ -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
tests/cases/fourslash/stringBraceCompletionPosition.ts
View File

@ -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('(');

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

@ -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
tests/cases/fourslash/validBraceCompletionPosition.ts
View File

@ -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('(');