monaco-languageclient - npm Package Compare versions

Comparing version 0.11.0 to 0.11.1-dev.4

dist/amd/monaco-converter.d.ts

 /// <reference types="monaco-editor-core/monaco" />
-import { CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentOnTypeFormattingParams, DocumentRangeFormattingParams, ReferenceParams, RenameParams, TextDocumentPositionParams, Position, TextDocumentIdentifier, CompletionItem, CompletionList, CompletionParams, CompletionContext, CompletionTriggerKind, Range, Diagnostic, CompletionItemKind, Hover, SignatureHelp, SignatureInformation, ParameterInformation, Definition, Location, DocumentHighlight, SymbolInformation, DocumentSymbolParams, CodeActionContext, DiagnosticSeverity, Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink, MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, DiagnosticRelatedInformation, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind } from './services';
+import * as ls from 'vscode-languageserver-protocol';
+import { CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentOnTypeFormattingParams, DocumentRangeFormattingParams, ReferenceParams, RenameParams, TextDocumentPositionParams, Position, TextDocumentIdentifier, CompletionItem, CompletionList, CompletionParams, CompletionContext, CompletionTriggerKind, Range, Diagnostic, CompletionItemKind, Hover, SignatureHelp, SignatureInformation, ParameterInformation, Definition, DefinitionLink, Location, DocumentHighlight, SymbolInformation, DocumentSymbolParams, CodeActionContext, DiagnosticSeverity, Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink, MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, DiagnosticRelatedInformation, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind } from './services';
 import IReadOnlyModel = monaco.editor.IReadOnlyModel;
@@ -29,2 +30,6 @@ export declare type RecursivePartial<T> = {
 }
+declare type RangeReplace = {
+    insert: monaco.IRange;
+    replace: monaco.IRange;
+};
 export declare class MonacoToProtocolConverter {
@@ -41,2 +46,6 @@ asPosition(lineNumber: undefined | null, column: undefined | null): {};
     asRange(range: monaco.IRange | null): Range | null;
+    asRange(range: monaco.IRange | {
+        insert: monaco.IRange;
+        replace: monaco.IRange;
+    }): Range;
     asRange(range: Partial<monaco.IRange>): RecursivePartial<Range>;
@@ -122,7 +131,10 @@ asRange(range: Partial<monaco.IRange> | undefined): RecursivePartial<Range> | undefined;
     asDefinitionResult(item: Definition): monaco.languages.Definition;
+    asDefinitionResult(item: DefinitionLink[]): monaco.languages.Definition;
     asDefinitionResult(item: undefined | null): undefined;
-    asDefinitionResult(item: Definition | undefined | null): monaco.languages.Definition | undefined;
+    asDefinitionResult(item: Definition | DefinitionLink[] | undefined | null): monaco.languages.Definition | undefined;
     asLocation(item: Location): monaco.languages.Location;
     asLocation(item: undefined | null): undefined;
     asLocation(item: Location | undefined | null): monaco.languages.Location | undefined;
+    asLocationLink(item: undefined | null): undefined;
+    asLocationLink(item: ls.LocationLink): monaco.languages.LocationLink;
     asSignatureHelpResult(item: undefined | null): undefined;
@@ -149,7 +161,7 @@ asSignatureHelpResult(item: SignatureHelp): monaco.languages.SignatureHelpResult;
     asCompletionResult(result: CompletionItem[] | CompletionList | null | undefined, defaultRange: monaco.IRange): monaco.languages.CompletionList;
-    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange): ProtocolCompletionItem;
+    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): ProtocolCompletionItem;
     asCompletionItemKind(value: CompletionItemKind): [monaco.languages.CompletionItemKind, CompletionItemKind | undefined];
-    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange): {
+    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): {
         insertText: string;
-        range: monaco.IRange;
+        range: monaco.IRange | RangeReplace;
         fromEdit: boolean;
@@ -185,2 +197,3 @@ isSnippet: boolean;
 }
+export {};
 //# sourceMappingURL=monaco-converter.d.ts.map

dist/amd/monaco-converter.js

@@ -25,2 +25,5 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-languageserver-protocol/lib/utils/is", "./services"], function (require, exports, ls, Is, services_1) {
     })(ProtocolCompletionItem = exports.ProtocolCompletionItem || (exports.ProtocolCompletionItem = {}));
+    function isRangeReplace(v) {
+        return v.insert !== undefined;
+    }
     class MonacoToProtocolConverter {
@@ -41,7 +44,12 @@ asPosition(lineNumber, column) {
             }
-            const start = this.asPosition(range.startLineNumber, range.startColumn);
-            const end = this.asPosition(range.endLineNumber, range.endColumn);
-            return {
-                start, end
-            };
+            if (isRangeReplace(range)) {
+                return this.asRange(range.insert);
+            }
+            else {
+                const start = this.asPosition(range.startLineNumber, range.startColumn);
+                const end = this.asPosition(range.endLineNumber, range.endColumn);
+                return {
+                    start, end
+                };
+            }
         }
