Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-25 17:57:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: show context menu option to disable empty editor hint (#218548)

Browse Source 
* fix: show context menu option to disable empty editor hint

* Fix action name
This commit is contained in:
Joyce Er
2024-06-26 14:03:37 -07:00
committed by GitHub
parent b9f2435180
commit 9e7cd445fa
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
+37 -8
View File
@@ -34,6 +34,8 @@ import { SEARCH_RESULT_LANGUAGE_ID } from 'vs/workbench/services/search/common/s
import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
import { IHoverService } from 'vs/platform/hover/browser/hover';
import { ChatAgentLocation, IChatAgent, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
const $ = dom.$;
@@ -60,6 +62,7 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
@IChatAgentService private readonly chatAgentService: IChatAgentService,
@ITelemetryService private readonly telemetryService: ITelemetryService,
@IProductService protected readonly productService: IProductService,
@IContextMenuService private readonly contextMenuService: IContextMenuService
) {
this.toDispose = [];
this.toDispose.push(this.editor.onDidChangeModel(() => this.update()));
@@ -145,7 +148,8 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
this.keybindingService,
this.chatAgentService,
this.telemetryService,
this.productService
this.productService,
this.contextMenuService
);
} else if (!shouldRenderHint && this.textHintContentWidget) {
this.textHintContentWidget.dispose();
@@ -178,7 +182,8 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
private readonly keybindingService: IKeybindingService,
private readonly chatAgentService: IChatAgentService,
private readonly telemetryService: ITelemetryService,
private readonly productService: IProductService
private readonly productService: IProductService,
private readonly contextMenuService: IContextMenuService,
) {
this.toDispose = new DisposableStore();
this.toDispose.add(this.editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
@@ -199,10 +204,34 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
return EmptyTextEditorHintContentWidget.ID;
}
private _disableHint() {
this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
this.dispose();
this.editor.focus();
private _disableHint(e?: MouseEvent) {
const disableHint = () => {
this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
this.dispose();
this.editor.focus();
};
if (!e) {
disableHint();
return;
}
this.contextMenuService.showContextMenu({
getAnchor: () => { return new StandardMouseEvent(dom.getActiveWindow(), e); },
getActions: () => {
return [{
id: 'workench.action.disableEmptyEditorHint',
label: localize('disableEditorEmptyHint', "Disable Empty Editor Hint"),
tooltip: localize('disableEditorEmptyHint', "Disable Empty Editor Hint"),
enabled: true,
class: undefined,
run: () => {
disableHint();
}
}
];
}
});
}
private _getHintInlineChat(providers: IChatAgent[]) {
@@ -244,7 +273,7 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
const hintPart = $('a', undefined, fragment);
hintPart.style.fontStyle = 'italic';
hintPart.style.cursor = 'pointer';
this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CONTEXT_MENU, () => this._disableHint()));
this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CLICK, handleClick));
return hintPart;
} else {
@@ -263,7 +292,7 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
if (this.options.clickable) {
label.element.style.cursor = 'pointer';
this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CONTEXT_MENU, () => this._disableHint()));
this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CLICK, handleClick));
}
src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
+5 -2
View File
@@ -8,6 +8,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IHoverService } from 'vs/platform/hover/browser/hover';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IProductService } from 'vs/platform/product/common/productService';
@@ -32,7 +33,8 @@ export class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribu
@IInlineChatSessionService inlineChatSessionService: IInlineChatSessionService,
@IChatAgentService chatAgentService: IChatAgentService,
@ITelemetryService telemetryService: ITelemetryService,
@IProductService productService: IProductService
@IProductService productService: IProductService,
@IContextMenuService contextMenuService: IContextMenuService
) {
super(
editor,
@@ -44,7 +46,8 @@ export class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribu
inlineChatSessionService,
chatAgentService,
telemetryService,
productService
productService,
contextMenuService
);
const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);