Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:28:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not clear selection in single-select case (fixes #57850)"

Browse Source 
This reverts commit a6626a8d90.
This commit is contained in:
Martin Aeschlimann
2018-09-10 23:08:17 +02:00
parent 1b38a64602
commit 7361bd990c
3 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
View File

@@ -16,7 +16,6 @@ interface QuickPickExpected {
acceptedItems: {
active: string[][];
selection: string[][];
dispose: boolean[];
};
}
@@ -37,8 +36,7 @@ suite('window namespace tests', function () {
selectionItems: [['zwei']],
acceptedItems: {
active: [['zwei']],
selection: [['zwei']],
dispose: [true]
selection: [['zwei']]
},
}, (err?: any) => done(err));
quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
@@ -63,8 +61,7 @@ suite('window namespace tests', function () {
selectionItems: [['zwei']],
acceptedItems: {
active: [['zwei']],
selection: [['zwei']],
dispose: [true]
selection: [['zwei']]
},
}, (err?: any) => done(err));
quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
@@ -89,8 +86,7 @@ suite('window namespace tests', function () {
selectionItems: [['eins'], ['eins', 'zwei']],
acceptedItems: {
active: [['zwei']],
selection: [['eins', 'zwei']],
dispose: [true]
selection: [['eins', 'zwei']]
},
}, (err?: any) => done(err));
quickPick.canSelectMany = true;
@@ -106,31 +102,6 @@ suite('window namespace tests', function () {
})()
.catch(err => done(err));
});
test('createQuickPick, selection events', function (_done) {
let done = (err?: any) => {
done = () => {};
_done(err);
};
const quickPick = createQuickPick({
events: ['active', 'selection', 'accept', 'selection', 'accept', 'hide'],
activeItems: [['eins']],
selectionItems: [['zwei'], ['drei']],
acceptedItems: {
active: [['eins'], ['eins']],
selection: [['zwei'], ['drei']],
dispose: [false, true]
},
}, (err?: any) => done(err));
quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
quickPick.show();
quickPick.selectedItems = [quickPick.items[1]];
setTimeout(() => {
quickPick.selectedItems = [quickPick.items[2]];
}, 0);
});
});
});
@@ -163,9 +134,7 @@ function createQuickPick(expected: QuickPickExpected, done: (err?: any) => void)
assert.deepEqual(quickPick.activeItems.map(item => item.label), expectedActive);
const expectedSelection = expected.acceptedItems.selection.shift();
assert.deepEqual(quickPick.selectedItems.map(item => item.label), expectedSelection);
if (expected.acceptedItems.dispose.shift()) {
quickPick.dispose();
}
quickPick.dispose();
} catch (err) {
done(err);
}