Merge pull request microsoft#188514 from microsoft/aamunger/toggleScrollFix

amunger · web-flow · commit fb031d49574d · 2023-07-21T09:12:59.000-07:00
bump version on metadata change
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
@@ -617,6 +617,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
 			const currentlyEnabled = cellMetadata['scrollable'] !== undefined ? cellMetadata['scrollable'] : globalScrollSetting;
 			const shouldEnableScrolling = collapsed || !currentlyEnabled;
 			cellMetadata['scrollable'] = shouldEnableScrolling;
+			viewModel.model.bumpVersion();
 			viewModel.resetRenderer();
 		}
 	}
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
@@ -118,5 +118,8 @@ export class NotebookCellOutputTextModel extends Disposable implements ICellOutp
 		};
 	}
 
+	bumpVersion() {
+		this._versionId = this._versionId + 1;
+	}
 
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -218,6 +218,7 @@ export interface ICellOutput {
 	replaceData(items: IOutputDto): void;
 	appendData(items: IOutputItemDto[]): void;
 	appendedSinceVersion(versionId: number, mime: string): VSBuffer | undefined;
+	bumpVersion(): void;
 }
 
 export interface CellInternalMetadataChangedEvent {

Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction`
`617`	`617`	`const currentlyEnabled = cellMetadata['scrollable'] !== undefined ? cellMetadata['scrollable'] : globalScrollSetting;`
`618`	`618`	`const shouldEnableScrolling = collapsed \|\| !currentlyEnabled;`
`619`	`619`	`cellMetadata['scrollable'] = shouldEnableScrolling;`
	`620`	`+ viewModel.model.bumpVersion();`
`620`	`621`	`viewModel.resetRenderer();`
`621`	`622`	`}`
`622`	`623`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,5 +118,8 @@ export class NotebookCellOutputTextModel extends Disposable implements ICellOutp`
`118`	`118`	`};`
`119`	`119`	`}`
`120`	`120`
	`121`	`+ bumpVersion() {`
	`122`	`+ this._versionId = this._versionId + 1;`
	`123`	`+ }`
`121`	`124`
`122`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ export interface ICellOutput {`
`218`	`218`	`replaceData(items: IOutputDto): void;`
`219`	`219`	`appendData(items: IOutputItemDto[]): void;`
`220`	`220`	`appendedSinceVersion(versionId: number, mime: string): VSBuffer \| undefined;`
	`221`	`+ bumpVersion(): void;`
`221`	`222`	`}`
`222`	`223`
`223`	`224`	`export interface CellInternalMetadataChangedEvent {`