monaco-languageclient 0.12.0 → 0.13.0-next.10

package/dist/amd/monaco-converter.js

@@ -1,6 +1,7 @@
-define(["require", "exports", "vscode-languageserver-protocol", "vscode-languageserver-protocol/lib/utils/is", "./services"], function (require, exports, ls, Is, services_1) {
+define(["require", "exports", "vscode-languageserver-protocol", "vscode-languageserver-protocol/lib/common/utils/is", "./services"], function (require, exports, ls, Is, services_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.ProtocolToMonacoConverter = exports.MonacoToProtocolConverter = exports.ProtocolCodeAction = exports.ProtocolCompletionItem = exports.ProtocolCodeLens = exports.ProtocolDocumentLink = void 0;
     var ProtocolDocumentLink;
     (function (ProtocolDocumentLink) {
         function is(item) {
@@ -22,10 +23,20 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         ProtocolCompletionItem.is = is;
     })(ProtocolCompletionItem = exports.ProtocolCompletionItem || (exports.ProtocolCompletionItem = {}));
+    var ProtocolCodeAction;
+    (function (ProtocolCodeAction) {
+        function is(item) {
+            return !!item && 'data' in item;
+        }
+        ProtocolCodeAction.is = is;
+    })(ProtocolCodeAction = exports.ProtocolCodeAction || (exports.ProtocolCodeAction = {}));
     function isRangeReplace(v) {
         return v.insert !== undefined;
     }
     class MonacoToProtocolConverter {
+        constructor(_monaco) {
+            this._monaco = _monaco;
+        }
         asPosition(lineNumber, column) {
             const line = lineNumber === undefined || lineNumber === null ? undefined : lineNumber - 1;
             const character = column === undefined || column === null ? undefined : column - 1;
@@ -95,7 +106,8 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             return {
                 documentation: this.asMarkupContent(signatureInformation.documentation),
                 label: signatureInformation.label,
-                parameters: signatureInformation.parameters.map(paramInfo => this.asParameterInformation(paramInfo))
+                parameters: signatureInformation.parameters.map(paramInfo => this.asParameterInformation(paramInfo)),
+                activeParameter: signatureInformation.activeParameter
             };
         }
         asParameterInformation(parameterInformation) {
@@ -118,9 +130,9 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         asSignatureHelpTriggerKind(triggerKind) {
             switch (triggerKind) {
-                case monaco.languages.SignatureHelpTriggerKind.ContentChange:
+                case this._monaco.languages.SignatureHelpTriggerKind.ContentChange:
                     return services_1.SignatureHelpTriggerKind.ContentChange;
-                case monaco.languages.SignatureHelpTriggerKind.TriggerCharacter:
+                case this._monaco.languages.SignatureHelpTriggerKind.TriggerCharacter:
                     return services_1.SignatureHelpTriggerKind.TriggerCharacter;
                 default:
                     return services_1.SignatureHelpTriggerKind.Invoke;
@@ -128,28 +140,27 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         asCompletionTriggerKind(triggerKind) {
             switch (triggerKind) {
-                case monaco.languages.CompletionTriggerKind.TriggerCharacter:
+                case this._monaco.languages.CompletionTriggerKind.TriggerCharacter:
                     return services_1.CompletionTriggerKind.TriggerCharacter;
-                case monaco.languages.CompletionTriggerKind.TriggerForIncompleteCompletions:
+                case this._monaco.languages.CompletionTriggerKind.TriggerForIncompleteCompletions:
                     return services_1.CompletionTriggerKind.TriggerForIncompleteCompletions;
                 default:
                     return services_1.CompletionTriggerKind.Invoked;
             }
         }
         asCompletionItem(item) {
+            var _a;
             const result = { label: item.label };
             const protocolItem = ProtocolCompletionItem.is(item) ? item : undefined;
             if (item.detail) {
                 result.detail = item.detail;
             }
-            // We only send items back we created. So this can't be something else than
-            // a string right now.
             if (item.documentation) {
-                if (!protocolItem || !protocolItem.documentationFormat) {
+                if (typeof item.documentation === 'string') {
                     result.documentation = item.documentation;
                 }
                 else {
-                    result.documentation = this.asDocumentation(protocolItem.documentationFormat, item.documentation);
+                    result.documentation = this.asDocumentation((_a = protocolItem === null || protocolItem === void 0 ? void 0 : protocolItem.documentationFormat) !== null && _a !== void 0 ? _a : services_1.MarkupKind.Markdown, item.documentation);
                 }
             }
             if (item.filterText) {
@@ -190,32 +201,32 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                 return original;
             }
             switch (value) {
-                case monaco.languages.CompletionItemKind.Method: return services_1.CompletionItemKind.Method;
-                case monaco.languages.CompletionItemKind.Function: return services_1.CompletionItemKind.Function;
-                case monaco.languages.CompletionItemKind.Constructor: return services_1.CompletionItemKind.Constructor;
-                case monaco.languages.CompletionItemKind.Field: return services_1.CompletionItemKind.Field;
-                case monaco.languages.CompletionItemKind.Variable: return services_1.CompletionItemKind.Variable;
-                case monaco.languages.CompletionItemKind.Class: return services_1.CompletionItemKind.Class;
-                case monaco.languages.CompletionItemKind.Struct: return services_1.CompletionItemKind.Struct;
-                case monaco.languages.CompletionItemKind.Interface: return services_1.CompletionItemKind.Interface;
-                case monaco.languages.CompletionItemKind.Module: return services_1.CompletionItemKind.Module;
-                case monaco.languages.CompletionItemKind.Property: return services_1.CompletionItemKind.Property;
-                case monaco.languages.CompletionItemKind.Event: return services_1.CompletionItemKind.Event;
-                case monaco.languages.CompletionItemKind.Operator: return services_1.CompletionItemKind.Operator;
-                case monaco.languages.CompletionItemKind.Unit: return services_1.CompletionItemKind.Unit;
-                case monaco.languages.CompletionItemKind.Value: return services_1.CompletionItemKind.Value;
-                case monaco.languages.CompletionItemKind.Constant: return services_1.CompletionItemKind.Constant;
-                case monaco.languages.CompletionItemKind.Enum: return services_1.CompletionItemKind.Enum;
-                case monaco.languages.CompletionItemKind.EnumMember: return services_1.CompletionItemKind.EnumMember;
-                case monaco.languages.CompletionItemKind.Keyword: return services_1.CompletionItemKind.Keyword;
-                case monaco.languages.CompletionItemKind.Text: return services_1.CompletionItemKind.Text;
-                case monaco.languages.CompletionItemKind.Color: return services_1.CompletionItemKind.Color;
-                case monaco.languages.CompletionItemKind.File: return services_1.CompletionItemKind.File;
-                case monaco.languages.CompletionItemKind.Reference: return services_1.CompletionItemKind.Reference;
-                case monaco.languages.CompletionItemKind.Customcolor: return services_1.CompletionItemKind.Color;
-                case monaco.languages.CompletionItemKind.Folder: return services_1.CompletionItemKind.Folder;
-                case monaco.languages.CompletionItemKind.TypeParameter: return services_1.CompletionItemKind.TypeParameter;
-                case monaco.languages.CompletionItemKind.Snippet: return services_1.CompletionItemKind.Snippet;
+                case this._monaco.languages.CompletionItemKind.Method: return services_1.CompletionItemKind.Method;
+                case this._monaco.languages.CompletionItemKind.Function: return services_1.CompletionItemKind.Function;
+                case this._monaco.languages.CompletionItemKind.Constructor: return services_1.CompletionItemKind.Constructor;
+                case this._monaco.languages.CompletionItemKind.Field: return services_1.CompletionItemKind.Field;
+                case this._monaco.languages.CompletionItemKind.Variable: return services_1.CompletionItemKind.Variable;
+                case this._monaco.languages.CompletionItemKind.Class: return services_1.CompletionItemKind.Class;
+                case this._monaco.languages.CompletionItemKind.Struct: return services_1.CompletionItemKind.Struct;
+                case this._monaco.languages.CompletionItemKind.Interface: return services_1.CompletionItemKind.Interface;
+                case this._monaco.languages.CompletionItemKind.Module: return services_1.CompletionItemKind.Module;
+                case this._monaco.languages.CompletionItemKind.Property: return services_1.CompletionItemKind.Property;
+                case this._monaco.languages.CompletionItemKind.Event: return services_1.CompletionItemKind.Event;
+                case this._monaco.languages.CompletionItemKind.Operator: return services_1.CompletionItemKind.Operator;
+                case this._monaco.languages.CompletionItemKind.Unit: return services_1.CompletionItemKind.Unit;
+                case this._monaco.languages.CompletionItemKind.Value: return services_1.CompletionItemKind.Value;
+                case this._monaco.languages.CompletionItemKind.Constant: return services_1.CompletionItemKind.Constant;
+                case this._monaco.languages.CompletionItemKind.Enum: return services_1.CompletionItemKind.Enum;
+                case this._monaco.languages.CompletionItemKind.EnumMember: return services_1.CompletionItemKind.EnumMember;
+                case this._monaco.languages.CompletionItemKind.Keyword: return services_1.CompletionItemKind.Keyword;
+                case this._monaco.languages.CompletionItemKind.Text: return services_1.CompletionItemKind.Text;
+                case this._monaco.languages.CompletionItemKind.Color: return services_1.CompletionItemKind.Color;
+                case this._monaco.languages.CompletionItemKind.File: return services_1.CompletionItemKind.File;
+                case this._monaco.languages.CompletionItemKind.Reference: return services_1.CompletionItemKind.Reference;
+                case this._monaco.languages.CompletionItemKind.Customcolor: return services_1.CompletionItemKind.Color;
+                case this._monaco.languages.CompletionItemKind.Folder: return services_1.CompletionItemKind.Folder;
+                case this._monaco.languages.CompletionItemKind.TypeParameter: return services_1.CompletionItemKind.TypeParameter;
+                case this._monaco.languages.CompletionItemKind.Snippet: return services_1.CompletionItemKind.Snippet;
                 default: return value + 1;
             }
         }
@@ -233,7 +244,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             let format = services_1.InsertTextFormat.PlainText;
             let text;
             let range;
-            if (source.insertTextRules !== undefined && (source.insertTextRules & monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet) === 0) {
+            if (source.insertTextRules !== undefined && (source.insertTextRules & this._monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet) === 0) {
                 format = services_1.InsertTextFormat.Snippet;
                 text = source.insertText;
             }
@@ -249,6 +260,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             else {
                 target.insertText = text;
             }
+            target.insertTextMode = source.insertTextMode;
         }
         asTextEdit(edit) {
             const range = this.asRange(edit.range);
@@ -282,19 +294,19 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         asDiagnosticSeverity(value) {
             switch (value) {
-                case monaco.MarkerSeverity.Error:
+                case this._monaco.MarkerSeverity.Error:
                     return services_1.DiagnosticSeverity.Error;
-                case monaco.MarkerSeverity.Warning:
+                case this._monaco.MarkerSeverity.Warning:
                     return services_1.DiagnosticSeverity.Warning;
-                case monaco.MarkerSeverity.Info:
+                case this._monaco.MarkerSeverity.Info:
                     return services_1.DiagnosticSeverity.Information;
-                case monaco.MarkerSeverity.Hint:
+                case this._monaco.MarkerSeverity.Hint:
                     return services_1.DiagnosticSeverity.Hint;
             }
             return undefined;
         }
         asDiagnostic(marker) {
-            const range = this.asRange(new monaco.Range(marker.startLineNumber, marker.startColumn, marker.endLineNumber, marker.endColumn));
+            const range = this.asRange(new this._monaco.Range(marker.startLineNumber, marker.startColumn, marker.endLineNumber, marker.endColumn));
             const severity = this.asDiagnosticSeverity(marker.severity);
             return services_1.Diagnostic.create(range, marker.message, severity, marker.code, marker.source);
         }
@@ -382,48 +394,108 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             if (ProtocolDocumentLink.is(item) && item.data) {
                 result.data = item.data;
             }
+            if (item.tooltip) {
+                result.tooltip = item.tooltip;
+            }
+            return result;
+        }
+        asCodeAction(item) {
+            const result = { title: item.title };
+            const protocolCodeAction = ProtocolCodeAction.is(item) ? item : undefined;
+            if (Is.number(item.kind)) {
+                result.kind = item.kind;
+            }
+            if (item.diagnostics) {
+                result.diagnostics = this.asDiagnostics(item.diagnostics);
+            }
+            if (item.edit) {
+                throw new Error(`VS Code code actions can only be converted to a protocol code action without an edit.`);
+            }
+            if (item.command) {
+                result.command = this.asCommand(item.command);
+            }
+            if (item.isPreferred !== undefined) {
+                result.isPreferred = item.isPreferred;
+            }
+            if (item.disabled) {
+                result.disabled = { reason: item.disabled };
+            }
+            if (protocolCodeAction) {
+                if (protocolCodeAction.data !== undefined) {
+                    result.data = protocolCodeAction.data;
+                }
+            }
             return result;
         }
     }
     exports.MonacoToProtocolConverter = MonacoToProtocolConverter;
     class ProtocolToMonacoConverter {
-        asResourceEdits(resource, edits, modelVersionId) {
-            return {
+        constructor(_monaco) {
+            this._monaco = _monaco;
+        }
+        asResourceEdits(resource, edits, asMetadata, modelVersionId) {
+            return edits.map(edit => ({
                 resource: resource,
-                edits: this.asTextEdits(edits),
-                modelVersionId
+                edit: this.asTextEdit(edit),
+                modelVersionId,
+                metadata: services_1.AnnotatedTextEdit.is(edit) ? asMetadata(edit.annotationId) : undefined
+            }));
+        }
+        asWorkspaceEditMetadata(changeAnnotation) {
+            return {
+                needsConfirmation: changeAnnotation.needsConfirmation === true,
+                label: changeAnnotation.label,
+                description: changeAnnotation.description
             };
         }
         asWorkspaceEdit(item) {
             if (!item) {
                 return undefined;
             }
+            const sharedMetadata = new Map();
+            if (item.changeAnnotations !== undefined) {
+                for (const key of Object.keys(item.changeAnnotations)) {
+                    const metaData = this.asWorkspaceEditMetadata(item.changeAnnotations[key]);
+                    sharedMetadata.set(key, metaData);
+                }
+            }
+            const asMetadata = (annotation) => {
+                if (annotation === undefined) {
+                    return undefined;
+                }
+                else {
+                    return sharedMetadata.get(annotation);
+                }
+            };
             const edits = [];
             if (item.documentChanges) {
                 item.documentChanges.forEach(change => {
                     if (ls.CreateFile.is(change)) {
                         edits.push({
-                            newUri: monaco.Uri.parse(change.uri),
-                            options: change.options
+                            newUri: this._monaco.Uri.parse(change.uri),
+                            options: change.options,
+                            metadata: asMetadata(change.annotationId)
                         });
                     }
                     else if (ls.RenameFile.is(change)) {
                         edits.push({
-                            oldUri: monaco.Uri.parse(change.oldUri),
-                            newUri: monaco.Uri.parse(change.newUri),
-                            options: change.options
+                            oldUri: this._monaco.Uri.parse(change.oldUri),
+                            newUri: this._monaco.Uri.parse(change.newUri),
+                            options: change.options,
+                            metadata: asMetadata(change.annotationId)
                         });
                     }
                     else if (ls.DeleteFile.is(change)) {
                         edits.push({
-                            oldUri: monaco.Uri.parse(change.uri),
-                            options: change.options
+                            oldUri: this._monaco.Uri.parse(change.uri),
+                            options: change.options,
+                            metadata: asMetadata(change.annotationId)
                         });
                     }
                     else if (ls.TextDocumentEdit.is(change)) {
-                        const resource = monaco.Uri.parse(change.textDocument.uri);
+                        const resource = this._monaco.Uri.parse(change.textDocument.uri);
                         const version = typeof change.textDocument.version === 'number' ? change.textDocument.version : undefined;
-                        edits.push(this.asResourceEdits(resource, change.edits, version));
+                        edits.push(...this.asResourceEdits(resource, change.edits, asMetadata, version));
                     }
                     else {
                         console.error(`Unknown workspace edit change received:\n${JSON.stringify(change, undefined, 4)}`);
@@ -432,8 +504,8 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             }
             else if (item.changes) {
                 for (const key of Object.keys(item.changes)) {
-                    const resource = monaco.Uri.parse(key);
-                    edits.push(this.asResourceEdits(resource, item.changes[key]));
+                    const resource = this._monaco.Uri.parse(key);
+                    edits.push(...this.asResourceEdits(resource, item.changes[key], asMetadata));
                 }
             }
             return {
@@ -492,7 +564,10 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                     command: this.asCommand(item.command),
                     edit: this.asWorkspaceEdit(item.edit),
                     diagnostics: this.asDiagnostics(item.diagnostics),
-                    kind: item.kind
+                    kind: item.kind,
+                    disabled: item.disabled ? item.disabled.reason : undefined,
+                    isPreferred: item.isPreferred,
+                    data: item.data
                 };
             }
             return {
@@ -520,7 +595,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                 name: value.name,
                 detail: value.detail || "",
                 kind: this.asSymbolKind(value.kind),
-                tags: [],
+                tags: value.tags || [],
                 range: this.asRange(value.range),
                 selectionRange: this.asRange(value.selectionRange),
                 children
@@ -545,7 +620,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                 detail: '',
                 containerName: item.containerName,
                 kind: this.asSymbolKind(item.kind),
-                tags: [],
+                tags: item.tags || [],
                 range: location.range,
                 selectionRange: location.range
             };
@@ -555,7 +630,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                 // Symbol kind is one based in the protocol and zero based in code.
                 return item - 1;
             }
-            return monaco.languages.SymbolKind.Property;
+            return this._monaco.languages.SymbolKind.Property;
         }
         asDocumentHighlights(values) {
             if (!values) {
@@ -571,13 +646,13 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         asDocumentHighlightKind(item) {
             switch (item) {
                 case services_1.DocumentHighlightKind.Text:
-                    return monaco.languages.DocumentHighlightKind.Text;
+                    return this._monaco.languages.DocumentHighlightKind.Text;
                 case services_1.DocumentHighlightKind.Read:
-                    return monaco.languages.DocumentHighlightKind.Read;
+                    return this._monaco.languages.DocumentHighlightKind.Read;
                 case services_1.DocumentHighlightKind.Write:
-                    return monaco.languages.DocumentHighlightKind.Write;
+                    return this._monaco.languages.DocumentHighlightKind.Write;
             }
-            return monaco.languages.DocumentHighlightKind.Text;
+            return this._monaco.languages.DocumentHighlightKind.Text;
         }
         asReferences(values) {
             if (!values) {
@@ -610,7 +685,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             if (!item) {
                 return undefined;
             }
-            const uri = monaco.Uri.parse(item.uri);
+            const uri = this._monaco.Uri.parse(item.uri);
             const range = this.asRange(item.range);
             return {
                 uri, range
@@ -621,7 +696,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
                 return undefined;
             }
             let result = {
-                uri: monaco.Uri.parse(item.targetUri),
+                uri: this._monaco.Uri.parse(item.targetUri),
                 range: this.asRange(item.targetSelectionRange),
                 originSelectionRange: this.asRange(item.originSelectionRange),
                 targetSelectionRange: this.asRange(item.targetSelectionRange)
@@ -675,6 +750,9 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             else {
                 result.parameters = [];
             }
+            if (item.activeParameter) {
+                result.activeParameter = item.activeParameter;
+            }
             return result;
         }
         asParameterInformations(item) {
@@ -728,15 +806,15 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         asSeverity(severity) {
             if (severity === 1) {
-                return monaco.MarkerSeverity.Error;
+                return this._monaco.MarkerSeverity.Error;
             }
             if (severity === 2) {
-                return monaco.MarkerSeverity.Warning;
+                return this._monaco.MarkerSeverity.Warning;
             }
             if (severity === 3) {
-                return monaco.MarkerSeverity.Info;
+                return this._monaco.MarkerSeverity.Info;
             }
-            return monaco.MarkerSeverity.Hint;
+            return this._monaco.MarkerSeverity.Hint;
         }
         asDiagnostics(diagnostics) {
             if (!diagnostics) {
@@ -765,7 +843,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         }
         asRelatedInformation(relatedInformation) {
             return {
-                resource: monaco.Uri.parse(relatedInformation.location.uri),
+                resource: this._monaco.Uri.parse(relatedInformation.location.uri),
                 startLineNumber: relatedInformation.location.range.start.line + 1,
                 startColumn: relatedInformation.location.range.start.character + 1,
                 endLineNumber: relatedInformation.location.range.end.line + 1,
@@ -810,7 +888,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             result.range = insertText.range;
             result.fromEdit = insertText.fromEdit;
             if (insertText.isSnippet) {
-                result.insertTextRules = monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet;
+                result.insertTextRules = this._monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet;
             }
             if (Is.number(item.kind)) {
                 let [itemKind, original] = this.asCompletionItemKind(item.kind);
@@ -843,36 +921,37 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             if (item.deprecated === true || item.deprecated === false) {
                 result.deprecated = item.deprecated;
             }
+            result.insertTextMode = item.insertTextMode;
             return result;
         }
         asCompletionItemKind(value) {
             if (services_1.CompletionItemKind.Text <= value && value <= services_1.CompletionItemKind.TypeParameter) {
                 switch (value) {
-                    case services_1.CompletionItemKind.Text: return [monaco.languages.CompletionItemKind.Text, undefined];
-                    case services_1.CompletionItemKind.Method: return [monaco.languages.CompletionItemKind.Method, undefined];
-                    case services_1.CompletionItemKind.Function: return [monaco.languages.CompletionItemKind.Function, undefined];
-                    case services_1.CompletionItemKind.Constructor: return [monaco.languages.CompletionItemKind.Constructor, undefined];
-                    case services_1.CompletionItemKind.Field: return [monaco.languages.CompletionItemKind.Field, undefined];
-                    case services_1.CompletionItemKind.Variable: return [monaco.languages.CompletionItemKind.Variable, undefined];
-                    case services_1.CompletionItemKind.Class: return [monaco.languages.CompletionItemKind.Class, undefined];
-                    case services_1.CompletionItemKind.Interface: return [monaco.languages.CompletionItemKind.Interface, undefined];
-                    case services_1.CompletionItemKind.Module: return [monaco.languages.CompletionItemKind.Module, undefined];
-                    case services_1.CompletionItemKind.Property: return [monaco.languages.CompletionItemKind.Property, undefined];
-                    case services_1.CompletionItemKind.Unit: return [monaco.languages.CompletionItemKind.Unit, undefined];
-                    case services_1.CompletionItemKind.Value: return [monaco.languages.CompletionItemKind.Value, undefined];
-                    case services_1.CompletionItemKind.Enum: return [monaco.languages.CompletionItemKind.Enum, undefined];
-                    case services_1.CompletionItemKind.Keyword: return [monaco.languages.CompletionItemKind.Keyword, undefined];
-                    case services_1.CompletionItemKind.Snippet: return [monaco.languages.CompletionItemKind.Snippet, undefined];
-                    case services_1.CompletionItemKind.Color: return [monaco.languages.CompletionItemKind.Color, undefined];
-                    case services_1.CompletionItemKind.File: return [monaco.languages.CompletionItemKind.File, undefined];
-                    case services_1.CompletionItemKind.Reference: return [monaco.languages.CompletionItemKind.Reference, undefined];
-                    case services_1.CompletionItemKind.Folder: return [monaco.languages.CompletionItemKind.Folder, undefined];
-                    case services_1.CompletionItemKind.EnumMember: return [monaco.languages.CompletionItemKind.EnumMember, undefined];
-                    case services_1.CompletionItemKind.Constant: return [monaco.languages.CompletionItemKind.Constant, undefined];
-                    case services_1.CompletionItemKind.Struct: return [monaco.languages.CompletionItemKind.Struct, undefined];
-                    case services_1.CompletionItemKind.Event: return [monaco.languages.CompletionItemKind.Event, undefined];
-                    case services_1.CompletionItemKind.Operator: return [monaco.languages.CompletionItemKind.Operator, undefined];
-                    case services_1.CompletionItemKind.TypeParameter: return [monaco.languages.CompletionItemKind.TypeParameter, undefined];
+                    case services_1.CompletionItemKind.Text: return [this._monaco.languages.CompletionItemKind.Text, undefined];
+                    case services_1.CompletionItemKind.Method: return [this._monaco.languages.CompletionItemKind.Method, undefined];
+                    case services_1.CompletionItemKind.Function: return [this._monaco.languages.CompletionItemKind.Function, undefined];
+                    case services_1.CompletionItemKind.Constructor: return [this._monaco.languages.CompletionItemKind.Constructor, undefined];
+                    case services_1.CompletionItemKind.Field: return [this._monaco.languages.CompletionItemKind.Field, undefined];
+                    case services_1.CompletionItemKind.Variable: return [this._monaco.languages.CompletionItemKind.Variable, undefined];
+                    case services_1.CompletionItemKind.Class: return [this._monaco.languages.CompletionItemKind.Class, undefined];
+                    case services_1.CompletionItemKind.Interface: return [this._monaco.languages.CompletionItemKind.Interface, undefined];
+                    case services_1.CompletionItemKind.Module: return [this._monaco.languages.CompletionItemKind.Module, undefined];
+                    case services_1.CompletionItemKind.Property: return [this._monaco.languages.CompletionItemKind.Property, undefined];
+                    case services_1.CompletionItemKind.Unit: return [this._monaco.languages.CompletionItemKind.Unit, undefined];
+                    case services_1.CompletionItemKind.Value: return [this._monaco.languages.CompletionItemKind.Value, undefined];
+                    case services_1.CompletionItemKind.Enum: return [this._monaco.languages.CompletionItemKind.Enum, undefined];
+                    case services_1.CompletionItemKind.Keyword: return [this._monaco.languages.CompletionItemKind.Keyword, undefined];
+                    case services_1.CompletionItemKind.Snippet: return [this._monaco.languages.CompletionItemKind.Snippet, undefined];
+                    case services_1.CompletionItemKind.Color: return [this._monaco.languages.CompletionItemKind.Color, undefined];
+                    case services_1.CompletionItemKind.File: return [this._monaco.languages.CompletionItemKind.File, undefined];
+                    case services_1.CompletionItemKind.Reference: return [this._monaco.languages.CompletionItemKind.Reference, undefined];
+                    case services_1.CompletionItemKind.Folder: return [this._monaco.languages.CompletionItemKind.Folder, undefined];
+                    case services_1.CompletionItemKind.EnumMember: return [this._monaco.languages.CompletionItemKind.EnumMember, undefined];
+                    case services_1.CompletionItemKind.Constant: return [this._monaco.languages.CompletionItemKind.Constant, undefined];
+                    case services_1.CompletionItemKind.Struct: return [this._monaco.languages.CompletionItemKind.Struct, undefined];
+                    case services_1.CompletionItemKind.Event: return [this._monaco.languages.CompletionItemKind.Event, undefined];
+                    case services_1.CompletionItemKind.Operator: return [this._monaco.languages.CompletionItemKind.Operator, undefined];
+                    case services_1.CompletionItemKind.TypeParameter: return [this._monaco.languages.CompletionItemKind.TypeParameter, undefined];
                     default: return [value - 1, undefined];
                 }
             }
@@ -882,9 +961,19 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
         asCompletionInsertText(item, defaultRange) {
             const isSnippet = item.insertTextFormat === services_1.InsertTextFormat.Snippet;
             if (item.textEdit) {
-                const range = this.asRange(item.textEdit.range);
-                const value = item.textEdit.newText;
-                return { isSnippet, insertText: value, range, fromEdit: true, };
+                if (services_1.TextEdit.is(item.textEdit)) {
+                    const range = this.asRange(item.textEdit.range);
+                    const value = item.textEdit.newText;
+                    return { isSnippet, insertText: value, range, fromEdit: true, };
+                }
+                else {
+                    const range = {
+                        insert: this.asRange(item.textEdit.insert),
+                        replace: this.asRange(item.textEdit.replace)
+                    };
+                    const value = item.textEdit.newText;
+                    return { isSnippet, insertText: value, range, fromEdit: true, };
+                }
             }
             if (item.insertText) {
                 return { isSnippet, insertText: item.insertText, fromEdit: false, range: defaultRange };
@@ -899,7 +988,8 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             return {
                 range: this.asRange(documentLink.range),
                 url: documentLink.target,
-                data: documentLink.data
+                data: documentLink.data,
+                tooltip: documentLink.tooltip
             };
         }
         asRange(range) {
@@ -911,8 +1001,8 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             }
             const start = this.asPosition(range.start);
             const end = this.asPosition(range.end);
-            if (start instanceof monaco.Position && end instanceof monaco.Position) {
-                return new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
+            if (start instanceof this._monaco.Position && end instanceof this._monaco.Position) {
+                return new this._monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
             }
             const startLineNumber = !start || start.lineNumber === undefined ? undefined : start.lineNumber;
             const startColumn = !start || start.column === undefined ? undefined : start.column;
@@ -931,7 +1021,7 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             const lineNumber = line === undefined ? undefined : line + 1;
             const column = character === undefined ? undefined : character + 1;
             if (lineNumber !== undefined && column !== undefined) {
-                return new monaco.Position(lineNumber, column);
+                return new this._monaco.Position(lineNumber, column);
             }
             return { lineNumber, column };
         }
@@ -971,16 +1061,22 @@ define(["require", "exports", "vscode-languageserver-protocol", "vscode-language
             if (kind) {
                 switch (kind) {
                     case services_1.FoldingRangeKind.Comment:
-                        return monaco.languages.FoldingRangeKind.Comment;
+                        return this._monaco.languages.FoldingRangeKind.Comment;
                     case services_1.FoldingRangeKind.Imports:
-                        return monaco.languages.FoldingRangeKind.Imports;
+                        return this._monaco.languages.FoldingRangeKind.Imports;
                     case services_1.FoldingRangeKind.Region:
-                        return monaco.languages.FoldingRangeKind.Region;
+                        return this._monaco.languages.FoldingRangeKind.Region;
                 }
                 ;
             }
             return undefined;
         }
+        asSemanticTokens(semanticTokens) {
+            return {
+                resultId: semanticTokens.resultId,
+                data: Uint32Array.from(semanticTokens.data)
+            };
+        }
     }
     exports.ProtocolToMonacoConverter = ProtocolToMonacoConverter;
 });