Skip to content

Commit d2fbd1e

Browse files
KingwlKingwl
committed
Add test suits and tests
1 parent 446bee4 commit d2fbd1e

35 files changed

+608
-1
lines changed

‎src/harness/fourslashImpl.ts

+12
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,18 @@ namespace FourSlash {
824824
});
825825
}
826826

827+
public verifyInlineHints(expected: readonly FourSlashInterface.VerifyInlineHintsOptions[], span: ts.TextSpan = { start: 0, length: this.activeFile.content.length }, preference?: ts.InlineHintsOptions) {
828+
const hints = this.languageService.provideInlineHints(this.activeFile.fileName, span, preference);
829+
assert.equal(hints.length, expected.length, "Number of hints");
830+
const sortHints = (a: ts.InlineHint, b: ts.InlineHint) => a.position - b.position;
831+
ts.zipWith(hints.sort(sortHints), [...expected].sort(sortHints), (actual, expected) => {
832+
assert.equal(actual.text, expected.text, "Text");
833+
assert.equal(actual.position, expected.position, "Position");
834+
assert.equal(actual.whitespaceBefore, expected.whitespaceBefore, "whitespaceBefore");
835+
assert.equal(actual.whitespaceAfter, expected.whitespaceAfter, "whitespaceAfter");
836+
});
837+
}
838+
827839
public verifyCompletions(options: FourSlashInterface.VerifyCompletionsOptions) {
828840
if (options.marker === undefined) {
829841
this.verifyCompletionsWorker(options);

‎src/harness/fourslashInterfaceImpl.ts

+11
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,10 @@ namespace FourSlashInterface {
243243
}
244244
}
245245

246+
public getInlineHints(expected: readonly VerifyInlineHintsOptions[], span: ts.TextSpan, preference?: ts.InlineHintsOptions) {
247+
this.state.verifyInlineHints(expected, span, preference);
248+
}
249+
246250
public quickInfoIs(expectedText: string, expectedDocumentation?: string) {
247251
this.state.verifyQuickInfoString(expectedText, expectedDocumentation);
248252
}
@@ -1645,6 +1649,13 @@ namespace FourSlashInterface {
16451649
readonly containerKind?: ts.ScriptElementKind;
16461650
}
16471651

1652+
export interface VerifyInlineHintsOptions {
1653+
text: string;
1654+
position: number
1655+
whitespaceBefore?: boolean;
1656+
whitespaceAfter?: boolean;
1657+
}
1658+
16481659
export type ArrayOrSingle<T> = T | readonly T[];
16491660

16501661
export interface VerifyCompletionListContainsOptions extends ts.UserPreferences {

‎src/services/inlineHints.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ts.InlineHints {
77
whitespaceAfter?: boolean;
88
}
99

10-
const maxHintsLength = 20;
10+
const maxHintsLength = 30;
1111

1212
export function provideInlineHints(context: InlineHintsContext): HintInfo[] {
1313
const { file, program, span, cancellationToken, preferences } = context;

‎tests/cases/fourslash/fourslash.ts

+14
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ declare namespace FourSlashInterface {
381381
start: number;
382382
length: number;
383383
}, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[], tags: { name: string, text?: string }[] | undefined): void;
384+
getInlineHints(expected: readonly VerifyInlineHintsOptions[], span?: TextSpan, preference?: InlineHintsOptions);
384385
getSyntacticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
385386
getSemanticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
386387
getSuggestionDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
@@ -614,6 +615,11 @@ declare namespace FourSlashInterface {
614615
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
615616
readonly importModuleSpecifierEnding?: "minimal" | "index" | "js";
616617
}
618+
interface InlineHintsOptions extends UserPreferences {
619+
readonly includeInlineParameterName?: boolean;
620+
readonly includeInlineFunctionParameterType?: boolean;
621+
readonly includeInlineVariableType?: boolean;
622+
}
617623
interface CompletionsOptions {
618624
readonly marker?: ArrayOrSingle<string | Marker>;
619625
readonly isNewIdentifierLocation?: boolean;
@@ -711,6 +717,14 @@ declare namespace FourSlashInterface {
711717
readonly commands?: ReadonlyArray<{}>;
712718
}
713719

720+
export interface VerifyInlineHintsOptions {
721+
text: string;
722+
position: number
723+
whitespaceBefore?: boolean;
724+
whitespaceAfter?: boolean;
725+
}
726+
727+
714728
interface VerifyNavigateToOptions {
715729
readonly pattern: string;
716730
readonly fileName?: string;

‎tests/cases/fourslash/inlineHintsShouldWork1.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (a: number, b: number) {}
4+
//// foo(/*a*/1, /*b*/2);
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: 'a:',
10+
position: markers[0].position,
11+
whitespaceAfter: true
12+
},
13+
{
14+
text: 'b:',
15+
position: markers[1].position,
16+
whitespaceAfter: true
17+
}
18+
], undefined, {
19+
includeInlineParameterName: true
20+
});

‎tests/cases/fourslash/inlineHintsShouldWork10.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// declare const unknownCall: any;
4+
//// unknownCall();
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([], undefined, {
8+
includeInlineParameterName: true
9+
});

‎tests/cases/fourslash/inlineHintsShouldWork11.ts

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo(a: number) {
4+
//// return (b: number) => {
5+
//// return a + b
6+
//// }
7+
//// }
8+
//// foo(/*a*/1)(/*b*/2);
9+
10+
const markers = test.markers();
11+
verify.getInlineHints([
12+
{
13+
text: 'a:',
14+
position: markers[0].position,
15+
whitespaceAfter: true
16+
},
17+
{
18+
text: 'b:',
19+
position: markers[1].position,
20+
whitespaceAfter: true
21+
},
22+
], undefined, {
23+
includeInlineParameterName: true
24+
});

‎tests/cases/fourslash/inlineHintsShouldWork12.ts

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo(a: (b: number) => number) {
4+
//// return a(/*a*/1) + 2
5+
//// }
6+
7+
//// foo(/*b*/(c: number) => c + 1);
8+
9+
const markers = test.markers();
10+
verify.getInlineHints([
11+
{
12+
text: 'b:',
13+
position: markers[0].position,
14+
whitespaceAfter: true
15+
},
16+
{
17+
text: 'a:',
18+
position: markers[1].position,
19+
whitespaceAfter: true
20+
},
21+
], undefined, {
22+
includeInlineParameterName: true
23+
});

‎tests/cases/fourslash/inlineHintsShouldWork13.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (a: number, b: number) {}
4+
//// declare const a: 1;
5+
//// foo(a, /*b*/2);
6+
7+
const markers = test.markers();
8+
verify.getInlineHints([
9+
{
10+
text: 'b:',
11+
position: markers[0].position,
12+
whitespaceAfter: true
13+
},
14+
], undefined, {
15+
includeInlineParameterName: true
16+
});

‎tests/cases/fourslash/inlineHintsShouldWork14.ts

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (a: number, b: number) {}
4+
//// foo(1, 2);
5+
6+
verify.getInlineHints([], undefined, {
7+
includeInlineParameterName: false
8+
});

‎tests/cases/fourslash/inlineHintsShouldWork15.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a/*a*/ = 123;
4+
5+
const markers = test.markers();
6+
verify.getInlineHints([
7+
{
8+
text: ':123',
9+
position: markers[0].position,
10+
whitespaceBefore: true
11+
},
12+
], undefined, {
13+
includeInlineVariableType: true
14+
});

‎tests/cases/fourslash/inlineHintsShouldWork16.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a/*a*/ = 123;
4+
5+
const markers = test.markers();
6+
verify.getInlineHints([
7+
{
8+
text: ':123',
9+
position: markers[0].position,
10+
whitespaceBefore: true
11+
},
12+
], undefined, {
13+
includeInlineVariableType: true
14+
});

‎tests/cases/fourslash/inlineHintsShouldWork17.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a/*a*/ = { a: 123 };
4+
5+
const markers = test.markers();
6+
verify.getInlineHints([
7+
{
8+
text: ':{ a: number; }',
9+
position: markers[0].position,
10+
whitespaceBefore: true
11+
},
12+
], undefined, {
13+
includeInlineVariableType: true
14+
});

‎tests/cases/fourslash/inlineHintsShouldWork18.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// class Class {}
4+
//// const a/*a*/ = new Class();
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: ':Class',
10+
position: markers[0].position,
11+
whitespaceBefore: true
12+
},
13+
], undefined, {
14+
includeInlineVariableType: true
15+
});

