Skip to content

Commit 0a93b43

Browse files
dbaeumerdbaeumer
committed
Remove proposed from progress feature and some 💄
1 parent 93ae2bf commit 0a93b43

17 files changed

+70
-262
lines changed

‎client/src/colorProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import { languages as Languages, Disposable, TextDocument, ProviderResult, Range as VRange, Color as VColor, ColorPresentation as VColorPresentation, ColorInformation as VColorInformation, DocumentColorProvider} from 'vscode';
88

99
import {
10-
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, DocumentColorRequest, ColorPresentationRequest, Color, ColorInformation, ColorPresentation
10+
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, DocumentColorRequest, ColorPresentationRequest, Color, ColorInformation, ColorPresentation,
11+
DocumentColorRegistrationOptions, DocumentColorOptions
1112
} from 'vscode-languageserver-protocol';
1213

1314
import { TextDocumentFeature, BaseLanguageClient } from './client';
14-
import { DocumentColorRegistrationOptions, DocumentColorOptions } from 'vscode-languageserver-protocol/lib/protocol.colorProvider';
1515

1616
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1717
if (target[key] === void 0) {

‎client/src/declaration.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import { languages as Languages, Disposable, TextDocument, ProviderResult, Position as VPosition, Declaration as VDeclaration, DeclarationProvider } from 'vscode';
88

99
import {
10-
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, DeclarationRequest
10+
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, DeclarationRequest, DeclarationRegistrationOptions, DeclarationOptions
1111
} from 'vscode-languageserver-protocol';
1212

1313
import { TextDocumentFeature, BaseLanguageClient } from './client';
14-
import { DeclarationRegistrationOptions, DeclarationOptions } from 'vscode-languageserver-protocol/lib/protocol.declaration';
1514

1615
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1716
if (target[key] === void 0) {

‎client/src/foldingRange.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import { languages as Languages, Disposable, TextDocument, ProviderResult, FoldingRangeKind as VFoldingRangeKind, FoldingRange as VFoldingRange, FoldingContext, FoldingRangeProvider } from 'vscode';
88

99
import {
10-
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, FoldingRange, FoldingRangeKind, FoldingRangeRequest, FoldingRangeParams
10+
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, FoldingRange, FoldingRangeKind, FoldingRangeRequest, FoldingRangeParams, FoldingRangeRegistrationOptions, FoldingRangeOptions
1111
} from 'vscode-languageserver-protocol';
1212

1313
import { TextDocumentFeature, BaseLanguageClient } from './client';
14-
import { FoldingRangeRegistrationOptions, FoldingRangeOptions } from 'vscode-languageserver-protocol/lib/protocol.foldingRange';
1514

1615
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1716
if (target[key] === void 0) {

‎client/src/implementation.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import { languages as Languages, Disposable, TextDocument, ProviderResult, Position as VPosition, Definition as VDefinition, DefinitionLink as VDefinitionLink, ImplementationProvider } from 'vscode';
88

99
import {
10-
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, ImplementationRequest
10+
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, ImplementationRequest, ImplementationRegistrationOptions, ImplementationOptions
1111
} from 'vscode-languageserver-protocol';
1212

1313
import { TextDocumentFeature, BaseLanguageClient } from './client';
14-
import { ImplementationRegistrationOptions, ImplementationOptions } from 'vscode-languageserver-protocol/lib/protocol.implementation';
1514

1615
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1716
if (target[key] === void 0) {

‎client/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { WorkspaceFoldersFeature } from './workspaceFolders';
3131
import { FoldingRangeFeature } from './foldingRange';
3232
import { DeclarationFeature } from './declaration';
3333
import { SelectionRangeFeature } from './selectionRange';
34-
import { ProgressFeature } from './progress.proposed';
34+
import { ProgressFeature } from './progress';
3535
import { CallHierarchyFeature } from './callHierarchy.proposed';
3636

3737
import * as Is from './utils/is';
@@ -461,6 +461,7 @@ export class LanguageClient extends BaseLanguageClient {
461461
this.registerFeature(new FoldingRangeFeature(this));
462462
this.registerFeature(new DeclarationFeature(this));
463463
this.registerFeature(new SelectionRangeFeature(this));
464+
this.registerFeature(new ProgressFeature(this));
464465
}
465466

466467
private _mainGetRootPath(): string | undefined {
@@ -530,7 +531,6 @@ export class SettingMonitor {
530531
export namespace ProposedFeatures {
531532
export function createAll(client: BaseLanguageClient): (StaticFeature | DynamicFeature<any>)[] {
532533
let result: (StaticFeature | DynamicFeature<any>)[] = [
533-
new ProgressFeature(client),
534534
new CallHierarchyFeature(client)
535535
];
536536
return result;

‎client/src/progress.proposed.ts renamed to ‎client/src/progress.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55
'use strict';
66

7-
import { ClientCapabilities, Proposed } from 'vscode-languageserver-protocol';
7+
import { ClientCapabilities, WorkDoneProgressCreateParams, WorkDoneProgressCreateRequest } from 'vscode-languageserver-protocol';
88

99
import { BaseLanguageClient, StaticFeature } from './client';
1010
import { ProgressPart } from './progressPart';
@@ -20,17 +20,16 @@ export class ProgressFeature implements StaticFeature {
2020

2121
constructor(private _client: BaseLanguageClient) {}
2222

23-
public fillClientCapabilities(cap: ClientCapabilities): void {
24-
let capabilities: ClientCapabilities & Proposed.WorkDoneProgressClientCapabilities = cap as ClientCapabilities & Proposed.WorkDoneProgressClientCapabilities;
23+
public fillClientCapabilities(capabilities: ClientCapabilities): void {
2524
ensure(capabilities, 'window')!.workDoneProgress = true;
2625
}
2726

2827
public initialize(): void {
2928
let client = this._client;
3029

31-
let createHandler = (params: Proposed.WorkDoneProgressCreateParams) => {
30+
let createHandler = (params: WorkDoneProgressCreateParams) => {
3231
new ProgressPart(this._client, params.token);
3332
};
34-
client.onRequest(Proposed.WorkDoneProgressCreateRequest.type, createHandler);
33+
client.onRequest(WorkDoneProgressCreateRequest.type, createHandler);
3534
}
3635
}

‎client/src/progressPart.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
window as Window, Progress, ProgressLocation, CancellationToken, Disposable
99
} from 'vscode';
1010

11-
import { Proposed, ProgressToken, ProgressType, NotificationHandler, NotificationType } from 'vscode-languageserver-protocol';
11+
import { ProgressToken, ProgressType, NotificationHandler, NotificationType, WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressCancelNotification, WorkDoneProgressReport } from 'vscode-languageserver-protocol';
1212

1313
import * as Is from './utils/is';
1414

@@ -30,7 +30,7 @@ export class ProgressPart {
3030

3131
public constructor(private _client: ProgressContext , private _token: ProgressToken) {
3232
this._reported = 0;
33-
this._disposable = this._client.onProgress(Proposed.WorkDoneProgress.type, this._token, (value) => {
33+
this._disposable = this._client.onProgress(WorkDoneProgress.type, this._token, (value) => {
3434
switch (value.kind) {
3535
case 'begin':
3636
this.begin(value);
@@ -45,14 +45,14 @@ export class ProgressPart {
4545
});
4646
}
4747

48-
private begin(params: Proposed.WorkDoneProgressBegin): void {
48+
private begin(params: WorkDoneProgressBegin): void {
4949
let location: ProgressLocation = params.cancellable ? ProgressLocation.Notification : ProgressLocation.Window;
5050
Window.withProgress<void>({ location, cancellable: params.cancellable, title: params.title}, async (progress, cancellationToken) => {
5151
this._progress = progress;
5252
this._infinite = params.percentage === undefined;
5353
this._cancellationToken = cancellationToken;
5454
this._cancellationToken.onCancellationRequested(() => {
55-
this._client.sendNotification(Proposed.WorkDoneProgressCancelNotification.type, { token: this._token });
55+
this._client.sendNotification(WorkDoneProgressCancelNotification.type, { token: this._token });
5656
});
5757
this.report(params);
5858
return new Promise<void>((resolve, reject) => {
@@ -62,7 +62,7 @@ export class ProgressPart {
6262
});
6363
}
6464

65-
private report(params: Proposed.WorkDoneProgressReport | Proposed.WorkDoneProgressBegin): void {
65+
private report(params: WorkDoneProgressReport | WorkDoneProgressBegin): void {
6666
if (this._infinite && Is.string(params.message)) {
6767
this._progress.report({ message: params.message });
6868
} else if (Is.number(params.percentage)) {

‎client/src/selectionRange.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ import { languages as Languages, Disposable, TextDocument, ProviderResult, Posit
88

99
import {
1010
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector,
11-
SelectionRangeParams, SelectionRangeRequest, SelectionRangeClientCapabilities, SelectionRangeOptions
11+
SelectionRangeParams, SelectionRangeRequest, SelectionRangeOptions, SelectionRangeRegistrationOptions
1212
} from 'vscode-languageserver-protocol';
1313

1414
import { TextDocumentFeature, BaseLanguageClient } from './client';
15-
import { SelectionRangeRegistrationOptions } from 'vscode-languageserver-protocol/lib/protocol.selectionRange';
1615

1716
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1817
if (target[key] === void 0) {
@@ -34,8 +33,7 @@ export class SelectionRangeFeature extends TextDocumentFeature<boolean | Selecti
3433
super(client, SelectionRangeRequest.type);
3534
}
3635

37-
public fillClientCapabilities(cap: ClientCapabilities): void {
38-
let capabilites: ClientCapabilities & SelectionRangeClientCapabilities = cap as ClientCapabilities & SelectionRangeClientCapabilities;
36+
public fillClientCapabilities(capabilites: ClientCapabilities): void {
3937
let capability = ensure(ensure(capabilites, 'textDocument')!, 'selectionRange')!;
4038
capability.dynamicRegistration = true;
4139
}

‎client/src/typeDefinition.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import { languages as Languages, Disposable, TextDocument, ProviderResult, Position as VPosition, Definition as VDefinition, DefinitionLink as VDefinitionLink, TypeDefinitionProvider } from 'vscode';
88

99
import {
10-
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, TypeDefinitionRequest
10+
ClientCapabilities, CancellationToken, ServerCapabilities, DocumentSelector, TypeDefinitionRequest, TypeDefinitionRegistrationOptions, TypeDefinitionOptions
1111
} from 'vscode-languageserver-protocol';
1212

1313
import { TextDocumentFeature, BaseLanguageClient } from './client';
14-
import { TypeDefinitionRegistrationOptions, TypeDefinitionOptions } from 'vscode-languageserver-protocol/lib/protocol.typeDefinition';
1514

1615
function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
1716
if (target[key] === void 0) {

‎protocol/src/main.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export * from './protocol';
3636
export { FoldingRangeParams as FoldingRangeRequestParam } from './protocol'; // for backward compatibility
3737

3838
import * as callHierarchy from './protocol.callHierarchy.proposed';
39-
import * as progress from './protocol.progress.proposed';
4039

4140
export namespace Proposed {
4241

@@ -72,28 +71,6 @@ export namespace Proposed {
7271
export const resultType = callHierarchy.CallHierarchyOutgoingCallsRequest.resultType;
7372
export type HandlerSignature = callHierarchy.CallHierarchyOutgoingCallsRequest.HandlerSignature;
7473
}
75-
76-
export type WorkDoneProgressClientCapabilities = progress.WorkDoneProgressClientCapabilities;
77-
export type WorkDoneProgressBegin = progress.WorkDoneProgressBegin;
78-
export type WorkDoneProgressReport = progress.WorkDoneProgressReport;
79-
export type WorkDoneProgressEnd = progress.WorkDoneProgressEnd;
80-
// export type ProgressServerCapabilities = progress.ProgressServerCapabilities;
81-
82-
export namespace WorkDoneProgress {
83-
export const type = progress.WorkDoneProgress.type;
84-
}
85-
86-
export type WorkDoneProgressCreateParams = progress.WorkDoneProgressCreateParams;
87-
export namespace WorkDoneProgressCreateRequest {
88-
export const type = progress.WorkDoneProgressCreateRequest.type;
89-
export type HandlerSignature = progress.WorkDoneProgressCreateRequest.HandlerSignature;
90-
}
91-
92-
export type WorkDoneProgressCancelParams = progress.WorkDoneProgressCancelParams;
93-
export namespace WorkDoneProgressCancelNotification {
94-
export const type = progress.WorkDoneProgressCancelNotification.type;
95-
export type HandlerSignature = progress.WorkDoneProgressCancelNotification.HandlerSignature;
96-
}
9774
}
9875

9976
export interface ProtocolConnection {

0 commit comments

Comments
 (0)