@@ -536,3 +544,3 @@ asTextDocumentIdentifier(model) {
         asSymbolInformation(item, uri) {
-            const location = this.asLocation(uri ? Object.assign({}, item.location, { uri: uri.toString() }) : item.location);
+            const location = this.asLocation(uri ? Object.assign(Object.assign({}, item.location), { uri: uri.toString() }) : item.location);
             return {
@@ -588,3 +596,13 @@ name: item.name,
             if (Is.array(item)) {
-                return item.map((location) => this.asLocation(location));
+                if (item.length == 0) {
+                    return undefined;
+                }
+                else if (services_1.LocationLink.is(item[0])) {
+                    let links = item;
+                    return links.map((location) => this.asLocationLink(location));
+                }
+                else {
+                    let locations = item;
+                    return locations.map((location) => this.asLocation(location));
+                }
             }
@@ -605,2 +623,17 @@ else {
         }
+        asLocationLink(item) {
+            if (!item) {
+                return undefined;
+            }
+            let result = {
+                uri: monaco.Uri.parse(item.targetUri),
+                range: this.asRange(item.targetSelectionRange),
+                originSelectionRange: this.asRange(item.originSelectionRange),
+                targetSelectionRange: this.asRange(item.targetSelectionRange)
+            };
+            if (!result.targetSelectionRange) {
+                throw new Error(`targetSelectionRange must not be undefined or null`);
+            }
+            return result;
+        }
         asSignatureHelpResult(item) {
@@ -607,0 +640,0 @@ if (!item) {

dist/amd/monaco-diagnostic-collection.d.ts

@@ -24,4 +24,5 @@ /// <reference types="monaco-editor-core/monaco" />
     constructor(uri: string, diagnostics: Diagnostic[], owner: string, p2m: ProtocolToMonacoConverter);
-    diagnostics: Diagnostic[];
-    readonly markers: ReadonlyArray<IMarkerData>;
+    set diagnostics(diagnostics: Diagnostic[]);
+    get diagnostics(): Diagnostic[];
+    get markers(): ReadonlyArray<IMarkerData>;
     dispose(): void;
@@ -28,0 +29,0 @@ updateModelMarkers(): void;

dist/amd/monaco-language-client.d.ts

@@ -9,3 +9,3 @@ import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from "vscode-languageclient/lib/client";
     protected doCreateConnection(): Thenable<IConnection>;
-    protected createMessageTransports(encoding: string): Thenable<MessageTransports>;
+    protected createMessageTransports(encoding: string): Promise<MessageTransports>;
     protected registerBuiltinFeatures(): void;
@@ -12,0 +12,0 @@ }

dist/amd/monaco-language-client.js

@@ -81,5 +81,5 @@ define(["require", "exports", "vscode-languageclient/lib/client", "vscode-languageclient/lib/typeDefinition", "vscode-languageclient/lib/configuration", "vscode-languageclient/lib/implementation", "vscode-languageclient/lib/colorProvider", "vscode-languageclient/lib/workspaceFolders", "vscode-languageclient/lib/foldingRange", "vscode-languageclient/lib/declaration", "vscode-languageclient/lib/client"], function (require, exports, client_1, typeDefinition_1, configuration_1, implementation_1, colorProvider_1, workspaceFolders_1, foldingRange_1, declaration_1, client_2) {
     }
+    exports.MonacoLanguageClient = MonacoLanguageClient;
     MonacoLanguageClient.bypassConversion = (result) => result || undefined;
-    exports.MonacoLanguageClient = MonacoLanguageClient;
 });
 //# sourceMappingURL=monaco-language-client.js.map

dist/amd/monaco-languages.js

 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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -7,0 +8,0 @@ });

dist/amd/monaco-workspace.d.ts

@@ -14,3 +14,3 @@ /// <reference types="monaco-editor-core/monaco" />
     constructor(p2m: ProtocolToMonacoConverter, m2p: MonacoToProtocolConverter, _rootUri?: string | null);
-    readonly rootUri: string | null;
+    get rootUri(): string | null;
     protected removeModel(model: IModel): void;
@@ -20,8 +20,8 @@ protected addModel(model: IModel): void;
     protected setModel(uri: string, model: IModel): TextDocument;
-    readonly textDocuments: TextDocument[];
-    readonly onDidOpenTextDocument: Event<TextDocument>;
-    readonly onDidCloseTextDocument: Event<TextDocument>;
-    readonly onDidChangeTextDocument: Event<TextDocumentDidChangeEvent>;
+    get textDocuments(): TextDocument[];
+    get onDidOpenTextDocument(): Event<TextDocument>;
+    get onDidCloseTextDocument(): Event<TextDocument>;
+    get onDidChangeTextDocument(): Event<TextDocumentDidChangeEvent>;
     applyEdit(workspaceEdit: WorkspaceEdit): Promise<boolean>;
 }
 //# sourceMappingURL=monaco-workspace.d.ts.map

dist/amd/services.d.ts

@@ -34,2 +34,8 @@ import { DocumentSelector, MessageActionItem, MessageType, TextDocumentPositionParams, ReferenceParams, CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentRangeFormattingParams, DocumentOnTypeFormattingParams, RenameParams, DocumentLinkParams, WorkspaceClientCapabilities, DidChangeTextDocumentParams, Diagnostic, TextDocument, CompletionItem, CompletionList, Hover, SignatureHelp, Definition, Location, DocumentHighlight, SymbolInformation, Command, CodeLens, TextEdit, WorkspaceEdit, DocumentLink, TextDocumentSaveReason, DocumentSymbolParams, WorkspaceSymbolParams, TextDocumentContentChangeEvent, CompletionParams, ColorInformation, ColorPresentation, DocumentColorParams, ColorPresentationParams, FoldingRange, FoldingRangeRequestParam, DocumentSymbol, CodeAction, Declaration, SelectionRangeParams, SelectionRange } from 'vscode-languageserver-protocol';
 }
+export declare enum VsCodeDiagnosticSeverity {
+    Error = 0,
+    Warning = 1,
+    Information = 2,
+    Hint = 3
+}
 export interface SignatureHelpContext {
@@ -36,0 +42,0 @@ readonly triggerKind: SignatureHelpTriggerKind;

dist/amd/services.js

@@ -49,2 +49,10 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-jsonrpc", "vscode-languageserver-protocol/lib/main"], function (require, exports, vscode_languageserver_protocol_1, vscode_jsonrpc_1, main_1) {
     })(SignatureHelpTriggerKind = exports.SignatureHelpTriggerKind || (exports.SignatureHelpTriggerKind = {}));
+    // runtime support
+    var VsCodeDiagnosticSeverity;
+    (function (VsCodeDiagnosticSeverity) {
+        VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Error"] = 0] = "Error";
+        VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Warning"] = 1] = "Warning";
+        VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Information"] = 2] = "Information";
+        VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Hint"] = 3] = "Hint";
+    })(VsCodeDiagnosticSeverity = exports.VsCodeDiagnosticSeverity || (exports.VsCodeDiagnosticSeverity = {}));
     var DocumentIdentifier;
