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

fix undo notebook action leak

Browse Source
This commit is contained in:
aamunger
2023-10-03 11:07:36 -07:00
committed by Aaron Munger
parent f0c227187d
commit ef07cc9d5e
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+1
View File
@@ -735,6 +735,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
this._bindCellContentHandler(cell, e);
});
this._cellListeners.set(cell.handle, dirtyStateListener);
this._register(cell);
return cell;
});
src/vs/workbench/contrib/notebook/test/browser/contrib/notebookUndoRedo.test.ts
+13 -18
View File
@@ -4,20 +4,20 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { ILanguageService } from 'vs/editor/common/languages/language';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { CellEditType, CellKind, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { createNotebookCellList, TestCell, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
import { createNotebookCellList, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
suite('Notebook Undo/Redo', () => {
const disposables = ensureNoDisposablesAreLeakedInTestSuite();
test('Basics', async function () {
await withTestNotebook(
[
['# header 1', 'markdown', CellKind.Markup, [], {}],
['body', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel, _ds, accessor) => {
const languageService = accessor.get(ILanguageService);
async (editor, viewModel, _ds, _accessor) => {
assert.strictEqual(viewModel.length, 2);
assert.strictEqual(viewModel.getVersionId(), 0);
assert.strictEqual(viewModel.getAlternativeId(), '0_0,1;1,1');
@@ -41,7 +41,7 @@ suite('Notebook Undo/Redo', () => {
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 0, count: 0, cells: [
new TestCell(viewModel.viewType, 3, '# header 2', 'markdown', CellKind.Code, [], languageService),
{ source: '# header 3', language: 'markdown', cellKind: CellKind.Markup, outputs: [], mime: undefined }
]
}], true, undefined, () => undefined, undefined, true);
assert.strictEqual(viewModel.getVersionId(), 4);
@@ -60,8 +60,7 @@ suite('Notebook Undo/Redo', () => {
['# header 1', 'markdown', CellKind.Markup, [], {}],
['body', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel, _ds, accessor) => {
const languageService = accessor.get(ILanguageService);
async (editor, _viewModel, _ds, _accessor) => {
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 0, count: 2, cells: []
}], true, undefined, () => undefined, undefined, true);
@@ -69,7 +68,7 @@ suite('Notebook Undo/Redo', () => {
assert.doesNotThrow(() => {
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 0, count: 2, cells: [
new TestCell(viewModel.viewType, 3, '# header 2', 'markdown', CellKind.Code, [], languageService),
{ source: '# header 2', language: 'markdown', cellKind: CellKind.Markup, outputs: [], mime: undefined }
]
}], true, undefined, () => undefined, undefined, true);
});
@@ -101,15 +100,14 @@ suite('Notebook Undo/Redo', () => {
['# header 1', 'markdown', CellKind.Markup, [], {}],
['body', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel, _ds, accessor) => {
const languageService = accessor.get(ILanguageService);
async (editor, viewModel, _ds, _accessor) => {
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 0, count: 2, cells: []
}], true, undefined, () => undefined, undefined, true);
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 0, count: 2, cells: [
new TestCell(viewModel.viewType, 3, '# header 2', 'markdown', CellKind.Code, [], languageService),
{ source: '# header 2', language: 'markdown', cellKind: CellKind.Markup, outputs: [], mime: undefined }
]
}], true, undefined, () => undefined, undefined, true);
@@ -134,14 +132,13 @@ suite('Notebook Undo/Redo', () => {
['body', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel, _ds, accessor) => {
const languageService = accessor.get(ILanguageService);
const cellList = createNotebookCellList(accessor, new DisposableStore());
const cellList = createNotebookCellList(accessor, disposables);
cellList.attachViewModel(viewModel);
cellList.setFocus([1]);
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 2, count: 0, cells: [
new TestCell(viewModel.viewType, 3, '# header 2', 'markdown', CellKind.Code, [], languageService)
{ source: '# header 2', language: 'markdown', cellKind: CellKind.Markup, outputs: [], mime: undefined }
]
}], true, { focus: { start: 1, end: 2 }, selections: [{ start: 1, end: 2 }], kind: SelectionStateType.Index }, () => {
return {
@@ -175,11 +172,9 @@ suite('Notebook Undo/Redo', () => {
['body', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel, _ds, accessor) => {
const languageService = accessor.get(ILanguageService);
editor.textModel.applyEdits([{
editType: CellEditType.Replace, index: 2, count: 0, cells: [
new TestCell(viewModel.viewType, 3, '# header 2', 'markdown', CellKind.Code, [], languageService)
{ source: '# header 2', language: 'markdown', cellKind: CellKind.Markup, outputs: [], mime: undefined }
]
}, {
editType: CellEditType.Metadata, index: 0, metadata: { inputCollapsed: false }
src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
+1 -1
View File
@@ -416,7 +416,7 @@ export async function withTestNotebook<R = any>(cells: [source: string, lang: st
});
}
export function createNotebookCellList(instantiationService: TestInstantiationService, disposables: DisposableStore, viewContext?: ViewContext) {
export function createNotebookCellList(instantiationService: TestInstantiationService, disposables: Pick<DisposableStore, 'add'>, viewContext?: ViewContext) {
const delegate: IListVirtualDelegate<CellViewModel> = {
getHeight(element: CellViewModel) { return element.getHeight(17); },
getTemplateId() { return 'template'; }