maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #94057.

Browse source
This commit is contained in:
rebornix 2020-06-03 17:15:00 -07:00
parent 79004443db
commit d760fde11e
2 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
View file

@ -23,6 +23,7 @@ import { CellRevealPosition, CellRevealType, CursorAtBoundary, getVisibleCells,
import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel'; import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
import { diff, IProcessedOutput, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { diff, IProcessedOutput, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { clamp } from 'vs/base/common/numbers'; import { clamp } from 'vs/base/common/numbers';
import { SCROLLABLE_ELEMENT_PADDING_TOP } from 'vs/workbench/contrib/notebook/browser/constants';
export class NotebookCellList extends WorkbenchList<CellViewModel> implements IDisposable, IStyleController, INotebookCellList { export class NotebookCellList extends WorkbenchList<CellViewModel> implements IDisposable, IStyleController, INotebookCellList {
get onWillScroll(): Event<ScrollEvent> { return this.view.onWillScroll; } get onWillScroll(): Event<ScrollEvent> { return this.view.onWillScroll; }
@ -546,28 +547,35 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
super.domFocus(); super.domFocus();
} }
getViewScrollTop() {
return this.view.getScrollTop();
}
getViewScrollBottom() {
return this.getViewScrollTop() + this.view.renderHeight - SCROLLABLE_ELEMENT_PADDING_TOP;
}
private _revealRange(viewIndex: number, range: Range, revealType: CellRevealType, newlyCreated: boolean, alignToBottom: boolean) { private _revealRange(viewIndex: number, range: Range, revealType: CellRevealType, newlyCreated: boolean, alignToBottom: boolean) {
const element = this.view.element(viewIndex); const element = this.view.element(viewIndex);
const scrollTop = this.view.getScrollTop(); const scrollTop = this.getViewScrollTop();
const wrapperBottom = scrollTop + this.view.renderHeight; const wrapperBottom = this.getViewScrollBottom();
const startLineNumber = range.startLineNumber; const positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn);
const lineOffset = element.getLineScrollTopOffset(startLineNumber);
const elementTop = this.view.elementTop(viewIndex); const elementTop = this.view.elementTop(viewIndex);
const lineTop = elementTop + lineOffset; const positionTop = elementTop + positionOffset;
// TODO@rebornix 30 ---> line height * 1.5 // TODO@rebornix 30 ---> line height * 1.5
if (lineTop < scrollTop) { if (positionTop < scrollTop) {
this.view.setScrollTop(lineTop - 30); this.view.setScrollTop(positionTop - 30);
} else if (lineTop > wrapperBottom) { } else if (positionTop > wrapperBottom) {
this.view.setScrollTop(scrollTop + lineTop - wrapperBottom + 30); this.view.setScrollTop(scrollTop + positionTop - wrapperBottom + 30);
} else if (newlyCreated) { } else if (newlyCreated) {
// newly scrolled into view // newly scrolled into view
if (alignToBottom) { if (alignToBottom) {
// align to the bottom // align to the bottom
this.view.setScrollTop(scrollTop + lineTop - wrapperBottom + 30); this.view.setScrollTop(scrollTop + positionTop - wrapperBottom + 30);
} else { } else {
// align to to top // align to to top
this.view.setScrollTop(lineTop - 30); this.view.setScrollTop(positionTop - 30);
} }
} }
@ -580,8 +588,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
// For example, we scroll item 10 into the view upwards, in the first round, items 7, 8, 9, 10 are all in the viewport. Then item 7 and 8 resize themselves to be larger and finally item 10 is removed from the view. // For example, we scroll item 10 into the view upwards, in the first round, items 7, 8, 9, 10 are all in the viewport. Then item 7 and 8 resize themselves to be larger and finally item 10 is removed from the view.
// To ensure that item 10 is always there, we need to scroll item 10 to the top edge of the viewport. // To ensure that item 10 is always there, we need to scroll item 10 to the top edge of the viewport.
private _revealRangeInternal(viewIndex: number, range: Range, revealType: CellRevealType) { private _revealRangeInternal(viewIndex: number, range: Range, revealType: CellRevealType) {
const scrollTop = this.view.getScrollTop(); const scrollTop = this.getViewScrollTop();
const wrapperBottom = scrollTop + this.view.renderHeight; const wrapperBottom = this.getViewScrollBottom();
const elementTop = this.view.elementTop(viewIndex); const elementTop = this.view.elementTop(viewIndex);
const element = this.view.element(viewIndex); const element = this.view.element(viewIndex);
@ -624,9 +632,9 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
private _revealRangeInCenterInternal(viewIndex: number, range: Range, revealType: CellRevealType) { private _revealRangeInCenterInternal(viewIndex: number, range: Range, revealType: CellRevealType) {
const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => { const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => {
const element = this.view.element(viewIndex); const element = this.view.element(viewIndex);
let lineOffset = element.getLineScrollTopOffset(range.startLineNumber); let positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn);
let lineOffsetInView = this.view.elementTop(viewIndex) + lineOffset; let positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset;
this.view.setScrollTop(lineOffsetInView - this.view.renderHeight / 2); this.view.setScrollTop(positionOffsetInView - this.view.renderHeight / 2);
if (revealType === CellRevealType.Range) { if (revealType === CellRevealType.Range) {
element.revealRangeInCenter(range); element.revealRangeInCenter(range);
@ -656,24 +664,25 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
private _revealRangeInCenterIfOutsideViewportInternal(viewIndex: number, range: Range, revealType: CellRevealType) { private _revealRangeInCenterIfOutsideViewportInternal(viewIndex: number, range: Range, revealType: CellRevealType) {
const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => { const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => {
const element = this.view.element(viewIndex); const element = this.view.element(viewIndex);
let lineOffset = element.getLineScrollTopOffset(range.startLineNumber); let positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn);
let lineOffsetInView = this.view.elementTop(viewIndex) + lineOffset; let positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset;
this.view.setScrollTop(lineOffsetInView - this.view.renderHeight / 2); this.view.setScrollTop(positionOffsetInView - this.view.renderHeight / 2);
if (revealType === CellRevealType.Range) { if (revealType === CellRevealType.Range) {
element.revealRangeInCenter(range); element.revealRangeInCenter(range);
} }
}; };
const scrollTop = this.view.getScrollTop(); const scrollTop = this.getViewScrollTop();
const wrapperBottom = scrollTop + this.view.renderHeight; const wrapperBottom = this.getViewScrollBottom();
const elementTop = this.view.elementTop(viewIndex); const elementTop = this.view.elementTop(viewIndex);
const viewItemOffset = elementTop; const viewItemOffset = elementTop;
const element = this.view.element(viewIndex); const element = this.view.element(viewIndex);
const positionOffset = viewItemOffset + element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn);
if (viewItemOffset < scrollTop || viewItemOffset > wrapperBottom) { if (positionOffset < scrollTop || positionOffset > wrapperBottom) {
// let it render // let it render
this.view.setScrollTop(viewItemOffset - this.view.renderHeight / 2); this.view.setScrollTop(positionOffset - this.view.renderHeight / 2);
// after rendering, it might be pushed down due to markdown cell dynamic height // after rendering, it might be pushed down due to markdown cell dynamic height
const elementTop = this.view.elementTop(viewIndex); const elementTop = this.view.elementTop(viewIndex);
@ -708,8 +717,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
return; return;
} }
const scrollTop = this.view.getScrollTop(); const scrollTop = this.getViewScrollTop();
const wrapperBottom = scrollTop + this.view.renderHeight; const wrapperBottom = this.getViewScrollBottom();
const elementTop = this.view.elementTop(viewIndex); const elementTop = this.view.elementTop(viewIndex);
if (ignoreIfInsideViewport && elementTop >= scrollTop && elementTop < wrapperBottom) { if (ignoreIfInsideViewport && elementTop >= scrollTop && elementTop < wrapperBottom) {

12
src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
View file

@ -12,7 +12,7 @@ import { IPosition } from 'vs/editor/common/core/position';
import * as editorCommon from 'vs/editor/common/editorCommon'; import * as editorCommon from 'vs/editor/common/editorCommon';
import * as model from 'vs/editor/common/model'; import * as model from 'vs/editor/common/model';
import { SearchParams } from 'vs/editor/common/model/textModelSearch'; import { SearchParams } from 'vs/editor/common/model/textModelSearch';
import { EDITOR_TOOLBAR_HEIGHT, EDITOR_TOP_MARGIN } from 'vs/workbench/contrib/notebook/browser/constants'; import { EDITOR_TOP_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
import { CellEditState, CellFocusMode, CursorAtBoundary, CellViewModelStateChangeEvent, IEditableCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser'; import { CellEditState, CellFocusMode, CursorAtBoundary, CellViewModelStateChangeEvent, IEditableCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CellKind, NotebookCellMetadata, NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { CellKind, NotebookCellMetadata, NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel'; import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
@ -279,7 +279,15 @@ export abstract class BaseCellViewModel extends Disposable {
return 0; return 0;
} }
return this._textEditor.getTopForLineNumber(line) + EDITOR_TOP_MARGIN + EDITOR_TOOLBAR_HEIGHT; return this._textEditor.getTopForLineNumber(line) + EDITOR_TOP_PADDING;
}
getPositionScrollTopOffset(line: number, column: number): number {
if (!this._textEditor) {
return 0;
}
return this._textEditor.getTopForPosition(line, column) + EDITOR_TOP_PADDING;
} }
cursorAtBoundary(): CursorAtBoundary { cursorAtBoundary(): CursorAtBoundary {