@@ -51,0 +59,0 @@ (function (DocumentIdentifier) {

dist/amd/vscode-api.js

@@ -6,10 +6,11 @@ /* --------------------------------------------------------------------------------------------
 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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        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", "vscode-uri", "./disposable", "./services"], function (require, exports, vscode, vscode_uri_1, disposable_1, services_1) {
+define(["require", "exports", "vscode", "vscode-uri", "./disposable", "./services", "./services"], function (require, exports, vscode, vscode_uri_1, disposable_1, services_1, ServicesModule) {
     "use strict";
@@ -61,3 +62,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
         CodeActionKind.SourceFixAll = CodeActionKind.Source.append('fixAll');
+        class EmptyFileSystem {
+            stat(uri) {
+                throw new Error("Method not implemented.");
+            }
+            readDirectory(uri) {
+                return Promise.resolve([]);
+            }
+            createDirectory(uri) {
+                return Promise.resolve();
+            }
+            readFile(uri) {
+                return Promise.resolve(new Uint8Array(0));
+            }
+            writeFile(uri, content) {
+                return Promise.resolve();
+            }
+            delete(uri, options) {
+                return Promise.resolve();
+            }
+            rename(source, target, options) {
+                return Promise.resolve();
+            }
+            copy(source, target, options) {
+                return Promise.resolve();
+            }
+        }
         const workspace = {
+            fs: new EmptyFileSystem(),
+            workspaceFile: undefined,
             createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents) {
@@ -188,2 +217,20 @@ const services = servicesProvider();
             },
+            get onWillCreateFiles() {
+                return services_1.Event.None;
+            },
+            get onDidCreateFiles() {
+                return services_1.Event.None;
+            },
+            get onWillDeleteFiles() {
+                return services_1.Event.None;
+            },
+            get onDidDeleteFiles() {
+                return services_1.Event.None;
+            },
+            get onWillRenameFiles() {
+                return services_1.Event.None;
+            },
+            get onDidRenameFiles() {
+                return services_1.Event.None;
+            },
             getWorkspaceFolder: unsupported,
@@ -201,2 +248,75 @@ asRelativePath: unsupported,
         };
+        function isVsCodeUri(v) {
+            return (v instanceof vscode_uri_1.default) !== undefined;
+        }
+        class ApiDiagnosticCollection {
+            constructor(name) {
+                this.name = name || 'default',
+                    this.services = servicesProvider();
+                this.collection = this.services.languages.createDiagnosticCollection
+                    ? this.services.languages.createDiagnosticCollection(name)
+                    : undefined;
+            }
+            entries() {
+            }
+            set(arg0, arg1) {
+                function toInternalSeverity(severity) {
+                    // there is a typing mismatch, trying to use the proper switch
+                    // mixes error with warnings etc...
+                    // just cast for now, this as the correct behaviour
+                    return severity;
+                    // we don't want to rely on the runtime vscode module here, so we use our version
+                    // of the enum
+                    /*
+                    switch ((severity as unknown) as VsCodeDiagnosticSeverity)
+                    {
+                        case VsCodeDiagnosticSeverity.Warning:
+                            return DiagnosticSeverity.Warning;
+                        case VsCodeDiagnosticSeverity.Information:
+                            return DiagnosticSeverity.Information;
+                        case VsCodeDiagnosticSeverity.Hint:
+                            return DiagnosticSeverity.Hint;
+                        case VsCodeDiagnosticSeverity.Error:
+                            return DiagnosticSeverity.Error;
+                    }
+                    return DiagnosticSeverity.Error;
+                    // */
+                }
+                if (isVsCodeUri(arg0)) {
+                    if (this.collection) {
+                        if (arg1) {
+                            this.collection.set(arg0.toString(), arg1.map(diag => {
+                                return {
+                                    range: diag.range,
+                                    code: diag.code,
+                                    source: diag.source,
+                                    message: diag.message,
+                                    tags: diag.tags,
+                                    relatedInformation: undefined,
+                                    severity: toInternalSeverity(diag.severity)
+                                };
+                            }));
+                        }
+                        else {
+                            this.collection.set(arg0.toString(), []);
+                        }
+                    }
+                }
+                else {
+                    arg0.forEach(element => {
+                        this.set(element[0], element[1]);
+                    });
+                }
+            }
+            dispose() {
+                if (this.collection) {
+                    this.collection.dispose();
+                }
+            }
+            delete(uri) { }
+            clear() { }
+            forEach(callback, thisArg) { }
+            get(uri) { return undefined; }
+            has(uri) { return false; }
+        }
         const languages = {
@@ -214,30 +334,12 @@ match(selector, document) {
             },
-            createDiagnosticCollection(name) {
-                const services = servicesProvider();
-                const collection = services.languages.createDiagnosticCollection ?
-                    services.languages.createDiagnosticCollection(name) : undefined;
+            registerCallHierarchyProvider(selector, provider) {
+                /* empty stub for now */
                 return {
-                    name: name || 'default',
-                    set(arg0, arg1) {
-                        if (collection) {
-                            if (arg1) {
-                                collection.set(arg0.toString(), arg1);
-                            }
-                            else {
-                                collection.set(arg0.toString(), []);
-                            }
-                        }
-                    },
                     dispose() {
-                        if (collection) {
-                            collection.dispose();
-                        }
-                    },
-                    delete: unsupported,
-                    clear: unsupported,
-                    forEach: unsupported,
-                    get: unsupported,
-                    has: unsupported
+                    }
                 };
             },
+            createDiagnosticCollection(name) {
+                return new ApiDiagnosticCollection(name);
+            },
             registerCompletionItemProvider(selector, provider, ...triggerCharacters) {
@@ -690,3 +792,5 @@ if (!services_1.isDocumentSelector(selector)) {
             CodeActionKind,
-            Disposable: CodeDisposable
+            Disposable: CodeDisposable,
+            SignatureHelpTriggerKind: services_1.SignatureHelpTriggerKind,
+            DiagnosticSeverity: ServicesModule.DiagnosticSeverity
         };
@@ -693,0 +797,0 @@ }

lib/monaco-converter.d.ts

 /// <reference types="monaco-editor-core/monaco" />
-import { CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentOnTypeFormattingParams, DocumentRangeFormattingParams, ReferenceParams, RenameParams, TextDocumentPositionParams, Position, TextDocumentIdentifier, CompletionItem, CompletionList, CompletionParams, CompletionContext, CompletionTriggerKind, Range, Diagnostic, CompletionItemKind, Hover, SignatureHelp, SignatureInformation, ParameterInformation, Definition, Location, DocumentHighlight, SymbolInformation, DocumentSymbolParams, CodeActionContext, DiagnosticSeverity, Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink, MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, DiagnosticRelatedInformation, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind } from './services';
+import * as ls from 'vscode-languageserver-protocol';
+import { CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentOnTypeFormattingParams, DocumentRangeFormattingParams, ReferenceParams, RenameParams, TextDocumentPositionParams, Position, TextDocumentIdentifier, CompletionItem, CompletionList, CompletionParams, CompletionContext, CompletionTriggerKind, Range, Diagnostic, CompletionItemKind, Hover, SignatureHelp, SignatureInformation, ParameterInformation, Definition, DefinitionLink, Location, DocumentHighlight, SymbolInformation, DocumentSymbolParams, CodeActionContext, DiagnosticSeverity, Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink, MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, DiagnosticRelatedInformation, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind } from './services';
 import IReadOnlyModel = monaco.editor.IReadOnlyModel;
@@ -29,2 +30,6 @@ export declare type RecursivePartial<T> = {
 }
+declare type RangeReplace = {
+    insert: monaco.IRange;
+    replace: monaco.IRange;
+};
 export declare class MonacoToProtocolConverter {
@@ -41,2 +46,6 @@ asPosition(lineNumber: undefined | null, column: undefined | null): {};
     asRange(range: monaco.IRange | null): Range | null;
+    asRange(range: monaco.IRange | {
+        insert: monaco.IRange;
+        replace: monaco.IRange;
+    }): Range;
     asRange(range: Partial<monaco.IRange>): RecursivePartial<Range>;
@@ -122,7 +131,10 @@ asRange(range: Partial<monaco.IRange> | undefined): RecursivePartial<Range> | undefined;
     asDefinitionResult(item: Definition): monaco.languages.Definition;
+    asDefinitionResult(item: DefinitionLink[]): monaco.languages.Definition;
     asDefinitionResult(item: undefined | null): undefined;
-    asDefinitionResult(item: Definition | undefined | null): monaco.languages.Definition | undefined;
+    asDefinitionResult(item: Definition | DefinitionLink[] | undefined | null): monaco.languages.Definition | undefined;
     asLocation(item: Location): monaco.languages.Location;
     asLocation(item: undefined | null): undefined;
     asLocation(item: Location | undefined | null): monaco.languages.Location | undefined;
+    asLocationLink(item: undefined | null): undefined;
+    asLocationLink(item: ls.LocationLink): monaco.languages.LocationLink;
     asSignatureHelpResult(item: undefined | null): undefined;
@@ -149,7 +161,7 @@ asSignatureHelpResult(item: SignatureHelp): monaco.languages.SignatureHelpResult;
     asCompletionResult(result: CompletionItem[] | CompletionList | null | undefined, defaultRange: monaco.IRange): monaco.languages.CompletionList;
-    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange): ProtocolCompletionItem;
+    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): ProtocolCompletionItem;
     asCompletionItemKind(value: CompletionItemKind): [monaco.languages.CompletionItemKind, CompletionItemKind | undefined];
