From 1e1e82b602051b5f55f3212cdb88014b8a7d1182 Mon Sep 17 00:00:00 2001
From: Anton Kosyakov <anton.kosyakov@typefox.io>
Date: Mon, 12 Aug 2019 13:09:43 +0000
Subject: [PATCH] upgrading to Monaco 0.17.0

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
---
 .../browser/console-keybinding-contexts.ts    |   6 +-
 .../console/src/browser/console-widget.ts     |   4 +-
 .../browser/debug-configuration-manager.ts    |   6 +-
 .../editor/debug-breakpoint-widget.tsx        |  30 ++-
 .../src/browser/editor/debug-editor-model.ts  |  26 +--
 .../browser/editor/debug-editor-service.ts    |   8 +-
 .../src/browser/editor/debug-hover-widget.ts  |   6 +-
 packages/editor/src/browser/editor.ts         |   2 +-
 packages/languages/package.json               |   2 +-
 .../src/browser/monaco-bulk-edit-service.ts   |   2 +-
 .../src/browser/monaco-command-service.ts     |  12 +-
 packages/monaco/src/browser/monaco-command.ts |   3 +-
 .../monaco/src/browser/monaco-editor-model.ts |   5 +-
 .../src/browser/monaco-editor-provider.ts     |   2 +-
 .../src/browser/monaco-editor-service.ts      |  13 +-
 packages/monaco/src/browser/monaco-editor.ts  |  28 +--
 .../src/browser/monaco-frontend-module.ts     |   2 +-
 .../monaco/src/browser/monaco-keybinding.ts   |   9 +-
 packages/monaco/src/browser/monaco-loader.ts  |   5 +-
 packages/monaco/src/browser/monaco-menu.ts    |   3 +-
 .../browser/monaco-outline-contribution.ts    |  12 +-
 .../src/browser/monaco-quick-open-service.ts  |  20 +-
 .../monaco-semantic-highlighting-service.ts   |   2 +-
 .../monaco-snippet-suggest-provider.ts        |  24 ++-
 .../browser/monaco-status-bar-contribution.ts |   2 +-
 .../src/browser/monaco-text-model-service.ts  |   4 +-
 .../monaco/src/browser/monaco-workspace.ts    |   4 +-
 .../textmate-snippet-completion-provider.ts   |  13 +-
 packages/monaco/src/typings/monaco/index.d.ts | 173 +++++-------------
 .../src/common/plugin-api-rpc-model.ts        |   5 +-
 .../plugin-ext/src/common/plugin-api-rpc.ts   |   7 +-
 .../browser/editors-and-documents-main.ts     |   4 +-
 .../src/main/browser/languages-main.ts        |  75 ++++++--
 .../src/main/browser/text-editor-main.ts      |   4 +-
 packages/plugin-ext/src/plugin/languages.ts   |   8 +-
 .../plugin/languages/document-formatting.ts   |   4 +-
 .../plugin/languages/on-type-formatting.ts    |   4 +-
 .../src/plugin/languages/range-formatting.ts  |   4 +-
 .../plugin-ext/src/plugin/type-converters.ts  |   7 +-
 yarn.lock                                     |  13 +-
 40 files changed, 265 insertions(+), 298 deletions(-)

diff --git a/packages/console/src/browser/console-keybinding-contexts.ts b/packages/console/src/browser/console-keybinding-contexts.ts
index 431ecee22307b..76acae8d204a8 100644
--- a/packages/console/src/browser/console-keybinding-contexts.ts
+++ b/packages/console/src/browser/console-keybinding-contexts.ts
@@ -83,7 +83,7 @@ export class ConsoleNavigationBackEnabled extends ConsoleInputFocusContext {
             return false;
         }
         const editor = console.input.getControl();
-        return editor.getPosition().equals({ lineNumber: 1, column: 1 });
+        return editor.getPosition()!.equals({ lineNumber: 1, column: 1 });
     }
 
 }
@@ -98,10 +98,10 @@ export class ConsoleNavigationForwardEnabled extends ConsoleInputFocusContext {
             return false;
         }
         const editor = console.input.getControl();
-        const model = console.input.getControl().getModel();
+        const model = console.input.getControl().getModel()!;
         const lineNumber = model.getLineCount();
         const column = model.getLineMaxColumn(lineNumber);
-        return editor.getPosition().equals({ lineNumber, column });
+        return editor.getPosition()!.equals({ lineNumber, column });
     }
 
 }
diff --git a/packages/console/src/browser/console-widget.ts b/packages/console/src/browser/console-widget.ts
index ca1ed3b33bb83..48b7a9cf27a26 100644
--- a/packages/console/src/browser/console-widget.ts
+++ b/packages/console/src/browser/console-widget.ts
@@ -193,8 +193,8 @@ export class ConsoleWidget extends BaseWidget implements StatefulWidget {
         const value = this.history.next || '';
         const editor = this.input.getControl();
         editor.setValue(value);
-        const lineNumber = editor.getModel().getLineCount();
-        const column = editor.getModel().getLineMaxColumn(lineNumber);
+        const lineNumber = editor.getModel()!.getLineCount();
+        const column = editor.getModel()!.getLineMaxColumn(lineNumber);
         editor.setPosition({ lineNumber, column });
     }
 
diff --git a/packages/debug/src/browser/debug-configuration-manager.ts b/packages/debug/src/browser/debug-configuration-manager.ts
index bcbaeca4548e6..ce25e327a44ac 100644
--- a/packages/debug/src/browser/debug-configuration-manager.ts
+++ b/packages/debug/src/browser/debug-configuration-manager.ts
@@ -208,7 +208,7 @@ export class DebugConfigurationManager {
             },
             onArrayBegin: offset => {
                 if (lastProperty === 'configurations' && depthInArray === 0) {
-                    position = editor.getModel().getPositionAt(offset + 1);
+                    position = editor.getModel()!.getPositionAt(offset + 1);
                 }
                 depthInArray++;
             },
@@ -220,12 +220,12 @@ export class DebugConfigurationManager {
             return;
         }
         // Check if there are more characters on a line after a "configurations": [, if yes enter a newline
