npm - @theia/monaco - Versions diffs - 1.24.0-next.46 → 1.24.0-next.49 - Mend

@theia/monaco 1.24.0-next.46 → 1.24.0-next.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

package/lib/browser/monaco-editor-provider.d.ts CHANGED Viewed

@@ -1,18 +1,16 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
 import URI from '@theia/core/lib/common/uri';
 import { EditorPreferenceChange, EditorPreferences, TextEditor, DiffNavigator } from '@theia/editor/lib/browser';
-import { DisposableCollection, Disposable } from '@theia/core/lib/common';
+import { DisposableCollection } from '@theia/core/lib/common';
 import { MonacoCommandServiceFactory } from './monaco-command-service';
 import { MonacoContextMenuService } from './monaco-context-menu';
 import { MonacoDiffEditor } from './monaco-diff-editor';
 import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
-import { MonacoEditor, MonacoEditorServices } from './monaco-editor';
+import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
 import { MonacoEditorModel, WillSaveMonacoModelEvent } from './monaco-editor-model';
 import { MonacoEditorService } from './monaco-editor-service';
 import { MonacoTextModelService } from './monaco-text-model-service';
 import { MonacoWorkspace } from './monaco-workspace';
 import { MonacoBulkEditService } from './monaco-bulk-edit-service';
-import IEditorOverrideServices = monaco.editor.IEditorOverrideServices;
 import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import { ContributionProvider } from '@theia/core';
 import { KeybindingRegistry, OpenerService, PreferenceValidationService } from '@theia/core/lib/browser';
@@ -20,10 +18,13 @@ import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
 import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
 import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
 import { MonacoQuickInputImplementation } from './monaco-quick-input-service';
