monaco-languageclient - npm Package Compare versions

Comparing version 0.17.0 to 0.17.3

dist/amd/connection.d.ts

@@ -1,2 +0,2 @@
-import { Message, RequestType, RequestType0, RequestHandler, RequestHandler0, GenericRequestHandler, NotificationType, NotificationType0, NotificationHandler, NotificationHandler0, GenericNotificationHandler, Trace, Tracer, CancellationToken, MessageConnection, MessageSignature } from 'vscode-jsonrpc';
+import { Message, RequestType, RequestType0, RequestHandler, RequestHandler0, GenericRequestHandler, NotificationType, NotificationType0, NotificationHandler, NotificationHandler0, GenericNotificationHandler, Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable, ProgressType } from 'vscode-jsonrpc';
 import { InitializeParams, InitializeResult, LogMessageParams, ShowMessageParams, DidChangeConfigurationParams, DidOpenTextDocumentParams, DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidSaveTextDocumentParams, DidChangeWatchedFilesParams, PublishDiagnosticsParams } from 'vscode-languageserver-protocol';
@@ -11,31 +11,33 @@ import { OutputChannel } from "./services";
     sendRequest<R>(type: string | MessageSignature, ...params: any[]): Thenable<R>;
-    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): void;
-    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): void;
-    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): void;
-    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): void;
-    sendNotification<RO>(type: NotificationType0): void;
-    sendNotification<P>(type: NotificationType<P>, params?: P): void;
-    sendNotification(method: string): void;
-    sendNotification(method: string, params: any): void;
-    sendNotification(method: string | MessageSignature, params?: any): void;
-    onNotification<RO>(type: NotificationType0, handler: NotificationHandler0): void;
-    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): void;
-    onNotification(method: string, handler: GenericNotificationHandler): void;
-    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): void;
+    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): Disposable;
+    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): Disposable;
+    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): Disposable;
+    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): Disposable;
+    sendNotification(type: NotificationType0): Thenable<void>;
+    sendNotification<P>(type: NotificationType<P>, params?: P): Thenable<void>;
+    sendNotification(method: string): Thenable<void>;
+    sendNotification(method: string, params: any): Thenable<void>;
+    sendNotification(method: string | MessageSignature, params?: any): Thenable<void>;
+    onNotification(type: NotificationType0, handler: NotificationHandler0): Disposable;
+    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): Disposable;
+    onNotification(method: string, handler: GenericNotificationHandler): Disposable;
+    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): Disposable;
+    onProgress<P>(type: ProgressType<P>, token: string | number, handler: NotificationHandler<P>): Disposable;
+    sendProgress<P>(type: ProgressType<P>, token: string | number, value: P): Thenable<void>;
     trace(value: Trace, tracer: Tracer, sendNotification?: boolean): void;
     initialize(params: InitializeParams): Thenable<InitializeResult>;
     shutdown(): Thenable<void>;
-    exit(): void;
+    exit(): Thenable<void>;
     onLogMessage(handle: NotificationHandler<LogMessageParams>): void;
     onShowMessage(handler: NotificationHandler<ShowMessageParams>): void;
     onTelemetry(handler: NotificationHandler<any>): void;
-    didChangeConfiguration(params: DidChangeConfigurationParams): void;
-    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): void;
-    didOpenTextDocument(params: DidOpenTextDocumentParams): void;
-    didChangeTextDocument(params: DidChangeTextDocumentParams): void;
-    didCloseTextDocument(params: DidCloseTextDocumentParams): void;
-    didSaveTextDocument(params: DidSaveTextDocumentParams): void;
+    didChangeConfiguration(params: DidChangeConfigurationParams): Thenable<void>;
+    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): Thenable<void>;
+    didOpenTextDocument(params: DidOpenTextDocumentParams): Thenable<void>;
+    didChangeTextDocument(params: DidChangeTextDocumentParams): Thenable<void>;
+    didCloseTextDocument(params: DidCloseTextDocumentParams): Thenable<void>;
+    didSaveTextDocument(params: DidSaveTextDocumentParams): Thenable<void>;
     onDiagnostics(handler: NotificationHandler<PublishDiagnosticsParams>): void;
+    end(): void;
     dispose(): void;
-    end(): void;
 }
