Skip to content

Commit a2e7af7

Browse files
alexdimaalexdima
committed
Get rid of BaseHoverWidget._renderAction
1 parent 8f80811 commit a2e7af7

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎src/vs/base/browser/ui/hover/baseHoverWidget.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ export abstract class BaseHoverWidget extends Widget {
3535
protected _onContentsChange(): void {
3636
this._scrollbar.scanDomNode();
3737
}
38+
}
3839

39-
protected _renderAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }, keybindingLabel: string | null): IDisposable {
40-
const actionContainer = dom.append(parent, $('div.action-container'));
41-
const action = dom.append(actionContainer, $('a.action'));
42-
action.setAttribute('href', '#');
43-
action.setAttribute('role', 'button');
44-
if (actionOptions.iconClass) {
45-
dom.append(action, $(`span.icon.${actionOptions.iconClass}`));
46-
}
47-
const label = dom.append(action, $('span'));
48-
label.textContent = keybindingLabel ? `${actionOptions.label} (${keybindingLabel})` : actionOptions.label;
49-
return dom.addDisposableListener(actionContainer, dom.EventType.CLICK, e => {
50-
e.stopPropagation();
51-
e.preventDefault();
52-
actionOptions.run(actionContainer);
53-
});
40+
export function renderHoverAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }, keybindingLabel: string | null): IDisposable {
41+
const actionContainer = dom.append(parent, $('div.action-container'));
42+
const action = dom.append(actionContainer, $('a.action'));
43+
action.setAttribute('href', '#');
44+
action.setAttribute('role', 'button');
45+
if (actionOptions.iconClass) {
46+
dom.append(action, $(`span.icon.${actionOptions.iconClass}`));
5447
}
48+
const label = dom.append(action, $('span'));
49+
label.textContent = keybindingLabel ? `${actionOptions.label} (${keybindingLabel})` : actionOptions.label;
50+
return dom.addDisposableListener(actionContainer, dom.EventType.CLICK, e => {
51+
e.stopPropagation();
52+
e.preventDefault();
53+
actionOptions.run(actionContainer);
54+
});
5555
}

‎src/vs/editor/contrib/hover/hoverWidgets.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPosit
1111
import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
1212
import { Position } from 'vs/editor/common/core/position';
1313
import { Range } from 'vs/editor/common/core/range';
14-
import { BaseHoverWidget } from 'vs/base/browser/ui/hover/baseHoverWidget';
14+
import { BaseHoverWidget, renderHoverAction } from 'vs/base/browser/ui/hover/baseHoverWidget';
1515
import { IDisposable } from 'vs/base/common/lifecycle';
1616
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1717

@@ -142,7 +142,7 @@ export class ContentHoverWidget extends BaseHoverWidget implements IContentWidge
142142
protected _renderAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }): IDisposable {
143143
const keybinding = this._keybindingService.lookupKeybinding(actionOptions.commandId);
144144
const keybindingLabel = keybinding ? keybinding.getLabel() : null;
145-
return super._renderAction(parent, actionOptions, keybindingLabel);
145+
return renderHoverAction(parent, actionOptions, keybindingLabel);
146146
}
147147

148148
private layout(): void {

‎src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IHoverTarget, HorizontalAnchorSide, VerticalAnchorSide } from 'vs/workb
1515
import { KeyCode } from 'vs/base/common/keyCodes';
1616
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1717
import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
18-
import { BaseHoverWidget } from 'vs/base/browser/ui/hover/baseHoverWidget';
18+
import { BaseHoverWidget, renderHoverAction } from 'vs/base/browser/ui/hover/baseHoverWidget';
1919
import { Widget } from 'vs/base/browser/ui/widget';
2020

2121
const $ = dom.$;
@@ -80,7 +80,7 @@ export class HoverWidget extends BaseHoverWidget {
8080
this._actions.forEach(action => {
8181
const keybinding = this._keybindingService.lookupKeybinding(action.commandId);
8282
const keybindingLabel = keybinding ? keybinding.getLabel() : null;
83-
this._renderAction(actionsElement, action, keybindingLabel);
83+
renderHoverAction(actionsElement, action, keybindingLabel);
8484
});
8585
statusBarElement.appendChild(actionsElement);
8686
this._containerDomNode.appendChild(statusBarElement);

0 commit comments

Comments
 (0)