Skip to content

Commit cca7000

Browse files
paulvanbrenkpaulvanbrenk
authored
Merge pull request #9342 from Microsoft/typoinbracecompletion
Fix typo
2 parents 8312168 + 6346fc1 commit cca7000

11 files changed

+44
-44
lines changed

‎src/harness/fourslash.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@ namespace FourSlash {
18941894
});
18951895
}
18961896

1897-
public verifyBraceCompletionAtPostion(negative: boolean, openingBrace: string) {
1897+
public verifyBraceCompletionAtPosition(negative: boolean, openingBrace: string) {
18981898

18991899
const openBraceMap: ts.Map<ts.CharacterCodes> = {
19001900
"(": ts.CharacterCodes.openParen,
@@ -1914,7 +1914,7 @@ namespace FourSlash {
19141914

19151915
const position = this.currentCaretPosition;
19161916

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

19191919
if (!negative && !validBraceCompletion) {
19201920
this.raiseError(`${position} is not a valid brace completion position for ${openingBrace}`);
@@ -2922,8 +2922,8 @@ namespace FourSlashInterface {
29222922
this.state.verifyDefinitionsName(this.negative, name, containerName);
29232923
}
29242924

2925-
public isValidBraceCompletionAtPostion(openingBrace: string) {
2926-
this.state.verifyBraceCompletionAtPostion(this.negative, openingBrace);
2925+
public isValidBraceCompletionAtPosition(openingBrace: string) {
2926+
this.state.verifyBraceCompletionAtPosition(this.negative, openingBrace);
29272927
}
29282928
}
29292929

‎src/harness/harnessLanguageService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ namespace Harness.LanguageService {
450450
getDocCommentTemplateAtPosition(fileName: string, position: number): ts.TextInsertion {
451451
return unwrapJSONCallResult(this.shim.getDocCommentTemplateAtPosition(fileName, position));
452452
}
453-
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
454-
return unwrapJSONCallResult(this.shim.isValidBraceCompletionAtPostion(fileName, position, openingBrace));
453+
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {
454+
return unwrapJSONCallResult(this.shim.isValidBraceCompletionAtPosition(fileName, position, openingBrace));
455455
}
456456
getEmitOutput(fileName: string): ts.EmitOutput {
457457
return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));

‎src/server/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ namespace ts.server {
588588
throw new Error("Not Implemented Yet.");
589589
}
590590

591-
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
591+
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {
592592
throw new Error("Not Implemented Yet.");
593593
}
594594

‎src/services/services.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ namespace ts {
11471147

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

1150-
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean;
1150+
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
11511151

11521152
getEmitOutput(fileName: string): EmitOutput;
11531153

@@ -7785,7 +7785,7 @@ namespace ts {
77857785
return { newText: result, caretOffset: preamble.length };
77867786
}
77877787

7788-
function isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
7788+
function isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean {
77897789

77907790
// '<' is currently not supported, figuring out if we're in a Generic Type vs. a comparison is too
77917791
// expensive to do during typing scenarios
@@ -8153,7 +8153,7 @@ namespace ts {
81538153
getFormattingEditsForDocument,
81548154
getFormattingEditsAfterKeystroke,
81558155
getDocCommentTemplateAtPosition,
8156-
isValidBraceCompletionAtPostion,
8156+
isValidBraceCompletionAtPosition,
81578157
getEmitOutput,
81588158
getNonBoundSourceFile,
81598159
getProgram

‎src/services/shims.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ namespace ts {
228228
* at the current position.
229229
* E.g. we don't want brace completion inside string-literals, comments, etc.
230230
*/
231-
isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string;
231+
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string;
232232

233233
getEmitOutput(fileName: string): string;
234234
}
@@ -773,10 +773,10 @@ namespace ts {
773773
);
774774
}
775775

776-
public isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string {
776+
public isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string {
777777
return this.forwardJSONCall(
778-
`isValidBraceCompletionAtPostion('${fileName}', ${position}, ${openingBrace})`,
779-
() => this.languageService.isValidBraceCompletionAtPostion(fileName, position, openingBrace)
778+
`isValidBraceCompletionAtPosition('${fileName}', ${position}, ${openingBrace})`,
779+
() => this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace)
780780
);
781781
}
782782

‎tests/cases/fourslash/commentBraceCompletionPosition.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//// }
1515

1616
goTo.marker('1');
17-
verify.not.isValidBraceCompletionAtPostion('(');
17+
verify.not.isValidBraceCompletionAtPosition('(');
1818

1919
goTo.marker('2');
20-
verify.not.isValidBraceCompletionAtPostion('(');
20+
verify.not.isValidBraceCompletionAtPosition('(');
2121

2222
goTo.marker('3');
23-
verify.not.isValidBraceCompletionAtPostion('(');
23+
verify.not.isValidBraceCompletionAtPosition('(');

‎tests/cases/fourslash/fourslash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ declare namespace FourSlashInterface {
136136
typeDefinitionCountIs(expectedCount: number): void;
137137
definitionLocationExists(): void;
138138
verifyDefinitionsName(name: string, containerName: string): void;
139-
isValidBraceCompletionAtPostion(openingBrace?: string): void;
139+
isValidBraceCompletionAtPosition(openingBrace?: string): void;
140140
}
141141
class verify extends verifyNegatable {
142142
assertHasRanges(ranges: Range[]): void;

‎tests/cases/fourslash/jsxBraceCompletionPosition.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@
1919
//// </div>
2020

2121
goTo.marker('1');
22-
verify.not.isValidBraceCompletionAtPostion('(');
23-
verify.isValidBraceCompletionAtPostion('{');
22+
verify.not.isValidBraceCompletionAtPosition('(');
23+
verify.isValidBraceCompletionAtPosition('{');
2424

2525
goTo.marker('2');
26-
verify.not.isValidBraceCompletionAtPostion('(');
27-
verify.not.isValidBraceCompletionAtPostion('{');
26+
verify.not.isValidBraceCompletionAtPosition('(');
27+
verify.not.isValidBraceCompletionAtPosition('{');
2828

2929
goTo.marker('3');
30-
verify.not.isValidBraceCompletionAtPostion('(');
31-
verify.isValidBraceCompletionAtPostion('{');
30+
verify.not.isValidBraceCompletionAtPosition('(');
31+
verify.isValidBraceCompletionAtPosition('{');
3232

3333
goTo.marker('4');
34-
verify.not.isValidBraceCompletionAtPostion('(');
35-
verify.isValidBraceCompletionAtPostion('{');
34+
verify.not.isValidBraceCompletionAtPosition('(');
35+
verify.isValidBraceCompletionAtPosition('{');
3636

3737
goTo.marker('5');
38-
verify.not.isValidBraceCompletionAtPostion('(');
39-
verify.isValidBraceCompletionAtPostion('{');
38+
verify.not.isValidBraceCompletionAtPosition('(');
39+
verify.isValidBraceCompletionAtPosition('{');
4040

4141
goTo.marker('6');
42-
verify.not.isValidBraceCompletionAtPostion('(');
43-
verify.isValidBraceCompletionAtPostion('{');
42+
verify.not.isValidBraceCompletionAtPosition('(');
43+
verify.isValidBraceCompletionAtPosition('{');
4444

4545
goTo.marker('7');
46-
verify.not.isValidBraceCompletionAtPostion('(');
47-
verify.isValidBraceCompletionAtPostion('{');
46+
verify.not.isValidBraceCompletionAtPosition('(');
47+
verify.isValidBraceCompletionAtPosition('{');

‎tests/cases/fourslash/stringBraceCompletionPosition.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
//// /*3*/";
77

88
goTo.marker('1');
9-
verify.not.isValidBraceCompletionAtPostion('(');
9+
verify.not.isValidBraceCompletionAtPosition('(');
1010

1111
goTo.marker('2');
12-
verify.not.isValidBraceCompletionAtPostion('(');
12+
verify.not.isValidBraceCompletionAtPosition('(');
1313

1414
goTo.marker('3');
15-
verify.not.isValidBraceCompletionAtPostion('(');
15+
verify.not.isValidBraceCompletionAtPosition('(');
1616

‎tests/cases/fourslash/stringTemplateBraceCompletionPosition.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
//// var y = `hello /*2*/world, ${100}how /*3*/are you{ 200 } to/*4*/day!?`
55

66
goTo.marker('1');
7-
verify.not.isValidBraceCompletionAtPostion('(');
7+
verify.not.isValidBraceCompletionAtPosition('(');
88

99
goTo.marker('2');
10-
verify.not.isValidBraceCompletionAtPostion('(');
10+
verify.not.isValidBraceCompletionAtPosition('(');
1111

1212
goTo.marker('3');
13-
verify.not.isValidBraceCompletionAtPostion('(');
13+
verify.not.isValidBraceCompletionAtPosition('(');
1414

1515
goTo.marker('4');
16-
verify.not.isValidBraceCompletionAtPostion('(');
16+
verify.not.isValidBraceCompletionAtPosition('(');

‎tests/cases/fourslash/validBraceCompletionPosition.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
//// var x = /*5*/{ a:true }
99

1010
goTo.marker('1');
11-
verify.isValidBraceCompletionAtPostion('(');
11+
verify.isValidBraceCompletionAtPosition('(');
1212

1313
goTo.marker('2');
14-
verify.isValidBraceCompletionAtPostion('(');
14+
verify.isValidBraceCompletionAtPosition('(');
1515

1616
goTo.marker('3');
17-
verify.isValidBraceCompletionAtPostion('(');
17+
verify.isValidBraceCompletionAtPosition('(');
1818

1919
goTo.marker('4');
20-
verify.isValidBraceCompletionAtPostion('(');
20+
verify.isValidBraceCompletionAtPosition('(');
2121

2222
goTo.marker('5');
23-
verify.isValidBraceCompletionAtPostion('(');
23+
verify.isValidBraceCompletionAtPosition('(');

0 commit comments

Comments
 (0)