Skip to content

Commit 89f2de6

Browse files
joaomorenojoaomoreno
committed
move IActionViewItemProvider to actions
1 parent e7279b1 commit 89f2de6

9 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎src/vs/base/browser/ui/actionbar/actionbar.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import 'vs/css!./actionbar';
77
import { Disposable, dispose } from 'vs/base/common/lifecycle';
8-
import { IAction, IActionRunner, ActionRunner, IRunEvent, Separator, IActionViewItem } from 'vs/base/common/actions';
8+
import { IAction, IActionRunner, ActionRunner, IRunEvent, Separator, IActionViewItem, IActionViewItemProvider } from 'vs/base/common/actions';
99
import * as DOM from 'vs/base/browser/dom';
1010
import * as types from 'vs/base/common/types';
1111
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -25,10 +25,6 @@ export interface ActionTrigger {
2525
keyDown: boolean;
2626
}
2727

28-
export interface IActionViewItemProvider {
29-
(action: IAction): IActionViewItem | undefined;
30-
}
31-
3228
export interface IActionBarOptions {
3329
orientation?: ActionsOrientation;
3430
context?: any;

‎src/vs/base/browser/ui/dropdown/dropdown.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import 'vs/css!./dropdown';
77
import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
8-
import { ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
9-
import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
8+
import { ActionRunner, IAction, IActionRunner, IActionViewItemProvider } from 'vs/base/common/actions';
109
import { IDisposable } from 'vs/base/common/lifecycle';
1110
import { IContextViewProvider, IAnchor, AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
1211
import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';

‎src/vs/base/browser/ui/menu/menu.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import 'vs/css!./menu';
77
import * as nls from 'vs/nls';
88
import * as strings from 'vs/base/common/strings';
9-
import { IActionRunner, IAction, SubmenuAction, Separator } from 'vs/base/common/actions';
10-
import { ActionBar, IActionViewItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
9+
import { IActionRunner, IAction, SubmenuAction, Separator, IActionViewItemProvider } from 'vs/base/common/actions';
10+
import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
1111
import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
1212
import { addClass, EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus, isAncestor, hasClass, addDisposableListener, removeClass, append, $, addClasses, removeClasses, clearNode } from 'vs/base/browser/dom';
1313
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';

‎src/vs/base/browser/ui/toolbar/toolbar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import 'vs/css!./toolbar';
77
import * as nls from 'vs/nls';
8-
import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
9-
import { ActionBar, ActionsOrientation, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
8+
import { Action, IActionRunner, IAction, IActionViewItemProvider } from 'vs/base/common/actions';
9+
import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
1010
import { IContextMenuProvider, DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdown';
1111
import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
1212
import { Disposable, IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';

‎src/vs/base/common/actions.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ export interface IActionViewItem extends IDisposable {
4747
blur(): void;
4848
}
4949

50+
export interface IActionViewItemProvider {
51+
(action: IAction): IActionViewItem | undefined;
52+
}
53+
5054
export interface IActionChangeEvent {
5155
readonly label?: string;
5256
readonly tooltip?: string;

‎src/vs/editor/contrib/suggest/suggestWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
4343
import { flatten, isFalsyOrEmpty } from 'vs/base/common/arrays';
4444
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
4545
import { IMenuService } from 'vs/platform/actions/common/actions';
46-
import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
47-
import { IAction } from 'vs/base/common/actions';
46+
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
47+
import { IAction, IActionViewItemProvider } from 'vs/base/common/actions';
4848
import { Codicon, registerIcon } from 'vs/base/common/codicons';
4949
import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
5050

‎src/vs/workbench/contrib/scm/browser/scmViewPane.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
2020
import { ICommandService } from 'vs/platform/commands/common/commands';
2121
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2222
import { MenuItemAction, IMenuService } from 'vs/platform/actions/common/actions';
23-
import { IAction, IActionViewItem, ActionRunner, Action, RadioGroup, Separator, SubmenuAction } from 'vs/base/common/actions';
23+
import { IAction, IActionViewItem, ActionRunner, Action, RadioGroup, Separator, SubmenuAction, IActionViewItemProvider } from 'vs/base/common/actions';
2424
import { ContextAwareMenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
2525
import { SCMMenus } from './menus';
26-
import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
26+
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
2727
import { IThemeService, LIGHT, registerThemingParticipant, IFileIconTheme } from 'vs/platform/theme/common/themeService';
2828
import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, connectPrimaryMenu } from './util';
2929
import { attachBadgeStyler } from 'vs/platform/theme/common/styler';

‎src/vs/workbench/contrib/timeline/browser/timelinePane.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import 'vs/css!./media/timelinePane';
77
import { localize } from 'vs/nls';
88
import * as DOM from 'vs/base/browser/dom';
9-
import { IAction, ActionRunner } from 'vs/base/common/actions';
9+
import { IAction, ActionRunner, IActionViewItemProvider } from 'vs/base/common/actions';
1010
import { CancellationTokenSource } from 'vs/base/common/cancellation';
1111
import { fromNow } from 'vs/base/common/date';
1212
import { debounce } from 'vs/base/common/decorators';
@@ -36,7 +36,7 @@ import { IThemeService, LIGHT, ThemeIcon } from 'vs/platform/theme/common/themeS
3636
import { IViewDescriptorService } from 'vs/workbench/common/views';
3737
import { IProgressService } from 'vs/platform/progress/common/progress';
3838
import { IOpenerService } from 'vs/platform/opener/common/opener';
39-
import { IActionViewItemProvider, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
39+
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
4040
import { ContextAwareMenuEntryActionViewItem, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
4141
import { MenuItemAction, IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
4242
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

‎src/vs/workbench/contrib/views/browser/treeView.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'vs/css!./media/views';
77
import { Event, Emitter } from 'vs/base/common/event';
88
import { IDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
99
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
10-
import { IAction, ActionRunner } from 'vs/base/common/actions';
10+
import { IAction, ActionRunner, IActionViewItemProvider } from 'vs/base/common/actions';
1111
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1212
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1313
import { IMenuService, MenuId, MenuItemAction, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
@@ -21,7 +21,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
2121
import { ICommandService } from 'vs/platform/commands/common/commands';
2222
import * as DOM from 'vs/base/browser/dom';
2323
import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels';
24-
import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
24+
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
2525
import { URI } from 'vs/base/common/uri';
2626
import { dirname, basename } from 'vs/base/common/resources';
2727
import { LIGHT, FileThemeIcon, FolderThemeIcon, registerThemingParticipant, ThemeIcon, IThemeService } from 'vs/platform/theme/common/themeService';

0 commit comments

Comments
 (0)