ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-26 17:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 10492ba146318412cbee8b76a8c630f226914734

Browse Source
This commit is contained in:
ADS Merger
2020-04-08 06:33:38 +00:00
parent fca2344c2e
commit 1868a7d370
339 changed files with 3795 additions and 3146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/base/browser/ui/scrollableSplitview/heightMap.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { INextIterator } from 'vs/base/common/iterator';
import { INavigator } from 'vs/base/common/navigator';
export interface IView {
id?: string;
@@ -31,7 +31,7 @@ export class HeightMap {
return !last ? 0 : last.top + last.height;
}
public onInsertItems(iterator: INextIterator<IViewItem>, afterItemId: string | null = null): number | undefined {
public onInsertItems(iterator: INavigator<IViewItem>, afterItemId: string | null = null): number | undefined {
let viewItem: IViewItem | null = null;
let i: number, j: number;
let totalSize: number;
@@ -89,7 +89,7 @@ export class HeightMap {
}
// Contiguous items
public onRemoveItems(iterator: INextIterator<string>): void {
public onRemoveItems(iterator: INavigator<string>): void {
let itemId: string | null = null;
let viewItem: IViewItem;
let startIndex: number | null = null;

10
src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts
View File

@@ -14,7 +14,7 @@ import { clamp } from 'vs/base/common/numbers';
import { range, firstIndex, pushToStart } from 'vs/base/common/arrays';
import { Sash, Orientation, ISashEvent as IBaseSashEvent } from 'vs/base/browser/ui/sash/sash';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { ArrayIterator } from 'vs/base/common/iterator';
import { ArrayNavigator } from 'vs/base/common/navigator';
import { mixin } from 'vs/base/common/objects';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { ISplitViewStyles, Sizing } from 'vs/base/browser/ui/splitview/splitview';
@@ -239,7 +239,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
if (container.parentElement) {
this.viewContainer.removeChild(container);
}
this.onRemoveItems(new ArrayIterator([item.view.id!]));
this.onRemoveItems(new ArrayNavigator([item.view.id!]));
});
const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
@@ -268,7 +268,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
const item: IViewItem = { onAdd, onRemove, view, container, size: viewSize, layout, disposable, height: viewSize, top: 0, width: 0 };
this.viewItems.splice(currentIndex, 0, item);
this.onInsertItems(new ArrayIterator([item]), currentIndex > 0 ? this.viewItems[currentIndex - 1].view.id : undefined);
this.onInsertItems(new ArrayNavigator([item]), currentIndex > 0 ? this.viewItems[currentIndex - 1].view.id : undefined);
// Add sash
if (this.options.enableResizing && this.viewItems.length > 1) {
@@ -342,7 +342,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
if (container.parentElement) {
this.viewContainer.removeChild(container);
}
this.onRemoveItems(new ArrayIterator([item.view.id!]));
this.onRemoveItems(new ArrayNavigator([item.view.id!]));
});
const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
@@ -371,7 +371,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
const item: IViewItem = { onAdd, onRemove, view, container, size: viewSize, layout, disposable, height: viewSize, top: 0, width: 0 };
this.viewItems.splice(index, 0, item);
this.onInsertItems(new ArrayIterator([item]), index > 0 ? this.viewItems[index - 1].view.id : undefined);
this.onInsertItems(new ArrayNavigator([item]), index > 0 ? this.viewItems[index - 1].view.id : undefined);
// Add sash
if (this.options.enableResizing && this.viewItems.length > 1) {

23
src/sql/base/common/navigator.ts Normal file
View File

@@ -0,0 +1,23 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { INavigator as vsINavigator } from 'vs/base/common/navigator';
export interface INavigator<T> extends vsINavigator<T> {
parent(): T | null;
}
export class MappedNavigator<T, R> implements INavigator<R> {
constructor(protected navigator: INavigator<T>, private fn: (item: T | null) => R) {
}
current() { return this.fn(this.navigator.current()); }
previous() { return this.fn(this.navigator.previous()); }
first() { return this.fn(this.navigator.first()); }
last() { return this.fn(this.navigator.last()); }
next() { return this.fn(this.navigator.next()); }
parent() { return this.fn(this.navigator.parent()); }
}