Merge pull request microsoft#97849 from microsoft/aweinand/breakpointmargin

weinand · web-flow · commit d40066d9cd01 · 2020-05-15T01:10:18.000+02:00
add breakpointMargin property to cell metadata
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -1591,6 +1591,12 @@ declare module 'vscode' {
 		 */
 		runnable?: boolean;
 
+		/**
+		 * Controls if the cell has a margin to support the breakpoint UI.
+		 * This metadata is ignored for markdown cell.
+		 */
+		breakpointMargin?: boolean;
+
 		/**
 		 * The order in which this cell was executed.
 		 */
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -159,6 +159,13 @@ export class CellEditorOptions {
 	get value(): IEditorOptions {
 		return this._value;
 	}
+
+	setGlyphMargin(gm: boolean): void {
+		if (gm !== this._value.glyphMargin) {
+			this._value.glyphMargin = gm;
+			this._onDidChange.fire(this.value);
+		}
+	}
 }
 
 abstract class AbstractCellRenderer {
@@ -989,6 +996,10 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 		} else {
 			templateData.timer.clear();
 		}
+
+		if (typeof metadata.breakpointMargin === 'boolean') {
+			this.editorOptions.setGlyphMargin(metadata.breakpointMargin);
+		}
 	}
 
 	private renderExecutionOrder(element: CodeCellViewModel, templateData: CodeCellRenderTemplate): void {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -79,6 +79,7 @@ export enum NotebookCellRunState {
 export interface NotebookCellMetadata {
 	editable?: boolean;
 	runnable?: boolean;
+	breakpointMargin?: boolean;
 	executionOrder?: number;
 	statusMessage?: string;
 	runState?: NotebookCellRunState;

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,13 @@ export class CellEditorOptions {`
`159`	`159`	`get value(): IEditorOptions {`
`160`	`160`	`return this._value;`
`161`	`161`	`}`
	`162`	`+`
	`163`	`+ setGlyphMargin(gm: boolean): void {`
	`164`	`+ if (gm !== this._value.glyphMargin) {`
	`165`	`+ this._value.glyphMargin = gm;`
	`166`	`+ this._onDidChange.fire(this.value);`
	`167`	`+ }`
	`168`	`+ }`
`162`	`169`	`}`
`163`	`170`
`164`	`171`	`abstract class AbstractCellRenderer {`
`@@ -989,6 +996,10 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende`
`989`	`996`	`} else {`
`990`	`997`	`templateData.timer.clear();`
`991`	`998`	`}`
	`999`	`+`
	`1000`	`+ if (typeof metadata.breakpointMargin === 'boolean') {`
	`1001`	`+ this.editorOptions.setGlyphMargin(metadata.breakpointMargin);`
	`1002`	`+ }`
`992`	`1003`	`}`
`993`	`1004`
`994`	`1005`	`private renderExecutionOrder(element: CodeCellViewModel, templateData: CodeCellRenderTemplate): void {`