-        if (editor.getModel().getLineLastNonWhitespaceColumn(position.lineNumber) > position.column) {
+        if (editor.getModel()!.getLineLastNonWhitespaceColumn(position.lineNumber) > position.column) {
             editor.setPosition(position);
             editor.trigger('debug', 'lineBreakInsert', undefined);
         }
         // Check if there is already an empty line to insert suggest, if yes just place the cursor
-        if (editor.getModel().getLineLastNonWhitespaceColumn(position.lineNumber + 1) === 0) {
+        if (editor.getModel()!.getLineLastNonWhitespaceColumn(position.lineNumber + 1) === 0) {
             editor.setPosition({ lineNumber: position.lineNumber + 1, column: 1 << 30 });
             await commandService.executeCommand('editor.action.deleteLines');
         }
diff --git a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
index b346f0a35c302..88b8a56058c95 100644
--- a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
+++ b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
@@ -89,19 +89,30 @@ export class DebugBreakpointWidget implements Disposable {
             return;
         }
         this.toDispose.push(input);
-        this.toDispose.push(monaco.modes.SuggestRegistry.register({ scheme: input.uri.scheme }, {
+        this.toDispose.push(monaco.modes.CompletionProviderRegistry.register({ scheme: input.uri.scheme }, {
             provideCompletionItems: async (model, position, context, token) => {
                 const suggestions = [];
                 if ((this.context === 'condition' || this.context === 'logMessage')
                     && input.uri.toString() === model.uri.toString()) {
                     const editor = this.editor.getControl();
                     const items = await monaco.suggest.provideSuggestionItems(
-                        editor.getModel(),
-                        new monaco.Position(editor.getPosition().lineNumber, 1),
-                        'none', undefined, context, token);
+                        editor.getModel()!,
+                        new monaco.Position(editor.getPosition()!.lineNumber, 1),
+                        new monaco.suggest.CompletionOptions(undefined, new Set<monaco.languages.CompletionItemKind>().add(monaco.languages.CompletionItemKind.Snippet)),
+                        context, token);
+                    let overwriteBefore = 0;
+                    if (this.context === 'condition') {
+                        overwriteBefore = position.column - 1;
+                    } else {
+                        // Inside the currly brackets, need to count how many useful characters are behind the position so they would all be taken into account
+                        const value = editor.getModel()!.getValue();
+                        while ((position.column - 2 - overwriteBefore >= 0)
+                            && value[position.column - 2 - overwriteBefore] !== '{' && value[position.column - 2 - overwriteBefore] !== ' ') {
+                            overwriteBefore++;
+                        }
+                    }
                     for (const { suggestion } of items) {
-                        suggestion.overwriteAfter = 0;
-                        suggestion.overwriteBefore = position.column - 1;
+                        suggestion.range = monaco.Range.fromPositions(position.delta(0, -overwriteBefore), position);
                         suggestions.push(suggestion);
                     }
                 }
@@ -110,7 +121,7 @@ export class DebugBreakpointWidget implements Disposable {
         }));
         this.toDispose.push(this.zone.onDidLayoutChange(dimension => this.layout(dimension)));
         this.toDispose.push(input.getControl().onDidChangeModelContent(() => {
-            const heightInLines = input.getControl().getModel().getLineCount() + 1;
+            const heightInLines = input.getControl().getModel()!.getLineCount() + 1;
             this.zone.layout(heightInLines);
             this.updatePlaceholder();
         }));
@@ -152,9 +163,9 @@ export class DebugBreakpointWidget implements Disposable {
         const afterLineNumber = breakpoint ? breakpoint.line : position!.lineNumber;
         const afterColumn = breakpoint ? breakpoint.column : position!.column;
         const editor = this._input.getControl();
-        const heightInLines = editor.getModel().getLineCount() + 1;
+        const heightInLines = editor.getModel()!.getLineCount() + 1;
         this.zone.show({ afterLineNumber, afterColumn, heightInLines, frameWidth: 1 });
-        editor.setPosition(editor.getModel().getPositionAt(editor.getModel().getValueLength()));
+        editor.setPosition(editor.getModel()!.getPositionAt(editor.getModel()!.getValueLength()));
         this._input.focus();
     }
 
@@ -207,6 +218,7 @@ export class DebugBreakpointWidget implements Disposable {
         }
         const value = this._input.getControl().getValue();
         const decorations: monaco.editor.IDecorationOptions[] = !!value ? [] : [{
+            color: undefined,
             range: {
                 startLineNumber: 0,
                 endLineNumber: 0,
diff --git a/packages/debug/src/browser/editor/debug-editor-model.ts b/packages/debug/src/browser/editor/debug-editor-model.ts
index 672ef4d500f14..090b2cbcd49e5 100644
--- a/packages/debug/src/browser/editor/debug-editor-model.ts
+++ b/packages/debug/src/browser/editor/debug-editor-model.ts
@@ -79,7 +79,7 @@ export class DebugEditorModel implements Disposable {
 
     @postConstruct()
     protected init(): void {
-        this.uri = new URI(this.editor.getControl().getModel().uri.toString());
+        this.uri = new URI(this.editor.getControl().getModel()!.uri.toString());
         this.toDispose.pushAll([
             this.hover,
             this.breakpointWidget,
@@ -87,7 +87,7 @@ export class DebugEditorModel implements Disposable {
             this.editor.getControl().onMouseMove(event => this.handleMouseMove(event)),
             this.editor.getControl().onMouseLeave(event => this.handleMouseLeave(event)),
             this.editor.getControl().onKeyDown(() => this.hover.hide({ immediate: false })),
-            this.editor.getControl().getModel().onDidChangeDecorations(() => this.updateBreakpoints()),
+            this.editor.getControl().getModel()!.onDidChangeDecorations(() => this.updateBreakpoints()),
             this.sessions.onDidChange(() => this.renderFrames())
         ]);
         this.renderFrames();
@@ -176,7 +176,7 @@ export class DebugEditorModel implements Disposable {
     protected updateBreakpointRanges(): void {
         this.breakpointRanges.clear();
         for (const decoration of this.breakpointDecorations) {
-            const range = this.editor.getControl().getModel().getDecorationRange(decoration);
+            const range = this.editor.getControl().getModel()!.getDecorationRange(decoration)!;
             this.breakpointRanges.set(decoration, range);
         }
     }
@@ -214,7 +214,7 @@ export class DebugEditorModel implements Disposable {
             return false;
         }
         for (const decoration of this.breakpointDecorations) {
-            const range = this.editor.getControl().getModel().getDecorationRange(decoration);
+            const range = this.editor.getControl().getModel()!.getDecorationRange(decoration);
             const oldRange = this.breakpointRanges.get(decoration)!;
             if (!range || !range.equalsRange(oldRange)) {
                 return true;
@@ -227,7 +227,7 @@ export class DebugEditorModel implements Disposable {
         const lines = new Set<number>();
         const breakpoints: SourceBreakpoint[] = [];
         for (const decoration of this.breakpointDecorations) {
-            const range = this.editor.getControl().getModel().getDecorationRange(decoration);
+            const range = this.editor.getControl().getModel()!.getDecorationRange(decoration);
             if (range && !lines.has(range.startLineNumber)) {
                 const line = range.startLineNumber;
                 const oldRange = this.breakpointRanges.get(decoration);
@@ -242,7 +242,7 @@ export class DebugEditorModel implements Disposable {
 
     protected _position: monaco.Position | undefined;
     get position(): monaco.Position {
-        return this._position || this.editor.getControl().getPosition();
+        return this._position || this.editor.getControl().getPosition()!;
     }
     get breakpoint(): DebugBreakpoint | undefined {
         return this.getBreakpoint();
@@ -285,12 +285,12 @@ export class DebugEditorModel implements Disposable {
     protected handleMouseDown(event: monaco.editor.IEditorMouseEvent): void {
         if (event.target && event.target.type === monaco.editor.MouseTargetType.GUTTER_GLYPH_MARGIN) {
             if (event.event.rightButton) {
-                this._position = event.target.position;
+                this._position = event.target.position!;
                 this.contextMenu.render(DebugEditorModel.CONTEXT_MENU, event.event.browserEvent, () =>
                     setTimeout(() => this._position = undefined)
                 );
             } else {
-                this.doToggleBreakpoint(event.target.position);
+                this.doToggleBreakpoint(event.target.position!);
             }
         }
         this.hintBreakpoint(event);
@@ -299,7 +299,7 @@ export class DebugEditorModel implements Disposable {
         this.showHover(event);
         this.hintBreakpoint(event);
     }
-    protected handleMouseLeave(event: monaco.editor.IEditorMouseEvent): void {
+    protected handleMouseLeave(event: monaco.editor.IPartialEditorMouseEvent): void {
         this.hideHover(event);
         this.deltaHintDecorations([]);
     }
@@ -313,7 +313,7 @@ export class DebugEditorModel implements Disposable {
         this.hintDecorations = this.deltaDecorations(this.hintDecorations, hintDecorations);
     }
     protected createHintDecorations(event: monaco.editor.IEditorMouseEvent): monaco.editor.IModelDeltaDecoration[] {
-        if (event.target && event.target.type === monaco.editor.MouseTargetType.GUTTER_GLYPH_MARGIN) {
+        if (event.target && event.target.type === monaco.editor.MouseTargetType.GUTTER_GLYPH_MARGIN && event.target.position) {
             const lineNumber = event.target.position.lineNumber;
             if (!!this.sessions.getBreakpoint(this.uri, lineNumber)) {
                 return [];
@@ -337,14 +337,14 @@ export class DebugEditorModel implements Disposable {
         }
         if (targetType === monaco.editor.MouseTargetType.CONTENT_TEXT) {
             this.hover.show({
-                selection: mouseEvent.target.range,
+                selection: mouseEvent.target.range!,
                 immediate: false
             });
         } else {
             this.hover.hide({ immediate: false });
         }
     }
-    protected hideHover({ event }: monaco.editor.IEditorMouseEvent): void {
+    protected hideHover({ event }: monaco.editor.IPartialEditorMouseEvent): void {
         const rect = this.hover.getDomNode().getBoundingClientRect();
         if (event.posx < rect.left || event.posx > rect.right || event.posy < rect.top || event.posy > rect.bottom) {
             this.hover.hide({ immediate: false });
@@ -354,7 +354,7 @@ export class DebugEditorModel implements Disposable {
     protected deltaDecorations(oldDecorations: string[], newDecorations: monaco.editor.IModelDeltaDecoration[]): string[] {
         this.updatingDecorations = true;
         try {
-            return this.editor.getControl().getModel().deltaDecorations(oldDecorations, newDecorations);
+            return this.editor.getControl().getModel()!.deltaDecorations(oldDecorations, newDecorations);
         } finally {
             this.updatingDecorations = false;
         }
diff --git a/packages/debug/src/browser/editor/debug-editor-service.ts b/packages/debug/src/browser/editor/debug-editor-service.ts
index 5275d3d9880dc..9b4ea52ad4908 100644
--- a/packages/debug/src/browser/editor/debug-editor-service.ts
+++ b/packages/debug/src/browser/editor/debug-editor-service.ts
@@ -62,7 +62,7 @@ export class DebugEditorService {
         if (!(editor instanceof MonacoEditor)) {
             return;
         }
-        const uri = editor.getControl().getModel().uri.toString();
+        const uri = editor.getControl().getModel()!.uri.toString();
         const debugModel = this.factory(editor);
         this.models.set(uri, debugModel);
         editor.getControl().onDidDispose(() => {
@@ -122,15 +122,15 @@ export class DebugEditorService {
     showHover(): void {
         const { model } = this;
         if (model) {
-            const selection = model.editor.getControl().getSelection();
+            const selection = model.editor.getControl().getSelection()!;
             model.hover.show({ selection, focus: true });
         }
     }
     canShowHover(): boolean {
         const { model } = this;
         if (model) {
-            const selection = model.editor.getControl().getSelection();
-            return !!model.editor.getControl().getModel().getWordAtPosition(selection.getStartPosition());
+            const selection = model.editor.getControl().getSelection()!;
+            return !!model.editor.getControl().getModel()!.getWordAtPosition(selection.getStartPosition());
         }
         return false;
     }
diff --git a/packages/debug/src/browser/editor/debug-hover-widget.ts b/packages/debug/src/browser/editor/debug-hover-widget.ts
index 9a3a766821557..1ed6dca22593c 100644
--- a/packages/debug/src/browser/editor/debug-hover-widget.ts
+++ b/packages/debug/src/browser/editor/debug-hover-widget.ts
@@ -159,7 +159,7 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
         }
         super.show();
         this.options = options;
-        const expression = this.expressionProvider.get(this.editor.getControl().getModel(), options.selection);
+        const expression = this.expressionProvider.get(this.editor.getControl().getModel()!, options.selection);
         if (!expression) {
             this.hide();
             return;
@@ -181,7 +181,7 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
     protected isEditorFrame(): boolean {
         const { currentFrame } = this.sessions;
         return !!currentFrame && !!currentFrame.source &&
-            this.editor.getControl().getModel().uri.toString() === currentFrame.source.uri.toString();
+            this.editor.getControl().getModel()!.uri.toString() === currentFrame.source.uri.toString();
     }
 
     getPosition(): monaco.editor.IContentWidgetPosition {
@@ -189,7 +189,7 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
             return undefined!;
         }
         const position = this.options && this.options.selection.getStartPosition();
-        const word = position && this.editor.getControl().getModel().getWordAtPosition(position);
+        const word = position && this.editor.getControl().getModel()!.getWordAtPosition(position);
         return position && word ? {
             position: new monaco.Position(position.lineNumber, word.startColumn),
             preference: [
diff --git a/packages/editor/src/browser/editor.ts b/packages/editor/src/browser/editor.ts
index 34adec58bd53c..54bb9562261ee 100644
--- a/packages/editor/src/browser/editor.ts
+++ b/packages/editor/src/browser/editor.ts
@@ -119,7 +119,7 @@ export interface MouseTarget {
     /**
      * The target element
      */
-    readonly element: Element;
+    readonly element?: Element;
     /**
      * The target type
      */
diff --git a/packages/languages/package.json b/packages/languages/package.json
index c726873c9bfdc..7fb8d327fa46c 100644
--- a/packages/languages/package.json
+++ b/packages/languages/package.json
@@ -7,7 +7,7 @@
     "@theia/output": "^0.9.0",
     "@theia/process": "^0.9.0",
     "@theia/workspace": "^0.9.0",
-    "@typefox/monaco-editor-core": "^0.14.6",
+    "@typefox/monaco-editor-core": "next",
     "@types/uuid": "^3.4.3",
     "monaco-languageclient": "next",
     "uuid": "^3.2.1"
diff --git a/packages/monaco/src/browser/monaco-bulk-edit-service.ts b/packages/monaco/src/browser/monaco-bulk-edit-service.ts
index ebfb6478aee2b..5a248ea2bd900 100644
--- a/packages/monaco/src/browser/monaco-bulk-edit-service.ts
+++ b/packages/monaco/src/browser/monaco-bulk-edit-service.ts
@@ -23,7 +23,7 @@ export class MonacoBulkEditService implements monaco.editor.IBulkEditService {
     @inject(MonacoWorkspace)
     protected readonly workspace: MonacoWorkspace;
 
-    apply(edit: monaco.languages.WorkspaceEdit): monaco.Promise<monaco.editor.IBulkEditResult> {
+    apply(edit: monaco.languages.WorkspaceEdit): Promise<monaco.editor.IBulkEditResult> {
         return this.workspace.applyBulkEdit(edit);
     }
 
diff --git a/packages/monaco/src/browser/monaco-command-service.ts b/packages/monaco/src/browser/monaco-command-service.ts
index c220874495621..9821595d55861 100644
--- a/packages/monaco/src/browser/monaco-command-service.ts
+++ b/packages/monaco/src/browser/monaco-command-service.ts
@@ -51,20 +51,16 @@ export class MonacoCommandService implements ICommandService {
     }
 
     // tslint:disable-next-line:no-any
-    executeCommand(commandId: any, ...args: any[]): monaco.Promise<any> {
+    async executeCommand(commandId: any, ...args: any[]): Promise<any> {
         const handler = this.commandRegistry.getActiveHandler(commandId, ...args);
         if (handler) {
-            try {
-                this._onWillExecuteCommand.fire({ commandId });
-                return monaco.Promise.wrap(handler.execute(...args));
-            } catch (err) {
-                return monaco.Promise.wrapError(err);
-            }
+            this._onWillExecuteCommand.fire({ commandId });
+            return handler.execute(...args);
         }
         if (this.delegate) {
             return this.delegate.executeCommand(commandId, ...args);
         }
-        return monaco.Promise.wrapError(new Error(`command '${commandId}' not found`));
+        throw new Error(`command '${commandId}' not found`);
     }
 
 }
diff --git a/packages/monaco/src/browser/monaco-command.ts b/packages/monaco/src/browser/monaco-command.ts
index 86771baf42838..1b2f072716a4d 100644
--- a/packages/monaco/src/browser/monaco-command.ts
+++ b/packages/monaco/src/browser/monaco-command.ts
@@ -25,7 +25,6 @@ import { EditorCommands } from '@theia/editor/lib/browser';
 import { MonacoEditor } from './monaco-editor';
 import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-command-registry';
 import MenuRegistry = monaco.actions.MenuRegistry;
-import MenuId = monaco.actions.MenuId;
 
 export type MonacoCommand = Command & { delegate?: string };
 export namespace MonacoCommands {
@@ -72,7 +71,7 @@ export namespace MonacoCommands {
         'find.history.showPrevious',
     ]);
     const iconClasses = new Map<string, string>();
-    for (const menuItem of MenuRegistry.getMenuItems(MenuId.EditorContext)) {
+    for (const menuItem of MenuRegistry.getMenuItems(7)) {
         if (menuItem.command.iconClass) {
             iconClasses.set(menuItem.command.id, menuItem.command.iconClass);
         }
diff --git a/packages/monaco/src/browser/monaco-editor-model.ts b/packages/monaco/src/browser/monaco-editor-model.ts
index a6dd459735953..c874dd3f7e995 100644
--- a/packages/monaco/src/browser/monaco-editor-model.ts
+++ b/packages/monaco/src/browser/monaco-editor-model.ts
@@ -181,8 +181,9 @@ export class MonacoEditorModel implements ITextEditorModel, TextEditorDocument {
         return this.model;
     }
 
-    load(): monaco.Promise<MonacoEditorModel> {
-        return monaco.Promise.wrap(this.resolveModel).then(() => this);
+    async load(): Promise<MonacoEditorModel> {
+        await this.resolveModel;
+        return this;
     }
 
     save(): Promise<void> {
diff --git a/packages/monaco/src/browser/monaco-editor-provider.ts b/packages/monaco/src/browser/monaco-editor-provider.ts
index 56cb15fdf1dec..9c8086a7f7e19 100644
--- a/packages/monaco/src/browser/monaco-editor-provider.ts
+++ b/packages/monaco/src/browser/monaco-editor-provider.ts
@@ -302,7 +302,7 @@ export class MonacoEditorProvider {
             referencesController._editorService.openCodeEditor({
                 resource: ref.uri,
                 options: { selection: range }
-            }, control).done(openedEditor => {
+            }, control).then(openedEditor => {
                 referencesController._ignoreModelChangeEvent = false;
                 if (!openedEditor) {
                     referencesController.closeWidget();
diff --git a/packages/monaco/src/browser/monaco-editor-service.ts b/packages/monaco/src/browser/monaco-editor-service.ts
index 000f0c10b9f22..446b000dc31af 100644
--- a/packages/monaco/src/browser/monaco-editor-service.ts
+++ b/packages/monaco/src/browser/monaco-editor-service.ts
@@ -56,15 +56,14 @@ export class MonacoEditorService extends monaco.services.CodeEditorServiceImpl {
         return editor && editor.getControl();
     }
 
-    openCodeEditor(input: IResourceInput, source?: ICodeEditor, sideBySide?: boolean): monaco.Promise<CommonCodeEditor | undefined> {
+    async openCodeEditor(input: IResourceInput, source?: ICodeEditor, sideBySide?: boolean): Promise<CommonCodeEditor | undefined> {
         const uri = new URI(input.resource.toString());
         const openerOptions = this.createEditorOpenerOptions(input, source, sideBySide);
-        return monaco.Promise.wrap(open(this.openerService, uri, openerOptions).then(widget => {
-            if (widget instanceof EditorWidget && widget.editor instanceof MonacoEditor) {
-                return widget.editor.getControl();
-            }
-            return undefined;
-        }));
+        const widget = await open(this.openerService, uri, openerOptions);
+        if (widget instanceof EditorWidget && widget.editor instanceof MonacoEditor) {
+            return widget.editor.getControl();
+        }
+        return undefined;
     }
 
     protected createEditorOpenerOptions(input: IResourceInput, source?: ICodeEditor, sideBySide?: boolean): EditorOpenerOptions {
diff --git a/packages/monaco/src/browser/monaco-editor.ts b/packages/monaco/src/browser/monaco-editor.ts
index b2fa80a8e2d0b..4d58f960e073a 100644
--- a/packages/monaco/src/browser/monaco-editor.ts
+++ b/packages/monaco/src/browser/monaco-editor.ts
@@ -130,13 +130,14 @@ export class MonacoEditor implements TextEditor {
             this.onFocusChangedEmitter.fire(this.isFocused())
         ));
         this.toDispose.push(codeEditor.onMouseDown(e => {
-            const { position, range } = e.target;
+            const { element, position, range } = e.target;
             this.onMouseDownEmitter.fire({
                 target: {
                     ...e.target,
+                    element: element || undefined,
                     mouseColumn: this.m2p.asPosition(undefined, e.target.mouseColumn).character,
-                    range: range && this.m2p.asRange(range),
-                    position: position && this.m2p.asPosition(position.lineNumber, position.column)
+                    range: range && this.m2p.asRange(range) || undefined,
+                    position: position && this.m2p.asPosition(position.lineNumber, position.column) || undefined
                 },
                 event: e.event.browserEvent
             });
@@ -167,7 +168,7 @@ export class MonacoEditor implements TextEditor {
     }
 
     get cursor(): Position {
-        const { lineNumber, column } = this.editor.getPosition();
+        const { lineNumber, column } = this.editor.getPosition()!;
         return this.m2p.asPosition(lineNumber, column);
     }
 
@@ -181,7 +182,7 @@ export class MonacoEditor implements TextEditor {
     }
 
     get selection(): Range {
-        return this.m2p.asRange(this.editor.getSelection());
+        return this.m2p.asRange(this.editor.getSelection()!);
     }
 
     set selection(selection: Range) {
@@ -236,8 +237,10 @@ export class MonacoEditor implements TextEditor {
 
     blur(): void {
         const node = this.editor.getDomNode();
-        const textarea = node.querySelector('textarea') as HTMLElement;
-        textarea.blur();
+        if (node) {
+            const textarea = node.querySelector('textarea') as HTMLElement;
+            textarea.blur();
+        }
     }
 
     isFocused({ strict }: { strict: boolean } = { strict: false }): boolean {
@@ -342,7 +345,7 @@ export class MonacoEditor implements TextEditor {
         const configuration = this.editor.getConfiguration();
 
         const lineHeight = configuration.lineHeight;
-        const lineCount = this.editor.getModel().getLineCount();
+        const lineCount = this.editor.getModel()!.getLineCount();
         const contentHeight = lineHeight * lineCount;
 
         const horizontalScrollbarHeight = configuration.layoutInfo.horizontalScrollbarHeight;
@@ -366,12 +369,11 @@ export class MonacoEditor implements TextEditor {
         return !!action && action.isSupported();
     }
 
-    runAction(id: string): monaco.Promise<void> {
+    async runAction(id: string): Promise<void> {
         const action = this.editor.getAction(id);
         if (action && action.isSupported()) {
-            return action.run();
+            await action.run();
         }
-        return monaco.Promise.as(undefined);
     }
 
     get commandService(): monaco.commands.ICommandService {
@@ -400,7 +402,7 @@ export class MonacoEditor implements TextEditor {
         const start = toPosition(startLineNumber).lineNumber;
         const end = toPosition(endLineNumber).lineNumber;
         return this.editor
-            .getModel()
+            .getModel()!
             .getLinesDecorations(start, end)
             .map(this.toEditorDecoration.bind(this));
     }
@@ -440,7 +442,7 @@ export class MonacoEditor implements TextEditor {
     }
 
     storeViewState(): object {
-        return this.editor.saveViewState();
+        return this.editor.saveViewState()!;
     }
 
     restoreViewState(state: object): void {
diff --git a/packages/monaco/src/browser/monaco-frontend-module.ts b/packages/monaco/src/browser/monaco-frontend-module.ts
index 668e6e85cbf1e..c29e8d60a62f2 100644
--- a/packages/monaco/src/browser/monaco-frontend-module.ts
+++ b/packages/monaco/src/browser/monaco-frontend-module.ts
@@ -152,7 +152,7 @@ export function createMonacoConfigurationService(container: interfaces.Container
 
     const initFromConfiguration = debounce(() => {
         const event = new monaco.services.ConfigurationChangeEvent();
-        event._source = monaco.services.ConfigurationTarget.DEFAULT;
+        event._source = 6 /* DEFAULT */;
         service._onDidChangeConfiguration.fire(event);
     });
     preferences.onPreferenceChanged(e => {
diff --git a/packages/monaco/src/browser/monaco-keybinding.ts b/packages/monaco/src/browser/monaco-keybinding.ts
index 816bfe908e435..a6cb7a2b784f1 100644
--- a/packages/monaco/src/browser/monaco-keybinding.ts
+++ b/packages/monaco/src/browser/monaco-keybinding.ts
@@ -43,8 +43,8 @@ export class MonacoKeybindingContribution implements KeybindingContribution {
             const command = this.commands.validate(item.command);
             if (command) {
                 const raw = item.keybinding;
-                const keybinding = raw.type === monaco.keybindings.KeybindingType.Simple
-                    ? this.keyCode(raw as monaco.keybindings.SimpleKeybinding).toString()
+                const keybinding = raw instanceof monaco.keybindings.SimpleKeybinding
+                    ? this.keyCode(raw).toString()
                     : this.keySequence(raw as monaco.keybindings.ChordKeybinding).join(' ');
                 const isInDiffEditor = item.when && /(^|[^!])\bisInDiffEditor\b/gm.test(item.when.serialize());
                 const context = isInDiffEditor
@@ -91,9 +91,6 @@ export class MonacoKeybindingContribution implements KeybindingContribution {
     }
 
     protected keySequence(keybinding: monaco.keybindings.ChordKeybinding): KeySequence {
-        return [
-            this.keyCode(keybinding.firstPart),
-            this.keyCode(keybinding.chordPart)
-        ];
+        return keybinding.parts.map(part => this.keyCode(part));
     }
 }
diff --git a/packages/monaco/src/browser/monaco-loader.ts b/packages/monaco/src/browser/monaco-loader.ts
index b6e7fd0814474..9440d4ea51b93 100644
--- a/packages/monaco/src/browser/monaco-loader.ts
+++ b/packages/monaco/src/browser/monaco-loader.ts
@@ -57,7 +57,6 @@ export function loadMonaco(vsRequire: any): Promise<void> {
                 'vs/editor/browser/editorExtensions',
                 'vs/editor/standalone/browser/simpleServices',
                 'vs/editor/standalone/browser/standaloneServices',
-                'vs/base/parts/quickopen/common/quickOpen',
                 'vs/base/parts/quickopen/browser/quickOpenWidget',
                 'vs/base/parts/quickopen/browser/quickOpenModel',
                 'vs/base/common/filters',
@@ -77,7 +76,7 @@ export function loadMonaco(vsRequire: any): Promise<void> {
                 'vs/platform/contextkey/browser/contextKeyService'
             ], (css: any, html: any, commands: any, actions: any,
                 keybindingsRegistry: any, keybindingResolver: any, resolvedKeybinding: any, keybindingLabels: any,
-                keyCodes: any, mime: any, editorExtensions: any, simpleServices: any, standaloneServices: any, quickOpen: any, quickOpenWidget: any, quickOpenModel: any,
+                keyCodes: any, mime: any, editorExtensions: any, simpleServices: any, standaloneServices: any, quickOpenWidget: any, quickOpenModel: any,
                 filters: any, styler: any, platform: any, modes: any, suggest: any, suggestController: any, findController: any, rename: any, snippetParser: any,
                 configuration: any, configurationModels: any,
                 codeEditorService: any, codeEditorServiceImpl: any,
@@ -87,7 +86,7 @@ export function loadMonaco(vsRequire: any): Promise<void> {
                     global.monaco.actions = actions;
                     global.monaco.keybindings = Object.assign({}, keybindingsRegistry, keybindingResolver, resolvedKeybinding, keybindingLabels, keyCodes);
                     global.monaco.services = Object.assign({}, simpleServices, standaloneServices, configuration, configurationModels, codeEditorService, codeEditorServiceImpl);
-                    global.monaco.quickOpen = Object.assign({}, quickOpen, quickOpenWidget, quickOpenModel);
+                    global.monaco.quickOpen = Object.assign({}, quickOpenWidget, quickOpenModel);
                     global.monaco.filters = filters;
                     global.monaco.theme = styler;
                     global.monaco.platform = platform;
diff --git a/packages/monaco/src/browser/monaco-menu.ts b/packages/monaco/src/browser/monaco-menu.ts
index c499b614455cb..cd75810a79b75 100644
--- a/packages/monaco/src/browser/monaco-menu.ts
+++ b/packages/monaco/src/browser/monaco-menu.ts
@@ -20,7 +20,6 @@ import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
 import { MonacoCommands } from './monaco-command';
 import { MonacoCommandRegistry } from './monaco-command-registry';
 import MenuRegistry = monaco.actions.MenuRegistry;
-import MenuId = monaco.actions.MenuId;
 
 export interface MonacoActionGroup {
     id: string;
@@ -75,7 +74,7 @@ export class MonacoEditorMenuContribution implements MenuContribution {
     ) { }
 
     registerMenus(registry: MenuModelRegistry): void {
-        for (const item of MenuRegistry.getMenuItems(MenuId.EditorContext)) {
+        for (const item of MenuRegistry.getMenuItems(7)) {
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const menuPath = [...EDITOR_CONTEXT_MENU, (item.group || '')];
diff --git a/packages/monaco/src/browser/monaco-outline-contribution.ts b/packages/monaco/src/browser/monaco-outline-contribution.ts
index 816c5898d7a25..2ebcbda6bf3db 100644
--- a/packages/monaco/src/browser/monaco-outline-contribution.ts
+++ b/packages/monaco/src/browser/monaco-outline-contribution.ts
@@ -97,10 +97,12 @@ export class MonacoOutlineContribution implements FrontendApplicationContributio
         const editor = this.editorManager.currentEditor;
         if (editor) {
             const model = MonacoEditor.get(editor)!.getControl().getModel();
-            this.toDisposeOnEditor.push(model.onDidChangeContent(() => {
-                this.roots = undefined; // Invalidate the previously resolved roots.
-                this.updateOutline();
-            }));
+            if (model) {
+                this.toDisposeOnEditor.push(model.onDidChangeContent(() => {
+                    this.roots = undefined; // Invalidate the previously resolved roots.
+                    this.updateOutline();
+                }));
+            }
             this.toDisposeOnEditor.push(editor.editor.onSelectionChanged(selection => this.updateOutline(selection)));
         }
         this.updateOutline();
@@ -145,7 +147,7 @@ export class MonacoOutlineContribution implements FrontendApplicationContributio
                     if (token.isCancellationRequested) {
                         return [];
                     }
-                    const nodes = this.createNodes(uri, symbols);
+                    const nodes = this.createNodes(uri, symbols || []);
                     this.roots.push(...nodes);
                 } catch {
                     /* collect symbols from other providers */
diff --git a/packages/monaco/src/browser/monaco-quick-open-service.ts b/packages/monaco/src/browser/monaco-quick-open-service.ts
index a971abf5bfc7e..549daca740f75 100644
--- a/packages/monaco/src/browser/monaco-quick-open-service.ts
+++ b/packages/monaco/src/browser/monaco-quick-open-service.ts
@@ -17,10 +17,11 @@
 import { injectable, inject, postConstruct } from 'inversify';
 import { MessageType } from '@theia/core/lib/common/message-service-protocol';
 import {
-    QuickOpenService, QuickOpenModel, QuickOpenOptions, QuickOpenItem, QuickOpenGroupItem,
-    QuickOpenMode, KeySequence, QuickOpenActionProvider, QuickOpenAction, ResolvedKeybinding,
+    QuickOpenService, QuickOpenOptions, QuickOpenItem, QuickOpenGroupItem,
+    QuickOpenMode, KeySequence, ResolvedKeybinding,
     KeyCode, Key, KeybindingRegistry
 } from '@theia/core/lib/browser';
+import { QuickOpenModel, QuickOpenActionProvider, QuickOpenAction } from '@theia/core/lib/common/quick-open-model';
 import { KEY_CODE_MAP } from './monaco-keycode-map';
 import { ContextKey } from '@theia/core/lib/browser/context-key-service';
 import { MonacoContextKeyService } from './monaco-context-key-service';
@@ -439,13 +440,13 @@ export class QuickOpenEntry extends monaco.quickOpen.QuickOpenEntry {
     }
 
     run(mode: monaco.quickOpen.Mode): boolean {
-        if (mode === monaco.quickOpen.Mode.OPEN) {
+        if (mode === 1) {
             return this.item.run(QuickOpenMode.OPEN);
         }
-        if (mode === monaco.quickOpen.Mode.OPEN_IN_BACKGROUND) {
+        if (mode === 2) {
             return this.item.run(QuickOpenMode.OPEN_IN_BACKGROUND);
         }
-        if (mode === monaco.quickOpen.Mode.PREVIEW) {
+        if (mode === 0) {
             return this.item.run(QuickOpenMode.PREVIEW);
         }
         return false;
@@ -527,18 +528,17 @@ export class MonacoQuickOpenActionProvider implements monaco.quickOpen.IActionPr
     }
 
     // tslint:disable-next-line:no-any
-    async getActions(element: any, entry: QuickOpenEntry | QuickOpenEntryGroup): monaco.Promise<monaco.quickOpen.IAction[]> {
+    async getActions(element: any, entry: QuickOpenEntry | QuickOpenEntryGroup): Promise<monaco.quickOpen.IAction[]> {
         const actions = await this.provider.getActions(entry.item);
-        const monacoActions = actions.map(action => new MonacoQuickOpenAction(action));
-        return monaco.Promise.wrap(monacoActions);
+        return actions.map(action => new MonacoQuickOpenAction(action));
     }
 
     hasSecondaryActions(): boolean {
         return false;
     }
 
-    getSecondaryActions(): monaco.Promise<monaco.quickOpen.IAction[]> {
-        return monaco.Promise.wrap([]);
+    async getSecondaryActions(): Promise<monaco.quickOpen.IAction[]> {
+        return [];
     }
 
     getActionItem(): undefined {
diff --git a/packages/monaco/src/browser/monaco-semantic-highlighting-service.ts b/packages/monaco/src/browser/monaco-semantic-highlighting-service.ts
index db162f29dc13f..bb6db918b4953 100644
--- a/packages/monaco/src/browser/monaco-semantic-highlighting-service.ts
+++ b/packages/monaco/src/browser/monaco-semantic-highlighting-service.ts
@@ -79,7 +79,7 @@ export class MonacoSemanticHighlightingService extends SemanticHighlightingServi
     protected async model(uri: string | URI): Promise<monaco.editor.ITextModel | undefined> {
         const editor = await this.editor(uri);
         if (editor) {
-            return editor.getControl().getModel();
+            return editor.getControl().getModel() || undefined;
         }
         return undefined;
     }
diff --git a/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts b/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts
index eac9538cca13e..e7c3ea405d9aa 100644
--- a/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts
+++ b/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts
@@ -19,22 +19,23 @@ import URI from '@theia/core/lib/common/uri';
 import { FileSystem, FileSystemError } from '@theia/filesystem/lib/common';
 
 @injectable()
-export class MonacoSnippetSuggestProvider implements monaco.modes.ISuggestSupport {
+export class MonacoSnippetSuggestProvider implements monaco.languages.CompletionItemProvider {
 
     @inject(FileSystem)
     protected readonly filesystem: FileSystem;
 
-    protected readonly snippets = new Map<string, MonacoSnippetSuggestion[]>();
+    protected readonly snippets = new Map<string, Snippet[]>();
     protected readonly pendingSnippets = new Map<string, Promise<void>[]>();
 
-    async provideCompletionItems(model: monaco.editor.ITextModel): Promise<monaco.modes.ISuggestResult> {
+    async provideCompletionItems(model: monaco.editor.ITextModel, position: monaco.Position): Promise<monaco.languages.CompletionList> {
         const languageId = model.getModeId(); // TODO: look up a language id at the position
         await this.loadSnippets(languageId);
-        const suggestions = this.snippets.get(languageId) || [];
+        const range = monaco.Range.fromPositions(position);
+        const suggestions = (this.snippets.get(languageId) || []).map(snippet => new MonacoSnippetSuggestion(snippet, range));
         return { suggestions };
     }
 
-    resolveCompletionItem(_: monaco.editor.ITextModel, __: monaco.Position, item: monaco.modes.ISuggestion): monaco.modes.ISuggestion {
+    resolveCompletionItem(_: monaco.editor.ITextModel, __: monaco.Position, item: monaco.languages.CompletionItem): monaco.languages.CompletionItem {
         return item instanceof MonacoSnippetSuggestion ? item.resolve() : item;
     }
 
@@ -125,7 +126,7 @@ export class MonacoSnippetSuggestProvider implements monaco.modes.ISuggestSuppor
         for (const snippet of snippets) {
             for (const scope of snippet.scopes) {
                 const languageSnippets = this.snippets.get(scope) || [];
-                languageSnippets.push(new MonacoSnippetSuggestion(snippet));
+                languageSnippets.push(snippet);
                 this.snippets.set(scope, languageSnippets);
             }
         }
@@ -162,19 +163,22 @@ export interface Snippet {
     readonly source: string
 }
 
-export class MonacoSnippetSuggestion implements monaco.modes.ISuggestion {
+export class MonacoSnippetSuggestion implements monaco.languages.CompletionItem {
 
     readonly label: string;
     readonly detail: string;
     readonly sortText: string;
     readonly noAutoAccept = true;
-    readonly type: 'snippet' = 'snippet';
-    readonly snippetType: 'textmate' = 'textmate';
+    readonly kind = monaco.languages.CompletionItemKind.Snippet;
+    readonly insertTextRules = monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet;
 
     insertText: string;
     documentation?: monaco.IMarkdownString;
 
-    constructor(protected readonly snippet: Snippet) {
+    constructor(
+        protected readonly snippet: Snippet,
+        readonly range: monaco.Range
+    ) {
         this.label = snippet.prefix;
         this.detail = `${snippet.description || snippet.name} (${snippet.source})`;
         this.insertText = snippet.body;
diff --git a/packages/monaco/src/browser/monaco-status-bar-contribution.ts b/packages/monaco/src/browser/monaco-status-bar-contribution.ts
index 455b0148491f5..1e77eaf77f1c6 100644
--- a/packages/monaco/src/browser/monaco-status-bar-contribution.ts
+++ b/packages/monaco/src/browser/monaco-status-bar-contribution.ts
@@ -99,6 +99,6 @@ export class MonacoStatusBarContribution implements FrontendApplicationContribut
 
     protected getModel(editor: EditorWidget | undefined): monaco.editor.IModel | undefined {
         const monacoEditor = MonacoEditor.get(editor);
-        return monacoEditor && monacoEditor.getControl().getModel();
+        return monacoEditor && monacoEditor.getControl().getModel() || undefined;
     }
 }
diff --git a/packages/monaco/src/browser/monaco-text-model-service.ts b/packages/monaco/src/browser/monaco-text-model-service.ts
index e4dcef0e0b0dd..594128662a09e 100644
--- a/packages/monaco/src/browser/monaco-text-model-service.ts
+++ b/packages/monaco/src/browser/monaco-text-model-service.ts
@@ -52,8 +52,8 @@ export class MonacoTextModelService implements monaco.editor.ITextModelService {
         return this._models.onDidCreate;
     }
 
-    createModelReference(raw: monaco.Uri | URI): monaco.Promise<monaco.editor.IReference<MonacoEditorModel>> {
-        return monaco.Promise.wrap(this._models.acquire(raw.toString()));
+    createModelReference(raw: monaco.Uri | URI): Promise<monaco.editor.IReference<MonacoEditorModel>> {
+        return this._models.acquire(raw.toString());
     }
 
     protected async loadModel(uri: URI): Promise<MonacoEditorModel> {
diff --git a/packages/monaco/src/browser/monaco-workspace.ts b/packages/monaco/src/browser/monaco-workspace.ts
index 3456b470f76b4..dc054c618b9f9 100644
--- a/packages/monaco/src/browser/monaco-workspace.ts
+++ b/packages/monaco/src/browser/monaco-workspace.ts
@@ -268,7 +268,7 @@ export class MonacoWorkspace implements lang.Workspace {
         return true;
     }
 
-    async applyBulkEdit(workspaceEdit: monaco.languages.WorkspaceEdit, options?: EditorOpenerOptions): monaco.Promise<monaco.editor.IBulkEditResult> {
+    async applyBulkEdit(workspaceEdit: monaco.languages.WorkspaceEdit, options?: EditorOpenerOptions): Promise<monaco.editor.IBulkEditResult> {
         try {
             const unresolvedEditorEdits = this.groupEdits(workspaceEdit);
             const editorEdits = await this.openEditors(unresolvedEditorEdits, options);
@@ -278,7 +278,7 @@ export class MonacoWorkspace implements lang.Workspace {
             editorEdits.forEach(editorEdit => {
                 const editor = editorEdit.editor!;
                 const model = editor!.document.textEditorModel;
-                const currentSelections = editor!.getControl().getSelections();
+                const currentSelections = editor!.getControl().getSelections() || [];
                 const editOperations: monaco.editor.IIdentifiedSingleEditOperation[] = editorEdit.textEdits.map(edit => ({
                     identifier: undefined!,
                     forceMoveMarkers: false,
diff --git a/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts b/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts
index a675197aabb07..d443f99c88109 100644
--- a/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts
+++ b/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts
@@ -33,9 +33,8 @@ export class TextmateSnippetCompletionProvider implements monaco.languages.Compl
                 documentation: {
                     value: '```' + this.mdLanguage + '\n' + this.replaceVariables(insertText) + '```'
                 },
-                insertText: {
-                    value: insertText
-                }
+                insertText: insertText,
+                range: undefined!
             });
         }
     }
@@ -46,9 +45,11 @@ export class TextmateSnippetCompletionProvider implements monaco.languages.Compl
 
     provideCompletionItems(document: monaco.editor.ITextModel,
         position: monaco.Position,
-        token: monaco.CancellationToken,
-        context: monaco.languages.CompletionContext): monaco.languages.CompletionItem[] {
-        return this.items;
+        context: monaco.languages.CompletionContext,
+        token: monaco.CancellationToken): monaco.languages.CompletionList {
+        return {
+            suggestions: this.items
+        };
     }
 }
 
diff --git a/packages/monaco/src/typings/monaco/index.d.ts b/packages/monaco/src/typings/monaco/index.d.ts
index f4de5a3e3704a..71385da0bab51 100644
--- a/packages/monaco/src/typings/monaco/index.d.ts
+++ b/packages/monaco/src/typings/monaco/index.d.ts
@@ -29,7 +29,7 @@ declare module monaco.editor {
     }
 
     export interface IBulkEditService {
-        apply(edit: monaco.languages.WorkspaceEdit): monaco.Promise<IBulkEditResult>;
+        apply(edit: monaco.languages.WorkspaceEdit): Promise<IBulkEditResult>;
     }
 
     export interface IDiffNavigator {
@@ -106,7 +106,7 @@ declare module monaco.editor {
 
     export interface ICodeEditorService {
         getActiveCodeEditor(): monaco.editor.ICodeEditor | undefined;
-        openCodeEditor(input: monaco.editor.IResourceInput, source?: monaco.editor.ICodeEditor, sideBySide?: boolean): monaco.Promise<monaco.editor.CommonCodeEditor | undefined>;
+        openCodeEditor(input: monaco.editor.IResourceInput, source?: monaco.editor.ICodeEditor, sideBySide?: boolean): Promise<monaco.editor.CommonCodeEditor | undefined>;
         registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void;
         removeDecorationType(key: string): void;
         resolveDecorationOptions(typeKey: string, writable: boolean): IModelDecorationOptions;
@@ -121,7 +121,7 @@ declare module monaco.editor {
          * Provided a resource URI, it will return a model reference
          * which should be disposed once not needed anymore.
          */
-        createModelReference(resource: monaco.Uri): monaco.Promise<IReference<ITextEditorModel>>;
+        createModelReference(resource: monaco.Uri): Promise<IReference<ITextEditorModel>>;
 
         /**
          * Registers a specific `scheme` content provider.
@@ -133,7 +133,7 @@ declare module monaco.editor {
         /**
          * Given a resource, return the content of the resource as IModel.
          */
-        provideTextContent(resource: monaco.Uri): monaco.Promise<monaco.editor.IModel>;
+        provideTextContent(resource: monaco.Uri): Promise<monaco.editor.IModel>;
     }
 
     export interface ITextEditorModel {
@@ -141,7 +141,7 @@ declare module monaco.editor {
         /**
          * Loads the model.
          */
-        load(): monaco.Promise<ITextEditorModel>;
+        load(): Promise<ITextEditorModel>;
 
         /**
          * Dispose associated resources
@@ -162,7 +162,7 @@ declare module monaco.editor {
         /**
          * Returns the actions for the menu
          */
-        getActions(): monaco.Promise<IAction[]>
+        getActions(): Promise<IAction[]>
 
         /**
          * Needs to be called with the context menu closes again.
@@ -178,7 +178,7 @@ declare module monaco.editor {
         enabled: boolean;
         checked: boolean;
         radio: boolean;
-        run(event?: any): monaco.Promise<any>;
+        run(event?: any): Promise<any>;
     }
 
     export interface IContextMenuService {
@@ -273,21 +273,14 @@ declare module monaco.commands {
 
     export interface ICommandService {
         readonly _onWillExecuteCommand: monaco.Emitter<ICommandEvent>;
-        executeCommand<T>(commandId: string, ...args: any[]): monaco.Promise<T>;
-        executeCommand(commandId: string, ...args: any[]): monaco.Promise<any>;
+        executeCommand<T>(commandId: string, ...args: any[]): Promise<T>;
+        executeCommand(commandId: string, ...args: any[]): Promise<any>;
     }
 
 }
 
 declare module monaco.actions {
 
-    export class MenuId {
-        /**
-         * The unique ID of the editor's context menu.
-         */
-        public static readonly EditorContext: MenuId;
-    }
-
     export interface ICommandAction {
         id: string;
         title: string
@@ -304,8 +297,9 @@ declare module monaco.actions {
     export interface IMenuRegistry {
         /**
          * Retrieves all the registered menu items for the given menu.
+         * @param menuId - see https://github.com/TypeFox/vscode/blob/monaco/0.18.0/src/vs/platform/actions/common/actions.ts#L66
          */
-        getMenuItems(menuId: MenuId | { id: string }): IMenuItem[];
+        getMenuItems(menuId: 7 /* EditorContext */): IMenuItem[];
     }
 
     /**
@@ -330,14 +324,7 @@ declare module monaco.keybindings {
         static contextMatchesRules(context: monaco.contextKeyService.IContext, rules: monaco.contextkey.ContextKeyExpr): boolean;
     }
 
-    export const enum KeybindingType {
-        Simple = 1,
-        Chord = 2
-    }
-
     export class SimpleKeybinding {
-        public readonly type: KeybindingType;
-
         public readonly ctrlKey: boolean;
         public readonly shiftKey: boolean;
         public readonly altKey: boolean;
@@ -348,12 +335,7 @@ declare module monaco.keybindings {
     }
 
     export class ChordKeybinding {
-        public readonly type: KeybindingType;
-
-        public readonly firstPart: SimpleKeybinding;
-        public readonly chordPart: SimpleKeybinding;
-
-        constructor(firstPart: SimpleKeybinding, chordPart: SimpleKeybinding);
+        readonly parts: SimpleKeybinding[];
     }
 
     export type Keybinding = SimpleKeybinding | ChordKeybinding;
@@ -498,12 +480,9 @@ declare module monaco.services {
         getValue(section: string, overrides: any, workspace: any): any;
     }
 
-    export enum ConfigurationTarget {
-        DEFAULT
-    }
-
     export class ConfigurationChangeEvent {
-        _source?: ConfigurationTarget;
+        // https://github.com/TypeFox/vscode/blob/monaco/0.18.0/src/vs/platform/configuration/common/configuration.ts#L30-L38
+        _source?: number;
         change(keys: string[]): ConfigurationChangeEvent;
     }
 
@@ -516,7 +495,7 @@ declare module monaco.services {
         constructor(themeService: IStandaloneThemeService);
         abstract getActiveCodeEditor(): monaco.editor.ICodeEditor | undefined;
         abstract openCodeEditor(input: monaco.editor.IResourceInput, source?: monaco.editor.ICodeEditor,
-            sideBySide?: boolean): monaco.Promise<monaco.editor.CommonCodeEditor | undefined>;
+            sideBySide?: boolean): Promise<monaco.editor.CommonCodeEditor | undefined>;
         registerDecorationType: monaco.editor.ICodeEditorService['registerDecorationType'];
         removeDecorationType: monaco.editor.ICodeEditorService['removeDecorationType'];
         resolveDecorationOptions: monaco.editor.ICodeEditorService['resolveDecorationOptions'];
@@ -525,8 +504,8 @@ declare module monaco.services {
     export class StandaloneCommandService implements monaco.commands.ICommandService {
         constructor(instantiationService: monaco.instantiation.IInstantiationService);
         readonly _onWillExecuteCommand: monaco.Emitter<monaco.commands.ICommandEvent>;
-        executeCommand<T>(commandId: string, ...args: any[]): monaco.Promise<T>;
-        executeCommand(commandId: string, ...args: any[]): monaco.Promise<any>;
+        executeCommand<T>(commandId: string, ...args: any[]): Promise<T>;
+        executeCommand(commandId: string, ...args: any[]): Promise<any>;
     }
 
     export class LazyStaticService<T> {
@@ -576,7 +555,7 @@ declare module monaco.services {
     }
 
     export interface IModeService {
-        getOrCreateModeByFilenameOrFirstLine(filename: string, firstLine?: string): monaco.Promise<IMode>;
+        getOrCreateModeByFilenameOrFirstLine(filename: string, firstLine?: string): Promise<IMode>;
     }
 
     export interface IMode {
@@ -734,11 +713,8 @@ declare module monaco.quickOpen {
          */
         autoFocusPrefixMatch?: string;
     }
-    export enum Mode {
-        PREVIEW,
-        OPEN,
-        OPEN_IN_BACKGROUND
-    }
+    // https://github.com/TypeFox/vscode/blob/monaco/0.18.0/src/vs/base/parts/quickopen/common/quickOpen.ts#L43-L48
+    export type Mode = 0 /* PREVIEW */ | 1 /* OPEN */ | 2 /* OPEN_IN_BACKGROUND */;
     export interface IEntryRunContext {
         event: any;
         keymods: number[];
@@ -827,9 +803,9 @@ declare module monaco.quickOpen {
 
     export interface IActionProvider {
         hasActions(element: any, item: any): boolean;
-        getActions(element: any, item: any): monaco.Promise<IAction[]>;
+        getActions(element: any, item: any): Promise<IAction[]>;
         hasSecondaryActions(element: any, item: any): boolean;
-        getSecondaryActions(element: any, item: any): monaco.Promise<IAction[]>;
+        getSecondaryActions(element: any, item: any): Promise<IAction[]>;
         getActionItem(element: any, item: any, action: IAction): any;
     }
 
@@ -899,80 +875,6 @@ declare module monaco.modes {
         public static getInlineStyleFromMetadata(metadata: number, colorMap: string[]): string;
     }
 
-    export type SuggestionType = 'method'
-        | 'function'
-        | 'constructor'
-        | 'field'
-        | 'variable'
-        | 'class'
-        | 'struct'
-        | 'interface'
-        | 'module'
-        | 'property'
-        | 'event'
-        | 'operator'
-        | 'unit'
-        | 'value'
-        | 'constant'
-        | 'enum'
-        | 'enum-member'
-        | 'keyword'
-        | 'snippet'
-        | 'text'
-        | 'color'
-        | 'file'
-        | 'reference'
-        | 'customcolor'
-        | 'folder'
-        | 'type-parameter';
-
-    export type SnippetType = 'internal' | 'textmate';
-
-    export interface ISuggestion {
-        label: string;
-        insertText: string;
-        type: SuggestionType;
-        detail?: string;
-        documentation?: string | IMarkdownString;
-        filterText?: string;
-        sortText?: string;
-        preselect?: boolean;
-        noAutoAccept?: boolean;
-        commitCharacters?: string[];
-        overwriteBefore?: number;
-        overwriteAfter?: number;
-        additionalTextEdits?: editor.ISingleEditOperation[];
-        command?: monaco.languages.Command;
-        snippetType?: SnippetType;
-    }
-
-    export interface ISuggestResult {
-        suggestions: ISuggestion[];
-        incomplete?: boolean;
-        dispose?(): void;
-    }
-
-    export enum CompletionTriggerKind {
-        Invoke = 0,
-        TriggerCharacter = 1,
-        TriggerForIncompleteCompletions = 2,
-    }
-
-    export interface SuggestContext {
-        triggerKind: CompletionTriggerKind;
-        triggerCharacter?: string;
-    }
-
-    export interface ISuggestSupport {
-
-        triggerCharacters?: string[];
-
-        // tslint:disable-next-line:max-line-length
-        provideCompletionItems(model: monaco.editor.ITextModel, position: Position, context: SuggestContext, token: CancellationToken): ISuggestResult | Thenable<ISuggestResult | undefined> | undefined;
-
-        resolveCompletionItem?(model: monaco.editor.ITextModel, position: Position, item: ISuggestion, token: CancellationToken): ISuggestion | Thenable<ISuggestion>;
-    }
-
     export interface IRelativePattern {
         base: string;
         pattern: string;
@@ -1000,27 +902,38 @@ declare module monaco.modes {
 
     export const DocumentSymbolProviderRegistry: LanguageFeatureRegistry<monaco.languages.DocumentSymbolProvider>;
 
-    export const SuggestRegistry: LanguageFeatureRegistry<ISuggestSupport>;
+    export const CompletionProviderRegistry: LanguageFeatureRegistry<monaco.languages.CompletionItemProvider>;
 }
 
 declare module monaco.suggest {
 
-    export type SnippetConfig = 'top' | 'bottom' | 'inline' | 'none';
+    export const enum SnippetSortOrder {
+        Top, Inline, Bottom
+    }
+
+    export interface CompletionItem {
+        suggestion: monaco.languages.CompletionItem;
+    }
+
+    export class CompletionOptions {
+
+        constructor(
+            snippetSortOrder?: SnippetSortOrder,
+            kindFilter?: Set<languages.CompletionItemKind>,
+            providerFilter?: Set<languages.CompletionItemProvider>,
+        );
 
-    export interface ISuggestionItem {
-        suggestion: monaco.modes.ISuggestion;
     }
 
     export function provideSuggestionItems(
         model: monaco.editor.ITextModel,
         position: Position,
-        snippetConfig?: SnippetConfig,
-        onlyFrom?: monaco.modes.ISuggestSupport[],
-        context?: monaco.modes.SuggestContext,
+        options?: CompletionOptions,
+        context?: monaco.languages.CompletionContext,
         token?: monaco.CancellationToken
-    ): Promise<ISuggestionItem[]>;
+    ): Promise<CompletionItem[]>;
 
-    export function setSnippetSuggestSupport(support: monaco.modes.ISuggestSupport): monaco.modes.ISuggestSupport;
+    export function setSnippetSuggestSupport(support: monaco.languages.CompletionItemProvider): monaco.languages.CompletionItemProvider;
 
 }
 
@@ -1134,7 +1047,7 @@ declare module monaco.mime {
         readonly userConfigured?: boolean;
     }
 
-    export function registerTextMime(association: monaco.mime.ITextMimeAssociation, warnOnOverwrite: boolean): void
+    export function registerTextMime(association: monaco.mime.ITextMimeAssociation, warnOnOverwrite: boolean): void;
 
     export function clearTextMimes(onlyUserConfigured?: boolean): void;
 }
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
index 4938d87486706..7cc25bb543398 100644
--- a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
+++ b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
@@ -137,7 +137,7 @@ export interface Completion {
 }
 export interface SingleEditOperation {
     range: Range;
-    text: string;
+    text: string | null;
     /**
      * This indicates that this operation has "insert" semantics.
      * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
@@ -312,7 +312,8 @@ export interface ReferenceContext {
 
 export interface DocumentLink {
     range: Range;
-    url?: string;
+    url?: UriComponents | string;
+    tooltip?: string;
 }
 
 export interface DocumentLinkProvider {
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
index 558d0fda7faa8..3639fcd19b53a 100644
--- a/packages/plugin-ext/src/common/plugin-api-rpc.ts
+++ b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -43,7 +43,6 @@ import {
     Hover,
     DocumentHighlight,
     FormattingOptions,
-    SingleEditOperation as ModelSingleEditOperation,
     Definition,
     DefinitionLink,
     DocumentLink,
@@ -1089,9 +1088,9 @@ export interface LanguagesExt {
     $provideHover(handle: number, resource: UriComponents, position: Position, token: CancellationToken): Promise<Hover | undefined>;
     $provideDocumentHighlights(handle: number, resource: UriComponents, position: Position, token: CancellationToken): Promise<DocumentHighlight[] | undefined>;
     $provideDocumentFormattingEdits(handle: number, resource: UriComponents,
-        options: FormattingOptions, token: CancellationToken): Promise<ModelSingleEditOperation[] | undefined>;
+        options: FormattingOptions, token: CancellationToken): Promise<TextEdit[] | undefined>;
     $provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: Range,
-        options: FormattingOptions, token: CancellationToken): Promise<ModelSingleEditOperation[] | undefined>;
+        options: FormattingOptions, token: CancellationToken): Promise<TextEdit[] | undefined>;
     $provideOnTypeFormattingEdits(
         handle: number,
         resource: UriComponents,
@@ -1099,7 +1098,7 @@ export interface LanguagesExt {
         ch: string,
         options: FormattingOptions,
         token: CancellationToken
-    ): Promise<ModelSingleEditOperation[] | undefined>;
+    ): Promise<TextEdit[] | undefined>;
     $provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Promise<DocumentLink[] | undefined>;
     $resolveDocumentLink(handle: number, link: DocumentLink, token: CancellationToken): Promise<DocumentLink | undefined>;
     $provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<CodeLensSymbol[] | undefined>;
diff --git a/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts b/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts
index df5dc96425a24..b04bb0f4c6693 100644
--- a/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts
+++ b/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts
@@ -94,7 +94,7 @@ export class EditorsAndDocumentsMain {
         const removedDocuments = delta.removedDocuments.map(d => d.textEditorModel.uri);
 
         for (const editor of delta.addedEditors) {
-            const textEditorMain = new TextEditorMain(editor.id, editor.editor.getControl().getModel(), editor.editor);
+            const textEditorMain = new TextEditorMain(editor.id, editor.editor.getControl().getModel()!, editor.editor);
             this.textEditors.set(editor.id, textEditorMain);
             addedEditors.push(textEditorMain);
         }
@@ -339,7 +339,7 @@ class EditorAndDocumentState {
 class EditorSnapshot {
     readonly id: string;
     constructor(readonly editor: MonacoEditor) {
-        this.id = `${editor.getControl().getId()},${editor.getControl().getModel().id}`;
+        this.id = `${editor.getControl().getId()},${editor.getControl().getModel()!.id}`;
     }
 }
 
diff --git a/packages/plugin-ext/src/main/browser/languages-main.ts b/packages/plugin-ext/src/main/browser/languages-main.ts
index 6fc0e487cb800..7ea6a13be1a97 100644
--- a/packages/plugin-ext/src/main/browser/languages-main.ts
+++ b/packages/plugin-ext/src/main/browser/languages-main.ts
@@ -35,7 +35,7 @@ import {
     ResourceFileEditDto,
 } from '../../common/plugin-api-rpc';
 import { interfaces } from 'inversify';
-import { SerializedDocumentFilter, MarkerData, Range, WorkspaceSymbolProvider, RelatedInformation, MarkerSeverity } from '../../common/plugin-api-rpc-model';
+import { SerializedDocumentFilter, MarkerData, Range, WorkspaceSymbolProvider, RelatedInformation, MarkerSeverity, DocumentLink } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { fromLanguageSelector } from '../../plugin/type-converters';
 import { LanguageSelector } from '../../plugin/languages';
@@ -99,12 +99,12 @@ export class LanguagesMainImpl implements LanguagesMain {
     }
 
     $registerCompletionSupport(handle: number, selector: SerializedDocumentFilter[], triggerCharacters: string[], supportsResolveDetails: boolean): void {
-        this.disposables.set(handle, monaco.modes.SuggestRegistry.register(fromLanguageSelector(selector)!, {
+        this.disposables.set(handle, monaco.modes.CompletionProviderRegistry.register(fromLanguageSelector(selector)!, {
             triggerCharacters,
             provideCompletionItems: (model: monaco.editor.ITextModel,
                 position: monaco.Position,
-                context: monaco.modes.SuggestContext,
-                token: monaco.CancellationToken): Thenable<monaco.modes.ISuggestResult> =>
+                context: monaco.languages.CompletionContext,
+                token: monaco.CancellationToken): Thenable<monaco.languages.CompletionList> =>
                 Promise.resolve(this.proxy.$provideCompletionItems(handle, model.uri, position, context, token)).then(result => {
                     if (!result) {
                         return undefined!;
@@ -221,7 +221,7 @@ export class LanguagesMainImpl implements LanguagesMain {
 
                     if (Array.isArray(result)) {
                         // using DefinitionLink because Location is mandatory part of DefinitionLink
-                        const definitionLinks: monaco.languages.DefinitionLink[] = [];
+                        const definitionLinks: monaco.languages.LocationLink[] = [];
                         for (const item of result) {
                             definitionLinks.push({ ...item, uri: monaco.Uri.revive(item.uri) });
                         }
@@ -263,7 +263,7 @@ export class LanguagesMainImpl implements LanguagesMain {
 
                     if (Array.isArray(result)) {
                         // using DefinitionLink because Location is mandatory part of DefinitionLink
-                        const definitionLinks: monaco.languages.DefinitionLink[] = [];
+                        const definitionLinks: monaco.languages.LocationLink[] = [];
                         for (const item of result) {
                             definitionLinks.push({ ...item, uri: monaco.Uri.revive(item.uri) });
                         }
@@ -373,14 +373,32 @@ export class LanguagesMainImpl implements LanguagesMain {
 
     protected createLinkProvider(handle: number, selector: LanguageSelector | undefined): monaco.languages.LinkProvider {
         return {
-            provideLinks: (model, token) => {
+            provideLinks: async (model, token) => {
                 if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
                     return undefined!;
                 }
-                return this.proxy.$provideDocumentLinks(handle, model.uri, token).then(v => v!);
+                const links = await this.proxy.$provideDocumentLinks(handle, model.uri, token);
+                if (!links) {
+                    return undefined;
+                }
+                return {
+                    links: links.map(link => this.toMonacoLink(link)),
+                    dispose: () => {
+                        // TODO this.proxy.$releaseDocumentLinks(handle, links.cacheId);
+                    }
+                };
             },
-            resolveLink: (link: monaco.languages.ILink, token) =>
-                this.proxy.$resolveDocumentLink(handle, link, token).then(v => v!)
+            resolveLink: async (link, token) => {
+                const resolved = await this.proxy.$resolveDocumentLink(handle, link, token);
+                return resolved && this.toMonacoLink(resolved);
+            }
+        };
+    }
+
+    protected toMonacoLink(link: DocumentLink): monaco.languages.ILink {
+        return {
+            ...link,
+            url: !!link.url && typeof link.url !== 'string' ? monaco.Uri.revive(link.url) : link.url
         };
     }
 
@@ -405,9 +423,18 @@ export class LanguagesMainImpl implements LanguagesMain {
 
     protected createCodeLensProvider(handle: number, selector: LanguageSelector | undefined): monaco.languages.CodeLensProvider {
         return {
-            provideCodeLenses: (model, token) =>
-                this.proxy.$provideCodeLenses(handle, model.uri, token).then(v => v!)
-            ,
+            provideCodeLenses: async (model, token) => {
+                if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
+                    return undefined!;
+                }
+                const lenses = await this.proxy.$provideCodeLenses(handle, model.uri, token);
+                return {
+                    lenses: lenses!,
+                    dispose: () => {
+                        // TODO this.proxy.$releaseCodeLenses
+                    }
+                };
+            },
             resolveCodeLens: (model, codeLens, token) =>
                 this.proxy.$resolveCodeLens(handle, model.uri, codeLens, token).then(v => v!)
         };
@@ -454,7 +481,7 @@ export class LanguagesMainImpl implements LanguagesMain {
 
                     if (Array.isArray(result)) {
                         // using DefinitionLink because Location is mandatory part of DefinitionLink
-                        const definitionLinks: monaco.languages.DefinitionLink[] = [];
+                        const definitionLinks: monaco.languages.LocationLink[] = [];
                         for (const item of result) {
                             definitionLinks.push({ ...item, uri: monaco.Uri.revive(item.uri) });
                         }
@@ -474,11 +501,17 @@ export class LanguagesMainImpl implements LanguagesMain {
     protected createSignatureHelpProvider(handle: number, selector: LanguageSelector | undefined, triggerCharacters: string[]): monaco.languages.SignatureHelpProvider {
         return {
             signatureHelpTriggerCharacters: triggerCharacters,
-            provideSignatureHelp: (model, position, token) => {
+            provideSignatureHelp: async (model, position, token) => {
                 if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
                     return undefined!;
                 }
-                return this.proxy.$provideSignatureHelp(handle, model.uri, position, token).then(v => v!);
+                const value = await this.proxy.$provideSignatureHelp(handle, model.uri, position, token);
+                return {
+                    value: value!,
+                    dispose: () => {
+                        // TDOO ?
+                    }
+                };
             }
         };
     }
@@ -642,11 +675,17 @@ export class LanguagesMainImpl implements LanguagesMain {
 
     protected createQuickFixProvider(handle: number, selector: LanguageSelector | undefined, providedCodeActionKinds?: string[]): monaco.languages.CodeActionProvider {
         return {
-            provideCodeActions: (model, rangeOrSelection, monacoContext, token) => {
+            provideCodeActions: async (model, rangeOrSelection, monacoContext, token) => {
                 if (!this.matchModel(selector, MonacoModelIdentifier.fromModel(model))) {
                     return undefined!;
                 }
-                return this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, monacoContext, token);
+                const actions = await this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, monacoContext, token);
+                return {
+                    actions,
+                    dispose: () => {
+                        // TODO this.proxy.$releaseCodeActions(handle, cacheId);
+                    }
+                };
             }
         };
     }
diff --git a/packages/plugin-ext/src/main/browser/text-editor-main.ts b/packages/plugin-ext/src/main/browser/text-editor-main.ts
index 05da61af2114f..f0e4afb45c3e7 100644
--- a/packages/plugin-ext/src/main/browser/text-editor-main.ts
+++ b/packages/plugin-ext/src/main/browser/text-editor-main.ts
@@ -270,7 +270,7 @@ export class TextEditorMain {
         if (!this.editor) {
             return;
         }
-        this.editor.getControl().setDecorations(key, ranges);
+        this.editor.getControl().setDecorations(key, ranges.map(option => Object.assign(option, { color: undefined })));
     }
 
     setDecorationsFast(key: string, _ranges: number[]): void {
@@ -349,7 +349,7 @@ export class TextEditorPropertiesMain {
     private static getSelectionsFromEditor(prevProperties: TextEditorPropertiesMain | undefined, editor: MonacoEditor): monaco.Selection[] {
         let result: monaco.Selection[] | undefined = undefined;
         if (editor) {
-            result = editor.getControl().getSelections();
+            result = editor.getControl().getSelections() || undefined;
         }
 
         if (!result && prevProperties) {
diff --git a/packages/plugin-ext/src/plugin/languages.ts b/packages/plugin-ext/src/plugin/languages.ts
index 42bc2b79487a5..da7e416332b83 100644
--- a/packages/plugin-ext/src/plugin/languages.ts
+++ b/packages/plugin-ext/src/plugin/languages.ts
@@ -44,7 +44,7 @@ import {
     Hover,
     DocumentHighlight,
     Range,
-    SingleEditOperation,
+    TextEdit,
     FormattingOptions,
     Definition,
     DefinitionLink,
@@ -337,7 +337,7 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
 
     $provideDocumentFormattingEdits(handle: number, resource: UriComponents,
-        options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+        options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         return this.withAdapter(handle, DocumentFormattingAdapter, adapter => adapter.provideDocumentFormattingEdits(URI.revive(resource), options, token));
     }
     // ### Document Formatting Edit end
@@ -350,7 +350,7 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
 
     $provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: Range,
-        options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+        options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         return this.withAdapter(handle, RangeFormattingAdapter, adapter => adapter.provideDocumentRangeFormattingEdits(URI.revive(resource), range, options, token));
     }
     // ### Document Range Formatting Edit end
@@ -367,7 +367,7 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
 
     $provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: Position, ch: string,
-        options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+        options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         return this.withAdapter(handle, OnTypeFormattingAdapter, adapter => adapter.provideOnTypeFormattingEdits(URI.revive(resource), position, ch, options, token));
     }
     // ### On Type Formatting Edit end
diff --git a/packages/plugin-ext/src/plugin/languages/document-formatting.ts b/packages/plugin-ext/src/plugin/languages/document-formatting.ts
index 0e6f113f62bf3..49c7c2491eef6 100644
--- a/packages/plugin-ext/src/plugin/languages/document-formatting.ts
+++ b/packages/plugin-ext/src/plugin/languages/document-formatting.ts
@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as Converter from '../type-converters';
 import URI from 'vscode-uri/lib/umd';
-import { FormattingOptions, SingleEditOperation } from '../../common/plugin-api-rpc-model';
+import { FormattingOptions, TextEdit } from '../../common/plugin-api-rpc-model';
 
 export class DocumentFormattingAdapter {
 
@@ -27,7 +27,7 @@ export class DocumentFormattingAdapter {
         private readonly documents: DocumentsExtImpl
     ) { }
 
-    provideDocumentFormattingEdits(resource: URI, options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+    provideDocumentFormattingEdits(resource: URI, options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         const document = this.documents.getDocumentData(resource);
         if (!document) {
             return Promise.reject(new Error(`There are no document for ${resource}`));
diff --git a/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts b/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts
index f4c5f19ad5704..79f33a0a2ac80 100644
--- a/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts
+++ b/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts
@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as Converter from '../type-converters';
 import URI from 'vscode-uri/lib/umd';
-import { FormattingOptions, SingleEditOperation } from '../../common/plugin-api-rpc-model';
+import { FormattingOptions, TextEdit } from '../../common/plugin-api-rpc-model';
 import { Position } from '../../common/plugin-api-rpc';
 
 export class OnTypeFormattingAdapter {
@@ -29,7 +29,7 @@ export class OnTypeFormattingAdapter {
     ) { }
 
     provideOnTypeFormattingEdits(resource: URI, position: Position, ch: string,
-        options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+        options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         const document = this.documents.getDocumentData(resource);
         if (!document) {
             return Promise.reject(new Error(`There are no document for ${resource}`));
diff --git a/packages/plugin-ext/src/plugin/languages/range-formatting.ts b/packages/plugin-ext/src/plugin/languages/range-formatting.ts
index acd53da03dcd8..8872faafac673 100644
--- a/packages/plugin-ext/src/plugin/languages/range-formatting.ts
+++ b/packages/plugin-ext/src/plugin/languages/range-formatting.ts
@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as Converter from '../type-converters';
 import URI from 'vscode-uri/lib/umd';
-import { FormattingOptions, SingleEditOperation, Range } from '../../common/plugin-api-rpc-model';
+import { FormattingOptions, TextEdit, Range } from '../../common/plugin-api-rpc-model';
 
 export class RangeFormattingAdapter {
 
@@ -27,7 +27,7 @@ export class RangeFormattingAdapter {
         private readonly documents: DocumentsExtImpl
     ) { }
 
-    provideDocumentRangeFormattingEdits(resource: URI, range: Range, options: FormattingOptions, token: theia.CancellationToken): Promise<SingleEditOperation[] | undefined> {
+    provideDocumentRangeFormattingEdits(resource: URI, range: Range, options: FormattingOptions, token: theia.CancellationToken): Promise<TextEdit[] | undefined> {
         const document = this.documents.getDocumentData(resource);
         if (!document) {
             return Promise.reject(new Error(`There are no document for ${resource}`));
diff --git a/packages/plugin-ext/src/plugin/type-converters.ts b/packages/plugin-ext/src/plugin/type-converters.ts
index 8b3b3ec1ba8c4..83bd23c728018 100644
--- a/packages/plugin-ext/src/plugin/type-converters.ts
+++ b/packages/plugin-ext/src/plugin/type-converters.ts
@@ -121,6 +121,9 @@ export function toRange(range: model.Range): types.Range {
     return new types.Range(startLineNumber - 1, startColumn - 1, endLineNumber - 1, endColumn - 1);
 }
 
+export function fromRange(range: undefined): undefined;
+export function fromRange(range: theia.Range): model.Range;
+export function fromRange(range: theia.Range | undefined): model.Range | undefined;
 export function fromRange(range: theia.Range | undefined): model.Range | undefined {
     if (!range) {
         return undefined;
@@ -308,8 +311,8 @@ export function toCompletionItemKind(type?: model.CompletionType): types.Complet
     return types.CompletionItemKind.Property;
 }
 
-export function fromTextEdit(edit: theia.TextEdit): model.SingleEditOperation {
-    return <model.SingleEditOperation>{
+export function fromTextEdit(edit: theia.TextEdit): model.TextEdit {
+    return {
         text: edit.newText,
         range: fromRange(edit.range)
     };
diff --git a/yarn.lock b/yarn.lock
index 0d0f7a7229df1..1b9f514136209 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -785,9 +785,10 @@
   dependencies:
     nan "2.10.0"
 
-"@typefox/monaco-editor-core@^0.14.6":
-  version "0.14.6"
-  resolved "https://registry.yarnpkg.com/@typefox/monaco-editor-core/-/monaco-editor-core-0.14.6.tgz#32e378f3430913504ea9c7063944444a04429892"
+"@typefox/monaco-editor-core@next":
+  version "0.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/@typefox/monaco-editor-core/-/monaco-editor-core-0.18.0-next.1.tgz#c31d3361215703b524065f460e1b4b6b714699db"
+  integrity sha512-l7uZbyLfXwh5b5YHv1U2T5KQAVrPTnUqklRd1HEI6ZBWGqw5ukXa5L17ATaVYRpCsy7ZtqyOQS2viWSS/goNFA==
 
 "@types/base64-arraybuffer@0.1.0":
   version "0.1.0"
@@ -7347,9 +7348,9 @@ monaco-html@^2.0.2:
   resolved "https://registry.yarnpkg.com/monaco-html/-/monaco-html-2.2.0.tgz#435f2f4ce6e5c7f707fb57e7c8a05b41e5cd1aa0"
 
 monaco-languageclient@next:
-  version "0.9.0-next.1"
-  resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.9.0-next.1.tgz#2a3c133f3b16c345aa3eba0738e7a0161cb2b05e"
-  integrity sha512-POZOxVsRBzqK14yfk66clEefTFR+Ahx77uhyhanmJG/pItBVX4E962N/uUwYZPGc4zO3FZ+Ef7tFFxbyIQXdAg==
+  version "0.9.1-next.20"
+  resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.9.1-next.20.tgz#6d5779d74208402de158edee3f9fd69c1c649bac"
+  integrity sha512-avwZKT+Yq/8Xpn6qLxHCzgHLNHBfXM7dUnzkT4kHNAMQ5jGuGHtMGdidc/C5YITgofn6kQfdEDaWMy80mzchzw==
   dependencies:
     glob-to-regexp "^0.3.0"
     vscode-jsonrpc "^4.1.0-next"