+import { ContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import * as monaco from '@theia/monaco-editor-core';
+import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
 export declare const MonacoEditorFactory: unique symbol;
 export interface MonacoEditorFactory {
     readonly scheme: string;
-    create(model: MonacoEditorModel, defaultOptions: MonacoEditor.IOptions, defaultOverrides: IEditorOverrideServices): MonacoEditor;
+    create(model: MonacoEditorModel, defaultOptions: MonacoEditor.IOptions, defaultOverrides: EditorServiceOverrides): MonacoEditor;
 }
 export declare class MonacoEditorProvider {
     protected readonly codeEditorService: MonacoEditorService;
@@ -37,7 +38,7 @@ export declare class MonacoEditorProvider {
     protected readonly diffNavigatorFactory: MonacoDiffNavigatorFactory;
     /** @deprecated since 1.6.0 */
     protected readonly applicationServer: ApplicationServer;
-    protected readonly contextKeyService: monaco.contextKeyService.ContextKeyService;
+    protected readonly contextKeyService: ContextKeyService;
     protected readonly factories: ContributionProvider<MonacoEditorFactory>;
     protected readonly bulkEditService: MonacoBulkEditService;
     protected readonly services: MonacoEditorServices;
@@ -55,30 +56,24 @@ export declare class MonacoEditorProvider {
     get current(): MonacoEditor | undefined;
     constructor(codeEditorService: MonacoEditorService, textModelService: MonacoTextModelService, contextMenuService: MonacoContextMenuService, m2p: MonacoToProtocolConverter, p2m: ProtocolToMonacoConverter, workspace: MonacoWorkspace, commandServiceFactory: MonacoCommandServiceFactory, editorPreferences: EditorPreferences, diffNavigatorFactory: MonacoDiffNavigatorFactory,
     /** @deprecated since 1.6.0 */
-    applicationServer: ApplicationServer, contextKeyService: monaco.contextKeyService.ContextKeyService);
+    applicationServer: ApplicationServer, contextKeyService: ContextKeyService);
     protected getModel(uri: URI, toDispose: DisposableCollection): Promise<MonacoEditorModel>;
     get(uri: URI): Promise<MonacoEditor>;
-    protected doCreateEditor(uri: URI, factory: (override: IEditorOverrideServices, toDispose: DisposableCollection) => Promise<MonacoEditor>): Promise<MonacoEditor>;
+    protected doCreateEditor(uri: URI, factory: (override: EditorServiceOverrides, toDispose: DisposableCollection) => Promise<MonacoEditor>): Promise<MonacoEditor>;
     /**
      * Intercept internal Monaco open calls and delegate to OpenerService.
      */
-    protected interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: monaco.services.OpenInternalOptions | monaco.services.OpenExternalOptions): Promise<boolean>;
-    /**
-     * Suppresses Monaco keydown listener to avoid triggering default Monaco keybindings
-     * if they are overridden by a user. Monaco keybindings should be registered as Theia keybindings
-     * to allow a user to customize them.
-     */
-    protected suppressMonacoKeybindingListener(editor: MonacoEditor): void;
+    protected interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean>;
     protected injectKeybindingResolver(editor: MonacoEditor): void;
-    protected createEditor(uri: URI, override: IEditorOverrideServices, toDispose: DisposableCollection): Promise<MonacoEditor>;
+    protected createEditor(uri: URI, override: EditorServiceOverrides, toDispose: DisposableCollection): Promise<MonacoEditor>;
     protected get preferencePrefixes(): string[];
-    protected createMonacoEditor(uri: URI, override: IEditorOverrideServices, toDispose: DisposableCollection): Promise<MonacoEditor>;
+    protected createMonacoEditor(uri: URI, override: EditorServiceOverrides, toDispose: DisposableCollection): Promise<MonacoEditor>;
     protected createMonacoEditorOptions(model: MonacoEditorModel): MonacoEditor.IOptions;
     protected updateMonacoEditorOptions(editor: MonacoEditor, event?: EditorPreferenceChange): void;
     protected shouldFormat(editor: MonacoEditor, event: WillSaveMonacoModelEvent): boolean;
     protected formatOnSave(editor: MonacoEditor, event: WillSaveMonacoModelEvent): Promise<monaco.editor.IIdentifiedSingleEditOperation[]>;
     protected get diffPreferencePrefixes(): string[];
-    protected createMonacoDiffEditor(uri: URI, override: IEditorOverrideServices, toDispose: DisposableCollection): Promise<MonacoDiffEditor>;
+    protected createMonacoDiffEditor(uri: URI, override: EditorServiceOverrides, toDispose: DisposableCollection): Promise<MonacoDiffEditor>;
     protected createMonacoDiffEditorOptions(original: MonacoEditorModel, modified: MonacoEditorModel): MonacoDiffEditor.IOptions;
     protected updateMonacoDiffEditorOptions(editor: MonacoDiffEditor, event?: EditorPreferenceChange, resourceUri?: string): void;
     /** @deprecated always pass a language as an overrideIdentifier */
@@ -97,7 +92,6 @@ export declare class MonacoEditorProvider {
     protected doSetOption(obj: {
         [name: string]: any;
     }, value: any, names: string[], idx?: number): void;
-    protected installReferencesController(editor: MonacoEditor): Disposable;
     getDiffNavigator(editor: TextEditor): DiffNavigator;
     createInline(uri: URI, node: HTMLElement, options?: MonacoEditor.IOptions): Promise<MonacoEditor>;
     static inlineOptions: monaco.editor.IEditorConstructionOptions;

package/lib/browser/monaco-editor-provider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":";AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAGjH,OAAO,EAAE,oBAAoB,~~EAAa~~,~~UAAU,EAAE,~~MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;~~AACrE~~,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;~~AAEnE~~,OAAO,~~uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;AACvE,OAAO,~~EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAyC,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAGhJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;~~AAG9E~~,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,~~uBAAuB~~,GAAG,YAAY,CAAC;~~CACpI~~;AAED,qBACa,oBAAoB;IAsCI,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB;IACtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB;IACzD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB;IAC9D,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IAC3D,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe;IACjC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B;IAC/E,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IACvG,8BAA8B;IACH,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;~~IAC9B~~,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,~~MAAM,CAAC,~~iBAAiB~~,CAAC,iBAAiB~~;~~IA7CxI~~,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,qBAAqB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,qBAAqB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,2BAA2B,CAAC;IAEpE,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IAC7C;;;;OAIG;IACH,IAAI,OAAO,IAAI,YAAY,GAAG,SAAS,CAEtC;gBAGmD,iBAAiB,EAAE,mBAAmB,EACnC,gBAAgB,EAAE,sBAAsB,EACtC,kBAAkB,EAAE,wBAAwB,EAC3C,GAAG,EAAE,yBAAyB,EAC9B,GAAG,EAAE,yBAAyB,EACxC,SAAS,EAAE,eAAe,EACd,qBAAqB,EAAE,2BAA2B,EAC5D,iBAAiB,EAAE,iBAAiB,EAC3B,oBAAoB,EAAE,0BAA0B;IACvG,8BAA8B;IACgB,iBAAiB,EAAE,iBAAiB,~~EACX~~,iBAAiB,EAAE,~~MAAM,CAAC,~~iBAAiB~~,CAAC,iBAAiB~~;~~cAYxH~~,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAczF,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;cAK1B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,~~CAAC~~,QAAQ,EAAE,~~uBAAuB~~,EAAE,SAAS,EAAE,oBAAoB,KAAK,OAAO,CAAC,YAAY,CAAC,~~GAAG~~,OAAO,CAAC,YAAY,CAAC;~~IA4CvK~~;;OAEG;cACa,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,EAAE,aAAa,CAAC,EAAE,~~MAAM,CAAC,QAAQ,CAAC,~~mBAAmB,GAAG,~~MAAM,CAAC,QAAQ,CAAC,~~mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;~~IA0B1K;;;;OAIG;IACH~~,SAAS,CAAC,~~gCAAgC,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IActE,SAAS,CAAC,~~wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAe9D,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,~~uBAAuB~~,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;~~IAO3H~~,SAAS,KAAK,kBAAkB,IAAI,MAAM,EAAE,CAE3C;cACe,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,~~uBAAuB~~,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;~~IAgBvI~~,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,GAAG,YAAY,CAAC,QAAQ;IAOpF,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,sBAAsB,GAAG,IAAI;IAe/F,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,wBAAwB,GAAG,OAAO;cActE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC;IAuB5I,SAAS,KAAK,sBAAsB,IAAI,MAAM,EAAE,CAE/C;cACe,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,~~uBAAuB~~,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;~~IAuB/I~~,SAAS,CAAC,6BAA6B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,GAAG,gBAAgB,CAAC,QAAQ;IAM5H,SAAS,CAAC,6BAA6B,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAc7H,kEAAkE;IAClE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IACjF,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAU7G,SAAS,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GAAG;QAChH,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;KACvB;IAKD,SAAS,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAQ1E,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,MAAU,GAAG,IAAI;IAYvG,~~SAAS,CAAC,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU;IAuDvE,~~gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa;IAO7C,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;~~IA6BvG~~,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,0BAA0B,CAqB5D;CAEL"}
1	+ {"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-editor-provider.js CHANGED Viewed

@@ -54,7 +54,21 @@ const monaco_to_protocol_converter_1 = require("./monaco-to-protocol-converter")
 const protocol_to_monaco_converter_1 = require("./protocol-to-monaco-converter");
 const browser_3 = require("@theia/filesystem/lib/browser");
 const monaco_quick_input_service_1 = require("./monaco-quick-input-service");
+const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
+const openerService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService");
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
+const opener_1 = require("@theia/monaco-editor-core/esm/vs/platform/opener/common/opener");
+const keybindings_1 = require("@theia/monaco-editor-core/esm/vs/base/common/keybindings");
+const codeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService");
+const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
+const keybinding_1 = require("@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding");
 const promise_util_1 = require("@theia/core/lib/common/promise-util");
+const resolverService_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService");
+const contextView_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView");
+const bulkEditService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService");
+const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
+const quickInput_1 = require("@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput");
+const commands_1 = require("@theia/monaco-editor-core/esm/vs/platform/commands/common/commands");
 exports.MonacoEditorFactory = Symbol('MonacoEditorFactory');
 let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
     constructor(codeEditorService, textModelService, contextMenuService, m2p, p2m, workspace, commandServiceFactory, editorPreferences, diffNavigatorFactory,
@@ -71,13 +85,9 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
         this.diffNavigatorFactory = diffNavigatorFactory;
         this.applicationServer = applicationServer;
         this.contextKeyService = contextKeyService;
-        const staticServices = monaco.services.StaticServices;
-        const init = staticServices.init.bind(monaco.services.StaticServices);
-        monaco.services.StaticServices.init = o => {
-            const result = init(o);
-            result[0].set(monaco.services.ICodeEditorService, codeEditorService);
-            return result;
-        };
+        standaloneServices_1.StandaloneServices.initialize({
+            [codeEditorService_1.ICodeEditorService.toString()]: codeEditorService,
+        });
     }
     /**
      * Returns the last focused MonacoEditor.
@@ -109,28 +119,27 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
         const domNode = document.createElement('div');
         const contextKeyService = this.contextKeyService.createScoped(domNode);
         const { codeEditorService, textModelService, contextMenuService } = this;
-        const IWorkspaceEditService = this.bulkEditService;
+        const workspaceEditService = this.bulkEditService;
         const toDispose = new common_1.DisposableCollection(commandService);
-        const openerService = new monaco.services.OpenerService(codeEditorService, commandService);
+        const openerService = new openerService_1.OpenerService(codeEditorService, commandService);
         openerService.registerOpener({
             open: (u, options) => this.interceptOpen(u, options)
         });
-        const editor = await factory({
-            codeEditorService,
-            textModelService,
-            contextMenuService,
-            commandService,
-            IWorkspaceEditService,
-            contextKeyService,
-            openerService,
-            quickInputService: this.quickInputService
-        }, toDispose);
+        const overrides = [
+            [codeEditorService_1.ICodeEditorService, codeEditorService],
+            [resolverService_1.ITextModelService, textModelService],
+            [contextView_1.IContextMenuService, contextMenuService],
+            [bulkEditService_1.IBulkEditService, workspaceEditService],
+            [contextkey_1.IContextKeyService, contextKeyService],
+            [opener_1.IOpenerService, openerService],
+            [quickInput_1.IQuickInputService, this.quickInputService],
+            [commands_1.ICommandService, commandService]
+        ];
+        const editor = await factory(overrides, toDispose);
         editor.onDispose(() => toDispose.dispose());
-        this.suppressMonacoKeybindingListener(editor);
         this.injectKeybindingResolver(editor);
-        const standaloneCommandService = new monaco.services.StandaloneCommandService(editor.instantiationService);
+        const standaloneCommandService = new standaloneServices_1.StandaloneCommandService(standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService));
         commandService.setDelegate(standaloneCommandService);
-        toDispose.push(this.installReferencesController(editor));
         toDispose.push(editor.onFocusChanged(focused => {
             if (focused) {
                 this._current = editor;
@@ -172,29 +181,11 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
             return false;
         }
     }
-    /**
-     * Suppresses Monaco keydown listener to avoid triggering default Monaco keybindings
-     * if they are overridden by a user. Monaco keybindings should be registered as Theia keybindings
-     * to allow a user to customize them.
-     */
-    suppressMonacoKeybindingListener(editor) {
-        let keydownListener;
-        const keybindingService = editor.getControl()._standaloneKeybindingService;
-        for (const listener of keybindingService._store._toDispose) {
-            if (listener['_type'] === 'keydown') {
-                keydownListener = listener;
-                break;
-            }
-        }
-        if (keydownListener) {
-            keydownListener.dispose();
-        }
-    }
     injectKeybindingResolver(editor) {
-        const keybindingService = editor.getControl()._standaloneKeybindingService;
+        const keybindingService = standaloneServices_1.StandaloneServices.get(keybinding_1.IKeybindingService);
         keybindingService.resolveKeybinding = keybinding => [new monaco_resolved_keybinding_1.MonacoResolvedKeybinding(monaco_resolved_keybinding_1.MonacoResolvedKeybinding.keySequence(keybinding), this.keybindingRegistry)];
         keybindingService.resolveKeyboardEvent = keyboardEvent => {
-            const keybinding = new monaco.keybindings.SimpleKeybinding(keyboardEvent.ctrlKey, keyboardEvent.shiftKey, keyboardEvent.altKey, keyboardEvent.metaKey, keyboardEvent.keyCode).toChord();
+            const keybinding = new keybindings_1.SimpleKeybinding(keyboardEvent.ctrlKey, keyboardEvent.shiftKey, keyboardEvent.altKey, keyboardEvent.metaKey, keyboardEvent.keyCode).toChord();
             return new monaco_resolved_keybinding_1.MonacoResolvedKeybinding(monaco_resolved_keybinding_1.MonacoResolvedKeybinding.keySequence(keybinding), this.keybindingRegistry);
         };
     }
@@ -328,7 +319,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
     toOptionName(preferenceName, prefixes) {
         for (const prefix of prefixes) {
             if (preferenceName.startsWith(prefix)) {
-                return preferenceName.substr(prefix.length);
+                return preferenceName.substring(prefix.length);
             }
         }
         return preferenceName;
@@ -345,53 +336,6 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
             }
         }
     }
-    installReferencesController(editor) {
-        const control = editor.getControl();
-        const referencesController = control._contributions['editor.contrib.referencesController'];
-        const originalGotoReference = referencesController._gotoReference;
-        referencesController._gotoReference = async (ref) => {
-            if (referencesController._widget) {
-                referencesController._widget.hide();
-            }
-            referencesController._ignoreModelChangeEvent = true;
-            const range = monaco.Range.lift(ref.range).collapseToStart();
-            // preserve the model that it does not get disposed if an editor preview replaces an editor
-            const model = referencesController._model;
-            referencesController._model = undefined;
-            referencesController._editorService.openCodeEditor({
-                resource: ref.uri,
-                options: { selection: range }
-            }, control).then(openedEditor => {
-                referencesController._model = model;
-                referencesController._ignoreModelChangeEvent = false;
-                if (!openedEditor) {
-                    referencesController.closeWidget();
-                    return;
-                }
-                if (openedEditor !== control) {
-                    // preserve the model that it does not get disposed in `referencesController.closeWidget`
-                    referencesController._model = undefined;
-                    // to preserve the active editor
-                    const focus = control.focus;
-                    control.focus = () => { };
-                    referencesController.closeWidget();
-                    control.focus = focus;
-                    const modelPromise = Promise.resolve(model);
-                    modelPromise.cancel = () => { };
-                    openedEditor._contributions['editor.contrib.referencesController'].toggleWidget(range, modelPromise, true);
-                    return;
-                }
-                if (referencesController._widget) {
-                    referencesController._widget.show(range);
-                    referencesController._widget.focusOnReferenceTree();
-                }
-            }, (e) => {
-                referencesController._ignoreModelChangeEvent = false;
-                monaco.error.onUnexpectedError(e);
-            });
-        };
-        return common_1.Disposable.create(() => referencesController._gotoReference = originalGotoReference);
-    }
     getDiffNavigator(editor) {
         if (editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
             return editor.diffNavigator;
@@ -400,9 +344,8 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
     }
     async createInline(uri, node, options) {
         return this.doCreateEditor(uri, async (override, toDispose) => {
-            override.contextMenuService = {
-                showContextMenu: () => { }
-            };
+            const overrides = override ? Array.from(override) : [];
+            overrides.push([contextView_1.IContextMenuService, { showContextMenu: () => { } }]);
             const document = new monaco_editor_model_1.MonacoEditorModel({
                 uri,
                 readContents: async () => '',
@@ -416,7 +359,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
                 autoSizing: false,
                 minHeight: 1,
                 maxHeight: 1
-            }, MonacoEditorProvider_1.inlineOptions, options), override);
+            }, MonacoEditorProvider_1.inlineOptions, options), overrides);
         });
     }
 };
