@theia/monaco 1.45.0 → 1.46.0-next.72

package/lib/browser/monaco-context-menu.js

@@ -1,103 +1,113 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonacoContextMenuService = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const browser_1 = require("@theia/editor/lib/browser");
-const browser_2 = require("@theia/core/lib/browser");
-const widgets_1 = require("@theia/core/shared/@phosphor/widgets");
-const commands_1 = require("@theia/core/shared/@phosphor/commands");
-const actions_1 = require("@theia/monaco-editor-core/esm/vs/platform/actions/common/actions");
-const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
-let MonacoContextMenuService = class MonacoContextMenuService {
-    constructor(contextMenuRenderer) {
-        this.contextMenuRenderer = contextMenuRenderer;
-        this.onDidShowContextMenuEmitter = new event_1.Emitter();
-        this.onDidHideContextMenuEmitter = new event_1.Emitter();
-    }
-    get onDidShowContextMenu() {
-        return this.onDidShowContextMenuEmitter.event;
-    }
-    ;
-    get onDidHideContextMenu() {
-        return this.onDidShowContextMenuEmitter.event;
-    }
-    ;
-    showContextMenu(delegate) {
-        const anchor = (0, browser_2.toAnchor)(delegate.getAnchor());
-        const actions = delegate.getActions();
-        const onHide = () => {
-            var _a;
-            (_a = delegate.onHide) === null || _a === void 0 ? void 0 : _a.call(delegate, false);
-            this.onDidHideContextMenuEmitter.fire();
-        };
-        // Actions for editor context menu come as 'MenuItemAction' items
-        // In case of 'Quick Fix' actions come as 'CodeActionAction' items
-        if (actions.length > 0 && actions[0] instanceof actions_1.MenuItemAction) {
-            this.contextMenuRenderer.render({
-                menuPath: this.menuPath(),
-                anchor,
-                onHide
-            });
-        }
-        else {
-            const commands = new commands_1.CommandRegistry();
-            const menu = new widgets_1.Menu({
-                commands
-            });
-            for (const action of actions) {
-                const commandId = 'quickfix_' + actions.indexOf(action);
-                commands.addCommand(commandId, {
-                    label: action.label,
-                    className: action.class,
-                    isToggled: () => Boolean(action.checked),
-                    isEnabled: () => action.enabled,
-                    execute: () => action.run()
-                });
-                menu.addItem({
-                    type: 'command',
-                    command: commandId
-                });
-            }
-            menu.aboutToClose.connect(() => onHide());
-            menu.open(anchor.x, anchor.y);
-        }
-        this.onDidShowContextMenuEmitter.fire();
-    }
-    menuPath() {
-        return browser_1.EDITOR_CONTEXT_MENU;
-    }
-};
-MonacoContextMenuService = __decorate([
-    (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(browser_2.ContextMenuRenderer)),
-    __metadata("design:paramtypes", [browser_2.ContextMenuRenderer])
-], MonacoContextMenuService);
-exports.MonacoContextMenuService = MonacoContextMenuService;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonacoContextMenuService = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const browser_1 = require("@theia/editor/lib/browser");
+const browser_2 = require("@theia/core/lib/browser");
+const widgets_1 = require("@theia/core/shared/@phosphor/widgets");
+const commands_1 = require("@theia/core/shared/@phosphor/commands");
+const actions_1 = require("@theia/monaco-editor-core/esm/vs/platform/actions/common/actions");
+const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
+const mouseEvent_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/mouseEvent");
+let MonacoContextMenuService = class MonacoContextMenuService {
+    constructor() {
+        this.onDidShowContextMenuEmitter = new event_1.Emitter();
+        this.onDidHideContextMenuEmitter = new event_1.Emitter();
+    }
+    get onDidShowContextMenu() {
+        return this.onDidShowContextMenuEmitter.event;
+    }
+    ;
+    get onDidHideContextMenu() {
+        return this.onDidShowContextMenuEmitter.event;
+    }
+    ;
+    toAnchor(anchor) {
+        if (anchor instanceof HTMLElement) {
+            return { x: anchor.offsetLeft, y: anchor.offsetTop };
+        }
+        else if (anchor instanceof mouseEvent_1.StandardMouseEvent) {
+            return { x: anchor.posx, y: anchor.posy };
+        }
+        else {
+            return anchor;
+        }
+    }
+    showContextMenu(delegate) {
+        const anchor = this.toAnchor(delegate.getAnchor());
+        const actions = delegate.getActions();
+        const onHide = () => {
+            var _a;
+            (_a = delegate.onHide) === null || _a === void 0 ? void 0 : _a.call(delegate, false);
+            this.onDidHideContextMenuEmitter.fire();
+        };
+        // Actions for editor context menu come as 'MenuItemAction' items
+        // In case of 'Quick Fix' actions come as 'CodeActionAction' items
+        if (actions.length > 0 && actions[0] instanceof actions_1.MenuItemAction) {
+            this.contextMenuRenderer.render({
+                menuPath: this.menuPath(),
+                anchor,
+                onHide
+            });
+        }
+        else {
+            const commands = new commands_1.CommandRegistry();
+            const menu = new widgets_1.Menu({
+                commands
+            });
+            for (const action of actions) {
+                const commandId = 'quickfix_' + actions.indexOf(action);
+                commands.addCommand(commandId, {
+                    label: action.label,
+                    className: action.class,
+                    isToggled: () => Boolean(action.checked),
+                    isEnabled: () => action.enabled,
+                    execute: () => action.run()
+                });
+                menu.addItem({
+                    type: 'command',
+                    command: commandId
+                });
+            }
+            menu.aboutToClose.connect(() => onHide());
+            menu.open(anchor.x, anchor.y);
+        }
+        this.onDidShowContextMenuEmitter.fire();
+    }
+    menuPath() {
+        return browser_1.EDITOR_CONTEXT_MENU;
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(browser_2.ContextMenuRenderer),
+    __metadata("design:type", browser_2.ContextMenuRenderer)
+], MonacoContextMenuService.prototype, "contextMenuRenderer", void 0);
+MonacoContextMenuService = __decorate([
+    (0, inversify_1.injectable)()
+], MonacoContextMenuService);
+exports.MonacoContextMenuService = MonacoContextMenuService;
 //# sourceMappingURL=monaco-context-menu.js.map

