Skip to content

Switch to returning undefined when cancelling a folding ranges request #7672

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.

Sign up for GitHub

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
Colengms merged 1 commit into from
Jun 9, 2021
Merged

Switch to returning undefined when cancelling a folding ranges request #7672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 24 additions & 25 deletions Extension/src/LanguageServer/Providers/foldingRangeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class FoldingRangeProvider implements vscode.FoldingRangeProvider {
this.onDidChangeFoldingRanges = this.onDidChangeFoldingRangesEvent.event;
}
async provideFoldingRanges(document: vscode.TextDocument, context: vscode.FoldingContext,
token: vscode.CancellationToken): Promise<vscode.FoldingRange[]> {
token: vscode.CancellationToken): Promise<vscode.FoldingRange[] | undefined> {
const id: number = ++DefaultClient.abortRequestId;
const params: GetFoldingRangesParams = {
id: id,
Expand All @@ -24,31 +24,30 @@ export class FoldingRangeProvider implements vscode.FoldingRangeProvider {
token.onCancellationRequested(e => this.client.abortRequest(id));
const ranges: GetFoldingRangesResult = await this.client.languageClient.sendRequest(GetFoldingRangesRequest, params);
if (ranges.canceled) {
throw new vscode.CancellationError();
} else {
const result: vscode.FoldingRange[] = [];
ranges.ranges.forEach((r) => {
const foldingRange: vscode.FoldingRange = {
start: r.range.start.line,
end: r.range.end.line
};
switch (r.kind) {
case FoldingRangeKind.Comment:
foldingRange.kind = vscode.FoldingRangeKind.Comment;
break;
case FoldingRangeKind.Imports:
foldingRange.kind = vscode.FoldingRangeKind.Imports;
break;
case FoldingRangeKind.Region:
foldingRange.kind = vscode.FoldingRangeKind.Region;
break;
default:
break;
}
result.push(foldingRange);
});
return result;
return undefined;
}
const result: vscode.FoldingRange[] = [];
ranges.ranges.forEach((r) => {
const foldingRange: vscode.FoldingRange = {
start: r.range.start.line,
end: r.range.end.line
};
switch (r.kind) {
case FoldingRangeKind.Comment:
foldingRange.kind = vscode.FoldingRangeKind.Comment;
break;
case FoldingRangeKind.Imports:
foldingRange.kind = vscode.FoldingRangeKind.Imports;
break;
case FoldingRangeKind.Region:
foldingRange.kind = vscode.FoldingRangeKind.Region;
break;
default:
break;
}
result.push(foldingRange);
});
return result;
}

public refresh(): void {
Expand Down