-    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange): {
+    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): {
         insertText: string;
-        range: monaco.IRange;
+        range: monaco.IRange | RangeReplace;
         fromEdit: boolean;
@@ -185,2 +197,3 @@ isSnippet: boolean;
 }
+export {};
 //# sourceMappingURL=monaco-converter.d.ts.map

lib/monaco-converter.js

@@ -31,2 +31,5 @@ "use strict";
 })(ProtocolCompletionItem = exports.ProtocolCompletionItem || (exports.ProtocolCompletionItem = {}));
+function isRangeReplace(v) {
+    return v.insert !== undefined;
+}
 class MonacoToProtocolConverter {
@@ -47,7 +50,12 @@ asPosition(lineNumber, column) {
         }
-        const start = this.asPosition(range.startLineNumber, range.startColumn);
-        const end = this.asPosition(range.endLineNumber, range.endColumn);
-        return {
-            start, end
-        };
+        if (isRangeReplace(range)) {
+            return this.asRange(range.insert);
+        }
+        else {
+            const start = this.asPosition(range.startLineNumber, range.startColumn);
+            const end = this.asPosition(range.endLineNumber, range.endColumn);
+            return {
+                start, end
+            };
+        }
     }
@@ -542,3 +550,3 @@ asTextDocumentIdentifier(model) {
     asSymbolInformation(item, uri) {
-        const location = this.asLocation(uri ? Object.assign({}, item.location, { uri: uri.toString() }) : item.location);
+        const location = this.asLocation(uri ? Object.assign(Object.assign({}, item.location), { uri: uri.toString() }) : item.location);
         return {
@@ -594,3 +602,13 @@ name: item.name,
         if (Is.array(item)) {
-            return item.map((location) => this.asLocation(location));
+            if (item.length == 0) {
+                return undefined;
+            }
+            else if (services_1.LocationLink.is(item[0])) {
+                let links = item;
+                return links.map((location) => this.asLocationLink(location));
+            }
+            else {
+                let locations = item;
+                return locations.map((location) => this.asLocation(location));
+            }
         }
@@ -611,2 +629,17 @@ else {
     }
+    asLocationLink(item) {
+        if (!item) {
+            return undefined;
+        }
+        let result = {
+            uri: monaco.Uri.parse(item.targetUri),
+            range: this.asRange(item.targetSelectionRange),
+            originSelectionRange: this.asRange(item.originSelectionRange),
+            targetSelectionRange: this.asRange(item.targetSelectionRange)
+        };
+        if (!result.targetSelectionRange) {
+            throw new Error(`targetSelectionRange must not be undefined or null`);
+        }
+        return result;
+    }
     asSignatureHelpResult(item) {
@@ -613,0 +646,0 @@ if (!item) {

lib/monaco-diagnostic-collection.d.ts

@@ -24,4 +24,5 @@ /// <reference types="monaco-editor-core/monaco" />
     constructor(uri: string, diagnostics: Diagnostic[], owner: string, p2m: ProtocolToMonacoConverter);
-    diagnostics: Diagnostic[];
-    readonly markers: ReadonlyArray<IMarkerData>;
+    set diagnostics(diagnostics: Diagnostic[]);
+    get diagnostics(): Diagnostic[];
+    get markers(): ReadonlyArray<IMarkerData>;
     dispose(): void;
@@ -28,0 +29,0 @@ updateModelMarkers(): void;

lib/monaco-language-client.d.ts

@@ -9,3 +9,3 @@ import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from "vscode-languageclient/lib/client";
     protected doCreateConnection(): Thenable<IConnection>;
-    protected createMessageTransports(encoding: string): Thenable<MessageTransports>;
+    protected createMessageTransports(encoding: string): Promise<MessageTransports>;
     protected registerBuiltinFeatures(): void;
@@ -12,0 +12,0 @@ }

lib/monaco-language-client.js

@@ -92,4 +92,4 @@ "use strict";
 }
+exports.MonacoLanguageClient = MonacoLanguageClient;
 MonacoLanguageClient.bypassConversion = (result) => result || undefined;
-exports.MonacoLanguageClient = MonacoLanguageClient;
 //# sourceMappingURL=monaco-language-client.js.map

lib/monaco-languages.js

 "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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -8,0 +9,0 @@ });

lib/monaco-workspace.d.ts

@@ -14,3 +14,3 @@ /// <reference types="monaco-editor-core/monaco" />
     constructor(p2m: ProtocolToMonacoConverter, m2p: MonacoToProtocolConverter, _rootUri?: string | null);
-    readonly rootUri: string | null;
+    get rootUri(): string | null;
     protected removeModel(model: IModel): void;
@@ -20,8 +20,8 @@ protected addModel(model: IModel): void;
     protected setModel(uri: string, model: IModel): TextDocument;
-    readonly textDocuments: TextDocument[];
-    readonly onDidOpenTextDocument: Event<TextDocument>;
-    readonly onDidCloseTextDocument: Event<TextDocument>;
-    readonly onDidChangeTextDocument: Event<TextDocumentDidChangeEvent>;
+    get textDocuments(): TextDocument[];
+    get onDidOpenTextDocument(): Event<TextDocument>;
+    get onDidCloseTextDocument(): Event<TextDocument>;
+    get onDidChangeTextDocument(): Event<TextDocumentDidChangeEvent>;
     applyEdit(workspaceEdit: WorkspaceEdit): Promise<boolean>;
 }
 //# sourceMappingURL=monaco-workspace.d.ts.map

lib/services.d.ts

@@ -34,2 +34,8 @@ import { DocumentSelector, MessageActionItem, MessageType, TextDocumentPositionParams, ReferenceParams, CodeActionParams, CodeLensParams, DocumentFormattingParams, DocumentRangeFormattingParams, DocumentOnTypeFormattingParams, RenameParams, DocumentLinkParams, WorkspaceClientCapabilities, DidChangeTextDocumentParams, Diagnostic, TextDocument, CompletionItem, CompletionList, Hover, SignatureHelp, Definition, Location, DocumentHighlight, SymbolInformation, Command, CodeLens, TextEdit, WorkspaceEdit, DocumentLink, TextDocumentSaveReason, DocumentSymbolParams, WorkspaceSymbolParams, TextDocumentContentChangeEvent, CompletionParams, ColorInformation, ColorPresentation, DocumentColorParams, ColorPresentationParams, FoldingRange, FoldingRangeRequestParam, DocumentSymbol, CodeAction, Declaration, SelectionRangeParams, SelectionRange } from 'vscode-languageserver-protocol';
 }
+export declare enum VsCodeDiagnosticSeverity {
+    Error = 0,
+    Warning = 1,
+    Information = 2,
+    Hint = 3
+}
 export interface SignatureHelpContext {
@@ -36,0 +42,0 @@ readonly triggerKind: SignatureHelpTriggerKind;

lib/services.js

@@ -50,2 +50,10 @@ /* --------------------------------------------------------------------------------------------
 })(SignatureHelpTriggerKind = exports.SignatureHelpTriggerKind || (exports.SignatureHelpTriggerKind = {}));
+// runtime support
+var VsCodeDiagnosticSeverity;
+(function (VsCodeDiagnosticSeverity) {
+    VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Error"] = 0] = "Error";
+    VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Warning"] = 1] = "Warning";
+    VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Information"] = 2] = "Information";
+    VsCodeDiagnosticSeverity[VsCodeDiagnosticSeverity["Hint"] = 3] = "Hint";
+})(VsCodeDiagnosticSeverity = exports.VsCodeDiagnosticSeverity || (exports.VsCodeDiagnosticSeverity = {}));
 var DocumentIdentifier;
@@ -52,0 +60,0 @@ (function (DocumentIdentifier) {

lib/vscode-api.js

@@ -7,6 +7,7 @@ "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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -20,2 +21,3 @@ });
 const services_1 = require("./services");
+const ServicesModule = require("./services");
 function createVSCodeApi(servicesProvider) {
@@ -65,3 +67,31 @@ const unsupported = () => { throw new Error('unsupported'); };
     CodeActionKind.SourceFixAll = CodeActionKind.Source.append('fixAll');
+    class EmptyFileSystem {
+        stat(uri) {
+            throw new Error("Method not implemented.");
+        }
+        readDirectory(uri) {
+            return Promise.resolve([]);
+        }
+        createDirectory(uri) {
+            return Promise.resolve();
+        }
+        readFile(uri) {
+            return Promise.resolve(new Uint8Array(0));
+        }
+        writeFile(uri, content) {
+            return Promise.resolve();
+        }
+        delete(uri, options) {
+            return Promise.resolve();
+        }
+        rename(source, target, options) {
+            return Promise.resolve();
+        }
+        copy(source, target, options) {
+            return Promise.resolve();
+        }
+    }
     const workspace = {
+        fs: new EmptyFileSystem(),
+        workspaceFile: undefined,
         createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents) {
@@ -192,2 +222,20 @@ const services = servicesProvider();
         },
+        get onWillCreateFiles() {
+            return services_1.Event.None;
+        },
+        get onDidCreateFiles() {
+            return services_1.Event.None;
+        },
+        get onWillDeleteFiles() {
+            return services_1.Event.None;
+        },
+        get onDidDeleteFiles() {
+            return services_1.Event.None;
+        },
+        get onWillRenameFiles() {
+            return services_1.Event.None;
+        },
+        get onDidRenameFiles() {
+            return services_1.Event.None;
+        },
         getWorkspaceFolder: unsupported,
@@ -205,2 +253,75 @@ asRelativePath: unsupported,
     };
+    function isVsCodeUri(v) {
+        return (v instanceof vscode_uri_1.default) !== undefined;
+    }
+    class ApiDiagnosticCollection {
+        constructor(name) {
+            this.name = name || 'default',
+                this.services = servicesProvider();
+            this.collection = this.services.languages.createDiagnosticCollection
+                ? this.services.languages.createDiagnosticCollection(name)
+                : undefined;
+        }
+        entries() {
+        }
+        set(arg0, arg1) {
+            function toInternalSeverity(severity) {
+                // there is a typing mismatch, trying to use the proper switch
+                // mixes error with warnings etc...
+                // just cast for now, this as the correct behaviour
+                return severity;
+                // we don't want to rely on the runtime vscode module here, so we use our version
+                // of the enum
+                /*
+                switch ((severity as unknown) as VsCodeDiagnosticSeverity)
+                {
+                    case VsCodeDiagnosticSeverity.Warning:
+                        return DiagnosticSeverity.Warning;
+                    case VsCodeDiagnosticSeverity.Information:
+                        return DiagnosticSeverity.Information;
+                    case VsCodeDiagnosticSeverity.Hint:
+                        return DiagnosticSeverity.Hint;
+                    case VsCodeDiagnosticSeverity.Error:
+                        return DiagnosticSeverity.Error;
+                }
+                return DiagnosticSeverity.Error;
+                // */
+            }
+            if (isVsCodeUri(arg0)) {
+                if (this.collection) {
+                    if (arg1) {
+                        this.collection.set(arg0.toString(), arg1.map(diag => {
+                            return {
+                                range: diag.range,
+                                code: diag.code,
+                                source: diag.source,
+                                message: diag.message,
+                                tags: diag.tags,
+                                relatedInformation: undefined,
+                                severity: toInternalSeverity(diag.severity)
+                            };
+                        }));
+                    }
+                    else {
+                        this.collection.set(arg0.toString(), []);
+                    }
+                }
+            }
+            else {
+                arg0.forEach(element => {
+                    this.set(element[0], element[1]);
+                });
+            }
+        }
+        dispose() {
+            if (this.collection) {
+                this.collection.dispose();
+            }
+        }
+        delete(uri) { }
+        clear() { }
+        forEach(callback, thisArg) { }
+        get(uri) { return undefined; }
+        has(uri) { return false; }
+    }
     const languages = {
@@ -218,30 +339,12 @@ match(selector, document) {
         },
-        createDiagnosticCollection(name) {
-            const services = servicesProvider();
-            const collection = services.languages.createDiagnosticCollection ?
-                services.languages.createDiagnosticCollection(name) : undefined;
+        registerCallHierarchyProvider(selector, provider) {
+            /* empty stub for now */
             return {
-                name: name || 'default',
-                set(arg0, arg1) {
-                    if (collection) {
-                        if (arg1) {
-                            collection.set(arg0.toString(), arg1);
-                        }
-                        else {
-                            collection.set(arg0.toString(), []);
-                        }
-                    }
-                },
                 dispose() {
-                    if (collection) {
-                        collection.dispose();
-                    }
-                },
-                delete: unsupported,
-                clear: unsupported,
-                forEach: unsupported,
-                get: unsupported,
-                has: unsupported
+                }
             };
         },
+        createDiagnosticCollection(name) {
+            return new ApiDiagnosticCollection(name);
+        },
         registerCompletionItemProvider(selector, provider, ...triggerCharacters) {
@@ -694,3 +797,5 @@ if (!services_1.isDocumentSelector(selector)) {
         CodeActionKind,
-        Disposable: CodeDisposable
+        Disposable: CodeDisposable,
+        SignatureHelpTriggerKind: services_1.SignatureHelpTriggerKind,
+        DiagnosticSeverity: ServicesModule.DiagnosticSeverity
     };
@@ -697,0 +802,0 @@ }

package.json

 {
     "name": "monaco-languageclient",
-    "version": "0.11.0",
+    "version": "0.11.1-dev.4+6590ed7",
     "description": "Monaco Language client implementation",
@@ -8,3 +8,3 @@ "author": "TypeFox GmbH (http://www.typefox.io)",
     "engines": {
-        "vscode": "^1.33.0"
+        "vscode": "^1.41.0"
     },
@@ -22,5 +22,5 @@ "repository": {
         "glob-to-regexp": "^0.3.0",
-        "vscode-jsonrpc": "^4.1.0-next",
-        "vscode-languageclient": "^5.3.0-next",
-        "vscode-uri": "^1.0.5"
+        "vscode-jsonrpc": "^5.0.0",
+        "vscode-languageclient": "^6.0.0",
+        "vscode-uri": "^1.0.8"
     },
@@ -40,3 +40,3 @@ "scripts": {
     ],
-    "gitHead": "bc8b38c669fdcfa2fd3f60301ef03c4882f28f7f"
+    "gitHead": "6590ed7c7fb4af308e40aef252bc2cdad53a5c8f"
 }

src/monaco-converter.ts

@@ -16,3 +16,3 @@ /* --------------------------------------------------------------------------------------------
     Hover, SignatureHelp, SignatureInformation, ParameterInformation,
-    Definition, Location, DocumentHighlight, DocumentHighlightKind,
+    Definition, DefinitionLink, Location, LocationLink, DocumentHighlight, DocumentHighlightKind,
     SymbolInformation, DocumentSymbolParams, CodeActionContext, DiagnosticSeverity,
@@ -60,2 +60,8 @@ Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink,
 
+type RangeReplace = { insert: monaco.IRange; replace: monaco.IRange}
+
+function isRangeReplace(v: Partial<monaco.IRange> | RangeReplace) : v is RangeReplace {
+    return (v as RangeReplace).insert !== undefined;
+}
+
 export class MonacoToProtocolConverter {
@@ -80,6 +86,7 @@ asPosition(lineNumber: undefined | null, column: undefined | null): {};
     asRange(range: monaco.IRange | null): Range | null;
+    asRange(range: monaco.IRange | { insert: monaco.IRange; replace: monaco.IRange}) : Range;
     asRange(range: Partial<monaco.IRange>): RecursivePartial<Range>;
     asRange(range: Partial<monaco.IRange> | undefined): RecursivePartial<Range> | undefined;
     asRange(range: Partial<monaco.IRange> | null): RecursivePartial<Range> | null;
-    asRange(range: Partial<monaco.IRange> | undefined | null): RecursivePartial<Range> | undefined | null {
+    asRange(range: Partial<monaco.IRange> | undefined | null | RangeReplace): RecursivePartial<Range> | undefined | null {
         if (range === undefined) {
@@ -91,7 +98,13 @@ return undefined;
         }
-        const start = this.asPosition(range.startLineNumber, range.startColumn);
-        const end = this.asPosition(range.endLineNumber, range.endColumn);
-        return {
-            start, end
-        };
+
+        if (isRangeReplace(range)) {
+            return this.asRange(range.insert);
+
+        } else {
+            const start = this.asPosition(range.startLineNumber, range.startColumn);
+            const end = this.asPosition(range.endLineNumber, range.endColumn);
+            return {
+                start, end
+            };
+        }
     }
@@ -686,5 +699,6 @@
     asDefinitionResult(item: Definition): monaco.languages.Definition;
+    asDefinitionResult(item: DefinitionLink[]): monaco.languages.Definition;
     asDefinitionResult(item: undefined | null): undefined;
-    asDefinitionResult(item: Definition | undefined | null): monaco.languages.Definition | undefined;
-    asDefinitionResult(item: Definition | undefined | null): monaco.languages.Definition | undefined {
+    asDefinitionResult(item: Definition | DefinitionLink[] | undefined | null): monaco.languages.Definition | undefined;
+    asDefinitionResult(item: Definition | DefinitionLink[] | undefined | null): monaco.languages.Definition | undefined {
         if (!item) {
@@ -694,3 +708,11 @@ return undefined;
         if (Is.array(item)) {
-            return item.map((location) => this.asLocation(location));
+            if (item.length == 0) {
+                return undefined;
+            } else if (LocationLink.is(item[0])) {
+                let links: LocationLink[] = item as LocationLink[];
+                return links.map((location) => this.asLocationLink(location));
+            } else {
+                let locations: Location[] = item as Location[];
+                return locations.map((location) => this.asLocation(location));
+            }
         } else {
@@ -715,2 +737,20 @@ return this.asLocation(item);
 
+    asLocationLink(item: undefined | null): undefined;
+	asLocationLink(item: ls.LocationLink): monaco.languages.LocationLink;
+	asLocationLink(item: ls.LocationLink | undefined | null): monaco.languages.LocationLink | undefined {
+		if (!item) {
+			return undefined;
+		}
+		let result: monaco.languages.LocationLink = {
+			uri: monaco.Uri.parse(item.targetUri),
+			range: this.asRange(item.targetSelectionRange)!, // See issue: https://github.com/Microsoft/vscode/issues/58649
+			originSelectionRange: this.asRange(item.originSelectionRange),
+			targetSelectionRange: this.asRange(item.targetSelectionRange)
+		};
+		if (!result.targetSelectionRange) {
+			throw new Error(`targetSelectionRange must not be undefined or null`);
+		}
+		return result;
+	}
+
     asSignatureHelpResult(item: undefined | null): undefined;
@@ -892,3 +932,3 @@ asSignatureHelpResult(item: SignatureHelp): monaco.languages.SignatureHelpResult;
 
-    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange): ProtocolCompletionItem {
+    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): ProtocolCompletionItem {
         const result = <ProtocolCompletionItem>{ label: item.label };
@@ -963,3 +1003,4 @@ if (item.detail) { result.detail = item.detail; }
 
-    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange): { insertText: string, range: monaco.IRange, fromEdit: boolean, isSnippet: boolean } {
+    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace)
+        : { insertText: string, range: monaco.IRange | RangeReplace, fromEdit: boolean, isSnippet: boolean } {
         const isSnippet = item.insertTextFormat === InsertTextFormat.Snippet;
@@ -966,0 +1007,0 @@ if (item.textEdit) {

src/monaco-language-client.ts

@@ -82,3 +82,3 @@ /* --------------------------------------------------------------------------------------------
 
-    protected createMessageTransports(encoding: string): Thenable<MessageTransports> {
+    protected createMessageTransports(encoding: string): Promise<MessageTransports> {
         throw new Error('Unsupported');
@@ -85,0 +85,0 @@ }

src/services.ts

@@ -87,2 +87,10 @@ /* --------------------------------------------------------------------------------------------
 
+// runtime support
+export enum VsCodeDiagnosticSeverity {
+    Error = 0,
+    Warning = 1,
+    Information = 2,
+    Hint = 3
+}
+
 export interface SignatureHelpContext {
@@ -89,0 +97,0 @@ readonly triggerKind: SignatureHelpTriggerKind;

src/vscode-api.ts

@@ -10,5 +10,8 @@ /* --------------------------------------------------------------------------------------------
 import {
-    Services, Event, Diagnostic, WorkspaceEdit, isDocumentSelector,
-    MessageType, OutputChannel, CompletionTriggerKind, DocumentIdentifier
+    Services, Event, DiagnosticCollection, WorkspaceEdit, isDocumentSelector,
+    MessageType, OutputChannel, CompletionTriggerKind, DocumentIdentifier,
+    SignatureHelpTriggerKind
 } from "./services";
+import * as ServicesModule from "./services"
+import { DiagnosticSeverity } from "vscode-languageserver-protocol";
 
@@ -53,3 +56,39 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vscode {
     }
+
+    class EmptyFileSystem implements vscode.FileSystem {
+        stat(uri: vscode.Uri): Thenable<vscode.FileStat> {
+            throw new Error("Method not implemented.");
+        }
+        readDirectory(uri: vscode.Uri): Thenable<[string, vscode.FileType][]> {
+            return Promise.resolve([]);
+        }
+        createDirectory(uri: vscode.Uri): Thenable<void> {
+            return Promise.resolve();
+        }
+        readFile(uri: vscode.Uri): Thenable<Uint8Array> {
+            return Promise.resolve(new Uint8Array(0));
+        }
+        writeFile(uri: vscode.Uri, content: Uint8Array): Thenable<void> {
+            return Promise.resolve();
+        }
+        delete(uri: vscode.Uri,
+               options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable<void> {
+            return Promise.resolve();
+        }
+        rename(source: vscode.Uri,
+               target: vscode.Uri,
+               options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
+            return Promise.resolve();
+        }
+
+        copy(source: vscode.Uri,
+            target: vscode.Uri,
+            options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
+            return Promise.resolve();
+        }
+    }
+
     const workspace: typeof vscode.workspace = {
+        fs: new EmptyFileSystem(),
+        workspaceFile: undefined,
         createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents): vscode.FileSystemWatcher {
@@ -180,2 +219,27 @@ const services = servicesProvider();
         },
+
+        get onWillCreateFiles() : vscode.Event<vscode.FileWillCreateEvent> {
+            return Event.None;
+        },
+
+        get onDidCreateFiles() : vscode.Event<vscode.FileCreateEvent> {
+            return Event.None;
+        },
+
+        get onWillDeleteFiles() : vscode.Event<vscode.FileWillDeleteEvent> {
+            return Event.None;
+        },
+
+        get onDidDeleteFiles() : vscode.Event<vscode.FileDeleteEvent> {
+            return Event.None;
+        },
+
+        get onWillRenameFiles() : vscode.Event<vscode.FileWillRenameEvent> {
+            return Event.None;
+        },
+
+        get onDidRenameFiles() : vscode.Event<vscode.FileRenameEvent> {
+            return Event.None
+        },
+
         getWorkspaceFolder: unsupported,
@@ -193,2 +257,90 @@ asRelativePath: unsupported,
     };
+
+    function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>) : v is vscode.Uri {
+        return (v instanceof URI) !== undefined;
+    }
+
+    class ApiDiagnosticCollection implements vscode.DiagnosticCollection {
+        readonly name: string;
+        private readonly services : Services;
+        private readonly collection : DiagnosticCollection | undefined;
+
+        constructor(name?: string) {
+            this.name = name || 'default',
+            this.services = servicesProvider();
+            this.collection = this.services.languages.createDiagnosticCollection
+                ? this.services.languages.createDiagnosticCollection(name)
+                : undefined;
+        }
+
+        entries() {
+        }
+
+		set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): void;
+        set(uri: vscode.Uri, arg1: ReadonlyArray<vscode.Diagnostic> | undefined): void;
+        set(arg0: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>,
+            arg1?: ReadonlyArray<vscode.Diagnostic>): void {
+
+            function toInternalSeverity(severity: vscode.DiagnosticSeverity) : DiagnosticSeverity {
+                // there is a typing mismatch, trying to use the proper switch
+                // mixes error with warnings etc...
+                // just cast for now, this as the correct behaviour
+                return severity as DiagnosticSeverity;
+                // we don't want to rely on the runtime vscode module here, so we use our version
+                // of the enum
+                /*
+                switch ((severity as unknown) as VsCodeDiagnosticSeverity)
+                {
+                    case VsCodeDiagnosticSeverity.Warning:
+                        return DiagnosticSeverity.Warning;
+                    case VsCodeDiagnosticSeverity.Information:
+                        return DiagnosticSeverity.Information;
+                    case VsCodeDiagnosticSeverity.Hint:
+                        return DiagnosticSeverity.Hint;
+                    case VsCodeDiagnosticSeverity.Error:
+                        return DiagnosticSeverity.Error;
+                }
+                return DiagnosticSeverity.Error;
+                // */
+            }
+
+            if (isVsCodeUri(arg0)) {
+                if (this.collection) {
+                    if (arg1) {
+                        this.collection.set(arg0.toString(), arg1.map(diag =>
+                        {
+                            return {
+                                range: diag.range,
+                                code: diag.code,
+                                source: diag.source,
+                                message: diag.message,
+                                tags: diag.tags,
+                                relatedInformation: undefined,
+                                severity: toInternalSeverity(diag.severity)
+                            }; 
+                        }));
+                    } else {
+                        this.collection.set(arg0.toString(), []);
+                    }
+                }
+            } else {
+                arg0.forEach(element => {
+                    this.set(element[0], element[1]);
+                });
+            }
+        }
+
+        dispose(): void {
+            if (this.collection) {
+                this.collection.dispose();
+            }
+        }
+
+        delete(uri : vscode.Uri) {}
+        clear() {}
+        forEach(callback: any, thisArg?: any) {}
+        get(uri : vscode.Uri) { return undefined; }
+        has(uri : vscode.Uri) { return false; }
+    }
+
     const languages: typeof vscode.languages = {
@@ -206,29 +358,15 @@ match(selector, document): number {
         },
-        createDiagnosticCollection(name?: string): vscode.DiagnosticCollection {
-            const services = servicesProvider();
-            const collection = services.languages.createDiagnosticCollection ?
-                services.languages.createDiagnosticCollection(name) : undefined;
+		registerCallHierarchyProvider(
+            selector: vscode.DocumentSelector,
+            provider: vscode.CallHierarchyProvider): vscode.Disposable {
+
+            /* empty stub for now */
             return {
-                name: name || 'default',
-                set(arg0: vscode.Uri | [vscode.Uri, vscode.Diagnostic[] | undefined][], arg1?: vscode.Diagnostic[] | undefined): void {
-                    if (collection) {
-                        if (arg1) {
-                            collection.set(arg0.toString(), arg1 as Diagnostic[]);
-                        } else {
-                            collection.set(arg0.toString(), []);
-                        }
-                    }
-                },
                 dispose(): void {
-                    if (collection) {
-                        collection.dispose();
-                    }
-                },
-                delete: unsupported,
-                clear: unsupported,
-                forEach: unsupported,
-                get: unsupported,
-                has: unsupported
+                }
             }
         },
+        createDiagnosticCollection(name?: string): vscode.DiagnosticCollection {
+            return new ApiDiagnosticCollection(name);
+        },
         registerCompletionItemProvider(selector, provider, ...triggerCharacters) {
@@ -678,4 +816,6 @@ if (!isDocumentSelector(selector)) {
         CodeActionKind,
-        Disposable: CodeDisposable
+        Disposable: CodeDisposable,
+        SignatureHelpTriggerKind: SignatureHelpTriggerKind,
+        DiagnosticSeverity: ServicesModule.DiagnosticSeverity 
     } as any;
 }

New alerts

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

782028

increased by3.75%

Lines of code

10138

increased by5.13%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addedvscode-jsonrpc@5.0.1(transitive)

• + Addedvscode-languageclient@6.1.4(transitive)

• + Addedvscode-languageserver-protocol@3.15.3(transitive)

• + Addedvscode-languageserver-types@3.15.1(transitive)

• - Removedvscode-jsonrpc@4.1.0-next.38.2.0(transitive)

• - Removedvscode-languageclient@5.3.0-next.9(transitive)

• - Removedvscode-languageserver-protocol@3.17.5(transitive)

• - Removedvscode-languageserver-types@3.17.5(transitive)

• Updatedvscode-jsonrpc@^5.0.0

• Updatedvscode-languageclient@^6.0.0

• Updatedvscode-uri@^1.0.8