‎tests/cases/fourslash/inlineHintsShouldWork19.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a/*a*/ = () => 123;
4+
5+
const markers = test.markers();
6+
verify.getInlineHints([
7+
{
8+
text: ':() => number',
9+
position: markers[0].position,
10+
whitespaceBefore: true
11+
},
12+
], undefined, {
13+
includeInlineVariableType: true
14+
});

‎tests/cases/fourslash/inlineHintsShouldWork2.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (a: number, { c }: any) {}
4+
//// foo(/*a*/1, { c: 1});
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: 'a:',
10+
position: markers[0].position,
11+
whitespaceAfter: true
12+
}
13+
], undefined, {
14+
includeInlineParameterName: true
15+
});

‎tests/cases/fourslash/inlineHintsShouldWork20.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a = 123;
4+
5+
verify.getInlineHints([], undefined, {
6+
includeInlineVariableType: false
7+
});

‎tests/cases/fourslash/inlineHintsShouldWork21.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a;
4+
5+
verify.getInlineHints([], undefined, {
6+
includeInlineVariableType: true
7+
});

‎tests/cases/fourslash/inlineHintsShouldWork22.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// const a/*a*/ = "I'm very very very very very very very very very long";
4+
5+
const markers = test.markers();
6+
verify.getInlineHints([
7+
{
8+
text: `:"I'm very very very very ve...`,
9+
position: markers[0].position,
10+
whitespaceBefore: true
11+
},
12+
], undefined, {
13+
includeInlineVariableType: true
14+
});

