vscode-languageserver-protocol 3.16.0 → 3.17.0-next.12

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

@@ -1,129 +1,13 @@
-import { TextDocumentIdentifier, Range, uinteger } from 'vscode-languageserver-types';
+import { TextDocumentIdentifier, Range, uinteger, SemanticTokensEdit, SemanticTokensLegend, SemanticTokens, SemanticTokensDelta } from 'vscode-languageserver-types';
 import { RequestHandler0, RequestHandler } from 'vscode-jsonrpc';
 import { ProtocolRequestType, ProtocolRequestType0, RegistrationType } from './messages';
 import { PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions, TextDocumentRegistrationOptions, StaticRegistrationOptions } from './protocol';
-/**
- * A set of predefined token types. This set is not fixed
- * an clients can specify additional token types via the
- * corresponding client capabilities.
- *
- * @since 3.16.0
- */
-export declare enum SemanticTokenTypes {
-    namespace = "namespace",
-    /**
-     * Represents a generic type. Acts as a fallback for types which can't be mapped to
-     * a specific type like class or enum.
-     */
-    type = "type",
-    class = "class",
-    enum = "enum",
-    interface = "interface",
-    struct = "struct",
-    typeParameter = "typeParameter",
-    parameter = "parameter",
-    variable = "variable",
-    property = "property",
-    enumMember = "enumMember",
-    event = "event",
-    function = "function",
-    method = "method",
-    macro = "macro",
-    keyword = "keyword",
-    modifier = "modifier",
-    comment = "comment",
-    string = "string",
-    number = "number",
-    regexp = "regexp",
-    operator = "operator"
-}
-/**
- * A set of predefined token modifiers. This set is not fixed
- * an clients can specify additional token types via the
- * corresponding client capabilities.
- *
- * @since 3.16.0
- */
-export declare enum SemanticTokenModifiers {
-    declaration = "declaration",
-    definition = "definition",
-    readonly = "readonly",
-    static = "static",
-    deprecated = "deprecated",
-    abstract = "abstract",
-    async = "async",
-    modification = "modification",
-    documentation = "documentation",
-    defaultLibrary = "defaultLibrary"
-}
-/**
- * @since 3.16.0
- */
-export interface SemanticTokensLegend {
-    /**
-     * The token types a server uses.
-     */
-    tokenTypes: string[];
-    /**
-     * The token modifiers a server uses.
-     */
-    tokenModifiers: string[];
-}
-/**
- * @since 3.16.0
- */
-export interface SemanticTokens {
-    /**
-     * An optional result id. If provided and clients support delta updating
-     * the client will include the result id in the next semantic token request.
-     * A server can then instead of computing all semantic tokens again simply
-     * send a delta.
-     */
-    resultId?: string;
-    /**
-     * The actual tokens.
-     */
-    data: uinteger[];
-}
-/**
- * @since 3.16.0
- */
-export declare namespace SemanticTokens {
-    function is(value: any): value is SemanticTokens;
-}
 /**
  * @since 3.16.0
  */
 export interface SemanticTokensPartialResult {
     data: uinteger[];
 }
-/**
- * @since 3.16.0
- */
-export interface SemanticTokensEdit {
-    /**
-     * The start offset of the edit.
-     */
-    start: uinteger;
-    /**
-     * The count of elements to remove.
-     */
-    deleteCount: uinteger;
-    /**
-     * The elements to insert.
-     */
-    data?: uinteger[];
-}
-/**
- * @since 3.16.0
- */
-export interface SemanticTokensDelta {
-    readonly resultId?: string;
-    /**
-     * The semantic token edits to transform a previous result into a new result.
-     */
-    edits: SemanticTokensEdit[];
-}
 /**
  * @since 3.16.0
  */
