@theia/monaco 1.46.0-next.153 → 1.46.0-next.196

package/lib/browser/monaco-editor.js

@@ -30,6 +30,16 @@ const language_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/langu
 const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
 const standaloneCodeEditor_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor");
 const serviceCollection_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection");
+const codeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService");
+const commands_1 = require("@theia/monaco-editor-core/esm/vs/platform/commands/common/commands");
+const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
+const keybinding_1 = require("@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding");
+const themeService_1 = require("@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService");
+const notification_1 = require("@theia/monaco-editor-core/esm/vs/platform/notification/common/notification");
+const accessibility_1 = require("@theia/monaco-editor-core/esm/vs/platform/accessibility/common/accessibility");
+const languageConfigurationRegistry_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/languages/languageConfigurationRegistry");
+const languageFeatures_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures");
+const objects = require("@theia/monaco-editor-core/esm/vs/base/common/objects");
 let MonacoEditorServices = class MonacoEditorServices {
     constructor(services) {
         Object.assign(this, services);
@@ -54,11 +64,12 @@ MonacoEditorServices = (0, tslib_1.__decorate)([
 ], MonacoEditorServices);
 exports.MonacoEditorServices = MonacoEditorServices;
 class MonacoEditor extends MonacoEditorServices {
-    constructor(uri, document, node, services, options, override) {
+    constructor(uri, document, node, services, options, override, parentEditor) {
         super(services);
         this.uri = uri;
         this.document = document;
         this.node = node;
+        this.parentEditor = parentEditor;
         this.toDispose = new common_1.DisposableCollection();
         this.onCursorPositionChangedEmitter = new common_1.Emitter();
         this.onSelectionChangedEmitter = new common_1.Emitter();
@@ -119,7 +130,9 @@ class MonacoEditor extends MonacoEditorServices {
          * @monaco-uplift. Should be guaranteed to work.
          * Incomparable enums prevent TypeScript from believing that public IStandaloneCodeEditor is satisfied by private StandaloneCodeEditor
          */
-        return this.editor = instantiator.createInstance(standaloneCodeEditor_1.StandaloneEditor, this.node, combinedOptions);
+        return this.editor = (this.parentEditor ?
+            instantiator.createInstance(EmbeddedCodeEditor, this.node, combinedOptions, this.parentEditor.getControl()) :
+            instantiator.createInstance(standaloneCodeEditor_1.StandaloneEditor, this.node, combinedOptions));
     }
     getInstantiatorWithOverrides(override) {
         const instantiator = standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
@@ -482,6 +495,9 @@ class MonacoEditor extends MonacoEditorServices {
     createMoveToUri(resourceUri) {
         return this.uri.withPath(resourceUri.path);
     }
+    shouldDisplayDirtyDiff() {
+        return true;
+    }
 }
 exports.MonacoEditor = MonacoEditor;
 (function (MonacoEditor) {
@@ -529,4 +545,40 @@ exports.MonacoEditor = MonacoEditor;
     }
     MonacoEditor.createReadOnlyOptions = createReadOnlyOptions;
 })(MonacoEditor = exports.MonacoEditor || (exports.MonacoEditor = {}));
+// adapted from https://github.com/microsoft/vscode/blob/0bd70d48ad8b3e2fb1922aa54f87c786ff2b4bd8/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
+// This class reproduces the logic in EmbeddedCodeEditorWidget but extends StandaloneCodeEditor rather than CodeEditorWidget.
+let EmbeddedCodeEditor = class EmbeddedCodeEditor extends standaloneCodeEditor_1.StandaloneCodeEditor {
+    constructor(domElement, options, parentEditor, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
+        super(domElement, { ...parentEditor.getRawOptions(), overflowWidgetsDomNode: parentEditor.getOverflowWidgetsDomNode() }, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
+        this._parentEditor = parentEditor;
+        this._overwriteOptions = options;
+        // Overwrite parent's options
+        super.updateOptions(this._overwriteOptions);
+        this._register(parentEditor.onDidChangeConfiguration((e) => this._onParentConfigurationChanged(e)));
+    }
+    getParentEditor() {
+        return this._parentEditor;
+    }
+    _onParentConfigurationChanged(e) {
+        super.updateOptions(this._parentEditor.getRawOptions());
+        super.updateOptions(this._overwriteOptions);
+    }
+    updateOptions(newOptions) {
+        objects.mixin(this._overwriteOptions, newOptions, true);
+        super.updateOptions(this._overwriteOptions);
+    }
+};
+EmbeddedCodeEditor = (0, tslib_1.__decorate)([
+    (0, tslib_1.__param)(3, instantiation_1.IInstantiationService),
+    (0, tslib_1.__param)(4, codeEditorService_1.ICodeEditorService),
+    (0, tslib_1.__param)(5, commands_1.ICommandService),
+    (0, tslib_1.__param)(6, contextkey_1.IContextKeyService),
+    (0, tslib_1.__param)(7, keybinding_1.IKeybindingService),
+    (0, tslib_1.__param)(8, themeService_1.IThemeService),
+    (0, tslib_1.__param)(9, notification_1.INotificationService),
+    (0, tslib_1.__param)(10, accessibility_1.IAccessibilityService),
+    (0, tslib_1.__param)(11, languageConfigurationRegistry_1.ILanguageConfigurationService),
+    (0, tslib_1.__param)(12, languageFeatures_1.ILanguageFeaturesService),
+    (0, tslib_1.__metadata)("design:paramtypes", [HTMLElement, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+], EmbeddedCodeEditor);
 //# sourceMappingURL=monaco-editor.js.map

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

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

package/lib/browser/monaco-menu.d.ts

@@ -1,6 +1,6 @@
-import { MenuContribution, MenuModelRegistry, MenuPath, MenuAction } from '@theia/core/lib/common';
-import { MonacoCommandRegistry } from './monaco-command-registry';
+import { MenuAction, MenuContribution, MenuModelRegistry, MenuPath } from '@theia/core/lib/common';
 import { IMenuItem } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
+import { MonacoCommandRegistry } from './monaco-command-registry';
 export interface MonacoActionGroup {
     id: string;
     actions: string[];

package/lib/browser/monaco-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAElH,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,SAAS,EAAqC,MAAM,kEAAkE,CAAC;AAEhI,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,yBAAiB,WAAW,CAAC;IAClB,MAAM,SAAS,UAAoC,CAAC;IACpD,MAAM,oBAAoB,EAAE,QAAiE,CAAC;IAC9F,MAAM,aAAa,UAA4C,CAAC;CAC1E;AAED,qBACa,4BAA6B,YAAW,gBAAgB;IAG9B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;gBAA/B,QAAQ,EAAE,qBAAqB;IAGrF,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IA6EhD,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAchE,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,UAAU;IAOzE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"monaco-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAiB,UAAU,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIlH,OAAO,EAAE,SAAS,EAAqC,MAAM,kEAAkE,CAAC;AAEhI,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,yBAAiB,WAAW,CAAC;IAClB,MAAM,SAAS,UAAoC,CAAC;IACpD,MAAM,oBAAoB,EAAE,QAAiE,CAAC;IAC9F,MAAM,aAAa,UAA4C,CAAC;CAC1E;AAED,qBACa,4BAA6B,YAAW,gBAAgB;IAG9B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;gBAA/B,QAAQ,EAAE,qBAAqB;IAGrF,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAiFhD,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAchE,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,UAAU;IAOzE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAGlD"}

package/lib/browser/monaco-menu.js

@@ -17,12 +17,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonacoEditorMenuContribution = exports.MonacoMenus = void 0;
 const tslib_1 = require("tslib");
-const inversify_1 = require("@theia/core/shared/inversify");
 const common_1 = require("@theia/core/lib/common");
-const browser_1 = require("@theia/editor/lib/browser");
-const monaco_command_registry_1 = require("./monaco-command-registry");
 const nls_1 = require("@theia/core/lib/common/nls");
+const inversify_1 = require("@theia/core/shared/inversify");
+const browser_1 = require("@theia/editor/lib/browser");
 const actions_1 = require("@theia/monaco-editor-core/esm/vs/platform/actions/common/actions");
+const monaco_command_1 = require("./monaco-command");
+const monaco_command_registry_1 = require("./monaco-command-registry");
 var MonacoMenus;
 (function (MonacoMenus) {
     MonacoMenus.SELECTION = [...common_1.MAIN_MENU_BAR, '3_selection'];
@@ -41,7 +42,11 @@ let MonacoEditorMenuContribution = class MonacoEditorMenuContribution {
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const menuPath = [...browser_1.EDITOR_CONTEXT_MENU, (item.group || '')];
-                registry.registerMenuAction(menuPath, this.buildMenuAction(commandId, item));
+                const coreId = monaco_command_1.MonacoCommands.COMMON_ACTIONS.get(commandId);
+                if (!(coreId && registry.getMenu(menuPath).children.some(it => it.id === coreId))) {
+                    // Don't add additional actions if the item is already registered with a core ID.
+                    registry.registerMenuAction(menuPath, this.buildMenuAction(commandId, item));
+                }
             }
         }
         this.registerPeekSubmenu(registry);

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

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

package/lib/browser/monaco-text-model-service.d.ts

@@ -40,7 +40,7 @@ export declare class MonacoTextModelService implements ITextModelService {
      * creates a model which is not saved by the model service.
      * this will therefore also not be created on backend side.
      */
-    createUnmangedModel(raw: monaco.Uri | URI): Promise<MonacoEditorModel>;
+    createUnmanagedModel(raw: monaco.Uri | URI): Promise<MonacoEditorModel>;
     loadModel(uri: URI): Promise<MonacoEditorModel>;
     protected createModel(resource: Resource): MaybePromise<MonacoEditorModel>;
     protected readonly modelOptions: {

package/lib/browser/monaco-text-model-service.d.ts.map

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

package/lib/browser/monaco-text-model-service.js

@@ -72,7 +72,7 @@ let MonacoTextModelService = class MonacoTextModelService {
      * creates a model which is not saved by the model service.
      * this will therefore also not be created on backend side.
      */
-    createUnmangedModel(raw) {
+    createUnmanagedModel(raw) {
         return this.loadModel(new uri_1.default(raw.toString()));
     }
     async loadModel(uri) {

package/lib/browser/monaco-text-model-service.js.map

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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/monaco",
-  "version": "1.46.0-next.153+cff0a9c25",
+  "version": "1.46.0-next.196+cb2bd96b3",
   "description": "Theia - Monaco Extension",
   "dependencies": {
-    "@theia/core": "1.46.0-next.153+cff0a9c25",
-    "@theia/editor": "1.46.0-next.153+cff0a9c25",
-    "@theia/filesystem": "1.46.0-next.153+cff0a9c25",
-    "@theia/markers": "1.46.0-next.153+cff0a9c25",
+    "@theia/core": "1.46.0-next.196+cb2bd96b3",
+    "@theia/editor": "1.46.0-next.196+cb2bd96b3",
+    "@theia/filesystem": "1.46.0-next.196+cb2bd96b3",
+    "@theia/markers": "1.46.0-next.196+cb2bd96b3",
     "@theia/monaco-editor-core": "1.83.101",
-    "@theia/outline-view": "1.46.0-next.153+cff0a9c25",
-    "@theia/workspace": "1.46.0-next.153+cff0a9c25",
+    "@theia/outline-view": "1.46.0-next.196+cb2bd96b3",
+    "@theia/workspace": "1.46.0-next.196+cb2bd96b3",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.2.0",
@@ -52,10 +52,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.48.0"
+    "@theia/ext-scripts": "1.49.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cff0a9c255ee748de2a055972196850faf09277f"
+  "gitHead": "cb2bd96b362408c90179005a5b415ddbd452ce41"
 }

package/src/browser/monaco-diff-editor.ts

@@ -22,8 +22,15 @@ import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './mo
 import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
 import { DiffUris } from '@theia/core/lib/browser/diff-uris';
 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';
+import { ICodeEditor, IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, StandaloneCodeEditor, StandaloneDiffEditor2 }
+    from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+import { IEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration';
+import { EmbeddedDiffEditorWidget } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
+import { ContextKeyValue, IContextKey } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { ICommandHandler } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
 
 export namespace MonacoDiffEditor {
     export interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions {
@@ -31,7 +38,7 @@ export namespace MonacoDiffEditor {
 }
 
 export class MonacoDiffEditor extends MonacoEditor {
-    protected _diffEditor: StandaloneDiffEditor2;
+    protected _diffEditor: IStandaloneDiffEditor;
     protected _diffNavigator: DiffNavigator;
 
     constructor(
@@ -42,9 +49,10 @@ export class MonacoDiffEditor extends MonacoEditor {
         services: MonacoEditorServices,
         protected readonly diffNavigatorFactory: MonacoDiffNavigatorFactory,
         options?: MonacoDiffEditor.IOptions,
-        override?: EditorServiceOverrides
+        override?: EditorServiceOverrides,
+        parentEditor?: MonacoEditor
     ) {
-        super(uri, modifiedModel, node, services, options, override);
+        super(uri, modifiedModel, node, services, options, override, parentEditor);
         this.documents.add(originalModel);
         const original = originalModel.textEditorModel;
         const modified = modifiedModel.textEditorModel;
@@ -61,13 +69,15 @@ export class MonacoDiffEditor extends MonacoEditor {
     }
 
     protected override create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable {
+        options = { ...options, fixedOverflowWidgets: true };
         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(StandaloneDiffEditor2, this.node, { ...options, fixedOverflowWidgets: true });
+        this._diffEditor = this.parentEditor ?
+            instantiator.createInstance(EmbeddedDiffEditor, this.node, options, {}, this.parentEditor.getControl() as unknown as ICodeEditor) :
+            instantiator.createInstance(StandaloneDiffEditor2, this.node, options);
         this.editor = this._diffEditor.getModifiedEditor() as unknown as monaco.editor.IStandaloneCodeEditor;
         return this._diffEditor;
     }
@@ -97,4 +107,35 @@ export class MonacoDiffEditor extends MonacoEditor {
         return DiffUris.encode(left.withPath(resourceUri.path), right.withPath(resourceUri.path));
     }
 
+    override shouldDisplayDirtyDiff(): boolean {
+        return false;
+    }
+}
+
+class EmbeddedDiffEditor extends EmbeddedDiffEditorWidget implements IStandaloneDiffEditor {
+
+    protected override _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement,
+        options: Readonly<IEditorConstructionOptions>): StandaloneCodeEditor {
+        return instantiationService.createInstance(StandaloneCodeEditor, container, options);
+    }
+
+    override getOriginalEditor(): IStandaloneCodeEditor {
+        return super.getOriginalEditor() as IStandaloneCodeEditor;
+    }
+
+    override getModifiedEditor(): IStandaloneCodeEditor {
+        return super.getModifiedEditor() as IStandaloneCodeEditor;
+    }
+
+    addCommand(keybinding: number, handler: ICommandHandler, context?: string): string | null {
+        return this.getModifiedEditor().addCommand(keybinding, handler, context);
+    }
+
+    createContextKey<T extends ContextKeyValue = ContextKeyValue>(key: string, defaultValue: T): IContextKey<T> {
+        return this.getModifiedEditor().createContextKey(key, defaultValue);
+    }
+
+    addAction(descriptor: IActionDescriptor): IDisposable {
+        return this.getModifiedEditor().addAction(descriptor);
+    }
 }

package/src/browser/monaco-diff-navigator-factory.ts

@@ -16,7 +16,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { DiffNavigator } from '@theia/editor/lib/browser';
-import { StandaloneDiffEditor2 } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+import { IDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
 
 @injectable()
 export class MonacoDiffNavigatorFactory {
@@ -28,7 +28,7 @@ export class MonacoDiffNavigatorFactory {
         previous: () => { },
     };
 
-    createdDiffNavigator(editor: StandaloneDiffEditor2): DiffNavigator {
+    createdDiffNavigator(editor: IDiffEditor): DiffNavigator {
         return {
             hasNext: () => true,
             hasPrevious: () => true,