Skip to content

Commit a3b49d6

Browse files
authored
remove preview from tooltip for terminal (microsoft#167460)
1 parent 971065d commit a3b49d6

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

src/vs/editor/contrib/codeAction/browser/codeActionUi.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ export class CodeActionUi extends Disposable {
187187

188188
this._actionWidgetService.show(
189189
'codeActionWidget',
190+
true,
190191
toMenuItems(actionsToShow, this._shouldShowHeaders()),
191192
delegate,
192193
anchor,

src/vs/platform/actionWidget/browser/actionList.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
8080
get templateId(): string { return 'action'; }
8181

8282
constructor(
83+
private readonly _supportsPreview: boolean,
8384
private readonly _keybindingResolver: IActionKeybindingResolver | undefined,
8485
@IKeybindingService private readonly _keybindingService: IKeybindingService
8586
) { }
@@ -129,7 +130,11 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
129130
if (element.disabled) {
130131
data.container.title = element.label;
131132
} else if (actionTitle && previewTitle) {
132-
data.container.title = localize({ key: 'label', comment: ['placeholders are keybindings, e.g "F2 to apply, Shift+F2 to preview"'] }, "{0} to apply, {1} to preview", actionTitle, previewTitle);
133+
if (this._supportsPreview) {
134+
data.container.title = localize({ key: 'label-preview', comment: ['placeholders are keybindings, e.g "F2 to apply, Shift+F2 to preview"'] }, "{0} to apply, {1} to preview", actionTitle, previewTitle);
135+
} else {
136+
data.container.title = localize({ key: 'label', comment: ['placeholder is a keybinding, e.g "F2 to apply"'] }, "{0} to apply", actionTitle);
137+
}
133138
} else {
134139
data.container.title = '';
135140
}
@@ -158,6 +163,7 @@ export class ActionList<T extends IActionItem> extends Disposable {
158163

159164
constructor(
160165
user: string,
166+
preview: boolean,
161167
items: IListMenuItem<T>[],
162168
private readonly _delegate: IRenderDelegate,
163169
resolver: IActionKeybindingResolver | undefined,
@@ -172,11 +178,7 @@ export class ActionList<T extends IActionItem> extends Disposable {
172178
getHeight: element => element.kind === ActionListItemKind.Header ? this._headerLineHeight : this._actionLineHeight,
173179
getTemplateId: element => element.kind
174180
};
175-
176-
this._list = this._register(new List(user, this.domNode, virtualDelegate, [
177-
new ActionItemRenderer<IListMenuItem<IActionItem>>(resolver, this._keybindingService),
178-
new HeaderRenderer()
179-
], {
181+
this._list = this._register(new List(user, this.domNode, virtualDelegate, [new ActionItemRenderer<IListMenuItem<IActionItem>>(preview, resolver, this._keybindingService), new HeaderRenderer()], {
180182
keyboardSupport: false,
181183
accessibilityProvider: {
182184
getAriaLabel: element => {

src/vs/platform/actionWidget/browser/actionWidget.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const IActionWidgetService = createDecorator<IActionWidgetService>('actio
3434
export interface IActionWidgetService {
3535
readonly _serviceBrand: undefined;
3636

37-
show(user: string, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[]): Promise<void>;
37+
show(user: string, supportsPreview: boolean, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[]): Promise<void>;
3838

3939
hide(): void;
4040

@@ -58,10 +58,10 @@ class ActionWidgetService extends Disposable implements IActionWidgetService {
5858
super();
5959
}
6060

61-
async show(user: string, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[], resolver?: IActionKeybindingResolver): Promise<void> {
61+
async show(user: string, supportsPreview: boolean, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[], resolver?: IActionKeybindingResolver): Promise<void> {
6262
const visibleContext = ActionWidgetContextKeys.Visible.bindTo(this._contextKeyService);
6363

64-
const list = this._instantiationService.createInstance(ActionList, user, items, delegate, resolver);
64+
const list = this._instantiationService.createInstance(ActionList, user, supportsPreview, items, delegate, resolver);
6565
this.contextViewService.showContextView({
6666
getAnchor: () => anchor,
6767
render: (container: HTMLElement) => {

src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
132132
this._terminal?.focus();
133133
},
134134
};
135-
this._actionWidgetService.show('quickFixWidget', toMenuItems(actionSet.validActions, true), delegate, this._currentRenderContext.anchor, this._currentRenderContext.parentElement);
135+
this._actionWidgetService.show('quickFixWidget', false, toMenuItems(actionSet.validActions, true), delegate, this._currentRenderContext.anchor, this._currentRenderContext.parentElement);
136136
}
137137

138138
registerCommandSelector(selector: ITerminalCommandSelector): void {

0 commit comments

Comments
 (0)