Fix bad cell layout after "toggle word wrap"

roblourens · roblourens · commit 79fa27d2bd09 · 2020-07-09T15:57:19.000-07:00
Fix microsoft#101940
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
@@ -293,28 +293,27 @@ export class CodeCell extends Disposable {
 
 	private onCellWidthChange(): void {
 		const realContentHeight = this.templateData.editor!.getContentHeight();
+		this.viewCell.editorHeight = realContentHeight;
+		this.relayoutCell();
+
 		this.layoutEditor(
 			{
 				width: this.viewCell.layoutInfo.editorWidth,
 				height: realContentHeight
 			}
 		);
-
-		this.viewCell.editorHeight = realContentHeight;
-		this.relayoutCell();
 	}
 
 	private onCellHeightChange(newHeight: number): void {
 		const viewLayout = this.templateData.editor!.getLayoutInfo();
+		this.viewCell.editorHeight = newHeight;
+		this.relayoutCell();
 		this.layoutEditor(
 			{
 				width: viewLayout.width,
 				height: newHeight
 			}
 		);
-
-		this.viewCell.editorHeight = newHeight;
-		this.relayoutCell();
 	}
 
 	renderOutput(currOutput: IProcessedOutput, index: number, beforeElement?: HTMLElement) {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
@@ -310,13 +310,13 @@ export class StatefullMarkdownCell extends Disposable {
 			let viewLayout = this.editor!.getLayoutInfo();
 
 			if (e.contentHeightChanged) {
+				this.viewCell.editorHeight = e.contentHeight;
 				this.editor!.layout(
 					{
 						width: viewLayout.width,
 						height: e.contentHeight
 					}
 				);
-				this.viewCell.editorHeight = e.contentHeight;
 			}
 		}));
 

Original file line number	Diff line number	Diff line change
`@@ -293,28 +293,27 @@ export class CodeCell extends Disposable {`
`293`	`293`
`294`	`294`	`private onCellWidthChange(): void {`
`295`	`295`	`const realContentHeight = this.templateData.editor!.getContentHeight();`
	`296`	`+ this.viewCell.editorHeight = realContentHeight;`
	`297`	`+ this.relayoutCell();`
	`298`	`+`
`296`	`299`	`this.layoutEditor(`
`297`	`300`	`{`
`298`	`301`	`width: this.viewCell.layoutInfo.editorWidth,`
`299`	`302`	`height: realContentHeight`
`300`	`303`	`}`
`301`	`304`	`);`
`302`		`-`
`303`		`- this.viewCell.editorHeight = realContentHeight;`
`304`		`- this.relayoutCell();`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`private onCellHeightChange(newHeight: number): void {`
`308`	`308`	`const viewLayout = this.templateData.editor!.getLayoutInfo();`
	`309`	`+ this.viewCell.editorHeight = newHeight;`
	`310`	`+ this.relayoutCell();`
`309`	`311`	`this.layoutEditor(`
`310`	`312`	`{`
`311`	`313`	`width: viewLayout.width,`
`312`	`314`	`height: newHeight`
`313`	`315`	`}`
`314`	`316`	`);`
`315`		`-`
`316`		`- this.viewCell.editorHeight = newHeight;`
`317`		`- this.relayoutCell();`
`318`	`317`	`}`
`319`	`318`
`320`	`319`	`renderOutput(currOutput: IProcessedOutput, index: number, beforeElement?: HTMLElement) {`
Original file line number	Diff line number	Diff line change
`@@ -310,13 +310,13 @@ export class StatefullMarkdownCell extends Disposable {`
`310`	`310`	`let viewLayout = this.editor!.getLayoutInfo();`
`311`	`311`
`312`	`312`	`if (e.contentHeightChanged) {`
	`313`	`+ this.viewCell.editorHeight = e.contentHeight;`
`313`	`314`	`this.editor!.layout(`
`314`	`315`	`{`
`315`	`316`	`width: viewLayout.width,`
`316`	`317`	`height: e.contentHeight`
`317`	`318`	`}`
`318`	`319`	`);`
`319`		`- this.viewCell.editorHeight = e.contentHeight;`
`320`	`320`	`}`
`321`	`321`	`}));`
`322`	`322`