package/lib/browser/monaco-context-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-diff-editor.d.ts

@@ -1,30 +1,30 @@
-import URI from '@theia/core/lib/common/uri';
-import { Disposable } from '@theia/core/lib/common';
-import { Dimension, DiffNavigator, DeltaDecorationParams } from '@theia/editor/lib/browser';
-import { MonacoEditorModel } from './monaco-editor-model';
-import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
-import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
-import * as monaco from '@theia/monaco-editor-core';
-import { IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { IDiffNavigatorOptions } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneEditor';
-export declare namespace MonacoDiffEditor {
-    interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions, IDiffNavigatorOptions {
-    }
-}
-export declare class MonacoDiffEditor extends MonacoEditor {
-    readonly originalModel: MonacoEditorModel;
-    readonly modifiedModel: MonacoEditorModel;
-    protected readonly diffNavigatorFactory: MonacoDiffNavigatorFactory;
-    protected _diffEditor: monaco.editor.IStandaloneDiffEditor;
-    protected _diffNavigator: DiffNavigator;
-    constructor(uri: URI, node: HTMLElement, originalModel: MonacoEditorModel, modifiedModel: MonacoEditorModel, services: MonacoEditorServices, diffNavigatorFactory: MonacoDiffNavigatorFactory, options?: MonacoDiffEditor.IOptions, override?: EditorServiceOverrides);
-    get diffEditor(): monaco.editor.IStandaloneDiffEditor;
-    get diffNavigator(): DiffNavigator;
-    protected create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable;
-    protected resize(dimension: Dimension | null): void;
-    isActionSupported(id: string): boolean;
-    deltaDecorations(params: DeltaDecorationParams): string[];
-    getResourceUri(): URI;
-    createMoveToUri(resourceUri: URI): URI;
-}
+import URI from '@theia/core/lib/common/uri';
+import { Disposable } from '@theia/core/lib/common';
+import { Dimension, DiffNavigator, DeltaDecorationParams } from '@theia/editor/lib/browser';
+import { MonacoEditorModel } from './monaco-editor-model';
+import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
+import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
+import * as monaco from '@theia/monaco-editor-core';
+import { IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { StandaloneDiffEditor2 } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+export declare namespace MonacoDiffEditor {
+    interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions {
+    }
+}
+export declare class MonacoDiffEditor extends MonacoEditor {
+    readonly originalModel: MonacoEditorModel;
+    readonly modifiedModel: MonacoEditorModel;
+    protected readonly diffNavigatorFactory: MonacoDiffNavigatorFactory;
+    protected _diffEditor: StandaloneDiffEditor2;
+    protected _diffNavigator: DiffNavigator;
+    constructor(uri: URI, node: HTMLElement, originalModel: MonacoEditorModel, modifiedModel: MonacoEditorModel, services: MonacoEditorServices, diffNavigatorFactory: MonacoDiffNavigatorFactory, options?: MonacoDiffEditor.IOptions, override?: EditorServiceOverrides);
+    get diffEditor(): monaco.editor.IStandaloneDiffEditor;
+    get diffNavigator(): DiffNavigator;
+    protected create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable;
+    protected resize(dimension: Dimension | null): void;
+    isActionSupported(id: string): boolean;
+    deltaDecorations(params: DeltaDecorationParams): string[];
+    getResourceUri(): URI;
+    createMoveToUri(resourceUri: URI): URI;
+}
 //# sourceMappingURL=monaco-diff-editor.d.ts.map

package/lib/browser/monaco-diff-editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC/G,OAAO,EAAE,qBAAqB,EAAE,MAAM,6EAA6E,CAAC;AAGpH,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,QAAS,SAAQ,YAAY,CAAC,cAAc,EAAE,8BAA8B,EAAE,qBAAqB;KACnH;CACJ;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAO1C,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IAEzC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IATvE,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC;IAC3D,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;gBAGpC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,WAAW,EACR,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,iBAAiB,EACzC,QAAQ,EAAE,oBAAoB,EACX,oBAAoB,EAAE,0BAA0B,EACnE,OAAO,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,CAAC,EAAE,sBAAsB;IAUrC,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAEpD;IAED,IAAI,aAAa,IAAI,aAAa,CAEjC;cAEkB,MAAM,CAAC,OAAO,CAAC,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,sBAAsB,GAAG,UAAU;cAY/F,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI;IAOnD,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAKtC,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAKzD,cAAc,IAAI,GAAG;IAGrB,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;CAKlD"}
+{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC/G,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,QAAS,SAAQ,YAAY,CAAC,cAAc,EAAE,8BAA8B;KAC5F;CACJ;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAO1C,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IAEzC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IATvE,SAAS,CAAC,WAAW,EAAE,qBAAqB,CAAC;IAC7C,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;gBAGpC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,WAAW,EACR,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,iBAAiB,EACzC,QAAQ,EAAE,oBAAoB,EACX,oBAAoB,EAAE,0BAA0B,EACnE,OAAO,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,CAAC,EAAE,sBAAsB;IAUrC,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAEpD;IAED,IAAI,aAAa,IAAI,aAAa,CAEjC;cAEkB,MAAM,CAAC,OAAO,CAAC,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,sBAAsB,GAAG,UAAU;cAY/F,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI;IAOnD,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAKtC,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAKzD,cAAc,IAAI,GAAG;IAGrB,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;CAKlD"}

package/lib/browser/monaco-diff-editor.js

@@ -1,75 +1,75 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonacoDiffEditor = void 0;
-const uri_1 = require("@theia/core/lib/common/uri");
-const monaco_editor_1 = require("./monaco-editor");
-const diff_uris_1 = require("@theia/core/lib/browser/diff-uris");
-const standaloneCodeEditor_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor");
-class MonacoDiffEditor extends monaco_editor_1.MonacoEditor {
-    constructor(uri, node, originalModel, modifiedModel, services, diffNavigatorFactory, options, override) {
-        super(uri, modifiedModel, node, services, options, override);
-        this.originalModel = originalModel;
-        this.modifiedModel = modifiedModel;
-        this.diffNavigatorFactory = diffNavigatorFactory;
-        this.documents.add(originalModel);
-        const original = originalModel.textEditorModel;
-        const modified = modifiedModel.textEditorModel;
-        this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor, options);
-        this._diffEditor.setModel({ original, modified });
-    }
-    get diffEditor() {
-        return this._diffEditor;
-    }
-    get diffNavigator() {
-        return this._diffNavigator;
-    }
-    create(options, override) {
-        const instantiator = this.getInstantiatorWithOverrides(override);
-        /**
-         *  @monaco-uplift. Should be guaranteed to work.
-         *  Incomparable enums prevent TypeScript from believing that public IStandaloneDiffEditor is satisfied by private StandaloneDiffEditor
-         */
-        this._diffEditor = instantiator
-            .createInstance(standaloneCodeEditor_1.StandaloneDiffEditor, this.node, { ...options, fixedOverflowWidgets: true });
-        this.editor = this._diffEditor.getModifiedEditor();
-        return this._diffEditor;
-    }
-    resize(dimension) {
-        if (this.node) {
-            const layoutSize = this.computeLayoutSize(this.node, dimension);
-            this._diffEditor.layout(layoutSize);
-        }
-    }
-    isActionSupported(id) {
-        const action = this._diffEditor.getSupportedActions().find(a => a.id === id);
-        return !!action && action.isSupported() && super.isActionSupported(id);
-    }
-    deltaDecorations(params) {
-        console.warn('`deltaDecorations` should be called on either the original, or the modified editor.');
-        return [];
-    }
-    getResourceUri() {
-        return new uri_1.default(this.originalModel.uri);
-    }
-    createMoveToUri(resourceUri) {
-        const [left, right] = diff_uris_1.DiffUris.decode(this.uri);
-        return diff_uris_1.DiffUris.encode(left.withPath(resourceUri.path), right.withPath(resourceUri.path));
-    }
-}
-exports.MonacoDiffEditor = MonacoDiffEditor;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonacoDiffEditor = void 0;
+const uri_1 = require("@theia/core/lib/common/uri");
+const monaco_editor_1 = require("./monaco-editor");
+const diff_uris_1 = require("@theia/core/lib/browser/diff-uris");
+const standaloneCodeEditor_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor");
+class MonacoDiffEditor extends monaco_editor_1.MonacoEditor {
+    constructor(uri, node, originalModel, modifiedModel, services, diffNavigatorFactory, options, override) {
+        super(uri, modifiedModel, node, services, options, override);
+        this.originalModel = originalModel;
+        this.modifiedModel = modifiedModel;
+        this.diffNavigatorFactory = diffNavigatorFactory;
+        this.documents.add(originalModel);
+        const original = originalModel.textEditorModel;
+        const modified = modifiedModel.textEditorModel;
+        this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
+        this._diffEditor.setModel({ original, modified });
+    }
+    get diffEditor() {
+        return this._diffEditor;
+    }
+    get diffNavigator() {
+        return this._diffNavigator;
+    }
+    create(options, override) {
+        const instantiator = this.getInstantiatorWithOverrides(override);
+        /**
+         *  @monaco-uplift. Should be guaranteed to work.
+         *  Incomparable enums prevent TypeScript from believing that public IStandaloneDiffEditor is satisfied by private StandaloneDiffEditor
+         */
+        this._diffEditor = instantiator
+            .createInstance(standaloneCodeEditor_1.StandaloneDiffEditor2, this.node, { ...options, fixedOverflowWidgets: true });
+        this.editor = this._diffEditor.getModifiedEditor();
+        return this._diffEditor;
+    }
+    resize(dimension) {
+        if (this.node) {
+            const layoutSize = this.computeLayoutSize(this.node, dimension);
+            this._diffEditor.layout(layoutSize);
+        }
+    }
+    isActionSupported(id) {
+        const action = this._diffEditor.getSupportedActions().find(a => a.id === id);
+        return !!action && action.isSupported() && super.isActionSupported(id);
+    }
+    deltaDecorations(params) {
+        console.warn('`deltaDecorations` should be called on either the original, or the modified editor.');
+        return [];
+    }
+    getResourceUri() {
+        return new uri_1.default(this.originalModel.uri);
+    }
+    createMoveToUri(resourceUri) {
+        const [left, right] = diff_uris_1.DiffUris.decode(this.uri);
+        return diff_uris_1.DiffUris.encode(left.withPath(resourceUri.path), right.withPath(resourceUri.path));
+    }
+}
+exports.MonacoDiffEditor = MonacoDiffEditor;
 //# sourceMappingURL=monaco-diff-editor.js.map

package/lib/browser/monaco-diff-editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-diff-navigator-factory.d.ts

@@ -1,8 +1,7 @@
-import { DiffNavigator } from '@theia/editor/lib/browser';
-import * as monaco from '@theia/monaco-editor-core';
-import { IStandaloneDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
-export declare class MonacoDiffNavigatorFactory {
-    static nullNavigator: DiffNavigator;
-    createdDiffNavigator(editor: IStandaloneDiffEditor | monaco.editor.IStandaloneDiffEditor, options?: monaco.editor.IDiffNavigatorOptions): DiffNavigator;
-}
+import { DiffNavigator } from '@theia/editor/lib/browser';
+import { StandaloneDiffEditor2 } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+export declare class MonacoDiffNavigatorFactory {
+    static nullNavigator: DiffNavigator;
+    createdDiffNavigator(editor: StandaloneDiffEditor2): DiffNavigator;
+}
 //# sourceMappingURL=monaco-diff-navigator-factory.d.ts.map

package/lib/browser/monaco-diff-navigator-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-diff-navigator-factory.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-navigator-factory.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,qBACa,0BAA0B;IAEnC,MAAM,CAAC,aAAa,gBAMlB;IAEF,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,aAAa;CA2B1J"}
+{"version":3,"file":"monaco-diff-navigator-factory.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-navigator-factory.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,qBACa,0BAA0B;IAEnC,MAAM,CAAC,aAAa,gBAKlB;IAEF,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,aAAa;CAQrE"}

package/lib/browser/monaco-diff-navigator-factory.js

@@ -1,67 +1,46 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonacoDiffNavigatorFactory = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const diffNavigator_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/widget/diffNavigator");
-let MonacoDiffNavigatorFactory = class MonacoDiffNavigatorFactory {
-    createdDiffNavigator(editor, options) {
-        const navigator = new diffNavigator_1.DiffNavigator(editor, options);
-        const ensureInitialized = (fwd) => {
-            if (navigator['nextIdx'] < 0) {
-                navigator['_initIdx'](fwd);
-            }
-        };
-        return {
-            canNavigate: () => navigator.canNavigate(),
-            hasNext: () => {
-                if (navigator.canNavigate()) {
-                    ensureInitialized(true);
-                    return navigator['nextIdx'] + 1 < navigator['ranges'].length;
-                }
-                return false;
-            },
-            hasPrevious: () => {
-                if (navigator.canNavigate()) {
-                    ensureInitialized(false);
-                    return navigator['nextIdx'] > 0;
-                }
-                return false;
-            },
-            next: () => navigator.next(),
-            previous: () => navigator.previous(),
-        };
-    }
-};
-MonacoDiffNavigatorFactory.nullNavigator = {
-    canNavigate: () => false,
-    hasNext: () => false,
-    hasPrevious: () => false,
-    next: () => { },
-    previous: () => { },
-};
-MonacoDiffNavigatorFactory = __decorate([
-    (0, inversify_1.injectable)()
-], MonacoDiffNavigatorFactory);
-exports.MonacoDiffNavigatorFactory = MonacoDiffNavigatorFactory;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonacoDiffNavigatorFactory = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+let MonacoDiffNavigatorFactory = class MonacoDiffNavigatorFactory {
+    createdDiffNavigator(editor) {
+        return {
+            hasNext: () => true,
+            hasPrevious: () => true,
+            next: () => editor.goToDiff('next'),
+            previous: () => editor.goToDiff('previous')
+        };
+    }
+};
+MonacoDiffNavigatorFactory.nullNavigator = {
+    hasNext: () => false,
+    hasPrevious: () => false,
+    next: () => { },
+    previous: () => { },
+};
+MonacoDiffNavigatorFactory = __decorate([
+    (0, inversify_1.injectable)()
+], MonacoDiffNavigatorFactory);
+exports.MonacoDiffNavigatorFactory = MonacoDiffNavigatorFactory;
 //# sourceMappingURL=monaco-diff-navigator-factory.js.map

package/lib/browser/monaco-diff-navigator-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-diff-navigator-factory.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-navigator-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAG1D,wGAA4H;AAI5H,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAUnC,oBAAoB,CAAC,MAAmE,EAAE,OAA6C;QACnI,MAAM,SAAS,GAAG,IAAI,6BAAmB,CAAC,MAA+B,EAAE,OAAO,CAAC,CAAC;QACpF,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,EAAE;YACvC,IAAI,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC1B,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC;aAC9B;QACL,CAAC,CAAC;QACF,OAAO;YACH,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1C,OAAO,EAAE,GAAG,EAAE;gBACV,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;oBACzB,iBAAiB,CAAC,IAAI,CAAC,CAAC;oBACxB,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;iBAChE;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,WAAW,EAAE,GAAG,EAAE;gBACd,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;oBACzB,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACzB,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;iBACnC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE;SACvC,CAAC;IACN,CAAC;CACJ,CAAA;AAnCU,wCAAa,GAAkB;IAClC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;IACxB,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK;IACpB,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;IACxB,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;CACrB,CAAA;AARO,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAqCtC;AArCY,gEAA0B"}
+{"version":3,"file":"monaco-diff-navigator-factory.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-navigator-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAK1D,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IASnC,oBAAoB,CAAC,MAA6B;QAC9C,OAAO;YACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;YACnB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;YACvB,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;SAC9C,CAAC;IACN,CAAC;CACJ,CAAA;AAfU,wCAAa,GAAkB;IAClC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK;IACpB,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;IACxB,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;CACrB,CAAA;AAPO,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAiBtC;AAjBY,gEAA0B"}