mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-12 02:58:31 -05:00
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
626 lines
20 KiB
TypeScript
626 lines
20 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
'use strict';
|
|
|
|
import * as nls from 'vs/nls';
|
|
import { Action, IAction } from 'vs/base/common/actions';
|
|
import { illegalArgument } from 'vs/base/common/errors';
|
|
import * as arrays from 'vs/base/common/arrays';
|
|
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
|
|
import { IBadge } from 'vs/workbench/services/activity/common/activity';
|
|
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
|
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
|
import { ActionBar, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
|
|
import { CompositeActionItem, CompositeOverflowActivityAction, ICompositeActivity, CompositeOverflowActivityActionItem, ActivityAction, ICompositeBar, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
|
|
import { TPromise } from 'vs/base/common/winjs.base';
|
|
import { Dimension, $, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
|
|
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
|
|
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
|
import { Widget } from 'vs/base/browser/ui/widget';
|
|
|
|
export interface ICompositeBarOptions {
|
|
icon: boolean;
|
|
storageId: string;
|
|
orientation: ActionsOrientation;
|
|
colors: ICompositeBarColors;
|
|
compositeSize: number;
|
|
overflowActionSize: number;
|
|
getActivityAction: (compositeId: string) => ActivityAction;
|
|
getCompositePinnedAction: (compositeId: string) => Action;
|
|
getOnCompositeClickAction: (compositeId: string) => Action;
|
|
getContextMenuActions: () => Action[];
|
|
openComposite: (compositeId: string) => TPromise<any>;
|
|
getDefaultCompositeId: () => string;
|
|
hidePart: () => TPromise<any>;
|
|
}
|
|
|
|
export class CompositeBar extends Widget implements ICompositeBar {
|
|
|
|
private dimension: Dimension;
|
|
|
|
private compositeSwitcherBar: ActionBar;
|
|
private compositeOverflowAction: CompositeOverflowActivityAction;
|
|
private compositeOverflowActionItem: CompositeOverflowActivityActionItem;
|
|
|
|
private model: CompositeBarModel;
|
|
private storedState: ISerializedCompositeBarItem[];
|
|
private visibleComposites: string[];
|
|
private compositeSizeInBar: Map<string, number>;
|
|
|
|
constructor(
|
|
private options: ICompositeBarOptions,
|
|
@IInstantiationService private instantiationService: IInstantiationService,
|
|
@IStorageService private storageService: IStorageService,
|
|
@IContextMenuService private contextMenuService: IContextMenuService
|
|
) {
|
|
super();
|
|
|
|
this.model = new CompositeBarModel(options);
|
|
this.storedState = this.loadCompositeItemsFromStorage();
|
|
this.visibleComposites = [];
|
|
this.compositeSizeInBar = new Map<string, number>();
|
|
}
|
|
|
|
getCompositesFromStorage(): string[] {
|
|
return this.storedState.map(s => s.id);
|
|
}
|
|
|
|
create(parent: HTMLElement): HTMLElement {
|
|
const actionBarDiv = parent.appendChild($('.composite-bar'));
|
|
this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
|
|
actionItemProvider: (action: Action) => {
|
|
if (action instanceof CompositeOverflowActivityAction) {
|
|
return this.compositeOverflowActionItem;
|
|
}
|
|
const item = this.model.findItem(action.id);
|
|
return item && this.instantiationService.createInstance(CompositeActionItem, action, item.pinnedAction, this.options.colors, this.options.icon, this);
|
|
},
|
|
orientation: this.options.orientation,
|
|
ariaLabel: nls.localize('activityBarAriaLabel', "Active View Switcher"),
|
|
animated: false,
|
|
}));
|
|
|
|
// Contextmenu for composites
|
|
this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => this.showContextMenu(e)));
|
|
|
|
// Allow to drop at the end to move composites to the end
|
|
this._register(addDisposableListener(parent, EventType.DROP, (e: DragEvent) => {
|
|
const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
|
|
if (draggedCompositeId) {
|
|
EventHelper.stop(e, true);
|
|
CompositeActionItem.clearDraggedComposite();
|
|
|
|
const targetItem = this.model.items[this.model.items.length - 1];
|
|
if (targetItem && targetItem.id !== draggedCompositeId) {
|
|
this.move(draggedCompositeId, targetItem.id);
|
|
}
|
|
}
|
|
}));
|
|
|
|
return actionBarDiv;
|
|
}
|
|
|
|
layout(dimension: Dimension): void {
|
|
this.dimension = dimension;
|
|
if (dimension.height === 0 || dimension.width === 0) {
|
|
// Do not layout if not visible. Otherwise the size measurment would be computed wrongly
|
|
return;
|
|
}
|
|
|
|
if (this.compositeSizeInBar.size === 0) {
|
|
// Compute size of each composite by getting the size from the css renderer
|
|
// Size is later used for overflow computation
|
|
this.computeSizes(this.model.items);
|
|
}
|
|
|
|
this.updateCompositeSwitcher();
|
|
}
|
|
|
|
addComposite({ id, name, order }: { id: string; name: string, order: number }): void {
|
|
const state = this.storedState.filter(s => s.id === id)[0];
|
|
const pinned = state ? state.pinned : true;
|
|
let index = order >= 0 ? order : this.model.items.length;
|
|
|
|
if (state) {
|
|
// Find the index by looking its previous item
|
|
index = 0;
|
|
for (let i = this.storedState.indexOf(state) - 1; i >= 0; i--) {
|
|
const previousItemId = this.storedState[i].id;
|
|
const previousItemIndex = this.model.findIndex(previousItemId);
|
|
if (previousItemIndex !== -1) {
|
|
index = previousItemIndex + 1;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Add to the model
|
|
if (this.model.add(id, name, order, index)) {
|
|
this.computeSizes([this.model.findItem(id)]);
|
|
if (pinned) {
|
|
this.pin(id);
|
|
} else {
|
|
this.updateCompositeSwitcher();
|
|
}
|
|
}
|
|
}
|
|
|
|
removeComposite(id: string): void {
|
|
|
|
// If it pinned, unpin it first
|
|
if (this.isPinned(id)) {
|
|
this.unpin(id);
|
|
}
|
|
|
|
// Remove from the model
|
|
if (this.model.remove(id)) {
|
|
this.updateCompositeSwitcher();
|
|
}
|
|
}
|
|
|
|
activateComposite(id: string): void {
|
|
const previousActiveItem = this.model.activeItem;
|
|
if (this.model.activate(id)) {
|
|
// Update if current composite is neither visible nor pinned
|
|
// or previous active composite is not pinned
|
|
if (this.visibleComposites.indexOf(id) === - 1 || !this.model.activeItem.pinned || (previousActiveItem && !previousActiveItem.pinned)) {
|
|
this.updateCompositeSwitcher();
|
|
}
|
|
}
|
|
}
|
|
|
|
deactivateComposite(id: string): void {
|
|
const previousActiveItem = this.model.activeItem;
|
|
if (this.model.deactivate()) {
|
|
if (previousActiveItem && !previousActiveItem.pinned) {
|
|
this.updateCompositeSwitcher();
|
|
}
|
|
}
|
|
}
|
|
|
|
showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
|
|
if (!badge) {
|
|
throw illegalArgument('badge');
|
|
}
|
|
|
|
if (typeof priority !== 'number') {
|
|
priority = 0;
|
|
}
|
|
|
|
const activity: ICompositeActivity = { badge, clazz, priority };
|
|
this.model.addActivity(compositeId, activity);
|
|
return toDisposable(() => this.model.removeActivity(compositeId, activity));
|
|
}
|
|
|
|
pin(compositeId: string, open?: boolean): void {
|
|
if (this.model.setPinned(compositeId, true)) {
|
|
this.updateCompositeSwitcher();
|
|
|
|
if (open) {
|
|
this.options.openComposite(compositeId)
|
|
.done(() => this.activateComposite(compositeId)); // Activate after opening
|
|
}
|
|
}
|
|
}
|
|
|
|
unpin(compositeId: string): void {
|
|
if (this.model.setPinned(compositeId, false)) {
|
|
|
|
this.updateCompositeSwitcher();
|
|
|
|
const defaultCompositeId = this.options.getDefaultCompositeId();
|
|
|
|
// Case: composite is not the active one or the active one is a different one
|
|
// Solv: we do nothing
|
|
if (!this.model.activeItem || this.model.activeItem.id !== compositeId) {
|
|
return;
|
|
}
|
|
|
|
// Deactivate itself
|
|
this.deactivateComposite(compositeId);
|
|
|
|
// Case: composite is not the default composite and default composite is still showing
|
|
// Solv: we open the default composite
|
|
if (defaultCompositeId !== compositeId && this.isPinned(defaultCompositeId)) {
|
|
this.options.openComposite(defaultCompositeId);
|
|
}
|
|
|
|
// Case: we closed the last visible composite
|
|
// Solv: we hide the part
|
|
else if (this.visibleComposites.length === 1) {
|
|
this.options.hidePart();
|
|
}
|
|
|
|
// Case: we closed the default composite
|
|
// Solv: we open the next visible composite from top
|
|
else {
|
|
this.options.openComposite(this.visibleComposites.filter(cid => cid !== compositeId)[0]);
|
|
}
|
|
}
|
|
}
|
|
|
|
isPinned(compositeId: string): boolean {
|
|
const item = this.model.findItem(compositeId);
|
|
return item && item.pinned;
|
|
}
|
|
|
|
move(compositeId: string, toCompositeId: string): void {
|
|
if (this.model.move(compositeId, toCompositeId)) {
|
|
// timeout helps to prevent artifacts from showing up
|
|
setTimeout(() => this.updateCompositeSwitcher(), 0);
|
|
}
|
|
}
|
|
|
|
getAction(compositeId): ActivityAction {
|
|
const item = this.model.findItem(compositeId);
|
|
return item && item.activityAction;
|
|
}
|
|
|
|
private computeSizes(items: ICompositeBarItem[]): void {
|
|
const size = this.options.compositeSize;
|
|
if (size) {
|
|
items.forEach(composite => this.compositeSizeInBar.set(composite.id, size));
|
|
} else {
|
|
if (this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
|
|
// Compute sizes only if visible. Otherwise the size measurment would be computed wrongly.
|
|
const currentItemsLength = this.compositeSwitcherBar.items.length;
|
|
this.compositeSwitcherBar.push(items.map(composite => composite.activityAction));
|
|
items.map((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === ActionsOrientation.VERTICAL
|
|
? this.compositeSwitcherBar.getHeight(currentItemsLength + index)
|
|
: this.compositeSwitcherBar.getWidth(currentItemsLength + index)
|
|
));
|
|
items.forEach(() => this.compositeSwitcherBar.pull(this.compositeSwitcherBar.items.length - 1));
|
|
}
|
|
}
|
|
}
|
|
|
|
private updateCompositeSwitcher(): void {
|
|
if (!this.compositeSwitcherBar || !this.dimension) {
|
|
return; // We have not been rendered yet so there is nothing to update.
|
|
}
|
|
|
|
let compositesToShow = this.model.items.filter(item =>
|
|
item.pinned
|
|
|| (this.model.activeItem && this.model.activeItem.id === item.id) /* Show the active composite even if it is not pinned */
|
|
).map(item => item.id);
|
|
|
|
// Ensure we are not showing more composites than we have height for
|
|
let overflows = false;
|
|
let maxVisible = compositesToShow.length;
|
|
let size = 0;
|
|
const limit = this.options.orientation === ActionsOrientation.VERTICAL ? this.dimension.height : this.dimension.width;
|
|
for (let i = 0; i < compositesToShow.length && size <= limit; i++) {
|
|
size += this.compositeSizeInBar.get(compositesToShow[i]);
|
|
if (size > limit) {
|
|
maxVisible = i;
|
|
}
|
|
}
|
|
overflows = compositesToShow.length > maxVisible;
|
|
|
|
if (overflows) {
|
|
size -= this.compositeSizeInBar.get(compositesToShow[maxVisible]);
|
|
compositesToShow = compositesToShow.slice(0, maxVisible);
|
|
size += this.options.overflowActionSize;
|
|
}
|
|
// Check if we need to make extra room for the overflow action
|
|
if (size > limit) {
|
|
size -= this.compositeSizeInBar.get(compositesToShow.pop());
|
|
}
|
|
|
|
// We always try show the active composite
|
|
if (this.model.activeItem && compositesToShow.every(compositeId => compositeId !== this.model.activeItem.id)) {
|
|
const removedComposite = compositesToShow.pop();
|
|
size = size - this.compositeSizeInBar.get(removedComposite) + this.compositeSizeInBar.get(this.model.activeItem.id);
|
|
compositesToShow.push(this.model.activeItem.id);
|
|
}
|
|
|
|
// The active composite might have bigger size than the removed composite, check for overflow again
|
|
if (size > limit) {
|
|
compositesToShow.length ? compositesToShow.splice(compositesToShow.length - 2, 1) : compositesToShow.pop();
|
|
}
|
|
|
|
const visibleCompositesChange = !arrays.equals(compositesToShow, this.visibleComposites);
|
|
|
|
// Pull out overflow action if there is a composite change so that we can add it to the end later
|
|
if (this.compositeOverflowAction && visibleCompositesChange) {
|
|
this.compositeSwitcherBar.pull(this.compositeSwitcherBar.length() - 1);
|
|
|
|
this.compositeOverflowAction.dispose();
|
|
this.compositeOverflowAction = null;
|
|
|
|
this.compositeOverflowActionItem.dispose();
|
|
this.compositeOverflowActionItem = null;
|
|
}
|
|
|
|
// Pull out composites that overflow or got hidden
|
|
const compositesToRemove: number[] = [];
|
|
this.visibleComposites.forEach((compositeId, index) => {
|
|
if (compositesToShow.indexOf(compositeId) === -1) {
|
|
compositesToRemove.push(index);
|
|
}
|
|
});
|
|
compositesToRemove.reverse().forEach(index => {
|
|
const actionItem = this.compositeSwitcherBar.items[index];
|
|
this.compositeSwitcherBar.pull(index);
|
|
actionItem.dispose();
|
|
this.visibleComposites.splice(index, 1);
|
|
});
|
|
|
|
// Update the positions of the composites
|
|
compositesToShow.forEach((compositeId, newIndex) => {
|
|
const currentIndex = this.visibleComposites.indexOf(compositeId);
|
|
if (newIndex !== currentIndex) {
|
|
if (currentIndex !== -1) {
|
|
const actionItem = this.compositeSwitcherBar.items[currentIndex];
|
|
this.compositeSwitcherBar.pull(currentIndex);
|
|
actionItem.dispose();
|
|
this.visibleComposites.splice(currentIndex, 1);
|
|
}
|
|
|
|
this.compositeSwitcherBar.push(this.model.findItem(compositeId).activityAction, { label: true, icon: this.options.icon, index: newIndex });
|
|
this.visibleComposites.splice(newIndex, 0, compositeId);
|
|
}
|
|
});
|
|
|
|
// Add overflow action as needed
|
|
if ((visibleCompositesChange && overflows) || this.compositeSwitcherBar.length() === 0) {
|
|
this.compositeOverflowAction = this.instantiationService.createInstance(CompositeOverflowActivityAction, () => this.compositeOverflowActionItem.showMenu());
|
|
this.compositeOverflowActionItem = this.instantiationService.createInstance(
|
|
CompositeOverflowActivityActionItem,
|
|
this.compositeOverflowAction,
|
|
() => this.getOverflowingComposites(),
|
|
() => this.model.activeItem ? this.model.activeItem.id : void 0,
|
|
(compositeId: string) => {
|
|
const item = this.model.findItem(compositeId);
|
|
return item && item.activity[0] && item.activity[0].badge;
|
|
},
|
|
this.options.getOnCompositeClickAction,
|
|
this.options.colors
|
|
);
|
|
|
|
this.compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
|
|
}
|
|
|
|
// Persist
|
|
this.saveCompositeItems();
|
|
}
|
|
|
|
private getOverflowingComposites(): { id: string, name: string }[] {
|
|
let overflowingIds = this.model.items.filter(item => item.pinned).map(item => item.id);
|
|
|
|
// Show the active composite even if it is not pinned
|
|
if (this.model.activeItem && !this.model.activeItem.pinned) {
|
|
overflowingIds.push(this.model.activeItem.id);
|
|
}
|
|
|
|
overflowingIds = overflowingIds.filter(compositeId => this.visibleComposites.indexOf(compositeId) === -1);
|
|
return this.model.items.filter(c => overflowingIds.indexOf(c.id) !== -1);
|
|
}
|
|
|
|
private showContextMenu(e: MouseEvent): void {
|
|
EventHelper.stop(e, true);
|
|
const event = new StandardMouseEvent(e);
|
|
const actions: IAction[] = this.model.items
|
|
.map(({ id, name, activityAction }) => (<IAction>{
|
|
id,
|
|
label: name,
|
|
checked: this.isPinned(id),
|
|
enabled: activityAction.enabled,
|
|
run: () => {
|
|
if (this.isPinned(id)) {
|
|
this.unpin(id);
|
|
} else {
|
|
this.pin(id, true);
|
|
}
|
|
}
|
|
}));
|
|
const otherActions = this.options.getContextMenuActions();
|
|
if (otherActions.length) {
|
|
actions.push(new Separator());
|
|
actions.push(...otherActions);
|
|
}
|
|
this.contextMenuService.showContextMenu({
|
|
getAnchor: () => { return { x: event.posx, y: event.posy }; },
|
|
getActions: () => TPromise.as(actions),
|
|
});
|
|
}
|
|
|
|
private loadCompositeItemsFromStorage(): ISerializedCompositeBarItem[] {
|
|
const storedStates = <Array<string | ISerializedCompositeBarItem>>JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, '[]'));
|
|
const compositeStates = <ISerializedCompositeBarItem[]>storedStates.map(c =>
|
|
typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true } : c);
|
|
return compositeStates;
|
|
}
|
|
|
|
private saveCompositeItems(): void {
|
|
this.storedState = this.model.toJSON();
|
|
this.storageService.store(this.options.storageId, JSON.stringify(this.storedState), StorageScope.GLOBAL);
|
|
}
|
|
}
|
|
|
|
interface ISerializedCompositeBarItem {
|
|
id: string;
|
|
pinned: boolean;
|
|
order: number;
|
|
}
|
|
|
|
interface ICompositeBarItem extends ISerializedCompositeBarItem {
|
|
name: string;
|
|
activityAction: ActivityAction;
|
|
pinnedAction: Action;
|
|
activity: ICompositeActivity[];
|
|
}
|
|
|
|
class CompositeBarModel {
|
|
|
|
readonly items: ICompositeBarItem[] = [];
|
|
activeItem: ICompositeBarItem;
|
|
|
|
constructor(private options: ICompositeBarOptions) { }
|
|
|
|
private createCompositeBarItem(id: string, name: string, order: number, pinned: boolean): ICompositeBarItem {
|
|
const options = this.options;
|
|
return {
|
|
id, name, pinned, order, activity: [],
|
|
get activityAction() {
|
|
return options.getActivityAction(id);
|
|
},
|
|
get pinnedAction() {
|
|
return options.getCompositePinnedAction(id);
|
|
}
|
|
};
|
|
}
|
|
|
|
add(id: string, name: string, order: number, index: number): boolean {
|
|
const item = this.findItem(id);
|
|
if (item) {
|
|
item.order = order;
|
|
item.name = name;
|
|
return false;
|
|
} else {
|
|
if (index === void 0) {
|
|
index = 0;
|
|
while (index < this.items.length && this.items[index].order < order) {
|
|
index++;
|
|
}
|
|
}
|
|
this.items.splice(index, 0, this.createCompositeBarItem(id, name, order, false));
|
|
return true;
|
|
}
|
|
}
|
|
|
|
remove(id: string): boolean {
|
|
for (let index = 0; index < this.items.length; index++) {
|
|
if (this.items[index].id === id) {
|
|
this.items.splice(index, 1);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
move(compositeId: string, toCompositeId: string): boolean {
|
|
|
|
const fromIndex = this.findIndex(compositeId);
|
|
const toIndex = this.findIndex(toCompositeId);
|
|
|
|
// Make sure both items are known to the model
|
|
if (fromIndex === -1 || toIndex === -1) {
|
|
return false;
|
|
}
|
|
|
|
const sourceItem = this.items.splice(fromIndex, 1)[0];
|
|
this.items.splice(toIndex, 0, sourceItem);
|
|
|
|
// Make sure a moved composite gets pinned
|
|
sourceItem.pinned = true;
|
|
|
|
return true;
|
|
}
|
|
|
|
setPinned(id: string, pinned: boolean): boolean {
|
|
for (let index = 0; index < this.items.length; index++) {
|
|
const item = this.items[index];
|
|
if (item.id === id) {
|
|
if (item.pinned !== pinned) {
|
|
item.pinned = pinned;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
addActivity(id: string, activity: ICompositeActivity): boolean {
|
|
const item = this.findItem(id);
|
|
if (item) {
|
|
const stack = item.activity;
|
|
for (let i = 0; i <= stack.length; i++) {
|
|
if (i === stack.length) {
|
|
stack.push(activity);
|
|
break;
|
|
} else if (stack[i].priority <= activity.priority) {
|
|
stack.splice(i, 0, activity);
|
|
break;
|
|
}
|
|
}
|
|
this.updateActivity(id);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
removeActivity(id: string, activity: ICompositeActivity): boolean {
|
|
const item = this.findItem(id);
|
|
if (item) {
|
|
const index = item.activity.indexOf(activity);
|
|
if (index !== -1) {
|
|
item.activity.splice(index, 1);
|
|
this.updateActivity(id);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
updateActivity(id: string): void {
|
|
const item = this.findItem(id);
|
|
if (item) {
|
|
if (item.activity.length) {
|
|
const [{ badge, clazz }] = item.activity;
|
|
item.activityAction.setBadge(badge, clazz);
|
|
}
|
|
else {
|
|
item.activityAction.setBadge(undefined);
|
|
}
|
|
}
|
|
}
|
|
|
|
activate(id: string): boolean {
|
|
if (!this.activeItem || this.activeItem.id !== id) {
|
|
if (this.activeItem) {
|
|
this.deactivate();
|
|
}
|
|
for (let index = 0; index < this.items.length; index++) {
|
|
const item = this.items[index];
|
|
if (item.id === id) {
|
|
this.activeItem = item;
|
|
this.activeItem.activityAction.activate();
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
deactivate(): boolean {
|
|
if (this.activeItem) {
|
|
this.activeItem.activityAction.deactivate();
|
|
this.activeItem = void 0;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
findItem(id: string): ICompositeBarItem {
|
|
return this.items.filter(item => item.id === id)[0];
|
|
}
|
|
|
|
findIndex(id: string): number {
|
|
for (let index = 0; index < this.items.length; index++) {
|
|
if (this.items[index].id === id) {
|
|
return index;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
toJSON(): ISerializedCompositeBarItem[] {
|
|
return this.items.map(({ id, pinned, order }) => ({ id, pinned, order }));
|
|
}
|
|
}
|