vscode-languageserver-protocol 3.17.6-next.14 → 3.17.6-next.16

package/lib/common/connection.d.ts

@@ -1,4 +1,4 @@
-import { Message, NotificationMessage, CancellationToken, RequestHandler0, RequestHandler, GenericRequestHandler, NotificationHandler0, NotificationHandler, GenericNotificationHandler, ProgressType, Trace, Tracer, TraceOptions, Disposable, Event, MessageReader, MessageWriter, Logger, ConnectionStrategy, ConnectionOptions, RequestType0, RequestType, NotificationType0, NotificationType } from 'vscode-jsonrpc';
+import { Message, NotificationMessage, CancellationToken, RequestHandler0, RequestHandler, GenericRequestHandler, NotificationHandler0, NotificationHandler, GenericNotificationHandler, ProgressType, Trace, Tracer, TraceOptions, Disposable, Event, MessageReader, MessageWriter, Logger, ConnectionStrategy, ConnectionOptions, RequestType0, RequestType, NotificationType0, NotificationType, RequestParam } from 'vscode-jsonrpc';
 import { ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0 } from './messages';
 export interface ProtocolConnection {
     /**
@@ -18,8 +18,8 @@ export interface ProtocolConnection {
      * @param token An optional cancellation token.
      * @returns A promise resolving to the request's result.
      */
-    sendRequest<P, R, PR, E, RO>(type: ProtocolRequestType<P, R, PR, E, RO>, params: P, token?: CancellationToken): Promise<R>;
-    sendRequest<P, R, E>(type: RequestType<P, R, E>, params: P, token?: CancellationToken): Promise<R>;
+    sendRequest<P, R, PR, E, RO>(type: ProtocolRequestType<P, R, PR, E, RO>, params: NoInfer<RequestParam<P>>, token?: CancellationToken): Promise<R>;
+    sendRequest<P, R, E>(type: RequestType<P, R, E>, params: NoInfer<RequestParam<P>>, token?: CancellationToken): Promise<R>;
     /**
      * Sends a request and returns a promise resolving to the result of the request.
      *
@@ -44,8 +44,8 @@ export interface ProtocolConnection {
      * @param handler The actual handler.
      * @returns A disposable to remove the handler.
      */
-    onRequest<R, PR, E, RO>(type: ProtocolRequestType0<R, PR, E, RO>, handler: RequestHandler0<R, E>): Disposable;
-    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): Disposable;
+    onRequest<R, PR, E, RO>(type: ProtocolRequestType0<R, PR, E, RO>, handler: NoInfer<RequestHandler0<R, E>>): Disposable;
+    onRequest<R, E>(type: RequestType0<R, E>, handler: NoInfer<RequestHandler0<R, E>>): Disposable;
     /**
      * Installs a request handler.
      *
@@ -53,8 +53,8 @@ export interface ProtocolConnection {
      * @param handler The actual handler.
      * @returns A disposable to remove the handler.
      */
-    onRequest<P, R, PR, E, RO>(type: ProtocolRequestType<P, R, PR, E, RO>, handler: RequestHandler<P, R, E>): Disposable;
-    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): Disposable;
+    onRequest<P, R, PR, E, RO>(type: ProtocolRequestType<P, R, PR, E, RO>, handler: NoInfer<RequestHandler<P, R, E>>): Disposable;
+    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: NoInfer<RequestHandler<P, R, E>>): Disposable;
     /**
      * Installs a request handler.
      *
@@ -85,8 +85,8 @@ export interface ProtocolConnection {
      * @returns A promise that resolves when the notification is written to the
      * network layer.
      */
-    sendNotification<P, RO>(type: ProtocolNotificationType<P, RO>, params?: P): Promise<void>;
-    sendNotification<P>(type: NotificationType<P>, params?: P): Promise<void>;
+    sendNotification<P, RO>(type: ProtocolNotificationType<P, RO>, params?: NoInfer<RequestParam<P>>): Promise<void>;
+    sendNotification<P>(type: NotificationType<P>, params?: NoInfer<RequestParam<P>>): Promise<void>;
     /**
      * Sends a notification.
      *
@@ -120,8 +120,8 @@ export interface ProtocolConnection {
      * @param handler The actual handler.
      * @returns A disposable to remove the handler.
      */