@@ -192,6 +76,28 @@ export interface SemanticTokensClientCapabilities {
      * Whether the client supports tokens that can span multiple lines.
      */
     multilineTokenSupport?: boolean;
+    /**
+     * Whether the client allows the server to actively cancel a
+     * semantic token request, e.g. supports returning
+     * LSPErrorCodes.ServerCancelled. If a server does the client
+     * needs to retrigger the request.
+     *
+     * @since 3.17.0
+     */
+    serverCancelSupport?: boolean;
+    /**
+     * Whether the client uses semantic tokens to augment existing
+     * syntax tokens. If set to `true` client side created syntax
+     * tokens and semantic tokens are both used for colorization. If
+     * set to `false` the client only uses the returned semantic tokens
+     * for colorization.
+     *
+     * If the value is `undefined` then the client behavior is not
+     * specified.
+     *
+     * @since 3.17.0
+     */
+    augmentsSyntaxTokens?: boolean;
 }
 /**
  * @since 3.16.0
@@ -285,6 +191,9 @@ export declare namespace SemanticTokensRangeRequest {
     const type: ProtocolRequestType<SemanticTokensRangeParams, SemanticTokens | null, SemanticTokensPartialResult, void, void>;
     type HandlerSignature = RequestHandler<SemanticTokensRangeParams, SemanticTokens | null, void>;
 }
+/**
+ * @since 3.16.0
+ */
 export interface SemanticTokensWorkspaceClientCapabilities {
     /**
      * Whether the client implementation supports a refresh request sent from
@@ -292,7 +201,7 @@ export interface SemanticTokensWorkspaceClientCapabilities {
      *
      * Note that this event is global and will force the client to refresh all
      * semantic tokens currently shown. It should be used with absolute care
-     * and is useful for situation where a server for example detect a project
+     * and is useful for situation where a server for example detects a project
      * wide change that requires such a calculation.
      */
     refreshSupport?: boolean;

package/lib/common/protocol.semanticTokens.js

@@ -4,76 +4,8 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SemanticTokensRefreshRequest = exports.SemanticTokensRangeRequest = exports.SemanticTokensDeltaRequest = exports.SemanticTokensRequest = exports.SemanticTokensRegistrationType = exports.TokenFormat = exports.SemanticTokens = exports.SemanticTokenModifiers = exports.SemanticTokenTypes = void 0;
+exports.SemanticTokensRefreshRequest = exports.SemanticTokensRangeRequest = exports.SemanticTokensDeltaRequest = exports.SemanticTokensRequest = exports.SemanticTokensRegistrationType = exports.TokenFormat = void 0;
 const messages_1 = require("./messages");
-/**
- * A set of predefined token types. This set is not fixed
- * an clients can specify additional token types via the
- * corresponding client capabilities.
- *
- * @since 3.16.0
- */
-var SemanticTokenTypes;
-(function (SemanticTokenTypes) {
-    SemanticTokenTypes["namespace"] = "namespace";
-    /**
-     * Represents a generic type. Acts as a fallback for types which can't be mapped to
-     * a specific type like class or enum.
-     */
-    SemanticTokenTypes["type"] = "type";
-    SemanticTokenTypes["class"] = "class";
-    SemanticTokenTypes["enum"] = "enum";
-    SemanticTokenTypes["interface"] = "interface";
-    SemanticTokenTypes["struct"] = "struct";
-    SemanticTokenTypes["typeParameter"] = "typeParameter";
-    SemanticTokenTypes["parameter"] = "parameter";
-    SemanticTokenTypes["variable"] = "variable";
-    SemanticTokenTypes["property"] = "property";
-    SemanticTokenTypes["enumMember"] = "enumMember";
-    SemanticTokenTypes["event"] = "event";
-    SemanticTokenTypes["function"] = "function";
-    SemanticTokenTypes["method"] = "method";
-    SemanticTokenTypes["macro"] = "macro";
-    SemanticTokenTypes["keyword"] = "keyword";
-    SemanticTokenTypes["modifier"] = "modifier";
-    SemanticTokenTypes["comment"] = "comment";
-    SemanticTokenTypes["string"] = "string";
-    SemanticTokenTypes["number"] = "number";
-    SemanticTokenTypes["regexp"] = "regexp";
-    SemanticTokenTypes["operator"] = "operator";
-})(SemanticTokenTypes = exports.SemanticTokenTypes || (exports.SemanticTokenTypes = {}));
-/**
- * A set of predefined token modifiers. This set is not fixed
- * an clients can specify additional token types via the
- * corresponding client capabilities.
- *
- * @since 3.16.0
- */
-var SemanticTokenModifiers;
-(function (SemanticTokenModifiers) {
-    SemanticTokenModifiers["declaration"] = "declaration";
-    SemanticTokenModifiers["definition"] = "definition";
-    SemanticTokenModifiers["readonly"] = "readonly";
-    SemanticTokenModifiers["static"] = "static";
-    SemanticTokenModifiers["deprecated"] = "deprecated";
-    SemanticTokenModifiers["abstract"] = "abstract";
-    SemanticTokenModifiers["async"] = "async";
-    SemanticTokenModifiers["modification"] = "modification";
-    SemanticTokenModifiers["documentation"] = "documentation";
-    SemanticTokenModifiers["defaultLibrary"] = "defaultLibrary";
-})(SemanticTokenModifiers = exports.SemanticTokenModifiers || (exports.SemanticTokenModifiers = {}));
-/**
- * @since 3.16.0
- */
-var SemanticTokens;
-(function (SemanticTokens) {
-    function is(value) {
-        const candidate = value;
-        return candidate !== undefined && (candidate.resultId === undefined || typeof candidate.resultId === 'string') &&
-            Array.isArray(candidate.data) && (candidate.data.length === 0 || typeof candidate.data[0] === 'number');
-    }
-    SemanticTokens.is = is;
-})(SemanticTokens = exports.SemanticTokens || (exports.SemanticTokens = {}));
 //------- 'textDocument/semanticTokens' -----
 var TokenFormat;
 (function (TokenFormat) {

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

@@ -33,6 +33,6 @@ export interface TypeDefinitionParams extends TextDocumentPositionParams, WorkDo
  */
 export declare namespace TypeDefinitionRequest {
     const method: 'textDocument/typeDefinition';
-    const type: ProtocolRequestType<TypeDefinitionParams, Location | Location[] | LocationLink[] | null, Location[] | LocationLink[], void, TypeDefinitionRegistrationOptions>;
+    const type: ProtocolRequestType<TypeDefinitionParams, Definition | LocationLink[] | null, Location[] | LocationLink[], void, TypeDefinitionRegistrationOptions>;
     type HandlerSignature = RequestHandler<TypeDefinitionParams, Definition | DefinitionLink[] | null, void>;
 }

package/lib/node/main.js

@@ -19,7 +19,7 @@ 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 node_1.createMessageConnection(input, output, logger, options);
+    return (0, node_1.createMessageConnection)(input, output, logger, options);
 }
 exports.createProtocolConnection = createProtocolConnection;
 //# sourceMappingURL=main.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vscode-languageserver-protocol",
 	"description": "VSCode Language Server Protocol implementation",
-	"version": "3.16.0",
+	"version": "3.17.0-next.12",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -18,8 +18,8 @@
 	},
 	"typings": "./lib/common/api.d.ts",
 	"dependencies": {
-		"vscode-jsonrpc": "6.0.0",
-		"vscode-languageserver-types": "3.16.0"
+		"vscode-jsonrpc": "8.0.0-next.5",
+		"vscode-languageserver-types": "3.17.0-next.6"
 	},
 	"scripts": {
 		"prepublishOnly": "git clean -xfd . && npm install && npm run clean && npm run compile && npm test",
@@ -28,6 +28,7 @@
 		"compile": "node ../build/bin/tsc -b ./tsconfig.json",
 		"watch": "node ../build/bin/tsc -b ./tsconfig-watch.json -w",
 		"clean": "node ../node_modules/rimraf/bin.js lib && node ../node_modules/rimraf/bin.js dist",
+		"lint": "node ../node_modules/eslint/bin/eslint.js --ext ts 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/",