Skip to content

Commit

Permalink
Add regression test
Browse files Browse the repository at this point in the history
  • Loading branch information
amcasey committed Jun 12, 2019
1 parent fdacf7f commit caa66f6
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
18 changes: 18 additions & 0 deletions src/harness/fourslash.ts
Expand Up @@ -2238,6 +2238,20 @@ Actual: ${stringify(fullActual)}`);
});
}

public verifyOutliningHintSpans(spans: Range[]) {
const actual = this.languageService.getOutliningSpans(this.activeFile.fileName);

if (actual.length !== spans.length) {
this.raiseError(`verifyOutliningHintSpans failed - expected total spans to be ${spans.length}, but was ${actual.length}`);
}

ts.zipWith(spans, actual, (expectedSpan, actualSpan, i) => {
if (expectedSpan.pos !== actualSpan.hintSpan.start || expectedSpan.end !== ts.textSpanEnd(actualSpan.hintSpan)) {
return this.raiseError(`verifyOutliningSpans failed - span ${(i + 1)} expected: (${expectedSpan.pos},${expectedSpan.end}), actual: (${actualSpan.hintSpan.start},${ts.textSpanEnd(actualSpan.hintSpan)})`);
}
});
}

public verifyTodoComments(descriptors: string[], spans: Range[]) {
const actual = this.languageService.getTodoComments(this.activeFile.fileName,
descriptors.map(d => { return { text: d, priority: 0 }; }));
Expand Down Expand Up @@ -4005,6 +4019,10 @@ namespace FourSlashInterface {
this.state.verifyOutliningSpans(spans, kind);
}

public outliningHintSpansInCurrentFile(spans: FourSlash.Range[]) {
this.state.verifyOutliningHintSpans(spans);
}

public todoCommentsInCurrentFile(descriptors: string[]) {
this.state.verifyTodoComments(descriptors, this.state.getRanges());
}
Expand Down
1 change: 1 addition & 0 deletions tests/cases/fourslash/fourslash.ts
Expand Up @@ -247,6 +247,7 @@ declare namespace FourSlashInterface {
baselineSmartSelection(): void;
nameOrDottedNameSpanTextIs(text: string): void;
outliningSpansInCurrentFile(spans: Range[]): void;
outliningHintSpansInCurrentFile(spans: Range[]): void;
todoCommentsInCurrentFile(descriptors: string[]): void;
matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number): void;
noMatchingBracePositionInCurrentFile(bracePosition: number): void;
Expand Down
16 changes: 16 additions & 0 deletions tests/cases/fourslash/outliningHintSpansForFunction.ts
@@ -0,0 +1,16 @@
/// <reference path="fourslash.ts"/>

////[|namespace NS {
//// [|function f(x: number, y: number) {
//// return x + y;
//// }|]
////
//// [|function g(
//// x: number,
//// y: number,
//// ): number {
//// return x + y;
//// }|]
////}|]

verify.outliningHintSpansInCurrentFile(test.ranges());

0 comments on commit caa66f6

Please sign in to comment.