@@ -487,13 +430,13 @@ MonacoEditorProvider = MonacoEditorProvider_1 = __decorate([
     __param(7, (0, inversify_1.inject)(browser_1.EditorPreferences)),
     __param(8, (0, inversify_1.inject)(monaco_diff_navigator_factory_1.MonacoDiffNavigatorFactory)),
     __param(9, (0, inversify_1.inject)(application_protocol_1.ApplicationServer)),
-    __param(10, (0, inversify_1.inject)(monaco.contextKeyService.ContextKeyService)),
+    __param(10, (0, inversify_1.inject)(contextKeyService_1.ContextKeyService)),
     __metadata("design:paramtypes", [monaco_editor_service_1.MonacoEditorService,
         monaco_text_model_service_1.MonacoTextModelService,
         monaco_context_menu_1.MonacoContextMenuService,
         monaco_to_protocol_converter_1.MonacoToProtocolConverter,
         protocol_to_monaco_converter_1.ProtocolToMonacoConverter,
-        monaco_workspace_1.MonacoWorkspace, Function, Object, monaco_diff_navigator_factory_1.MonacoDiffNavigatorFactory, Object, monaco.contextKeyService.ContextKeyService])
+        monaco_workspace_1.MonacoWorkspace, Function, Object, monaco_diff_navigator_factory_1.MonacoDiffNavigatorFactory, Object, contextKeyService_1.ContextKeyService])
 ], MonacoEditorProvider);
 exports.MonacoEditorProvider = MonacoEditorProvider;
 //# sourceMappingURL=monaco-editor-provider.js.map