‎tests/cases/fourslash/inlineHintsShouldWork23.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (Im_very_very_very_very_very_very_very_long: number) {}
4+
//// foo(/*a*/1);
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: 'Im_very_very_very_very_very...:',
10+
position: markers[0].position,
11+
whitespaceAfter: true
12+
}
13+
], undefined, {
14+
includeInlineParameterName: true
15+
});

‎tests/cases/fourslash/inlineHintsShouldWork24.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// type F = (a: string, b: number) => void
4+
//// const f: F = (a/*a*/, b/*b*/) => { }
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: ':string',
10+
position: markers[0].position,
11+
whitespaceBefore: true
12+
},
13+
{
14+
text: ':number',
15+
position: markers[1].position,
16+
whitespaceBefore: true
17+
}
18+
], undefined, {
19+
includeInlineFunctionParameterType: true
20+
});

‎tests/cases/fourslash/inlineHintsShouldWork25.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (cb: (a: string) => void) {}
4+
//// foo((a/*a*/) => { })
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: ':string',
10+
position: markers[0].position,
11+
whitespaceBefore: true
12+
}
13+
], undefined, {
14+
includeInlineFunctionParameterType: true
15+
});

‎tests/cases/fourslash/inlineHintsShouldWork26.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function foo (cb: (a: Exclude<1 | 2 | 3, 1>) => void) {}
4+
//// foo((a/*a*/) => { })
5+
6+
const markers = test.markers();
7+
verify.getInlineHints([
8+
{
9+
text: ':Exclude<1 | 2 | 3, 1>',
10+
position: markers[0].position,
11+
whitespaceBefore: true
12+
}
13+
], undefined, {
14+
includeInlineFunctionParameterType: true
15+
});

0 commit comments

Comments
 (0)