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

On the fly tab model construction (#133025)

Browse Source 
* Enrich the change event

* Initial tab model building

* Work in progress model construction

* Add pauseable emitter

* Attempt using microtask

* Make tests pass

* Update active tab logic

* Fix layering issue

* event rename

* PR feedback

* Remove stray new line

* Add test for microtask emitter

* Add move event

* Add mmerge functionality to Microtask emitter

* Fix compilation errrors

* Fix tests

* Add tests to address feedback

* Change editor change event to an array

* Add array support to editorsChangeEvent

* Update src/vs/workbench/common/editor/editorGroupModel.ts

Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>

* Switch to a less efficient array method

* Add console.log for debugging

* Test with different notebook

* Fix notebook URI

* For now split up file open for better debugging

* Don't use notebook in test for now

* Cleanup event

* Fix tests

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
This commit is contained in:
Logan Ramos
2021-09-16 14:34:54 -04:00
committed by GitHub
parent c78811c1a7
commit 76c3eb94c9
14 changed files with 345 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
View File

@@ -348,33 +348,30 @@ suite('vscode API - window', () => {
});
//#region Tabs API tests
test.skip('Tabs - Ensure tabs getter is correct', async () => {
assert.ok(workspace.workspaceFolders);
const workspaceRoot = workspace.workspaceFolders[0].uri;
const [docA, docB, docC, notebookDoc] = await Promise.all([
workspace.openTextDocument(await createRandomFile()),
workspace.openTextDocument(await createRandomFile()),
workspace.openTextDocument(await createRandomFile()),
workspace.openNotebookDocument(Uri.joinPath(workspaceRoot, 'test.ipynb'))
]);
test('Tabs - Ensure tabs getter is correct', async () => {
const docA = await workspace.openTextDocument(await createRandomFile());
const docB = await workspace.openTextDocument(await createRandomFile());
const docC = await workspace.openTextDocument(await createRandomFile());
// Add back actual notebook doc once stuck promise is figured out
//const notebookDoc = await workspace.openNotebookDocument(await createRandomFile('', undefined, '.vsctestnb'));
const notebookDoc = await workspace.openTextDocument(await createRandomFile());
// const [docA, docB, docC, notebookDoc] = await Promise.all([
// workspace.openTextDocument(await createRandomFile()),
// workspace.openTextDocument(await createRandomFile()),
// workspace.openTextDocument(await createRandomFile()),
// workspace.openNotebookDocument(await createRandomFile('', undefined, '.vsctestnb'))
// ]);
await window.showTextDocument(docA, { viewColumn: ViewColumn.One, preview: false });
await window.showTextDocument(docB, { viewColumn: ViewColumn.Two, preview: false });
await window.showTextDocument(docC, { viewColumn: ViewColumn.Three, preview: false });
await window.showNotebookDocument(notebookDoc, { viewColumn: ViewColumn.One, preview: false });
await window.showTextDocument(notebookDoc, { viewColumn: ViewColumn.One, preview: false });
//await window.showNotebookDocument(notebookDoc, { viewColumn: ViewColumn.One, preview: false });
const leftDiff = await createRandomFile();
const rightDiff = await createRandomFile();
await commands.executeCommand('vscode.diff', leftDiff, rightDiff, 'Diff', { viewColumn: ViewColumn.Three, preview: false });
// Wait for the tab change event to fire
await new Promise<void>((resolve) => {
const dispsable = window.onDidChangeTabs(() => {
dispsable.dispose();
resolve();
});
});
const tabs = window.tabs;
assert.strictEqual(tabs.length, 5);
@@ -393,16 +390,8 @@ suite('vscode API - window', () => {
assert.strictEqual(tabs[4].viewColumn, ViewColumn.Three);
});
test.skip('Tabs - ensure active tab is correct', async () => {
test('Tabs - ensure active tab is correct', async () => {
function createActiveTabListenerPromise(): Promise<void> {
return new Promise<void>((resolve) => {
const dispsable = window.onDidChangeActiveTab(() => {
dispsable.dispose();
resolve();
});
});
}
const [docA, docB, docC] = await Promise.all([
workspace.openTextDocument(await createRandomFile()),
workspace.openTextDocument(await createRandomFile()),
@@ -410,24 +399,20 @@ suite('vscode API - window', () => {
]);
await window.showTextDocument(docA, { viewColumn: ViewColumn.One, preview: false });
await createActiveTabListenerPromise();
assert.ok(window.activeTab);
assert.strictEqual(window.activeTab.resource?.toString(), docA.uri.toString());
await window.showTextDocument(docB, { viewColumn: ViewColumn.Two, preview: false });
await createActiveTabListenerPromise();
assert.ok(window.activeTab);
assert.strictEqual(window.activeTab.resource?.toString(), docB.uri.toString());
await window.showTextDocument(docC, { viewColumn: ViewColumn.Three, preview: false });
await createActiveTabListenerPromise();
assert.ok(window.activeTab);
assert.strictEqual(window.activeTab.resource?.toString(), docC.uri.toString());
await commands.executeCommand('workbench.action.closeActiveEditor');
await commands.executeCommand('workbench.action.closeActiveEditor');
await commands.executeCommand('workbench.action.closeActiveEditor');
await createActiveTabListenerPromise();
assert.ok(!window.activeTab);