-    onNotification<P, RO>(type: ProtocolNotificationType<P, RO>, handler: NotificationHandler<P>): Disposable;
-    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): Disposable;
+    onNotification<P, RO>(type: ProtocolNotificationType<P, RO>, handler: NoInfer<NotificationHandler<P>>): Disposable;
+    onNotification<P>(type: NotificationType<P>, handler: NoInfer<NotificationHandler<P>>): Disposable;
     /**
      * Installs a notification handler.
      *
@@ -137,7 +137,7 @@ export interface ProtocolConnection {
      * @param handler the handler
      * @returns A disposable to remove the handler.
      */
-    onProgress<P>(type: ProgressType<P>, token: string | number, handler: NotificationHandler<P>): Disposable;
+    onProgress<P>(type: ProgressType<P>, token: string | number, handler: NoInfer<NotificationHandler<P>>): Disposable;
     /**
      * Sends progress.
      * @param type the progress type
@@ -146,7 +146,7 @@ export interface ProtocolConnection {
      * @returns A promise that resolves when the progress is written to the
      * network layer.
      */
-    sendProgress<P>(type: ProgressType<P>, token: string | number, value: P): Promise<void>;
+    sendProgress<P>(type: ProgressType<P>, token: string | number, value: NoInfer<RequestParam<P>>): Promise<void>;
     /**
      * Enables tracing mode for the connection.
      * @returns A promise that resolves when the trace value is written to the

package/lib/common/protocol.colorProvider.d.ts

@@ -32,8 +32,8 @@ export interface DocumentColorParams extends WorkDoneProgressParams, PartialResu
 export declare namespace DocumentColorRequest {
     const method: 'textDocument/documentColor';
     const messageDirection: MessageDirection;
-    const type: ProtocolRequestType<DocumentColorParams, ColorInformation[], ColorInformation[], void, DocumentColorRegistrationOptions>;
-    type HandlerSignature = RequestHandler<DocumentColorParams, ColorInformation[], void>;
+    const type: ProtocolRequestType<DocumentColorParams, ColorInformation[] | null, ColorInformation[], void, DocumentColorRegistrationOptions>;
+    type HandlerSignature = RequestHandler<DocumentColorParams, ColorInformation[] | null, void>;
     const capabilities: CM<"textDocument.colorProvider", "colorProvider">;
 }
 /**
@@ -62,7 +62,7 @@ export interface ColorPresentationParams extends WorkDoneProgressParams, Partial
 export declare namespace ColorPresentationRequest {
     const method: 'textDocument/colorPresentation';
     const messageDirection: MessageDirection;
-    const type: ProtocolRequestType<ColorPresentationParams, ColorPresentation[], ColorPresentation[], void, WorkDoneProgressOptions & TextDocumentRegistrationOptions>;
-    type HandlerSignature = RequestHandler<ColorPresentationParams, ColorPresentation[], void>;
+    const type: ProtocolRequestType<ColorPresentationParams, ColorPresentation[] | null, ColorPresentation[], void, WorkDoneProgressOptions & TextDocumentRegistrationOptions>;
+    type HandlerSignature = RequestHandler<ColorPresentationParams, ColorPresentation[] | null, void>;
     const capabilities: CM<"textDocument.colorProvider", "colorProvider">;
 }

package/lib/common/protocol.d.ts

@@ -3410,15 +3410,7 @@ export interface RenameClientCapabilities {
 /**
  * The parameters of a {@link RenameRequest}.
  */
-export interface RenameParams extends WorkDoneProgressParams {
-    /**
-     * The document to rename.
-     */
-    textDocument: TextDocumentIdentifier;
-    /**
-     * The position at which this request was sent.
-     */
-    position: Position;
+export interface RenameParams extends TextDocumentPositionParams, WorkDoneProgressParams {
     /**
      * The new name of the symbol. If the given name is not valid the
      * request must return a {@link ResponseError} with an

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vscode-languageserver-protocol",
 	"description": "VSCode Language Server Protocol implementation",
-	"version": "3.17.6-next.14",
+	"version": "3.17.6-next.16",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -27,7 +27,7 @@
 		}
 	},
 	"dependencies": {
-		"vscode-jsonrpc": "9.0.0-next.9",
+		"vscode-jsonrpc": "9.0.0-next.11",
 		"vscode-languageserver-types": "3.17.6-next.6"
 	},
 	"scripts": {