disable EditorContent-menu for embedded editors, ignore the FloatingClickMenu-contribution for notebook code edtors (microsoft#162186)

fixes microsoft#160910

Author: jrieken

src/vs/workbench/browser/codeeditor.ts

@@ -26,6 +26,7 @@ import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IAction } from 'vs/base/common/actions';
+import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 
 export interface IRangeHighlightDecoration {
 	resource: URI;
@@ -224,28 +225,31 @@ export class FloatingClickMenu extends Disposable implements IEditorContribution
 	) {
 		super();
 
-		const menu = menuService.createMenu(MenuId.EditorContent, contextKeyService);
-		const menuDisposables = new DisposableStore();
-		const renderMenuAsFloatingClickBtn = () => {
-			menuDisposables.clear();
-			if (!editor.hasModel() || editor.getOption(EditorOption.inDiffEditor)) {
-				return;
-			}
-			const actions: IAction[] = [];
-			createAndFillInActionBarActions(menu, { renderShortTitle: true, shouldForwardArgs: true }, actions);
-			if (actions.length === 0) {
-				return;
-			}
-			// todo@jrieken find a way to handle N actions, like showing a context menu
-			const [first] = actions;
-			const widget = instantiationService.createInstance(FloatingClickWidget, editor, first.label, first.id);
-			menuDisposables.add(widget);
-			menuDisposables.add(widget.onClick(() => first.run(editor.getModel().uri)));
-			widget.render();
-		};
-		this._store.add(menu);
-		this._store.add(menuDisposables);
-		this._store.add(menu.onDidChange(renderMenuAsFloatingClickBtn));
-		renderMenuAsFloatingClickBtn();
+		// DISABLED for embedded editors. In the future we can use a different MenuId for embedded editors
+		if (!(editor instanceof EmbeddedCodeEditorWidget)) {
+			const menu = menuService.createMenu(MenuId.EditorContent, contextKeyService);
+			const menuDisposables = new DisposableStore();
+			const renderMenuAsFloatingClickBtn = () => {
+				menuDisposables.clear();
+				if (!editor.hasModel() || editor.getOption(EditorOption.inDiffEditor)) {
+					return;
+				}
+				const actions: IAction[] = [];
+				createAndFillInActionBarActions(menu, { renderShortTitle: true, shouldForwardArgs: true }, actions);
+				if (actions.length === 0) {
+					return;
+				}
+				// todo@jrieken find a way to handle N actions, like showing a context menu
+				const [first] = actions;
+				const widget = instantiationService.createInstance(FloatingClickWidget, editor, first.label, first.id);
+				menuDisposables.add(widget);
+				menuDisposables.add(widget.onClick(() => first.run(editor.getModel().uri)));
+				widget.render();
+			};
+			this._store.add(menu);
+			this._store.add(menuDisposables);
+			this._store.add(menu.onDidChange(renderMenuAsFloatingClickBtn));
+			renderMenuAsFloatingClickBtn();
+		}
 	}
 }

src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts

@@ -86,12 +86,13 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { NotebookPerfMarks } from 'vs/workbench/contrib/notebook/common/notebookPerformance';
 import { BaseCellEditorOptions } from 'vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions';
 import { ILogService } from 'vs/platform/log/common/log';
+import { FloatingClickMenu } from 'vs/workbench/browser/codeeditor';
 
 const $ = DOM.$;
 
 export function getDefaultNotebookCreationOptions(): INotebookEditorCreationOptions {
 	// We inlined the id to avoid loading comment contrib in tests
-	const skipContributions = ['editor.contrib.review'];
+	const skipContributions = ['editor.contrib.review', FloatingClickMenu.ID];
 	const contributions = EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.id) === -1);
 
 	return {