提交 4a23d5f5 编写于 作者: S Sandeep Somavarapu

Review comments and fix tests

上级 accd32a1
...@@ -6155,7 +6155,7 @@ declare module 'vscode' { ...@@ -6155,7 +6155,7 @@ declare module 'vscode' {
/** /**
* Element that is expanded or collapsed. * Element that is expanded or collapsed.
*/ */
element: T; readonly element: T;
} }
...@@ -6167,7 +6167,7 @@ declare module 'vscode' { ...@@ -6167,7 +6167,7 @@ declare module 'vscode' {
/** /**
* Selected elements. * Selected elements.
*/ */
selection: T[]; readonly selection: T[];
} }
...@@ -6179,7 +6179,7 @@ declare module 'vscode' { ...@@ -6179,7 +6179,7 @@ declare module 'vscode' {
/** /**
* `true` if the [tree view](#TreeView) is visible otherwise `false`. * `true` if the [tree view](#TreeView) is visible otherwise `false`.
*/ */
visible: boolean; readonly visible: boolean;
} }
......
...@@ -199,9 +199,9 @@ class ExtHostTreeView<T> extends Disposable { ...@@ -199,9 +199,9 @@ class ExtHostTreeView<T> extends Disposable {
const element = this.getExtensionElement(treeItemHandle); const element = this.getExtensionElement(treeItemHandle);
if (element) { if (element) {
if (expanded) { if (expanded) {
this._onDidExpandElement.fire({ element }); this._onDidExpandElement.fire(Object.freeze({ element }));
} else { } else {
this._onDidCollapseElement.fire({ element }); this._onDidCollapseElement.fire(Object.freeze({ element }));
} }
} }
} }
...@@ -209,14 +209,14 @@ class ExtHostTreeView<T> extends Disposable { ...@@ -209,14 +209,14 @@ class ExtHostTreeView<T> extends Disposable {
setSelection(treeItemHandles: TreeItemHandle[]): void { setSelection(treeItemHandles: TreeItemHandle[]): void {
if (!equals(this._selectedHandles, treeItemHandles)) { if (!equals(this._selectedHandles, treeItemHandles)) {
this._selectedHandles = treeItemHandles; this._selectedHandles = treeItemHandles;
this._onDidChangeSelection.fire({ selection: this.selectedElements }); this._onDidChangeSelection.fire(Object.freeze({ selection: this.selectedElements }));
} }
} }
setVisible(visible: boolean): void { setVisible(visible: boolean): void {
if (visible !== this._visible) { if (visible !== this._visible) {
this._visible = visible; this._visible = visible;
this._onDidChangeVisibility.fire({ visible: this._visible }); this._onDidChangeVisibility.fire(Object.freeze({ visible: this._visible }));
} }
} }
......
...@@ -416,7 +416,7 @@ suite('ExtHostTreeView', function () { ...@@ -416,7 +416,7 @@ suite('ExtHostTreeView', function () {
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
assert.deepEqual({ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }, removeUnsetKeys(revealTarget.args[0][1])); assert.deepEqual({ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }, removeUnsetKeys(revealTarget.args[0][1]));
assert.deepEqual([], revealTarget.args[0][2]); assert.deepEqual([], revealTarget.args[0][2]);
assert.equal(void 0, revealTarget.args[0][3]); assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
}); });
}); });
...@@ -429,7 +429,7 @@ suite('ExtHostTreeView', function () { ...@@ -429,7 +429,7 @@ suite('ExtHostTreeView', function () {
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1])); assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg))); assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
assert.equal(void 0, revealTarget.args[0][3]); assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
}); });
}); });
...@@ -444,7 +444,7 @@ suite('ExtHostTreeView', function () { ...@@ -444,7 +444,7 @@ suite('ExtHostTreeView', function () {
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1])); assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg))); assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
assert.equal(void 0, revealTarget.args[0][3]); assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
})); }));
}); });
...@@ -458,7 +458,7 @@ suite('ExtHostTreeView', function () { ...@@ -458,7 +458,7 @@ suite('ExtHostTreeView', function () {
}; };
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
return treeView.reveal({ key: 'bac' }, { select: false }) return treeView.reveal({ key: 'bac' }, { select: false, focus: false })
.then(() => { .then(() => {
assert.ok(revealTarget.calledOnce); assert.ok(revealTarget.calledOnce);
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
...@@ -467,7 +467,7 @@ suite('ExtHostTreeView', function () { ...@@ -467,7 +467,7 @@ suite('ExtHostTreeView', function () {
{ handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed }, { handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed },
{ handle: '0/0:b/0:ba', label: 'ba', collapsibleState: TreeItemCollapsibleState.Collapsed, parentHandle: '0/0:b' } { handle: '0/0:b/0:ba', label: 'ba', collapsibleState: TreeItemCollapsibleState.Collapsed, parentHandle: '0/0:b' }
], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg))); ], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
assert.deepEqual({ select: false }, revealTarget.args[0][3]); assert.deepEqual({ select: false, focus: false }, revealTarget.args[0][3]);
}); });
}); });
...@@ -494,7 +494,7 @@ suite('ExtHostTreeView', function () { ...@@ -494,7 +494,7 @@ suite('ExtHostTreeView', function () {
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
assert.deepEqual({ handle: '0/0:a/0:ac', label: 'ac', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1])); assert.deepEqual({ handle: '0/0:a/0:ac', label: 'ac', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg))); assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
assert.equal(void 0, revealTarget.args[0][3]); assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
}); });
}); });
}); });
...@@ -533,7 +533,7 @@ suite('ExtHostTreeView', function () { ...@@ -533,7 +533,7 @@ suite('ExtHostTreeView', function () {
assert.deepEqual('treeDataProvider', revealTarget.args[0][0]); assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
assert.deepEqual({ handle: '0/0:b/0:bc', label: 'bc', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:b' }, removeUnsetKeys(revealTarget.args[0][1])); assert.deepEqual({ handle: '0/0:b/0:bc', label: 'bc', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:b' }, removeUnsetKeys(revealTarget.args[0][1]));
assert.deepEqual([{ handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg))); assert.deepEqual([{ handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
assert.equal(void 0, revealTarget.args[0][3]); assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
}); });
}); });
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册