vscode-languageserver-protocol 3.17.6-next.9 → 3.18.1

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

@@ -1,12 +1,11 @@
 import type { DocumentUri } from 'vscode-languageserver-types';
 import type { RequestHandler } from 'vscode-jsonrpc';
-import { MessageDirection, ProtocolRequestType } from './messages';
-import type { StaticRegistrationOptions } from './protocol';
+import { MessageDirection, ProtocolRequestType, CM } from './messages';
+import { type StaticRegistrationOptions } from './protocol';
 /**
  * Client capabilities for a text document content provider.
  *
  * @since 3.18.0
- * @proposed
  */
 export type TextDocumentContentClientCapabilities = {
     /**
@@ -18,26 +17,23 @@ export type TextDocumentContentClientCapabilities = {
  * Text document content provider options.
  *
  * @since 3.18.0
- * @proposed
  */
 export type TextDocumentContentOptions = {
     /**
-     * The scheme for which the server provides content.
+     * The schemes for which the server provides content.
      */
-    scheme: string;
+    schemes: string[];
 };
 /**
  * Text document content provider registration options.
  *
  * @since 3.18.0
- * @proposed
  */
 export type TextDocumentContentRegistrationOptions = TextDocumentContentOptions & StaticRegistrationOptions;
 /**
  * Parameters for the `workspace/textDocumentContent` request.
  *
  * @since 3.18.0
- * @proposed
  */
 export interface TextDocumentContentParams {
     /**
@@ -45,24 +41,37 @@ export interface TextDocumentContentParams {
      */
     uri: DocumentUri;
 }
+/**
+ * Result of the `workspace/textDocumentContent` request.
+ *
+ * @since 3.18.0
+ */
+export interface TextDocumentContentResult {
+    /**
+     * The text content of the text document. Please note, that the content of
+     * any subsequent open notifications for the text document might differ
+     * from the returned content due to whitespace and line ending
+     * normalizations done on the client
+     */
+    text: string;
+}
 /**
  * The `workspace/textDocumentContent` request is sent from the client to the
  * server to request the content of a text document.
  *
  * @since 3.18.0
- * @proposed
  */
 export declare namespace TextDocumentContentRequest {
     const method: 'workspace/textDocumentContent';
     const messageDirection: MessageDirection;
-    const type: ProtocolRequestType<TextDocumentContentParams, string, void, void, TextDocumentContentRegistrationOptions>;
-    type HandlerSignature = RequestHandler<TextDocumentContentParams, string, void>;
+    const type: ProtocolRequestType<TextDocumentContentParams, TextDocumentContentResult, void, void, TextDocumentContentRegistrationOptions>;
+    type HandlerSignature = RequestHandler<TextDocumentContentParams, TextDocumentContentResult, void>;
+    const capabilities: CM<"workspace.textDocumentContent", "workspace.textDocumentContent">;
 }
 /**
  * Parameters for the `workspace/textDocumentContent/refresh` request.
  *
  * @since 3.18.0
- * @proposed
  */
 export interface TextDocumentContentRefreshParams {
     /**
@@ -75,7 +84,6 @@ export interface TextDocumentContentRefreshParams {
  * the content of a specific text document.
  *
  * @since 3.18.0
- * @proposed
  */
 export declare namespace TextDocumentContentRefreshRequest {
     const method: `workspace/textDocumentContent/refresh`;

package/lib/common/protocol.textDocumentContent.js

@@ -11,20 +11,19 @@ const messages_1 = require("./messages");
  * server to request the content of a text document.
  *
  * @since 3.18.0
- * @proposed
  */
 var TextDocumentContentRequest;
 (function (TextDocumentContentRequest) {
     TextDocumentContentRequest.method = 'workspace/textDocumentContent';
     TextDocumentContentRequest.messageDirection = messages_1.MessageDirection.clientToServer;
     TextDocumentContentRequest.type = new messages_1.ProtocolRequestType(TextDocumentContentRequest.method);
+    TextDocumentContentRequest.capabilities = messages_1.CM.create('workspace.textDocumentContent', 'workspace.textDocumentContent');
 })(TextDocumentContentRequest || (exports.TextDocumentContentRequest = TextDocumentContentRequest = {}));
 /**
  * The `workspace/textDocumentContent` request is sent from the server to the client to refresh
  * the content of a specific text document.
  *
  * @since 3.18.0
- * @proposed
  */
 var TextDocumentContentRefreshRequest;
 (function (TextDocumentContentRefreshRequest) {

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

@@ -1,7 +1,7 @@
 import { RequestHandler } from 'vscode-jsonrpc';
 import { Definition, DefinitionLink, LocationLink, Location } from 'vscode-languageserver-types';
-import { MessageDirection, ProtocolRequestType } from './messages';
-import type { TextDocumentRegistrationOptions, StaticRegistrationOptions, TextDocumentPositionParams, PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions } from './protocol';
+import { MessageDirection, ProtocolRequestType, CM } from './messages';
+import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions } from './protocol';
 /**
  * Since 3.6.0
  */
@@ -35,4 +35,5 @@ export declare namespace TypeDefinitionRequest {
     const messageDirection: MessageDirection;
     const type: ProtocolRequestType<TypeDefinitionParams, Definition | LocationLink[] | null, Location[] | LocationLink[], void, TypeDefinitionRegistrationOptions>;
     type HandlerSignature = RequestHandler<TypeDefinitionParams, Definition | DefinitionLink[] | null, void>;
+    const capabilities: CM<"textDocument.typeDefinition", "typeDefinitionProvider">;
 }

package/lib/common/protocol.typeDefinition.js

@@ -6,7 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeDefinitionRequest = void 0;
 const messages_1 = require("./messages");
-// @ts-ignore: to avoid inlining LocatioLink as dynamic import
+// @ts-ignore: to avoid inlining LocationLink as dynamic import
 let __noDynamicImport;
 /**
  * A request to resolve the type definition locations of a symbol at a given text
@@ -18,4 +18,5 @@ var TypeDefinitionRequest;
     TypeDefinitionRequest.method = 'textDocument/typeDefinition';
     TypeDefinitionRequest.messageDirection = messages_1.MessageDirection.clientToServer;
     TypeDefinitionRequest.type = new messages_1.ProtocolRequestType(TypeDefinitionRequest.method);
+    TypeDefinitionRequest.capabilities = messages_1.CM.create('textDocument.typeDefinition', 'typeDefinitionProvider');
 })(TypeDefinitionRequest || (exports.TypeDefinitionRequest = TypeDefinitionRequest = {}));

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

@@ -1,7 +1,7 @@
 import { RequestHandler } from 'vscode-jsonrpc';
 import { TypeHierarchyItem } from 'vscode-languageserver-types';
-import { MessageDirection, ProtocolRequestType } from './messages';
-import type { TextDocumentRegistrationOptions, StaticRegistrationOptions, TextDocumentPositionParams, PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions } from './protocol';
+import { MessageDirection, ProtocolRequestType, CM } from './messages';
+import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions } from './protocol';
 /**
  * @since 3.17.0
  */
@@ -42,6 +42,7 @@ export declare namespace TypeHierarchyPrepareRequest {
     const messageDirection: MessageDirection;
     const type: ProtocolRequestType<TypeHierarchyPrepareParams, TypeHierarchyItem[] | null, never, void, TypeHierarchyRegistrationOptions>;
     type HandlerSignature = RequestHandler<TypeHierarchyPrepareParams, TypeHierarchyItem[] | null, void>;
+    const capabilities: CM<"textDocument.typeHierarchy", "typeHierarchyProvider">;
 }
 /**
  * The parameter of a `typeHierarchy/supertypes` request.

package/lib/common/protocol.typeHierarchy.js

@@ -17,6 +17,7 @@ var TypeHierarchyPrepareRequest;
     TypeHierarchyPrepareRequest.method = 'textDocument/prepareTypeHierarchy';
     TypeHierarchyPrepareRequest.messageDirection = messages_1.MessageDirection.clientToServer;
     TypeHierarchyPrepareRequest.type = new messages_1.ProtocolRequestType(TypeHierarchyPrepareRequest.method);
+    TypeHierarchyPrepareRequest.capabilities = messages_1.CM.create('textDocument.typeHierarchy', 'typeHierarchyProvider');
 })(TypeHierarchyPrepareRequest || (exports.TypeHierarchyPrepareRequest = TypeHierarchyPrepareRequest = {}));
 /**
  * A request to resolve the supertypes for a given `TypeHierarchyItem`.

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

@@ -1,6 +1,6 @@
 import { WorkspaceFolder } from 'vscode-languageserver-types';
 import { RequestHandler0, NotificationHandler, HandlerResult, CancellationToken } from 'vscode-jsonrpc';
-import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType } from './messages';
+import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType, CM } from './messages';
 export interface WorkspaceFoldersInitializeParams {
     /**
      * The workspace folders configured in the client when the server starts.
@@ -38,6 +38,7 @@ export declare namespace WorkspaceFoldersRequest {
     const type: ProtocolRequestType0<WorkspaceFolder[] | null, never, void, void>;
     type HandlerSignature = RequestHandler0<WorkspaceFolder[] | null, void>;
     type MiddlewareSignature = (token: CancellationToken, next: HandlerSignature) => HandlerResult<WorkspaceFolder[] | null, void>;
+    const capabilities: CM<"workspace.workspaceFolders", "workspace.workspaceFolders">;
 }
 /**
  * The `workspace/didChangeWorkspaceFolders` notification is sent from the client to the server when the workspace
@@ -49,6 +50,7 @@ export declare namespace DidChangeWorkspaceFoldersNotification {
     const type: ProtocolNotificationType<DidChangeWorkspaceFoldersParams, void>;
     type HandlerSignature = NotificationHandler<DidChangeWorkspaceFoldersParams>;
     type MiddlewareSignature = (params: DidChangeWorkspaceFoldersParams, next: HandlerSignature) => void;
+    const capabilities: CM<undefined, "workspace.workspaceFolders.changeNotifications">;
 }
 /**
  * The parameters of a `workspace/didChangeWorkspaceFolders` notification.

package/lib/common/protocol.workspaceFolder.js

@@ -14,6 +14,7 @@ var WorkspaceFoldersRequest;
     WorkspaceFoldersRequest.method = 'workspace/workspaceFolders';
     WorkspaceFoldersRequest.messageDirection = messages_1.MessageDirection.serverToClient;
     WorkspaceFoldersRequest.type = new messages_1.ProtocolRequestType0(WorkspaceFoldersRequest.method);
+    WorkspaceFoldersRequest.capabilities = messages_1.CM.create('workspace.workspaceFolders', 'workspace.workspaceFolders');
 })(WorkspaceFoldersRequest || (exports.WorkspaceFoldersRequest = WorkspaceFoldersRequest = {}));
 /**
  * The `workspace/didChangeWorkspaceFolders` notification is sent from the client to the server when the workspace
@@ -24,4 +25,5 @@ var DidChangeWorkspaceFoldersNotification;
     DidChangeWorkspaceFoldersNotification.method = 'workspace/didChangeWorkspaceFolders';
     DidChangeWorkspaceFoldersNotification.messageDirection = messages_1.MessageDirection.clientToServer;
     DidChangeWorkspaceFoldersNotification.type = new messages_1.ProtocolNotificationType(DidChangeWorkspaceFoldersNotification.method);
+    DidChangeWorkspaceFoldersNotification.capabilities = messages_1.CM.create(undefined, 'workspace.workspaceFolders.changeNotifications');
 })(DidChangeWorkspaceFoldersNotification || (exports.DidChangeWorkspaceFoldersNotification = DidChangeWorkspaceFoldersNotification = {}));

package/lib/common/utils/is.js

@@ -4,43 +4,42 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.objectLiteral = exports.typedArray = exports.stringArray = exports.array = exports.func = exports.error = exports.number = exports.string = exports.boolean = void 0;
+exports.boolean = boolean;
+exports.string = string;
+exports.number = number;
+exports.error = error;
+exports.func = func;
+exports.array = array;
+exports.stringArray = stringArray;
+exports.typedArray = typedArray;
+exports.objectLiteral = objectLiteral;
 function boolean(value) {
     return value === true || value === false;
 }
-exports.boolean = boolean;
 function string(value) {
     return typeof value === 'string' || value instanceof String;
 }
-exports.string = string;
 function number(value) {
     return typeof value === 'number' || value instanceof Number;
 }
-exports.number = number;
 function error(value) {
     return value instanceof Error;
 }
-exports.error = error;
 function func(value) {
     return typeof value === 'function';
 }
-exports.func = func;
 function array(value) {
     return Array.isArray(value);
 }
-exports.array = array;
 function stringArray(value) {
     return array(value) && value.every(elem => string(elem));
 }
-exports.stringArray = stringArray;
 function typedArray(value, check) {
     return Array.isArray(value) && value.every(check);
 }
-exports.typedArray = typedArray;
 function objectLiteral(value) {
     // Strictly speaking class instances pass this check as well. Since the LSP
     // doesn't use classes we ignore this for now. If we do we need to add something
     // like this: `Object.getPrototypeOf(Object.getPrototypeOf(x)) === null`
     return value !== null && typeof value === 'object';
 }
-exports.objectLiteral = objectLiteral;

package/lib/node/main.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { MessageReader, MessageWriter, Logger, ConnectionStrategy, ConnectionOptions, ProtocolConnection } from '../common/api';
 export * from 'vscode-jsonrpc/node';
 export * from '../common/api';

package/lib/node/main.js

@@ -18,11 +18,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProtocolConnection = void 0;
+exports.createProtocolConnection = createProtocolConnection;
 const node_1 = require("vscode-jsonrpc/node");
 __exportStar(require("vscode-jsonrpc/node"), exports);
 __exportStar(require("../common/api"), exports);
 function createProtocolConnection(input, output, logger, options) {
     return (0, node_1.createMessageConnection)(input, output, logger, options);
 }
-exports.createProtocolConnection = createProtocolConnection;

package/metaModel.schema.json

@@ -3,7 +3,7 @@
   "definitions": {
     "AndType": {
       "additionalProperties": false,
-      "description": "Represents an `and`type (e.g. TextDocumentParams & WorkDoneProgressParams`).",
+      "description": "Represents an `and` type (e.g. TextDocumentParams & WorkDoneProgressParams`).",
       "properties": {
         "items": {
           "items": {
@@ -362,6 +362,10 @@
       "additionalProperties": false,
       "description": "Represents a LSP notification",
       "properties": {
+        "clientCapability": {
+          "description": "The client capability property path if any.",
+          "type": "string"
+        },
         "deprecated": {
           "description": "Whether the notification is deprecated or not. If deprecated the property contains the deprecation message.",
           "type": "string"
@@ -404,6 +408,10 @@
           "$ref": "#/definitions/Type",
           "description": "Optional registration options if the notification supports dynamic registration."
         },
+        "serverCapability": {
+          "description": "The server capability property path if any.",
+          "type": "string"
+        },
         "since": {
           "description": "Since when (release number) this notification is available. Is undefined if not known.",
           "type": "string"
@@ -515,6 +523,10 @@
       "additionalProperties": false,
       "description": "Represents a LSP request",
       "properties": {
+        "clientCapability": {
+          "description": "The client capability property path if any.",
+          "type": "string"
+        },
         "deprecated": {
           "description": "Whether the request is deprecated or not. If deprecated the property contains the deprecation message.",
           "type": "string"
@@ -569,6 +581,10 @@
           "$ref": "#/definitions/Type",
           "description": "The result type."
         },
+        "serverCapability": {
+          "description": "The server capability property path if any.",
+          "type": "string"
+        },
         "since": {
           "description": "Since when (release number) this request is available. Is undefined if not known.",
           "type": "string"
@@ -845,3 +861,4 @@
     }
   }
 }
+

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vscode-languageserver-protocol",
 	"description": "VSCode Language Server Protocol implementation",
-	"version": "3.17.6-next.9",
+	"version": "3.18.1",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -27,8 +27,8 @@
 		}
 	},
 	"dependencies": {
-		"vscode-jsonrpc": "9.0.0-next.5",
-		"vscode-languageserver-types": "3.17.6-next.5"
+		"vscode-jsonrpc": "9.0.0",
+		"vscode-languageserver-types": "3.18.0"
 	},
 	"scripts": {
 		"prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/npm/fail",
@@ -38,7 +38,7 @@
 		"compile": "tsc -b ./tsconfig.json",
 		"watch": "tsc -b ./tsconfig.watch.json -w",
 		"clean": "rimraf lib && rimraf dist",
-		"lint": "eslint --ext ts src",
+		"lint": "eslint src",
 		"test": "npm run test:node && npm run test:browser",
 		"test:node": "node ../node_modules/mocha/bin/_mocha",
 		"test:browser": "npm run webpack:test:silent && node ../build/bin/runBrowserTests.js  http://127.0.0.1:8080/protocol/src/browser/test/",