@theia/monaco 1.62.0-next.3 → 1.62.0

package/src/browser/monaco-menu.ts

@@ -40,16 +40,17 @@ export class MonacoEditorMenuContribution implements MenuContribution {
     ) { }
 
     registerMenus(registry: MenuModelRegistry): void {
+        registry.registerSubmenu(EDITOR_CONTEXT_MENU, 'Editor Context Menu');
         for (const item of MenuRegistry.getMenuItems(MenuId.EditorContext)) {
             if (!isIMenuItem(item)) {
                 continue;
             }
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
-                const menuPath = [...EDITOR_CONTEXT_MENU, (item.group || '')];
-                const coreId = 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.
+                const nodeId = MonacoCommands.COMMON_ACTIONS.get(commandId) || commandId;
+                const menuPath = item.group ? [...EDITOR_CONTEXT_MENU, item.group] : EDITOR_CONTEXT_MENU;
+                if (registry.getMenuNode([...menuPath, nodeId])) {
+                    // Don't add additional actions if the item is already registered.
                     registry.registerMenuAction(menuPath, this.buildMenuAction(commandId, item));
                 }
             }

package/src/browser/monaco-workspace.ts

@@ -23,7 +23,7 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
 import { EditorManager, EditorPreferences } from '@theia/editor/lib/browser';
 import { MonacoTextModelService } from './monaco-text-model-service';
-import { WillSaveMonacoModelEvent, MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model';
+import { MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model';
 import { MonacoEditor } from './monaco-editor';
 import { ProblemManager } from '@theia/markers/lib/browser';
 import { ArrayUtils } from '@theia/core/lib/common/types';
@@ -101,9 +101,6 @@ export class MonacoWorkspace {
     protected readonly onDidChangeTextDocumentEmitter = new Emitter<MonacoModelContentChangedEvent>();
     readonly onDidChangeTextDocument = this.onDidChangeTextDocumentEmitter.event;
 
-    protected readonly onWillSaveTextDocumentEmitter = new Emitter<WillSaveMonacoModelEvent>();
-    readonly onWillSaveTextDocument = this.onWillSaveTextDocumentEmitter.event;
-
     protected readonly onDidSaveTextDocumentEmitter = new Emitter<MonacoEditorModel>();
     readonly onDidSaveTextDocument = this.onDidSaveTextDocumentEmitter.event;
 
@@ -160,7 +157,6 @@ export class MonacoWorkspace {
         });
         model.onDidChangeContent(event => this.fireDidChangeContent(event));
         model.onDidSaveModel(() => this.fireDidSave(model));
-        model.onWillSaveModel(event => this.fireWillSave(event));
         model.onDirtyChanged(() => this.openEditorIfDirty(model));
         model.onDispose(() => this.fireDidClose(model));
     }
@@ -177,10 +173,6 @@ export class MonacoWorkspace {
         this.onDidChangeTextDocumentEmitter.fire(event);
     }
 
-    protected fireWillSave(event: WillSaveMonacoModelEvent): void {
-        this.onWillSaveTextDocumentEmitter.fire(event);
-    }
-
     protected fireDidSave(model: MonacoEditorModel): void {
         this.onDidSaveTextDocumentEmitter.fire(model);
     }