ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 17:23:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix split cell undo (#17845)

Browse Source 
* fix split cell undo
This commit is contained in:
Barbara Valdez
2021-12-08 15:17:54 -08:00
committed by GitHub
parent a9a8fec98a
commit 772d0bea83
3 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts
View File

@@ -15,7 +15,7 @@ import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogSer
import { URI } from 'vs/base/common/uri';
import { ExecuteManagerStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs';
import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel';
import { NotebookModel, SplitCell } from 'sql/workbench/services/notebook/browser/models/notebookModel';
import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory';
import { IClientSession, INotebookModelOptions, NotebookContentChange, IClientSessionOptions, ICellModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
import { ClientSession } from 'sql/workbench/services/notebook/browser/models/clientSession';
@@ -605,6 +605,49 @@ suite('notebook model', function (): void {
assert.strictEqual(model.cells.indexOf(secondCell), 0, 'Failed to redo');
});
test('Should merge when undoing split cells', async function (): Promise<void> {
let expectedNotebookContentSplitCells: nb.INotebookContents = {
cells: [{
cell_type: CellTypes.Code,
source: ['foobar '],
execution_count: 1
}, {
cell_type: CellTypes.Code,
source: [' hello'],
execution_count: 1
}],
metadata: {
kernelspec: {
name: 'mssql',
language: 'sql',
display_name: 'SQL'
},
language_info: {
name: 'sql'
}
},
nbformat: 4,
nbformat_minor: 5
};
let mockContentManager = TypeMoq.Mock.ofType(NotebookEditorContentLoader);
mockContentManager.setup(c => c.loadContent()).returns(() => Promise.resolve(expectedNotebookContentSplitCells));
defaultModelOptions.contentLoader = mockContentManager.object;
// When I initialize the model
let model = new NotebookModel(defaultModelOptions, undefined, logService, undefined, new NullAdsTelemetryService(), queryConnectionService.object, configurationService, undoRedoService);
await model.loadContents();
let splitCells: SplitCell[] = [
{ cell: model.cells[0], prefix: undefined },
{ cell: model.cells[1], prefix: '\n' }
];
// Merge cells
model.mergeCells(splitCells);
assert.strictEqual(model.cells.length, 1, 'Cells not deleted after merging');
assert.notStrictEqual(model.cells[0].source, ['foobar ', '\n', ' hello'], 'Cell source is not copied correctly');
});
test('Should notify cell on metadata change', async function (): Promise<void> {
let mockContentManager = TypeMoq.Mock.ofType(NotebookEditorContentLoader);
mockContentManager.setup(c => c.loadContent()).returns(() => Promise.resolve(expectedNotebookContent));