Invalid context menu entries in PR comments box (microsoft#209961)

* Invalid context menu entries in PR comments box
Fixes microsoft#208844

* 🤦‍♀️ fix test

Author: alexr00

src/vs/editor/browser/config/editorConfiguration.ts

@@ -21,6 +21,7 @@ import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguratio
 import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { getWindow, getWindowById } from 'vs/base/browser/dom';
 import { PixelRatio } from 'vs/base/browser/pixelRatio';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export interface IEditorConstructionOptions extends IEditorOptions {
 	/**
@@ -43,6 +44,7 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 	public readonly onDidChangeFast: Event<ConfigurationChangedEvent> = this._onDidChangeFast.event;
 
 	public readonly isSimpleWidget: boolean;
+	public readonly contextMenuId: MenuId;
 	private readonly _containerObserver: ElementSizeObserver;
 
 	private _isDominatedByLongLines: boolean = false;
@@ -68,12 +70,14 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 
 	constructor(
 		isSimpleWidget: boolean,
+		contextMenuId: MenuId,
 		options: Readonly<IEditorConstructionOptions>,
 		container: HTMLElement | null,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
 		super();
 		this.isSimpleWidget = isSimpleWidget;
+		this.contextMenuId = contextMenuId;
 		this._containerObserver = this._register(new ElementSizeObserver(container, options.dimension));
 		this._targetWindowId = getWindow(container).vscodeWindowId;
 

src/vs/editor/browser/editorBrowser.ts

@@ -22,6 +22,7 @@ import { InjectedText } from 'vs/editor/common/modelLineProjectionData';
 import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
 import { IEditorWhitespace, IViewModel } from 'vs/editor/common/viewModel';
 import { OverviewRulerZone } from 'vs/editor/common/viewModel/overviewZoneManager';
+import { MenuId } from 'vs/platform/actions/common/actions';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
@@ -571,6 +572,11 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * @internal
 	 */
 	readonly isSimpleWidget: boolean;
+	/**
+	 * The context menu ID that should be used to lookup context menu actions.
+	 * @internal
+	 */
+	readonly contextMenuId: MenuId;
 	/**
 	 * The editor's scoped context key service.
 	 * @internal

src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts

@@ -59,6 +59,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { editorErrorForeground, editorHintForeground, editorInfoForeground, editorWarningForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeEditor {
 
@@ -190,6 +191,10 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		return this._configuration.isSimpleWidget;
 	}
 
+	public get contextMenuId(): MenuId {
+		return this._configuration.contextMenuId;
+	}
+
 	private readonly _telemetryData?: object;
 
 	private readonly _domElement: HTMLElement;
@@ -254,7 +259,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._decorationTypeSubtypes = {};
 		this._telemetryData = codeEditorWidgetOptions.telemetryData;
 
-		this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false, options, accessibilityService));
+		this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false,
+			codeEditorWidgetOptions.contextMenuId ?? (codeEditorWidgetOptions.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext),
+			options, accessibilityService));
 		this._register(this._configuration.onDidChange((e) => {
 			this._onDidChangeConfiguration.fire(e);
 
@@ -362,8 +369,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._modelData?.view.writeScreenReaderContent(reason);
 	}
 
-	protected _createConfiguration(isSimpleWidget: boolean, options: Readonly<IEditorConstructionOptions>, accessibilityService: IAccessibilityService): EditorConfiguration {
-		return new EditorConfiguration(isSimpleWidget, options, this._domElement, accessibilityService);
+	protected _createConfiguration(isSimpleWidget: boolean, contextMenuId: MenuId, options: Readonly<IEditorConstructionOptions>, accessibilityService: IAccessibilityService): EditorConfiguration {
+		return new EditorConfiguration(isSimpleWidget, contextMenuId, options, this._domElement, accessibilityService);
 	}
 
 	public getId(): string {
@@ -1909,6 +1916,12 @@ export interface ICodeEditorWidgetOptions {
 	 * Defaults to null.
 	 */
 	telemetryData?: object;
+
+	/**
+	 * The ID of the context menu.
+	 * Defaults to MenuId.SimpleEditorContext or MenuId.EditorContext depending on whether the widget is simple.
+	 */
+	contextMenuId?: MenuId;
 }
 
 class ModelData {

src/vs/editor/common/config/editorConfiguration.ts

@@ -7,12 +7,17 @@ import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IDimension } from 'vs/editor/common/core/dimension';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export interface IEditorConfiguration extends IDisposable {
 	/**
 	 * Is this a simple widget (not a real code editor)?
 	 */
 	readonly isSimpleWidget: boolean;
+	/**
+	 * The context menu id for the editor.
+	 */
+	readonly contextMenuId: MenuId;
 	/**
 	 * Computed editor options.
 	 */

src/vs/editor/contrib/contextmenu/browser/contextmenu.ts

@@ -148,7 +148,7 @@ export class ContextMenuController implements IEditorContribution {
 
 		// Find actions available for menu
 		const menuActions = this._getMenuActions(this._editor.getModel(),
-			this._editor.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext);
+			this._editor.contextMenuId);
 
 		// Show menu if we have actions to show
 		if (menuActions.length > 0) {

src/vs/editor/test/browser/config/testConfiguration.ts

@@ -9,11 +9,12 @@ import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
 import { TestCodeEditorCreationOptions } from 'vs/editor/test/browser/testCodeEditor';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export class TestConfiguration extends EditorConfiguration {
 
 	constructor(opts: Readonly<TestCodeEditorCreationOptions>) {
-		super(false, opts, null, new TestAccessibilityService());
+		super(false, MenuId.EditorContext, opts, null, new TestAccessibilityService());
 	}
 
 	protected override _readEnvConfiguration(): IEnvConfiguration {

src/vs/editor/test/browser/testCodeEditor.ts

@@ -32,6 +32,7 @@ import { TestTextResourcePropertiesService } from 'vs/editor/test/common/service
 import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
 import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
+import { MenuId } from 'vs/platform/actions/common/actions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { TestClipboardService } from 'vs/platform/clipboard/test/common/testClipboardService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -68,7 +69,7 @@ export interface ITestCodeEditor extends IActiveCodeEditor {
 export class TestCodeEditor extends CodeEditorWidget implements ICodeEditor {
 
 	//#region testing overrides
-	protected override _createConfiguration(isSimpleWidget: boolean, options: Readonly<TestCodeEditorCreationOptions>): EditorConfiguration {
+	protected override _createConfiguration(isSimpleWidget: boolean, contextMenuId: MenuId, options: Readonly<TestCodeEditorCreationOptions>): EditorConfiguration {
 		return new TestConfiguration(options);
 	}
 	protected override _createView(viewModel: ViewModel): [View, boolean] {

src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts

@@ -36,6 +36,7 @@ import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions
 import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export const ctxCommentEditorFocused = new RawContextKey<boolean>('commentEditorFocused', false);
 export const MIN_EDITOR_HEIGHT = 5 * 18;
@@ -82,7 +83,8 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 					InlineCompletionsController.ID,
 					CodeActionController.ID,
 				])
-			]
+			],
+			contextMenuId: MenuId.SimpleEditorContext
 		};
 
 		super(domElement, options, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, scopedContextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);