Move progress bar to cell part.

Author: rebornix

src/vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar.ts

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { ICellViewModel, CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellPart';
 import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { NotebookCellExecutionState, NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 
-export class CellProgressBar extends Disposable {
+export class CellProgressBar extends CellPart {
 	private readonly _progressBar: ProgressBar;
 	private readonly _collapsedProgressBar: ProgressBar;
 
@@ -24,16 +25,19 @@ export class CellProgressBar extends Disposable {
 		this._collapsedProgressBar.hide();
 	}
 
-	updateForInternalMetadata(element: CodeCellViewModel, internalMetadata: NotebookCellInternalMetadata): void {
-		const progressBar = element.isInputCollapsed ? this._collapsedProgressBar : this._progressBar;
-		if (internalMetadata.runState === NotebookCellExecutionState.Executing && !internalMetadata.isPaused) {
-			showProgressBar(progressBar);
-		} else {
-			progressBar.hide();
-		}
+	prepareLayout(): void {
+		// nothing to read
 	}
 
-	updateForCellState(element: CodeCellViewModel): void {
+	updateLayoutNow(element: ICellViewModel): void {
+		// nothing to update
+	}
+
+	updateState(element: ICellViewModel, e: CellViewModelStateChangeEvent): void {
+		if (!e.inputCollapsedChanged) {
+			return;
+		}
+
 		if (element.isInputCollapsed) {
 			this._progressBar.hide();
 			if (element.internalMetadata.runState === NotebookCellExecutionState.Executing) {
@@ -46,6 +50,15 @@ export class CellProgressBar extends Disposable {
 			}
 		}
 	}
+
+	updateForInternalMetadata(element: CodeCellViewModel, internalMetadata: NotebookCellInternalMetadata): void {
+		const progressBar = element.isInputCollapsed ? this._collapsedProgressBar : this._progressBar;
+		if (internalMetadata.runState === NotebookCellExecutionState.Executing && !internalMetadata.isPaused) {
+			showProgressBar(progressBar);
+		} else {
+			progressBar.hide();
+		}
+	}
 }
 
 function showProgressBar(progressBar: ProgressBar): void {

src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts

@@ -65,10 +65,6 @@ export class CodeCell extends Disposable {
 				this.updateForOutputHover();
 			}
 
-			if (e.inputCollapsedChanged) {
-				this.templateData.progressBar.updateForCellState(this.viewCell);
-			}
-
 			if (e.outputIsFocusedChanged) {
 				this.updateForOutputFocus();
 			}

src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts

@@ -665,6 +665,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			templateData.focusIndicator,
 			templateData.betweenCellToolbar,
 			templateData.statusBar,
+			templateData.progressBar,
 			cellEditorOptions
 		]));
 		this.renderedEditors.set(element, templateData.editor);