[monaco] Align signatures for monaco/index.d.ts

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
eclipse-theia · Jun 26, 2020 · a3f599f · a3f599f
1 parent 6c414db
commit a3f599f
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 193 deletions.
diff --git a/packages/monaco/src/browser/monaco-bulk-edit-service.ts b/packages/monaco/src/browser/monaco-bulk-edit-service.ts
@@ -23,11 +23,29 @@ export class MonacoBulkEditService implements monaco.editor.IBulkEditService {
     @inject(MonacoWorkspace)
     protected readonly workspace: MonacoWorkspace;
 
+    private _previewHandler?: monaco.editor.IBulkEditPreviewHandler;
+
     apply(edit: monaco.languages.WorkspaceEdit): Promise<monaco.editor.IBulkEditResult> {
         return this.workspace.applyBulkEdit(edit);
     }
 
     hasPreviewHandler(): boolean {
-		return false; // todo
-	}
+        return Boolean(this._previewHandler);
+    }
+
+    setPreviewHandler(handler: monaco.editor.IBulkEditPreviewHandler): monaco.IDisposable {
+        this._previewHandler = handler;
+
+        const disposePreviewHandler = () => {
+            if (this._previewHandler === handler) {
+                this._previewHandler = undefined;
+            }
+        };
+
+        return {
+            dispose(): void {
+                disposePreviewHandler();
+            }
+        };
+    }
 }
diff --git a/packages/monaco/src/browser/monaco-editor-provider.ts b/packages/monaco/src/browser/monaco-editor-provider.ts
@@ -465,7 +465,7 @@ export class MonacoEditorProvider {
 
                 if (referencesController._widget) {
                     referencesController._widget.show(range);
-                    referencesController._widget.focus();
+                    referencesController._widget.focusOnReferenceTree();
                 }
 
             }, (e: any) => {

diff --git a/packages/monaco/src/browser/monaco-frontend-module.ts b/packages/monaco/src/browser/monaco-frontend-module.ts
@@ -166,7 +166,7 @@ export function createMonacoConfigurationService(container: interfaces.Container
     };
 
     const initFromConfiguration = debounce(() => {
-        const event = new monaco.services.ConfigurationChangeEvent();
+        const event = new monaco.services.ConfigurationChangeEvent(); // todo: align ConfigurationChangeEvent with VS Code
         event._source = 6 /* DEFAULT */;
         service._onDidChangeConfiguration.fire(event);
     });
@@ -177,7 +177,7 @@ export function createMonacoConfigurationService(container: interfaces.Container
     });
     configurations.onDidChangeConfiguration(e => {
         if (e.affectedSections) {
-            const event = new monaco.services.ConfigurationChangeEvent();
+            const event = new monaco.services.ConfigurationChangeEvent(); // todo: align ConfigurationChangeEvent with VS Code
             event.change(e.affectedSections);
             service._onDidChangeConfiguration.fire(event);
         }

diff --git a/packages/monaco/src/browser/monaco-menu.ts b/packages/monaco/src/browser/monaco-menu.ts
@@ -51,14 +51,15 @@ export class MonacoEditorMenuContribution implements MenuContribution {
         this.registerPeekSubmenu(registry);
 
         registry.registerSubmenu(MonacoMenus.SELECTION, 'Selection');
-        for (const item of MenuRegistry.getMenuItems(23)) {
+        for (const item of MenuRegistry.getMenuItems(25)) {
             if (!monaco.actions.isIMenuItem(item)) {
                 continue;
             }
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const menuPath = [...MonacoMenus.SELECTION, (item.group || '')];
-                const label = this.removeMnemonic(item.command.title);
+                const title = typeof item.command.title === 'string' ? item.command.title : item.command.title.value;
+                const label = this.removeMnemonic(title);
                 const order = item.order ? String(item.order) : '';
                 registry.registerMenuAction(menuPath, { commandId, order, label });
             }
@@ -69,6 +70,9 @@ export class MonacoEditorMenuContribution implements MenuContribution {
         registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, 'Peek');
 
         for (const item of MenuRegistry.getMenuItems(8)) {
+            if (!monaco.actions.isIMenuItem(item)) {
+                continue;
+            }
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const order = item.order ? String(item.order) : '';