layer breaker

rebornix · rebornix · commit 366edd28d507 · 2020-08-17T22:18:04.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -60,6 +60,7 @@ import { isMacintosh, isNative } from 'vs/base/common/platform';
 import { getTitleBarStyle } from 'vs/platform/windows/common/windows';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { CellDragAndDropController } from 'vs/workbench/contrib/notebook/browser/view/renderers/dnd';
+import { RangeMapWithWhitespace } from 'vs/workbench/contrib/notebook/browser/view/rangeMapWithWhitespace';
 
 const $ = DOM.$;
 
@@ -442,6 +443,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 					onFocusPrevious: (applyFocusPrevious: () => void) => this._updateForCursorNavigationMode(applyFocusPrevious),
 				}
 			},
+			new RangeMapWithWhitespace()
 		);
 		this._dndController.setList(this._list);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -68,7 +68,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 	private readonly _focusNextPreviousDelegate: IFocusNextPreviousDelegate;
 
 	private _cellListGutter: WorkbenchList<CellViewModel>;
-	private _rangeMap = new RangeMapWithWhitespace();
+	private _rangeMap: RangeMapWithWhitespace;
 
 	constructor(
 		private listUser: string,
@@ -78,6 +78,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		renderers: IListRenderer<CellViewModel, BaseCellRenderTemplate>[],
 		contextKeyService: IContextKeyService,
 		options: INotebookCellListOptions,
+		rangeMap: RangeMapWithWhitespace,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -87,9 +88,10 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		super(listUser, container, delegate, renderers, {
 			...options,
 			rangeMapProvider: () => {
-				return this._rangeMap;
+				return rangeMap;
 			}
 		}, contextKeyService, listService, themeService, configurationService, keybindingService);
+		this._rangeMap = rangeMap;
 		NOTEBOOK_CELL_LIST_FOCUSED.bindTo(this.contextKeyService).set(true);
 		this._focusNextPreviousDelegate = options.focusNextPreviousDelegate;
 		this._previousFocusedElements = this.getFocusedElements();