@@ -42,0 +44,0 @@ export interface ConnectionErrorHandler {

dist/amd/connection.js

@@ -0,1 +1,10 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 define(["require", "exports", "vscode-languageserver-protocol", "vscode-languageserver-protocol/lib/common/utils/is"], function (require, exports, vscode_languageserver_protocol_1, Is) {
@@ -16,17 +25,19 @@ /* --------------------------------------------------------------------------------------------
             onRequest: (type, handler) => connection.onRequest(Is.string(type) ? type : type.method, handler),
-            sendNotification: (type, params) => connection.sendNotification(Is.string(type) ? type : type.method, params),
+            sendNotification: (type, params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(Is.string(type) ? type : type.method, params); }),
             onNotification: (type, handler) => connection.onNotification(Is.string(type) ? type : type.method, handler),
+            onProgress: (type, token, handler) => connection.onProgress(type, token, handler),
+            sendProgress: (type, token, value) => __awaiter(this, void 0, void 0, function* () { return connection.sendProgress(type, token, value); }),
             trace: (value, tracer, sendNotification = false) => connection.trace(value, tracer, sendNotification),
             initialize: (params) => connection.sendRequest(vscode_languageserver_protocol_1.InitializeRequest.type, params),
             shutdown: () => connection.sendRequest(vscode_languageserver_protocol_1.ShutdownRequest.type, undefined),
-            exit: () => connection.sendNotification(vscode_languageserver_protocol_1.ExitNotification.type),
+            exit: () => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.ExitNotification.type); }),
             onLogMessage: (handler) => connection.onNotification(vscode_languageserver_protocol_1.LogMessageNotification.type, handler),
             onShowMessage: (handler) => connection.onNotification(vscode_languageserver_protocol_1.ShowMessageNotification.type, handler),
             onTelemetry: (handler) => connection.onNotification(vscode_languageserver_protocol_1.TelemetryEventNotification.type, handler),
-            didChangeConfiguration: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeConfigurationNotification.type, params),
-            didChangeWatchedFiles: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeWatchedFilesNotification.type, params),
-            didOpenTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, params),
-            didChangeTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeTextDocumentNotification.type, params),
-            didCloseTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, params),
-            didSaveTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidSaveTextDocumentNotification.type, params),
+            didChangeConfiguration: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeConfigurationNotification.type, params); }),
+            didChangeWatchedFiles: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeWatchedFilesNotification.type, params); }),
+            didOpenTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, params); }),
+            didChangeTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeTextDocumentNotification.type, params); }),
+            didCloseTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, params); }),
+            didSaveTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidSaveTextDocumentNotification.type, params); }),
             onDiagnostics: (handler) => connection.onNotification(vscode_languageserver_protocol_1.PublishDiagnosticsNotification.type, handler),
@@ -33,0 +44,0 @@ dispose: () => connection.dispose(),

dist/amd/monaco-language-client.js

@@ -11,3 +11,3 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
 };
-define(["require", "exports", "vscode-languageclient/lib/common/client", "vscode-languageclient/lib/common/typeDefinition", "vscode-languageclient/lib/common/configuration", "vscode-languageclient/lib/common/implementation", "vscode-languageclient/lib/common/colorProvider", "vscode-languageclient/lib/common/workspaceFolders", "vscode-languageclient/lib/common/foldingRange", "vscode-languageclient/lib/common/callHierarchy", "vscode-languageclient/lib/common/semanticTokens", "vscode-languageclient/lib/common/declaration", "vscode-languageclient/lib/common/client"], function (require, exports, client_1, typeDefinition_1, configuration_1, implementation_1, colorProvider_1, workspaceFolders_1, foldingRange_1, callHierarchy_1, semanticTokens_1, declaration_1, client_2) {
+define(["require", "exports", "vscode-languageclient/lib/common/client", "vscode-languageclient/lib/common/typeDefinition", "vscode-languageclient/lib/common/configuration", "vscode-languageclient/lib/common/implementation", "vscode-languageclient/lib/common/colorProvider", "vscode-languageclient/lib/common/workspaceFolders", "vscode-languageclient/lib/common/foldingRange", "vscode-languageclient/lib/common/callHierarchy", "vscode-languageclient/lib/common/progress", "vscode-languageclient/lib/common/semanticTokens", "vscode-languageclient/lib/common/declaration", "vscode-languageclient/lib/common/client"], function (require, exports, client_1, typeDefinition_1, configuration_1, implementation_1, colorProvider_1, workspaceFolders_1, foldingRange_1, callHierarchy_1, progress_1, semanticTokens_1, declaration_1, client_2) {
     "use strict";
@@ -81,2 +81,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
             this.registerFeature(new callHierarchy_1.CallHierarchyFeature(this));
+            this.registerFeature(new progress_1.ProgressFeature(this));
             const features = this['_features'];
@@ -83,0 +84,0 @@ for (const feature of features) {

dist/amd/monaco-languages.js

@@ -491,2 +491,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
                 },
+                onDidChange: provider.onDidChange,
                 provideDocumentSemanticTokens: (model, lastResultId, token) => __awaiter(this, void 0, void 0, function* () {
@@ -560,2 +561,5 @@ if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
             }
+            if (languages.has('*')) {
+                return new Set(['*']);
+            }
             return languages;
@@ -562,0 +566,0 @@ }

dist/amd/services.d.ts

@@ -42,2 +42,7 @@ import { DocumentSelector, MessageActionItem, MessageType, TextDocumentPositionParams, ReferenceParams, CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentRangeFormattingParams, DocumentOnTypeFormattingParams, RenameParams, DocumentLinkParams, WorkspaceClientCapabilities, Diagnostic, CompletionItem, CompletionList, Hover, SignatureHelp, Definition, Location, DocumentHighlight, SymbolInformation, Command, CodeLens, TextEdit, WorkspaceEdit, DocumentLink, TextDocumentSaveReason, DocumentSymbolParams, WorkspaceSymbolParams, TextDocumentContentChangeEvent, CompletionParams, ColorInformation, ColorPresentation, DocumentColorParams, ColorPresentationParams, FoldingRange, FoldingRangeParams, DocumentSymbol, CodeAction, Declaration, SelectionRangeParams, SelectionRange, SemanticTokensParams, SemanticTokens, SemanticTokensEdit, SemanticTokensLegend, SemanticTokensRangeParams, SemanticTokensDeltaParams } from 'vscode-languageserver-protocol';
 }
+export declare enum ProgressLocation {
+    SourceControl = 1,
+    Window = 10,
+    Notification = 15
+}
 export interface SignatureHelpContext {
@@ -120,2 +125,3 @@ readonly triggerKind: SignatureHelpTriggerKind;
 export interface DocumentSemanticTokensProvider {
+    onDidChange?: Event<void>;
     provideDocumentSemanticTokens(params: SemanticTokensParams, token: CancellationToken): ProviderResult<SemanticTokens>;
@@ -122,0 +128,0 @@ provideDocumentSemanticTokensEdits?(params: SemanticTokensDeltaParams, token: CancellationToken): ProviderResult<SemanticTokens | SemanticTokensEdit>;

dist/amd/services.js

@@ -18,3 +18,3 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ConfigurationTarget = exports.DocumentIdentifier = exports.VsCodeDiagnosticSeverity = exports.SignatureHelpTriggerKind = exports.isDocumentSelector = exports.Services = exports.TextDocument = exports.Emitter = exports.Event = exports.CancellationToken = exports.Disposable = void 0;
+    exports.ConfigurationTarget = exports.DocumentIdentifier = exports.ProgressLocation = exports.VsCodeDiagnosticSeverity = exports.SignatureHelpTriggerKind = exports.isDocumentSelector = exports.Services = exports.TextDocument = exports.Emitter = exports.Event = exports.CancellationToken = exports.Disposable = void 0;
     Object.defineProperty(exports, "TextDocument", { enumerable: true, get: function () { return vscode_languageserver_textdocument_1.TextDocument; } });
@@ -67,2 +67,8 @@ Object.defineProperty(exports, "Disposable", { enumerable: true, get: function () { return vscode_jsonrpc_1.Disposable; } });
     })(VsCodeDiagnosticSeverity = exports.VsCodeDiagnosticSeverity || (exports.VsCodeDiagnosticSeverity = {}));
+    var ProgressLocation;
+    (function (ProgressLocation) {
+        ProgressLocation[ProgressLocation["SourceControl"] = 1] = "SourceControl";
+        ProgressLocation[ProgressLocation["Window"] = 10] = "Window";
+        ProgressLocation[ProgressLocation["Notification"] = 15] = "Notification";
+    })(ProgressLocation = exports.ProgressLocation || (exports.ProgressLocation = {}));
     var DocumentIdentifier;
@@ -69,0 +75,0 @@ (function (DocumentIdentifier) {

dist/amd/vscode-api.js

@@ -14,3 +14,3 @@ /* --------------------------------------------------------------------------------------------
 };
-define(["require", "exports", "vscode", "vscode-uri", "./disposable", "./services", "./services", "vscode-languageserver-protocol"], function (require, exports, vscode, vscode_uri_1, disposable_1, services_1, ServicesModule, vscode_languageserver_protocol_1) {
+define(["require", "exports", "vscode-uri", "./disposable", "./services", "./services", "vscode-languageserver-protocol"], function (require, exports, vscode_uri_1, disposable_1, services_1, ServicesModule, vscode_languageserver_protocol_1) {
     "use strict";
@@ -719,2 +719,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 return languages.registerDocumentSemanticTokensProvider(selector, {
+                    onDidChange: provider.onDidChangeSemanticTokens,
                     provideDocumentSemanticTokens({ textDocument }, token) {
@@ -792,3 +793,3 @@ return provider.provideDocumentSemanticTokens(textDocument, token);
                 }
-                return task({ report: () => { } }, new vscode.CancellationTokenSource().token);
+                return task({ report: () => { } }, new vscode_languageserver_protocol_1.CancellationTokenSource().token);
             },
@@ -920,3 +921,5 @@ showTextDocument: unsupported,
             DiagnosticSeverity: ServicesModule.DiagnosticSeverity,
-            EventEmitter: ServicesModule.Emitter
+            EventEmitter: ServicesModule.Emitter,
+            CancellationTokenSource: vscode_languageserver_protocol_1.CancellationTokenSource,
+            ProgressLocation: ServicesModule.ProgressLocation
         };
@@ -923,0 +926,0 @@ return partialApi;

lib/connection.d.ts

@@ -1,2 +0,2 @@
-import { Message, RequestType, RequestType0, RequestHandler, RequestHandler0, GenericRequestHandler, NotificationType, NotificationType0, NotificationHandler, NotificationHandler0, GenericNotificationHandler, Trace, Tracer, CancellationToken, MessageConnection, MessageSignature } from 'vscode-jsonrpc';
+import { Message, RequestType, RequestType0, RequestHandler, RequestHandler0, GenericRequestHandler, NotificationType, NotificationType0, NotificationHandler, NotificationHandler0, GenericNotificationHandler, Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable, ProgressType } from 'vscode-jsonrpc';
 import { InitializeParams, InitializeResult, LogMessageParams, ShowMessageParams, DidChangeConfigurationParams, DidOpenTextDocumentParams, DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidSaveTextDocumentParams, DidChangeWatchedFilesParams, PublishDiagnosticsParams } from 'vscode-languageserver-protocol';
@@ -11,31 +11,33 @@ import { OutputChannel } from "./services";
     sendRequest<R>(type: string | MessageSignature, ...params: any[]): Thenable<R>;
-    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): void;
-    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): void;
-    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): void;
-    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): void;
-    sendNotification<RO>(type: NotificationType0): void;
-    sendNotification<P>(type: NotificationType<P>, params?: P): void;
-    sendNotification(method: string): void;
-    sendNotification(method: string, params: any): void;
-    sendNotification(method: string | MessageSignature, params?: any): void;
-    onNotification<RO>(type: NotificationType0, handler: NotificationHandler0): void;
-    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): void;
-    onNotification(method: string, handler: GenericNotificationHandler): void;
-    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): void;
+    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): Disposable;
+    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): Disposable;
+    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): Disposable;
+    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): Disposable;
+    sendNotification(type: NotificationType0): Thenable<void>;
+    sendNotification<P>(type: NotificationType<P>, params?: P): Thenable<void>;
+    sendNotification(method: string): Thenable<void>;
+    sendNotification(method: string, params: any): Thenable<void>;
+    sendNotification(method: string | MessageSignature, params?: any): Thenable<void>;
+    onNotification(type: NotificationType0, handler: NotificationHandler0): Disposable;
+    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): Disposable;
+    onNotification(method: string, handler: GenericNotificationHandler): Disposable;
+    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): Disposable;
+    onProgress<P>(type: ProgressType<P>, token: string | number, handler: NotificationHandler<P>): Disposable;
+    sendProgress<P>(type: ProgressType<P>, token: string | number, value: P): Thenable<void>;
     trace(value: Trace, tracer: Tracer, sendNotification?: boolean): void;
     initialize(params: InitializeParams): Thenable<InitializeResult>;
     shutdown(): Thenable<void>;
-    exit(): void;
+    exit(): Thenable<void>;
     onLogMessage(handle: NotificationHandler<LogMessageParams>): void;
     onShowMessage(handler: NotificationHandler<ShowMessageParams>): void;
     onTelemetry(handler: NotificationHandler<any>): void;
-    didChangeConfiguration(params: DidChangeConfigurationParams): void;
-    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): void;
-    didOpenTextDocument(params: DidOpenTextDocumentParams): void;
-    didChangeTextDocument(params: DidChangeTextDocumentParams): void;
-    didCloseTextDocument(params: DidCloseTextDocumentParams): void;
-    didSaveTextDocument(params: DidSaveTextDocumentParams): void;
+    didChangeConfiguration(params: DidChangeConfigurationParams): Thenable<void>;
+    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): Thenable<void>;
+    didOpenTextDocument(params: DidOpenTextDocumentParams): Thenable<void>;
+    didChangeTextDocument(params: DidChangeTextDocumentParams): Thenable<void>;
+    didCloseTextDocument(params: DidCloseTextDocumentParams): Thenable<void>;
+    didSaveTextDocument(params: DidSaveTextDocumentParams): Thenable<void>;
     onDiagnostics(handler: NotificationHandler<PublishDiagnosticsParams>): void;
+    end(): void;
     dispose(): void;
-    end(): void;
 }
@@ -42,0 +44,0 @@ export interface ConnectionErrorHandler {

lib/connection.js

@@ -6,2 +6,11 @@ /* --------------------------------------------------------------------------------------------
 'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -18,17 +27,19 @@ exports.createConnection = void 0;
         onRequest: (type, handler) => connection.onRequest(Is.string(type) ? type : type.method, handler),
-        sendNotification: (type, params) => connection.sendNotification(Is.string(type) ? type : type.method, params),
+        sendNotification: (type, params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(Is.string(type) ? type : type.method, params); }),
         onNotification: (type, handler) => connection.onNotification(Is.string(type) ? type : type.method, handler),
+        onProgress: (type, token, handler) => connection.onProgress(type, token, handler),
+        sendProgress: (type, token, value) => __awaiter(this, void 0, void 0, function* () { return connection.sendProgress(type, token, value); }),
         trace: (value, tracer, sendNotification = false) => connection.trace(value, tracer, sendNotification),
         initialize: (params) => connection.sendRequest(vscode_languageserver_protocol_1.InitializeRequest.type, params),
         shutdown: () => connection.sendRequest(vscode_languageserver_protocol_1.ShutdownRequest.type, undefined),
-        exit: () => connection.sendNotification(vscode_languageserver_protocol_1.ExitNotification.type),
+        exit: () => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.ExitNotification.type); }),
         onLogMessage: (handler) => connection.onNotification(vscode_languageserver_protocol_1.LogMessageNotification.type, handler),
         onShowMessage: (handler) => connection.onNotification(vscode_languageserver_protocol_1.ShowMessageNotification.type, handler),
         onTelemetry: (handler) => connection.onNotification(vscode_languageserver_protocol_1.TelemetryEventNotification.type, handler),
-        didChangeConfiguration: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeConfigurationNotification.type, params),
-        didChangeWatchedFiles: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeWatchedFilesNotification.type, params),
-        didOpenTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, params),
-        didChangeTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidChangeTextDocumentNotification.type, params),
-        didCloseTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, params),
-        didSaveTextDocument: (params) => connection.sendNotification(vscode_languageserver_protocol_1.DidSaveTextDocumentNotification.type, params),
+        didChangeConfiguration: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeConfigurationNotification.type, params); }),
+        didChangeWatchedFiles: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeWatchedFilesNotification.type, params); }),
+        didOpenTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, params); }),
+        didChangeTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidChangeTextDocumentNotification.type, params); }),
+        didCloseTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, params); }),
+        didSaveTextDocument: (params) => __awaiter(this, void 0, void 0, function* () { return connection.sendNotification(vscode_languageserver_protocol_1.DidSaveTextDocumentNotification.type, params); }),
         onDiagnostics: (handler) => connection.onNotification(vscode_languageserver_protocol_1.PublishDiagnosticsNotification.type, handler),
@@ -35,0 +46,0 @@ dispose: () => connection.dispose(),

lib/monaco-language-client.js

@@ -26,2 +26,3 @@ "use strict";
 const callHierarchy_1 = require("vscode-languageclient/lib/common/callHierarchy");
+const progress_1 = require("vscode-languageclient/lib/common/progress");
 const semanticTokens_1 = require("vscode-languageclient/lib/common/semanticTokens");
@@ -94,2 +95,3 @@ const declaration_1 = require("vscode-languageclient/lib/common/declaration");
         this.registerFeature(new callHierarchy_1.CallHierarchyFeature(this));
+        this.registerFeature(new progress_1.ProgressFeature(this));
         const features = this['_features'];
@@ -96,0 +98,0 @@ for (const feature of features) {

lib/monaco-languages.js

@@ -494,2 +494,3 @@ "use strict";
             },
+            onDidChange: provider.onDidChange,
             provideDocumentSemanticTokens: (model, lastResultId, token) => __awaiter(this, void 0, void 0, function* () {
@@ -563,2 +564,5 @@ if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
         }
+        if (languages.has('*')) {
+            return new Set(['*']);
+        }
         return languages;
@@ -565,0 +569,0 @@ }

lib/services.d.ts

@@ -42,2 +42,7 @@ import { DocumentSelector, MessageActionItem, MessageType, TextDocumentPositionParams, ReferenceParams, CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentRangeFormattingParams, DocumentOnTypeFormattingParams, RenameParams, DocumentLinkParams, WorkspaceClientCapabilities, Diagnostic, CompletionItem, CompletionList, Hover, SignatureHelp, Definition, Location, DocumentHighlight, SymbolInformation, Command, CodeLens, TextEdit, WorkspaceEdit, DocumentLink, TextDocumentSaveReason, DocumentSymbolParams, WorkspaceSymbolParams, TextDocumentContentChangeEvent, CompletionParams, ColorInformation, ColorPresentation, DocumentColorParams, ColorPresentationParams, FoldingRange, FoldingRangeParams, DocumentSymbol, CodeAction, Declaration, SelectionRangeParams, SelectionRange, SemanticTokensParams, SemanticTokens, SemanticTokensEdit, SemanticTokensLegend, SemanticTokensRangeParams, SemanticTokensDeltaParams } from 'vscode-languageserver-protocol';
 }
+export declare enum ProgressLocation {
+    SourceControl = 1,
+    Window = 10,
+    Notification = 15
+}
 export interface SignatureHelpContext {
@@ -120,2 +125,3 @@ readonly triggerKind: SignatureHelpTriggerKind;
 export interface DocumentSemanticTokensProvider {
+    onDidChange?: Event<void>;
     provideDocumentSemanticTokens(params: SemanticTokensParams, token: CancellationToken): ProviderResult<SemanticTokens>;
@@ -122,0 +128,0 @@ provideDocumentSemanticTokensEdits?(params: SemanticTokensDeltaParams, token: CancellationToken): ProviderResult<SemanticTokens | SemanticTokensEdit>;

lib/services.js

@@ -17,3 +17,3 @@ /* --------------------------------------------------------------------------------------------
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigurationTarget = exports.DocumentIdentifier = exports.VsCodeDiagnosticSeverity = exports.SignatureHelpTriggerKind = exports.isDocumentSelector = exports.Services = exports.TextDocument = exports.Emitter = exports.Event = exports.CancellationToken = exports.Disposable = void 0;
+exports.ConfigurationTarget = exports.DocumentIdentifier = exports.ProgressLocation = exports.VsCodeDiagnosticSeverity = exports.SignatureHelpTriggerKind = exports.isDocumentSelector = exports.Services = exports.TextDocument = exports.Emitter = exports.Event = exports.CancellationToken = exports.Disposable = void 0;
 const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
@@ -69,2 +69,8 @@ const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 })(VsCodeDiagnosticSeverity = exports.VsCodeDiagnosticSeverity || (exports.VsCodeDiagnosticSeverity = {}));
+var ProgressLocation;
+(function (ProgressLocation) {
+    ProgressLocation[ProgressLocation["SourceControl"] = 1] = "SourceControl";
+    ProgressLocation[ProgressLocation["Window"] = 10] = "Window";
+    ProgressLocation[ProgressLocation["Notification"] = 15] = "Notification";
+})(ProgressLocation = exports.ProgressLocation || (exports.ProgressLocation = {}));
 var DocumentIdentifier;
@@ -71,0 +77,0 @@ (function (DocumentIdentifier) {

lib/vscode-api.js

@@ -17,3 +17,2 @@ "use strict";
 exports.createVSCodeApi = void 0;
-const vscode = require("vscode");
 const vscode_uri_1 = require("vscode-uri");
@@ -724,2 +723,3 @@ const disposable_1 = require("./disposable");
             return languages.registerDocumentSemanticTokensProvider(selector, {
+                onDidChange: provider.onDidChangeSemanticTokens,
                 provideDocumentSemanticTokens({ textDocument }, token) {
@@ -797,3 +797,3 @@ return provider.provideDocumentSemanticTokens(textDocument, token);
             }
-            return task({ report: () => { } }, new vscode.CancellationTokenSource().token);
+            return task({ report: () => { } }, new vscode_languageserver_protocol_1.CancellationTokenSource().token);
         },
@@ -925,3 +925,5 @@ showTextDocument: unsupported,
         DiagnosticSeverity: ServicesModule.DiagnosticSeverity,
-        EventEmitter: ServicesModule.Emitter
+        EventEmitter: ServicesModule.Emitter,
+        CancellationTokenSource: vscode_languageserver_protocol_1.CancellationTokenSource,
+        ProgressLocation: ServicesModule.ProgressLocation
     };
@@ -928,0 +930,0 @@ return partialApi;

package.json

 {
     "name": "monaco-languageclient",
-    "version": "0.17.0",
+    "version": "0.17.3",
     "description": "Monaco Language client implementation",
@@ -5,0 +5,0 @@ "author": "TypeFox GmbH (http://www.typefox.io)",

src/connection.ts

@@ -12,3 +12,3 @@ /* --------------------------------------------------------------------------------------------
     NotificationHandler, NotificationHandler0, GenericNotificationHandler,
-    Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable
+    Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable, ProgressType
 } from 'vscode-jsonrpc';
@@ -45,18 +45,21 @@
 
-    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): void;
-    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): void;
-    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): void;
-    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): void;
+    onRequest<R, E>(type: RequestType0<R, E>, handler: RequestHandler0<R, E>): Disposable;
+    onRequest<P, R, E>(type: RequestType<P, R, E>, handler: RequestHandler<P, R, E>): Disposable;
+    onRequest<R, E>(method: string, handler: GenericRequestHandler<R, E>): Disposable;
+    onRequest<R, E>(method: string | MessageSignature, handler: GenericRequestHandler<R, E>): Disposable;
 
-    sendNotification<RO>(type: NotificationType0): void;
-    sendNotification<P>(type: NotificationType<P>, params?: P): void;
-    sendNotification(method: string): void;
-    sendNotification(method: string, params: any): void;
-    sendNotification(method: string | MessageSignature, params?: any): void;
+    sendNotification(type: NotificationType0): Thenable<void>;
+    sendNotification<P>(type: NotificationType<P>, params?: P): Thenable<void>;
+    sendNotification(method: string): Thenable<void>;
+    sendNotification(method: string, params: any): Thenable<void>;
+    sendNotification(method: string | MessageSignature, params?: any): Thenable<void>;
 
-    onNotification<RO>(type: NotificationType0, handler: NotificationHandler0): void;
-    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): void;
-    onNotification(method: string, handler: GenericNotificationHandler): void;
-    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): void;
+    onNotification(type: NotificationType0, handler: NotificationHandler0): Disposable;
+    onNotification<P>(type: NotificationType<P>, handler: NotificationHandler<P>): Disposable;
+    onNotification(method: string, handler: GenericNotificationHandler): Disposable;
+    onNotification(method: string | MessageSignature, handler: GenericNotificationHandler): Disposable;
 
+    onProgress<P>(type: ProgressType<P>, token: string | number, handler: NotificationHandler<P>): Disposable;
+    sendProgress<P>(type: ProgressType<P>, token: string | number, value: P): Thenable<void>;
+
     trace(value: Trace, tracer: Tracer, sendNotification?: boolean): void;
@@ -66,3 +69,3 @@
     shutdown(): Thenable<void>;
-    exit(): void;
+    exit(): Thenable<void>;
 
@@ -73,13 +76,13 @@ onLogMessage(handle: NotificationHandler<LogMessageParams>): void;
 
-    didChangeConfiguration(params: DidChangeConfigurationParams): void;
-    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): void;
+    didChangeConfiguration(params: DidChangeConfigurationParams): Thenable<void>;
+    didChangeWatchedFiles(params: DidChangeWatchedFilesParams): Thenable<void>;
 
-    didOpenTextDocument(params: DidOpenTextDocumentParams): void;
-    didChangeTextDocument(params: DidChangeTextDocumentParams): void;
-    didCloseTextDocument(params: DidCloseTextDocumentParams): void;
-    didSaveTextDocument(params: DidSaveTextDocumentParams): void;
+    didOpenTextDocument(params: DidOpenTextDocumentParams): Thenable<void>;
+    didChangeTextDocument(params: DidChangeTextDocumentParams): Thenable<void>;
+    didCloseTextDocument(params: DidCloseTextDocumentParams): Thenable<void>;
+    didSaveTextDocument(params: DidSaveTextDocumentParams): Thenable<void>;
     onDiagnostics(handler: NotificationHandler<PublishDiagnosticsParams>): void;
 
+    end(): void;
     dispose(): void;
-    end(): void
 }
@@ -106,5 +109,8 @@
 
-        sendNotification: (type: string | MessageSignature, params?: any): void => connection.sendNotification(Is.string(type) ? type : type.method, params),
+        sendNotification: async (type: string | MessageSignature, params?: any): Promise<void> => connection.sendNotification(Is.string(type) ? type : type.method, params),
         onNotification: (type: string | MessageSignature, handler: GenericNotificationHandler): Disposable => connection.onNotification(Is.string(type) ? type : type.method, handler),
 
+        onProgress: <P>(type: ProgressType<P>, token: string | number, handler: NotificationHandler<P>): Disposable => connection.onProgress(type, token, handler),
+        sendProgress: async <P>(type: ProgressType<P>, token: string | number, value: P) => connection.sendProgress(type, token, value),
+
         trace: (value: Trace, tracer: Tracer, sendNotification: boolean = false): void => connection.trace(value, tracer, sendNotification),
@@ -114,3 +120,3 @@
         shutdown: () => connection.sendRequest(ShutdownRequest.type, undefined),
-        exit: () => connection.sendNotification(ExitNotification.type),
+        exit: async () => connection.sendNotification(ExitNotification.type),
 
@@ -121,9 +127,9 @@ onLogMessage: (handler: NotificationHandler<LogMessageParams>) => connection.onNotification(LogMessageNotification.type, handler),
 
-        didChangeConfiguration: (params: DidChangeConfigurationParams) => connection.sendNotification(DidChangeConfigurationNotification.type, params),
-        didChangeWatchedFiles: (params: DidChangeWatchedFilesParams) => connection.sendNotification(DidChangeWatchedFilesNotification.type, params),
+        didChangeConfiguration: async (params: DidChangeConfigurationParams) => connection.sendNotification(DidChangeConfigurationNotification.type, params),
+        didChangeWatchedFiles: async (params: DidChangeWatchedFilesParams) => connection.sendNotification(DidChangeWatchedFilesNotification.type, params),
 
-        didOpenTextDocument: (params: DidOpenTextDocumentParams) => connection.sendNotification(DidOpenTextDocumentNotification.type, params),
-        didChangeTextDocument: (params: DidChangeTextDocumentParams) => connection.sendNotification(DidChangeTextDocumentNotification.type, params),
-        didCloseTextDocument: (params: DidCloseTextDocumentParams) => connection.sendNotification(DidCloseTextDocumentNotification.type, params),
-        didSaveTextDocument: (params: DidSaveTextDocumentParams) => connection.sendNotification(DidSaveTextDocumentNotification.type, params),
+        didOpenTextDocument: async (params: DidOpenTextDocumentParams) => connection.sendNotification(DidOpenTextDocumentNotification.type, params),
+        didChangeTextDocument: async (params: DidChangeTextDocumentParams) => connection.sendNotification(DidChangeTextDocumentNotification.type, params),
+        didCloseTextDocument: async (params: DidCloseTextDocumentParams) => connection.sendNotification(DidCloseTextDocumentNotification.type, params),
+        didSaveTextDocument: async (params: DidSaveTextDocumentParams) => connection.sendNotification(DidSaveTextDocumentNotification.type, params),
 
@@ -130,0 +136,0 @@ onDiagnostics: (handler: NotificationHandler<PublishDiagnosticsParams>) => connection.onNotification(PublishDiagnosticsNotification.type, handler),

src/monaco-language-client.ts

@@ -16,2 +16,3 @@ /* --------------------------------------------------------------------------------------------
 import { CallHierarchyFeature } from "vscode-languageclient/lib/common/callHierarchy";
+import { ProgressFeature } from "vscode-languageclient/lib/common/progress";
 import { SemanticTokensFeature } from "vscode-languageclient/lib/common/semanticTokens";
@@ -102,2 +103,3 @@ import * as p2c from 'vscode-languageclient/lib/common/protocolConverter';
         this.registerFeature(new CallHierarchyFeature(this));
+        this.registerFeature(new ProgressFeature(this));
 
@@ -104,0 +106,0 @@ const features = this['_features'] as ((StaticFeature | DynamicFeature<any>)[]);

src/monaco-languages.ts

@@ -541,2 +541,3 @@ /* --------------------------------------------------------------------------------------------
             },
+            onDidChange: provider.onDidChange,
             provideDocumentSemanticTokens: async (model, lastResultId, token) => {
@@ -613,2 +614,5 @@ if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
         }
+        if (languages.has('*')) {
+            return new Set(['*'])
+        }
         return languages;
@@ -615,0 +619,0 @@ }

src/services.ts

@@ -103,2 +103,8 @@ /* --------------------------------------------------------------------------------------------
 
+export enum ProgressLocation {
+    SourceControl = 1,
+    Window = 10,
+    Notification = 15
+}
+
 export interface SignatureHelpContext {
@@ -204,2 +210,3 @@ readonly triggerKind: SignatureHelpTriggerKind;
 export interface DocumentSemanticTokensProvider {
+    onDidChange?: Event<void>;
     provideDocumentSemanticTokens(params: SemanticTokensParams, token: CancellationToken): ProviderResult<SemanticTokens>;
@@ -206,0 +213,0 @@ provideDocumentSemanticTokensEdits?(params: SemanticTokensDeltaParams, token: CancellationToken): ProviderResult<SemanticTokens | SemanticTokensEdit>;

src/vscode-api.ts

@@ -16,3 +16,3 @@ /* --------------------------------------------------------------------------------------------
 import * as ServicesModule from "./services";
-import { DiagnosticSeverity } from "vscode-languageserver-protocol";
+import { CancellationTokenSource, DiagnosticSeverity } from "vscode-languageserver-protocol";
 
@@ -742,2 +742,3 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vscode {
             return languages.registerDocumentSemanticTokensProvider(selector, {
+                onDidChange: provider.onDidChangeSemanticTokens,
                 provideDocumentSemanticTokens({ textDocument }, token) {
@@ -816,3 +817,3 @@ return provider.provideDocumentSemanticTokens(<any>textDocument, token) as any;
             }
-            return task({ report: () => { } }, new vscode.CancellationTokenSource().token);
+            return task({ report: () => { } }, new CancellationTokenSource().token);
         },
@@ -946,3 +947,5 @@ showTextDocument: unsupported,
         DiagnosticSeverity: ServicesModule.DiagnosticSeverity,
-        EventEmitter: ServicesModule.Emitter
+        EventEmitter: ServicesModule.Emitter,
+        CancellationTokenSource,
+        ProgressLocation: ServicesModule.ProgressLocation
     };
@@ -949,0 +952,0 @@

No alert changes

Improved metrics

Total package byte prevSize

877643

increased by1.11%

Lines of code

11303

increased by0.77%

No dependency changes