Fixes microsoft#40271: Compute visible line widths when restoring the scroll position

alexdima · alexdima · commit 12396ea083a2 · 2017-12-19T09:43:45.000+01:00
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
@@ -450,6 +450,13 @@ export class View extends ViewEventHandler {
 		this._scrollbar.delegateVerticalScrollbarMouseDown(browserEvent);
 	}
 
+	public restoreState(scrollPosition: { scrollLeft: number; scrollTop: number; }): void {
+		this._context.viewLayout.setScrollPositionNow({ scrollTop: scrollPosition.scrollTop });
+		this._renderNow();
+		this.viewLines.updateLineWidths();
+		this._context.viewLayout.setScrollPositionNow({ scrollLeft: scrollPosition.scrollLeft });
+	}
+
 	public getOffsetForColumn(modelLineNumber: number, modelColumn: number): number {
 		let modelPosition = this._context.model.validateModelPosition({
 			lineNumber: modelLineNumber,
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts
@@ -455,6 +455,10 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 
 	// --- implementation
 
+	public updateLineWidths(): void {
+		this._updateLineWidths(false);
+	}
+
 	/**
 	 * Updates the max line width if it is fast to compute.
 	 * Returns true if all lines were taken into account.
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -392,6 +392,16 @@ export abstract class CodeEditorWidget extends CommonCodeEditor implements edito
 		viewEventBus.onKeyDown = (e) => this._onKeyDown.fire(e);
 	}
 
+	public restoreViewState(s: editorCommon.ICodeEditorViewState): void {
+		super.restoreViewState(s);
+		if (!this.cursor || !this.hasView) {
+			return;
+		}
+		if (s && s.cursorState && s.viewState) {
+			this._view.restoreState(this.viewModel.viewLayout.reduceRestoreState(s.viewState));
+		}
+	}
+
 	protected _detachModel(): editorCommon.IModel {
 		let removeDomNode: HTMLElement = null;
 
diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
@@ -651,7 +651,6 @@ export abstract class CommonCodeEditor extends Disposable {
 				// Backwards compatibility
 				this.cursor.restoreState([<editorCommon.ICursorState>cursorState]);
 			}
-			this.viewModel.viewLayout.restoreState(codeEditorState.viewState);
 
 			let contributionsState = s.contributionsState || {};
 			let keys = Object.keys(this._contributions);
diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -175,15 +175,15 @@ export class ViewLayout extends Disposable implements IViewLayout {
 		};
 	}
 
-	public restoreState(state: editorCommon.IViewState): void {
+	public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
 		let restoreScrollTop = state.scrollTop;
 		if (typeof state.scrollTopWithoutViewZones === 'number' && !this._linesLayout.hasWhitespace()) {
 			restoreScrollTop = state.scrollTopWithoutViewZones;
 		}
-		this.scrollable.setScrollPositionNow({
+		return {
 			scrollLeft: state.scrollLeft,
 			scrollTop: restoreScrollTop
-		});
+		};
 	}
 
 	// ---- IVerticalLayoutProvider
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
@@ -63,7 +63,7 @@ export interface IViewLayout {
 	getWhitespaces(): IEditorWhitespace[];
 
 	saveState(): IViewState;
-	restoreState(state: IViewState): void;
+	reduceRestoreState(state: IViewState): { scrollLeft: number; scrollTop: number; };
 
 	isAfterLines(verticalOffset: number): boolean;
 	getLineNumberAtVerticalOffset(verticalOffset: number): number;

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,6 @@ export abstract class CommonCodeEditor extends Disposable {`
`651`	`651`	`// Backwards compatibility`
`652`	`652`	`this.cursor.restoreState([<editorCommon.ICursorState>cursorState]);`
`653`	`653`	`}`
`654`		`- this.viewModel.viewLayout.restoreState(codeEditorState.viewState);`
`655`	`654`
`656`	`655`	`let contributionsState = s.contributionsState \|\| {};`
`657`	`656`	`let keys = Object.keys(this._contributions);`
Original file line number	Diff line number	Diff line change
`@@ -175,15 +175,15 @@ export class ViewLayout extends Disposable implements IViewLayout {`
`175`	`175`	`};`
`176`	`176`	`}`
`177`	`177`
`178`		`- public restoreState(state: editorCommon.IViewState): void {`
	`178`	`+ public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {`
`179`	`179`	`let restoreScrollTop = state.scrollTop;`
`180`	`180`	`if (typeof state.scrollTopWithoutViewZones === 'number' && !this._linesLayout.hasWhitespace()) {`
`181`	`181`	`restoreScrollTop = state.scrollTopWithoutViewZones;`
`182`	`182`	`}`
`183`		`- this.scrollable.setScrollPositionNow({`
	`183`	`+ return {`
`184`	`184`	`scrollLeft: state.scrollLeft,`
`185`	`185`	`scrollTop: restoreScrollTop`
`186`		`- });`
	`186`	`+ };`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// ---- IVerticalLayoutProvider`