Merge from vscode 10492ba146318412cbee8b76a8c630f226914734

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

View File

@@ -6,7 +6,6 @@
import * as assert from 'assert';
import { ITreeNode, ITreeFilter, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
import { ISpliceable } from 'vs/base/common/sequence';
import { Iterator } from 'vs/base/common/iterator';
import { IndexTreeModel, IIndexTreeNode } from 'vs/base/browser/ui/tree/indexTreeModel';
function toSpliceable<T>(arr: T[]): ISpliceable<T> {
@@ -34,11 +33,11 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{ element: 0 },
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 3);
assert.deepEqual(list[0].element, 0);
@@ -56,17 +55,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 6);
assert.deepEqual(list[0].element, 0);
@@ -93,17 +92,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, collapsed: true, children: Iterator.fromArray([
element: 0, collapsed: true, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 3);
assert.deepEqual(list[0].element, 0);
@@ -121,11 +120,11 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{ element: 0 },
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 3);
@@ -146,17 +145,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 6);
@@ -180,17 +179,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 6);
@@ -208,17 +207,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, collapsed: true, children: Iterator.fromArray([
element: 0, collapsed: true, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 3);
@@ -233,17 +232,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 6);
@@ -264,17 +263,17 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, collapsed: true, children: Iterator.fromArray([
element: 0, collapsed: true, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(list.length, 3);
@@ -304,7 +303,7 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 1, children: [
{
@@ -319,7 +318,7 @@ suite('IndexTreeModel', function () {
{ element: 21 }
]
}
]));
]);
assert.deepEqual(list.length, 5);
assert.deepEqual(toArray(list), [1, 11, 111, 2, 21]);
@@ -337,13 +336,13 @@ suite('IndexTreeModel', function () {
const list: ITreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 }
])
]
}
]));
]);
assert.deepEqual(list.length, 2);
@@ -406,7 +405,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: [
{ element: 1 },
@@ -418,7 +417,7 @@ suite('IndexTreeModel', function () {
{ element: 7 }
]
}
]));
]);
assert.deepEqual(list.length, 4);
assert.deepEqual(toArray(list), [0, 2, 4, 6]);
@@ -440,14 +439,14 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: [
{ element: 1 },
{ element: 2 }
]
}
]));
]);
assert.deepEqual(toArray(list), []);
});
@@ -463,7 +462,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: [
{ element: 1 },
@@ -475,7 +474,7 @@ suite('IndexTreeModel', function () {
{ element: 7 }
]
},
]));
]);
assert.deepEqual(toArray(list), [0, 1, 2, 3, 4, 5, 6, 7]);
@@ -502,7 +501,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 'vscode', children: [
{ element: '.build' },
@@ -522,7 +521,7 @@ suite('IndexTreeModel', function () {
}
]
},
]));
]);
assert.deepEqual(list.length, 10);
@@ -548,7 +547,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 'vscode', children: [
{ element: '.build' },
@@ -568,7 +567,7 @@ suite('IndexTreeModel', function () {
}
]
},
]));
]);
assert.deepEqual(list.length, 10);
@@ -594,7 +593,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 'vscode', collapsed: true, children: [
{ element: '.build' },
@@ -614,7 +613,7 @@ suite('IndexTreeModel', function () {
}
]
},
]));
]);
assert.deepEqual(toArray(list), ['vscode']);
@@ -642,17 +641,17 @@ suite('IndexTreeModel', function () {
const list: IIndexTreeNode<number>[] = [];
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: Iterator.fromArray([
element: 0, children: [
{ element: 10 },
{ element: 11 },
{ element: 12 },
])
]
},
{ element: 1 },
{ element: 2 }
]));
]);
assert.deepEqual(model.getNodeLocation(list[0]), [0]);
assert.deepEqual(model.getNodeLocation(list[1]), [0, 0]);
@@ -672,7 +671,7 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{
element: 0, children: [
{ element: 1 },
@@ -684,7 +683,7 @@ suite('IndexTreeModel', function () {
{ element: 7 }
]
}
]));
]);
assert.deepEqual(model.getNodeLocation(list[0]), [0]);
assert.deepEqual(model.getNodeLocation(list[1]), [0, 1]);
@@ -704,11 +703,11 @@ suite('IndexTreeModel', function () {
const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
model.splice([0], 0, Iterator.fromArray([
model.splice([0], 0, [
{ element: 'silver' },
{ element: 'gold' },
{ element: 'platinum' }
]));
]);
assert.deepEqual(toArray(list), ['silver', 'gold', 'platinum']);
@@ -716,11 +715,11 @@ suite('IndexTreeModel', function () {
model.refilter();
assert.deepEqual(toArray(list), ['platinum']);
model.splice([0], Number.POSITIVE_INFINITY, Iterator.fromArray([
model.splice([0], Number.POSITIVE_INFINITY, [
{ element: 'silver' },
{ element: 'gold' },
{ element: 'platinum' }
]));
]);
assert.deepEqual(toArray(list), ['platinum']);
model.refilter();