Skip to content

Commit 375bdea

Browse files
joaomorenojoaomoreno
committed
move Separator down to actions
1 parent af15adf commit 375bdea

36 files changed

Lines changed: 63 additions & 80 deletions

File tree

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as platform from 'vs/base/common/platform';
88
import * as nls from 'vs/nls';
99
import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
1010
import { SelectBox, ISelectOptionItem, ISelectBoxOptions } from 'vs/base/browser/ui/selectBox/selectBox';
11-
import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent } from 'vs/base/common/actions';
11+
import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent, Separator } from 'vs/base/common/actions';
1212
import * as DOM from 'vs/base/browser/dom';
1313
import * as types from 'vs/base/common/types';
1414
import { EventType, Gesture } from 'vs/base/browser/touch';
@@ -227,17 +227,6 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
227227
}
228228
}
229229

230-
export class Separator extends Action {
231-
232-
static readonly ID = 'vs.actions.separator';
233-
234-
constructor(label?: string) {
235-
super(Separator.ID, label, label ? 'separator text' : 'separator');
236-
this.checked = false;
237-
this.enabled = false;
238-
}
239-
}
240-
241230
export interface IActionViewItemOptions extends IBaseActionViewItemOptions {
242231
icon?: boolean;
243232
label?: boolean;

‎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 } from 'vs/base/common/actions';
10-
import { ActionBar, IActionViewItemProvider, ActionsOrientation, Separator, ActionViewItem, IActionViewItemOptions, BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
9+
import { IActionRunner, IAction, SubmenuAction, Separator } from 'vs/base/common/actions';
10+
import { ActionBar, IActionViewItemProvider, ActionsOrientation, ActionViewItem, IActionViewItemOptions, BaseActionViewItem } 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/menu/menubar.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { domEvent } from 'vs/base/browser/event';
1111
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
1212
import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
1313
import { cleanMnemonic, IMenuOptions, Menu, MENU_ESCAPED_MNEMONIC_REGEX, MENU_MNEMONIC_REGEX, IMenuStyles, Direction } from 'vs/base/browser/ui/menu/menu';
14-
import { ActionRunner, IAction, IActionRunner, SubmenuAction } from 'vs/base/common/actions';
14+
import { ActionRunner, IAction, IActionRunner, SubmenuAction, Separator } from 'vs/base/common/actions';
1515
import { RunOnceScheduler } from 'vs/base/common/async';
1616
import { Event, Emitter } from 'vs/base/common/event';
1717
import { KeyCode, ResolvedKeybinding, KeyMod } from 'vs/base/common/keyCodes';
@@ -21,7 +21,6 @@ import { asArray } from 'vs/base/common/arrays';
2121
import { ScanCodeUtils, ScanCode } from 'vs/base/common/scanCode';
2222
import { isMacintosh } from 'vs/base/common/platform';
2323
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
24-
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
2524
import { Codicon, registerIcon } from 'vs/base/common/codicons';
2625

2726
const $ = DOM.$;

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,17 @@ export class RadioGroup extends Disposable {
219219
}
220220
}
221221

222+
export class Separator extends Action {
223+
224+
static readonly ID = 'vs.actions.separator';
225+
226+
constructor(label?: string) {
227+
super(Separator.ID, label, label ? 'separator text' : 'separator');
228+
this.checked = false;
229+
this.enabled = false;
230+
}
231+
}
232+
222233
export class SubmenuAction extends Action {
223234
constructor(label: string, public entries: ReadonlyArray<SubmenuAction | IAction>, cssClass?: string) {
224235
super(!!cssClass ? cssClass : 'submenu', label, '', true);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { Separator, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
8-
import { Action } from 'vs/base/common/actions';
7+
import { prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
8+
import { Action, Separator } from 'vs/base/common/actions';
99

1010
suite('Actionbar', () => {
1111

‎src/vs/editor/contrib/codeAction/codeActionMenu.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { getDomNodePagePosition } from 'vs/base/browser/dom';
7-
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
87
import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
9-
import { Action, IAction } from 'vs/base/common/actions';
8+
import { Action, IAction, Separator } from 'vs/base/common/actions';
109
import { canceled } from 'vs/base/common/errors';
1110
import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
1211
import { Lazy } from 'vs/base/common/lazy';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import * as nls from 'vs/nls';
77
import * as dom from 'vs/base/browser/dom';
88
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
9-
import { ActionViewItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
9+
import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
1010
import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
11-
import { IAction } from 'vs/base/common/actions';
11+
import { IAction, Separator } from 'vs/base/common/actions';
1212
import { KeyCode, KeyMod, ResolvedKeybinding } from 'vs/base/common/keyCodes';
1313
import { DisposableStore } from 'vs/base/common/lifecycle';
1414
import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';

‎src/vs/platform/actions/browser/menuEntryActionViewItem.ts‎

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

66
import { addClasses, createCSSRule, removeClasses, asCSSUrl } from 'vs/base/browser/dom';
77
import { domEvent } from 'vs/base/browser/event';
8-
import { ActionViewItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
9-
import { IAction } from 'vs/base/common/actions';
8+
import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
9+
import { IAction, Separator } from 'vs/base/common/actions';
1010
import { Emitter } from 'vs/base/common/event';
1111
import { IdGenerator } from 'vs/base/common/idGenerator';
1212
import { IDisposable, toDisposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';

‎src/vs/workbench/browser/actions/textInputActions.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IAction, Action } from 'vs/base/common/actions';
6+
import { IAction, Action, Separator } from 'vs/base/common/actions';
77
import { localize } from 'vs/nls';
8-
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
98
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
109
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1110
import { Disposable } from 'vs/base/common/lifecycle';

‎src/vs/workbench/browser/panecomposite.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import { Composite } from 'vs/workbench/browser/composite';
1515
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
1616
import { ViewPaneContainer } from './parts/views/viewPaneContainer';
1717
import { IPaneComposite } from 'vs/workbench/common/panecomposite';
18-
import { IAction, IActionViewItem } from 'vs/base/common/actions';
18+
import { IAction, IActionViewItem, Separator } from 'vs/base/common/actions';
1919
import { ViewContainerMenuActions } from 'vs/workbench/browser/parts/views/viewMenuActions';
2020
import { MenuId } from 'vs/platform/actions/common/actions';
21-
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
2221

2322
export class PaneComposite extends Composite implements IPaneComposite {
2423

0 commit comments

Comments
 (0)