Skip to content

Commit 3364686

Browse files
committed
quick access - remove actionbar contributor that is no longer needed
1 parent b83e971 commit 3364686

11 files changed

Lines changed: 173 additions & 338 deletions

File tree

‎build/lib/i18n.resources.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@
126126
"name": "vs/workbench/contrib/quickaccess",
127127
"project": "vscode-workbench"
128128
},
129-
{
130-
"name": "vs/workbench/contrib/quickopen",
131-
"project": "vscode-workbench"
132-
},
133129
{
134130
"name": "vs/workbench/contrib/userData",
135131
"project": "vscode-workbench"

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,3 +873,51 @@ export class SelectActionViewItem extends BaseActionViewItem {
873873
this.selectBox.render(container);
874874
}
875875
}
876+
877+
export function prepareActions(actions: IAction[]): IAction[] {
878+
if (!actions.length) {
879+
return actions;
880+
}
881+
882+
// Clean up leading separators
883+
let firstIndexOfAction = -1;
884+
for (let i = 0; i < actions.length; i++) {
885+
if (actions[i].id === Separator.ID) {
886+
continue;
887+
}
888+
889+
firstIndexOfAction = i;
890+
break;
891+
}
892+
893+
if (firstIndexOfAction === -1) {
894+
return [];
895+
}
896+
897+
actions = actions.slice(firstIndexOfAction);
898+
899+
// Clean up trailing separators
900+
for (let h = actions.length - 1; h >= 0; h--) {
901+
const isSeparator = actions[h].id === Separator.ID;
902+
if (isSeparator) {
903+
actions.splice(h, 1);
904+
} else {
905+
break;
906+
}
907+
}
908+
909+
// Clean up separator duplicates
910+
let foundAction = false;
911+
for (let k = actions.length - 1; k >= 0; k--) {
912+
const isSeparator = actions[k].id === Separator.ID;
913+
if (isSeparator && !foundAction) {
914+
actions.splice(k, 1);
915+
} else if (!isSeparator) {
916+
foundAction = true;
917+
} else if (isSeparator) {
918+
foundAction = false;
919+
}
920+
}
921+
922+
return actions;
923+
}

src/vs/workbench/test/browser/actionRegistry.test.ts renamed to src/vs/base/test/browser/actionbar.test.ts

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

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

11-
suite('Workbench action registry', () => {
10+
suite('Actionbar', () => {
1211

13-
test('Workbench Action Bar prepareActions()', function () {
12+
test('prepareActions()', function () {
1413
let a1 = new Separator();
1514
let a2 = new Separator();
1615
let a3 = new Action('a3');

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

Lines changed: 0 additions & 196 deletions
This file was deleted.

‎src/vs/workbench/browser/parts/compositePart.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import * as strings from 'vs/base/common/strings';
1111
import { Emitter } from 'vs/base/common/event';
1212
import * as errors from 'vs/base/common/errors';
1313
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
14-
import { IActionViewItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
14+
import { IActionViewItem, ActionsOrientation, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
1515
import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
16-
import { prepareActions } from 'vs/workbench/browser/actions';
1716
import { IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
1817
import { Part, IPartOptions } from 'vs/workbench/browser/part';
1918
import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';

‎src/vs/workbench/browser/parts/editor/titleControl.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { applyDragImage, DataTransfers } from 'vs/base/browser/dnd';
77
import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
88
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
9-
import { ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
9+
import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
1010
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
1111
import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
1212
import * as arrays from 'vs/base/common/arrays';
@@ -27,7 +27,6 @@ import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
2727
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2828
import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
2929
import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
30-
import { prepareActions } from 'vs/workbench/browser/actions';
3130
import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillResourceDataTransfers, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
3231
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
3332
import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';

‎src/vs/workbench/browser/parts/views/viewPaneContainer.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension, a
1313
import { IDisposable, combinedDisposable, dispose, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
1414
import { firstIndex } from 'vs/base/common/arrays';
1515
import { IAction } from 'vs/base/common/actions';
16-
import { IActionViewItem, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
16+
import { IActionViewItem, ActionsOrientation, Separator, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
1717
import { Registry } from 'vs/platform/registry/common/platform';
18-
import { prepareActions } from 'vs/workbench/browser/actions';
1918
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
2019
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2120
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
1616
import { isWindows, isLinux, isWeb, isNative, isMacintosh } from 'vs/base/common/platform';
1717
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
1818
import { IEditorInputFactoryRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
19-
import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbench/browser/actions';
2019
import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
2120
import { Position, Parts, IWorkbenchLayoutService, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
2221
import { IStorageService, WillSaveStateReason, StorageScope } from 'vs/platform/storage/common/storage';
@@ -216,7 +215,6 @@ export class Workbench extends Layout {
216215
}
217216

218217
private startRegistries(accessor: ServicesAccessor): void {
219-
Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar).start(accessor);
220218
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).start(accessor);
221219
Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).start(accessor);
222220
}

0 commit comments

Comments
 (0)