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

fix #141687.

Browse Source
This commit is contained in:
rebornix
2022-02-03 17:03:05 -08:00
parent 5212a82cc8
commit d82bee0734
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+6 -6
View File
@@ -260,7 +260,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
const bottomModelIndex = this._viewModel!.getCellIndex(bottomElement);
if (bottomModelIndex - topModelIndex === bottomViewIndex - topViewIndex) {
this.visibleRanges = [{ start: topModelIndex, end: bottomModelIndex }];
this.visibleRanges = [{ start: topModelIndex, end: bottomModelIndex + 1 }];
} else {
this.visibleRanges = this._getVisibleRangesFromIndex(topViewIndex, topModelIndex, bottomViewIndex, bottomModelIndex);
}
@@ -568,9 +568,9 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
// no hidden area after it
if (stack.length) {
if (stack[stack.length - 1] === modelIndex - 1) {
ranges.push({ start: stack[stack.length - 1], end: modelIndex });
ranges.push({ start: stack[stack.length - 1], end: modelIndex + 1 });
} else {
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] });
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] + 1 });
}
}
@@ -581,9 +581,9 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
// there are hidden ranges after it
if (stack.length) {
if (stack[stack.length - 1] === modelIndex - 1) {
ranges.push({ start: stack[stack.length - 1], end: modelIndex });
ranges.push({ start: stack[stack.length - 1], end: modelIndex + 1 });
} else {
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] });
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] + 1 });
}
}
@@ -594,7 +594,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
}
if (stack.length) {
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] });
ranges.push({ start: stack[stack.length - 1], end: stack[stack.length - 1] + 1 });
}
return reduceCellRanges(ranges);
src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
+39
View File
@@ -317,4 +317,43 @@ suite('NotebookCellList', () => {
assert.deepStrictEqual(cellList.scrollTop, 60);
});
});
test('visibleRanges should be exclusive of end', async function () {
await withTestNotebook(
[
],
async (editor, viewModel) => {
const cellList = createNotebookCellList(instantiationService);
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(100, 100);
assert.deepStrictEqual(cellList.visibleRanges, []);
});
});
test('visibleRanges should be exclusive of end 2', async function () {
await withTestNotebook(
[
['# header a', 'markdown', CellKind.Markup, [], {}],
],
async (editor, viewModel) => {
viewModel.restoreEditorViewState({
editingCells: [false],
editorViewStates: [null],
cellTotalHeights: [50],
collapsedInputCells: {},
collapsedOutputCells: {},
});
const cellList = createNotebookCellList(instantiationService);
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(100, 100);
assert.deepStrictEqual(cellList.visibleRanges, [{ start: 0, end: 1 }]);
});
});
});