package/lib/browser/monaco-editor-provider.js.map CHANGED Viewed

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

package/lib/browser/monaco-editor-service.d.ts CHANGED Viewed

@@ -1,10 +1,11 @@
 import { OpenerService, WidgetOpenMode, ApplicationShell, PreferenceService } from '@theia/core/lib/browser';
 import { EditorWidget, EditorOpenerOptions, EditorManager } from '@theia/editor/lib/browser';
 import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import ICodeEditor = monaco.editor.ICodeEditor;
-import CommonCodeEditor = monaco.editor.CommonCodeEditor;
-import IResourceEditorInput = monaco.editor.IResourceEditorInput;
-export declare class MonacoEditorService extends monaco.services.CodeEditorServiceImpl {
+import { IResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
+import { StandaloneCodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService';
+import { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+export declare class MonacoEditorService extends StandaloneCodeEditorService {
     static readonly ENABLE_PREVIEW_PREFERENCE: string;
     protected readonly openerService: OpenerService;
     protected readonly m2p: MonacoToProtocolConverter;
@@ -15,11 +16,11 @@ export declare class MonacoEditorService extends monaco.services.CodeEditorServi
     /**
      * Monaco active editor is either focused or last focused editor.
      */
-    getActiveCodeEditor(): monaco.editor.IStandaloneCodeEditor | undefined;
-    openCodeEditor(input: IResourceEditorInput, source?: ICodeEditor, sideBySide?: boolean): Promise<CommonCodeEditor | undefined>;
+    getActiveCodeEditor(): StandaloneCodeEditor | null;
+    openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
     protected findEditorWidgetByUri(widget: object | undefined, uriAsString: string): Promise<EditorWidget | undefined>;
-    protected createEditorOpenerOptions(input: IResourceEditorInput, source?: ICodeEditor, sideBySide?: boolean): EditorOpenerOptions;
+    protected createEditorOpenerOptions(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): EditorOpenerOptions;
     protected getEditorOpenMode(input: IResourceEditorInput): WidgetOpenMode;
-    protected getWidgetOptions(source?: ICodeEditor, sideBySide?: boolean): ApplicationShell.WidgetOptions | undefined;
+    protected getWidgetOptions(source: ICodeEditor | null, sideBySide?: boolean): ApplicationShell.WidgetOptions | undefined;
 }
 //# sourceMappingURL=monaco-editor-service.d.ts.map

package/lib/browser/monaco-editor-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAQ,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAC;AAEjH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;~~AAG3E~~,OAAO,~~WAAW~~,~~GAAG~~,~~MAAM~~,~~CAAC,~~MAAM,~~CAAC~~,~~WAAW,~~CAAC;~~AAC/C~~,OAAO,~~gBAAgB~~,~~GAAG~~,~~MAAM~~,~~CAAC,~~MAAM,~~CAAC~~,~~gBAAgB,~~CAAC;~~AACzD~~,OAAO,oBAAoB,~~GAAG~~,MAAM,CAAC,~~MAAM~~,~~CAAC~~,~~oBAAoB~~,CAAC;~~AAIjE~~,qBACa,mBAAoB,SAAQ,~~MAAM,CAAC,QAAQ,CAAC,qBAAqB~~;~~IAE1E~~,gBAAuB,yBAAyB,EAAE,MAAM,CAA0B;IAGlF,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAG1C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;;IAMzD;;OAEG;IACM,mBAAmB,IAAI,~~MAAM~~,~~CAAC,MAAM,CAAC,qBAAqB,~~GAAG,~~SAAS~~;~~IAWhE~~,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,~~CAAC,~~EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,~~gBAAgB~~,GAAG,~~SAAS~~,CAAC;~~cAW7H~~,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAkBzH,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,~~CAAC,~~EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,mBAAmB;~~IAOjI~~,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,oBAAoB,GAAG,cAAc;~~IAWxE~~,SAAS,CAAC,gBAAgB,CAAC,MAAM,~~CAAC,~~EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC,aAAa,GAAG,SAAS;~~CAUrH~~"}
1	+ {"version":3,"file":"monaco-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAQ,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAC;AAEjH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gEAAgE,CAAC;AAGtG,OAAO,EAAE,2BAA2B,EAAE,MAAM,wFAAwF,CAAC;AAErI,OAAO,EAAE,oBAAoB,EAAE,MAAM,iFAAiF,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,+DAA+D,CAAC;AAI5F,qBACa,mBAAoB,SAAQ,2BAA2B;IAEhE,gBAAuB,yBAAyB,EAAE,MAAM,CAA0B;IAGlF,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAG1C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;;IAMzD;;OAEG;IACM,mBAAmB,IAAI,oBAAoB,GAAG,IAAI;IAc5C,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;cAezH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAkBzH,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,mBAAmB;IAOvI,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,oBAAoB,GAAG,cAAc;IAYxE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC,aAAa,GAAG,SAAS;CAU3H"}

package/lib/browser/monaco-editor-service.js CHANGED Viewed

@@ -33,10 +33,15 @@ const browser_2 = require("@theia/editor/lib/browser");
 const monaco_editor_1 = require("./monaco-editor");
 const monaco_to_protocol_converter_1 = require("./monaco-to-protocol-converter");
 const monaco_editor_model_1 = require("./monaco-editor-model");
-(0, inversify_1.decorate)((0, inversify_1.injectable)(), monaco.services.CodeEditorServiceImpl);
-let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService extends monaco.services.CodeEditorServiceImpl {
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
+const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
+const standaloneCodeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService");
+const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
+const standaloneCodeEditor_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor");
+(0, inversify_1.decorate)((0, inversify_1.injectable)(), standaloneCodeEditorService_1.StandaloneCodeEditorService);
+let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService extends standaloneCodeEditorService_1.StandaloneCodeEditorService {
     constructor() {
-        super(undefined, monaco.services.StaticServices.standaloneThemeService.get());
+        super(standaloneServices_1.StandaloneServices.get(contextkey_1.IContextKeyService), standaloneServices_1.StandaloneServices.get(standaloneTheme_1.IStandaloneThemeService));
     }
     /**
      * Monaco active editor is either focused or last focused editor.
@@ -49,7 +54,10 @@ let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService exte
                 editor = monaco_editor_1.MonacoEditor.findByDocument(this.editors, model.editorTextModel)[0];
             }
         }
-        return editor && editor.getControl();
+        const candidate = editor === null || editor === void 0 ? void 0 : editor.getControl();
+        // Since we extend a private super class, we have to check that the thing that matches the public interface also matches the private expectations the superclass.
+        /* eslint-disable-next-line no-null/no-null */
+        return candidate instanceof standaloneCodeEditor_1.StandaloneCodeEditor ? candidate : null;
     }
     async openCodeEditor(input, source, sideBySide) {
         const uri = new uri_1.default(input.resource.toString());
@@ -57,9 +65,13 @@ let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService exte
         const widget = await (0, browser_1.open)(this.openerService, uri, openerOptions);
         const editorWidget = await this.findEditorWidgetByUri(widget, uri.toString());
         if (editorWidget && editorWidget.editor instanceof monaco_editor_1.MonacoEditor) {
-            return editorWidget.editor.getControl();
+            const candidate = editorWidget.editor.getControl();
+            // Since we extend a private super class, we have to check that the thing that matches the public interface also matches the private expectations the superclass.
+            // eslint-disable-next-line no-null/no-null
+            return candidate instanceof standaloneCodeEditor_1.StandaloneCodeEditor ? candidate : null;
         }
-        return undefined;
+        // eslint-disable-next-line no-null/no-null
+        return null;
     }
     async findEditorWidgetByUri(widget, uriAsString) {
         if (widget instanceof browser_2.EditorWidget) {
@@ -80,10 +92,9 @@ let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService exte
     }
     createEditorOpenerOptions(input, source, sideBySide) {
         const mode = this.getEditorOpenMode(input);
-        const selection = input.options && this.m2p.asRange(input.options.selection);
         const widgetOptions = this.getWidgetOptions(source, sideBySide);
         const preview = !!this.preferencesService.get(MonacoEditorService_1.ENABLE_PREVIEW_PREFERENCE, false);
-        return { mode, selection, widgetOptions, preview };
+        return { mode, widgetOptions, preview };
     }
     getEditorOpenMode(input) {
         const options = Object.assign({ preserveFocus: false, revealIfVisible: true }, input.options);

package/lib/browser/monaco-editor-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco-editor-service.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,4DAA4E;AAC5E,oDAA6C;AAC7C,qDAAmH;AACnH,uDAAiH;AACjH,mDAA+C;AAC/C,iFAA2E;AAC3E,+DAA0D;~~AAM1D~~,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,~~MAAM~~,CAAC,~~QAAQ,~~CAAC~~,qBAAqB,CAAC,CAAC~~;~~AAG9D~~,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,~~MAAM,CAAC,QAAQ,CAAC,qBAAqB~~;~~IAmB1E~~;QACI,KAAK,CAAC,~~SAAS~~,~~EAAE~~,~~MAAM~~,CAAC,~~QAAQ,~~CAAC,~~cAAc~~,CAAC,~~sBAAsB~~,CAAC,~~GAAG~~,~~EAAE~~,CAAC,CAAC;~~IAClF~~,CAAC;IAED;;OAEG;IACM,mBAAmB;QACxB,IAAI,MAAM,GAAG,4BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,IAAI,KAAK,CAAC,eAAe,YAAY,uCAAiB,EAAE;gBACpD,MAAM,GAAG,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;aAChF;SACJ;QACD,~~OAAO~~,MAAM,~~IAAI~~,MAAM,~~CAAC~~,UAAU,EAAE,CAAC;~~IACzC~~,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,KAA2B,EAAE,~~MAAoB~~,EAAE,UAAoB;~~QACjG~~,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9E,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,YAAY,4BAAY,EAAE;YAC7D,~~OAAO~~,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;~~SAC3C~~;~~QACD~~,OAAO,SAAS,CAAC;~~IACrB~~,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,MAA0B,EAAE,WAAmB;QACjF,IAAI,MAAM,YAAY,sBAAY,EAAE;YAChC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,WAAW,EAAE;gBAC9C,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,0BAAgB,CAAC,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,mBAAmB,EAAE,EAAE;gBACpD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAChF,IAAI,YAAY,EAAE;oBACd,OAAO,YAAY,CAAC;iBACvB;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,yBAAyB,CAAC,KAA2B,EAAE,~~MAAoB~~,EAAE,UAAoB;~~QACvG~~,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,~~SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7E,MAAM,~~aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAU,qBAAmB,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAC7G,OAAO,EAAE,IAAI,EAAE,~~SAAS,EAAE,~~aAAa,EAAE,OAAO,EAAE,CAAC;~~IACvD~~,CAAC;~~IACS~~,iBAAiB,CAAC,KAA2B;QACnD,MAAM,OAAO,mBACT,aAAa,EAAE,KAAK,EACpB,eAAe,EAAE,IAAI,IAClB,KAAK,CAAC,OAAO,CACnB,CAAC;QACF,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACzD,CAAC;~~IACS~~,gBAAgB,CAAC,~~MAAoB~~,EAAE,UAAoB;~~QACjE~~,MAAM,GAAG,GAAG,4BAAY,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,SAAS,CAAC;SACpB;QACD,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC;QAC3D,MAAM,IAAI,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,CAAC;CAEJ,CAAA;~~AA5F0B~~,6CAAyB,GAAW,sBAAuB,CAAA;AAGlF;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;;0DAC0B;AAGhD;IADC,IAAA,kBAAM,EAAC,wDAAyB,CAAC;8BACV,wDAAyB;gDAAC;AAGlD;IADC,IAAA,kBAAM,EAAC,0BAAgB,CAAC;8BACC,0BAAgB;kDAAC;AAG3C;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BACM,uBAAa;oDAAC;AAG1C;IADC,IAAA,kBAAM,EAAC,2BAAiB,CAAC;;+DAC+B;AAjBhD,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;;GACA,mBAAmB,~~CA8F~~/B;~~AA9FY~~,kDAAmB"}
1	+ {"version":3,"file":"monaco-editor-service.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,4DAA4E;AAC5E,oDAA6C;AAC7C,qDAAmH;AACnH,uDAAiH;AACjH,mDAA+C;AAC/C,iFAA2E;AAC3E,+DAA0D;AAE1D,sHAAmH;AACnH,+GAAoH;AACpH,wIAAqI;AACrI,uGAA4G;AAC5G,0HAAuH;AAGvH,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,yDAA2B,CAAC,CAAC;AAGpD,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,yDAA2B;IAmBhE;QACI,KAAK,CAAC,uCAAkB,CAAC,GAAG,CAAC,+BAAkB,CAAC,EAAE,uCAAkB,CAAC,GAAG,CAAC,yCAAuB,CAAC,CAAC,CAAC;IACvG,CAAC;IAED;;OAEG;IACM,mBAAmB;QACxB,IAAI,MAAM,GAAG,4BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,IAAI,KAAK,CAAC,eAAe,YAAY,uCAAiB,EAAE;gBACpD,MAAM,GAAG,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;aAChF;SACJ;QACD,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE,CAAC;QACvC,iKAAiK;QACjK,8CAA8C;QAC9C,OAAO,SAAS,YAAY,2CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,KAA2B,EAAE,MAA0B,EAAE,UAAoB;QACvG,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9E,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,YAAY,4BAAY,EAAE;YAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACnD,iKAAiK;YACjK,2CAA2C;YAC3C,OAAO,SAAS,YAAY,2CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;SACvE;QACD,2CAA2C;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,MAA0B,EAAE,WAAmB;QACjF,IAAI,MAAM,YAAY,sBAAY,EAAE;YAChC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,WAAW,EAAE;gBAC9C,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,0BAAgB,CAAC,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,mBAAmB,EAAE,EAAE;gBACpD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAChF,IAAI,YAAY,EAAE;oBACd,OAAO,YAAY,CAAC;iBACvB;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,yBAAyB,CAAC,KAA2B,EAAE,MAA0B,EAAE,UAAoB;QAC7G,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAU,qBAAmB,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAC7G,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;IAC5C,CAAC;IAES,iBAAiB,CAAC,KAA2B;QACnD,MAAM,OAAO,mBACT,aAAa,EAAE,KAAK,EACpB,eAAe,EAAE,IAAI,IAClB,KAAK,CAAC,OAAO,CACnB,CAAC;QACF,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACzD,CAAC;IAES,gBAAgB,CAAC,MAA0B,EAAE,UAAoB;QACvE,MAAM,GAAG,GAAG,4BAAY,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,SAAS,CAAC;SACpB;QACD,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC;QAC3D,MAAM,IAAI,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,CAAC;CAEJ,CAAA;AApG0B,6CAAyB,GAAW,sBAAuB,CAAA;AAGlF;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;;0DAC0B;AAGhD;IADC,IAAA,kBAAM,EAAC,wDAAyB,CAAC;8BACV,wDAAyB;gDAAC;AAGlD;IADC,IAAA,kBAAM,EAAC,0BAAgB,CAAC;8BACC,0BAAgB;kDAAC;AAG3C;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BACM,uBAAa;oDAAC;AAG1C;IADC,IAAA,kBAAM,EAAC,2BAAiB,CAAC;;+DAC+B;AAjBhD,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;;GACA,mBAAmB,CAsG/B;AAtGY,kDAAmB"}

package/lib/browser/monaco-editor-zone-widget.d.ts CHANGED Viewed

@@ -1,10 +1,9 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
 import { Disposable, DisposableCollection, Event, Emitter } from '@theia/core';
+import * as monaco from '@theia/monaco-editor-core';
 export interface MonacoEditorViewZone extends monaco.editor.IViewZone {
     id: string;
 }
 export declare class MonacoEditorZoneWidget implements Disposable {
-    readonly editor: monaco.editor.IStandaloneCodeEditor;
     readonly showArrow: boolean;
     private arrow;
     readonly zoneNode: HTMLDivElement;
@@ -14,7 +13,8 @@ export declare class MonacoEditorZoneWidget implements Disposable {
     protected viewZone: MonacoEditorViewZone | undefined;
     protected readonly toHide: DisposableCollection;
     protected readonly toDispose: DisposableCollection;
-    constructor(editor: monaco.editor.IStandaloneCodeEditor, showArrow?: boolean);
+    editor: monaco.editor.IStandaloneCodeEditor;
+    constructor(editorInstance: monaco.editor.IStandaloneCodeEditor, showArrow?: boolean);
     dispose(): void;
     protected _options: MonacoEditorZoneWidget.Options | undefined;
     get options(): MonacoEditorZoneWidget.Options | undefined;

package/lib/browser/monaco-editor-zone-widget.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco-editor-zone-widget.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-zone-widget.ts"],"names":[],"mappings":";AAoBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;~~AAG~~/E,MAAM,WAAW,oBAAqB,SAAQ,MAAM,CAAC,MAAM,CAAC,SAAS;IACjE,EAAE,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,sBAAuB,YAAW,UAAU;~~IAoBjD~~,QAAQ,CAAC,~~MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB;IAAE,QAAQ,CAAC,~~SAAS,EAAE,OAAO;~~IAlBrF~~,OAAO,CAAC,KAAK,CAAoB;IAEjC,QAAQ,CAAC,QAAQ,iBAAiC;IAClD,QAAQ,CAAC,aAAa,iBAAiC;IAEvD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,oCAA2C;IACtF,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAuC;IAElG,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,MAAM,uBAA8B;IAEvD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAG1B;~~gBAGW~~,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAW,SAAS,GAAE,OAAc;~~IAS5F~~,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,QAAQ,EAAE,sBAAsB,CAAC,OAAO,GAAG,SAAS,CAAC;IAC/D,IAAI,OAAO,IAAI,sBAAsB,CAAC,OAAO,GAAG,SAAS,CAExD;IAED,IAAI,IAAI,IAAI;IAIZ,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO,GAAG,IAAI;IAwDnD,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAQnC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAGtC,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIhD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAQzD,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG;QAClD,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAA;KACrB;IAUD,SAAS,CAAC,WAAW,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,IAAI;IAK/F,SAAS,CAAC,YAAY,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,MAAM;IAGlG,SAAS,CAAC,WAAW,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,MAAM;CAQpG;AA2DD,yBAAiB,sBAAsB,CAAC;IACpC,UAAiB,OAAO;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAA;KACtB;CACJ"}
1	+ {"version":3,"file":"monaco-editor-zone-widget.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-zone-widget.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,MAAM,WAAW,oBAAqB,SAAQ,MAAM,CAAC,MAAM,CAAC,SAAS;IACjE,EAAE,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,sBAAuB,YAAW,UAAU;IAsBI,QAAQ,CAAC,SAAS,EAAE,OAAO;IApBpF,OAAO,CAAC,KAAK,CAAoB;IAEjC,QAAQ,CAAC,QAAQ,iBAAiC;IAClD,QAAQ,CAAC,aAAa,iBAAiC;IAEvD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,oCAA2C;IACtF,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAuC;IAElG,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,MAAM,uBAA8B;IAEvD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAG1B;IAEF,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBAGxC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAW,SAAS,GAAE,OAAc;IAU3F,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,QAAQ,EAAE,sBAAsB,CAAC,OAAO,GAAG,SAAS,CAAC;IAC/D,IAAI,OAAO,IAAI,sBAAsB,CAAC,OAAO,GAAG,SAAS,CAExD;IAED,IAAI,IAAI,IAAI;IAIZ,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO,GAAG,IAAI;IAwDnD,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAQnC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAGtC,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIhD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAQzD,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG;QAClD,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAA;KACrB;IAUD,SAAS,CAAC,WAAW,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,IAAI;IAK/F,SAAS,CAAC,YAAY,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,MAAM;IAGlG,SAAS,CAAC,WAAW,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,gBAA8C,GAAG,MAAM;CAQpG;AA2DD,yBAAiB,sBAAsB,CAAC;IACpC,UAAiB,OAAO;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAA;KACtB;CACJ"}

package/lib/browser/monaco-editor-zone-widget.js CHANGED Viewed

@@ -22,9 +22,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonacoEditorZoneWidget = void 0;
 const core_1 = require("@theia/core");
 const browser_1 = require("@theia/editor/lib/browser");
+const monaco = require("@theia/monaco-editor-core");
 class MonacoEditorZoneWidget {
-    constructor(editor, showArrow = true) {
-        this.editor = editor;
+    constructor(editorInstance, showArrow = true) {
         this.showArrow = showArrow;
         this.zoneNode = document.createElement('div');
         this.containerNode = document.createElement('div');
@@ -32,6 +32,7 @@ class MonacoEditorZoneWidget {
         this.onDidLayoutChange = this.onDidLayoutChangeEmitter.event;
         this.toHide = new core_1.DisposableCollection();
         this.toDispose = new core_1.DisposableCollection(this.onDidLayoutChangeEmitter, this.toHide);
+        this.editor = editorInstance;
         this.zoneNode.classList.add('zone-widget');
         this.containerNode.classList.add('zone-widget-container');
         this.zoneNode.appendChild(this.containerNode);