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

Merge remote-tracking branch 'origin' into rebornix/multi-kernel

Browse Source
This commit is contained in:
rebornix
2020-07-16 17:26:00 -07:00
parent b6c8c83ffe 7099dc0708
commit 847a98f34c
167 changed files with 3672 additions and 2105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/vscode-notebook-tests/src/notebook.test.ts
View File

@@ -438,7 +438,7 @@ suite('notebook workflow', () => {
await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
});
test.skip('notebook join cells', async function () {
test('notebook join cells', async function () {
const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
assert.equal(vscode.notebook.activeNotebookEditor !== undefined, true, 'notebook first');
@@ -453,7 +453,7 @@ suite('notebook workflow', () => {
await vscode.commands.executeCommand('notebook.cell.joinAbove');
await cellsChangeEvent;
assert.deepEqual(vscode.notebook.activeNotebookEditor!.selection?.document.getText().split(/\r|\n|\r\n/), ['test', 'var abc = 0;']);
assert.deepEqual(vscode.notebook.activeNotebookEditor!.selection?.document.getText().split(/\r\n|\r|\n/), ['test', 'var abc = 0;']);
await vscode.commands.executeCommand('workbench.action.files.save');
await vscode.commands.executeCommand('workbench.action.closeActiveEditor');