Skip to content

Commit 53684d6

Browse files
rebornixrebornix
committed
remove unused folding update event
1 parent 5ce0763 commit 53684d6

4 files changed

Lines changed: 13 additions & 17 deletions

File tree

‎src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,18 @@ export class FoldingController extends Disposable {
1717
super();
1818

1919
this._register(this._notebookEditor.onMouseUp(e => { this.onMouseUp(e); }));
20-
this._register(this._notebookEditor.viewModel!.onDidFoldingRegionChanged(() => {
21-
const hiddenRanges = this._notebookEditor.viewModel!.getHiddenRanges();
22-
this._notebookEditor.setHiddenAreas(hiddenRanges);
23-
}));
2420

2521
this._foldingModel = new FoldingModel();
2622
this._foldingModel.attachViewModel(this._notebookEditor.viewModel!);
2723

2824
this._register(this._foldingModel.onDidFoldingRegionChanged(() => {
29-
this._notebookEditor.viewModel!.updateFoldingRanges(this._foldingModel.regions);
25+
this._updateEditorFoldingRanges();
3026
}));
3127
}
3228

3329
applyMemento(state: ICellRange[]) {
3430
this._foldingModel.applyMemento(state);
35-
this._notebookEditor.viewModel!.updateFoldingRanges(this._foldingModel.regions);
31+
this._updateEditorFoldingRanges();
3632
}
3733

3834
getMemento(): ICellRange[] {
@@ -48,8 +44,13 @@ export class FoldingController extends Disposable {
4844
}
4945

5046
this._foldingModel.setCollapsed(range, state === CellFoldingState.Collapsed);
51-
this._notebookEditor.viewModel!.updateFoldingRanges(this._foldingModel.regions);
47+
this._updateEditorFoldingRanges();
48+
}
5249

50+
private _updateEditorFoldingRanges() {
51+
this._notebookEditor.viewModel!.updateFoldingRanges(this._foldingModel.regions);
52+
const hiddenRanges = this._notebookEditor.viewModel!.getHiddenRanges();
53+
this._notebookEditor.setHiddenAreas(hiddenRanges);
5354
}
5455

5556
onMouseUp(e: INotebookEditorMouseEvent) {

‎src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ export enum CellFoldingState {
211211
Collapsed
212212
}
213213

214-
export interface FoldingRegionDelegate {
215-
onDidFoldingRegionChanged: Event<void>;
214+
export interface EditorFoldingStateDelegate {
216215
getCellIndex(cell: CellViewModel): number;
217-
getFoldingStartIndex(index: number): number;
218216
getFoldingState(index: number): CellFoldingState;
219217
}

‎src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_MARGIN, CELL_RUN_GUTTER } from 'vs/wor
1313
import { CellEditState, CellFindMatch, ICellViewModel, MarkdownCellLayoutChangeEvent, MarkdownCellLayoutInfo, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
1414
import { MarkdownRenderer } from 'vs/workbench/contrib/notebook/browser/view/renderers/mdRenderer';
1515
import { BaseCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel';
16-
import { FoldingRegionDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
16+
import { EditorFoldingStateDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
1717
import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
1818
import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
1919

@@ -47,7 +47,7 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie
4747
readonly notebookHandle: number,
4848
readonly model: NotebookCellTextModel,
4949
initialNotebookLayoutInfo: NotebookLayoutInfo | null,
50-
readonly foldingDelegate: FoldingRegionDelegate,
50+
readonly foldingDelegate: EditorFoldingStateDelegate,
5151
@IInstantiationService private readonly _instaService: IInstantiationService,
5252
@ITextModelService private readonly _modelService: ITextModelService) {
5353
super(viewType, notebookHandle, model, UUID.generateUuid());

‎src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { NotebookEditorModel } from 'vs/workbench/contrib/notebook/browser/noteb
2323
import { DeleteCellEdit, InsertCellEdit, MoveCellEdit } from 'vs/workbench/contrib/notebook/browser/viewModel/cellEdit';
2424
import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
2525
import { NotebookEventDispatcher, NotebookMetadataChangedEvent } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
26-
import { CellFoldingState, FoldingRegionDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
26+
import { CellFoldingState, EditorFoldingStateDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
2727
import { MarkdownCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel';
2828
import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
2929
import { CellKind, ICell } from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -129,7 +129,7 @@ function _normalizeOptions(options: IModelDecorationOptions): ModelDecorationOpt
129129
let MODEL_ID = 0;
130130

131131

132-
export class NotebookViewModel extends Disposable implements FoldingRegionDelegate {
132+
export class NotebookViewModel extends Disposable implements EditorFoldingStateDelegate {
133133
private _localStore: DisposableStore = this._register(new DisposableStore());
134134
private _viewCells: CellViewModel[] = [];
135135
private _handleToViewCellMapping = new Map<number, CellViewModel>();
@@ -202,8 +202,6 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
202202
private readonly _instanceId: string;
203203
public readonly id: string;
204204
private _foldingRanges: FoldingRegions | null = null;
205-
private _onDidFoldingRegionChanges = new Emitter<void>();
206-
onDidFoldingRegionChanged: Event<void> = this._onDidFoldingRegionChanges.event;
207205
private _hiddenRanges: ICellRange[] = [];
208206

209207
constructor(
@@ -323,7 +321,6 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
323321

324322
if (updateHiddenAreas || k < this._hiddenRanges.length) {
325323
this._hiddenRanges = newHiddenAreas;
326-
this._onDidFoldingRegionChanges.fire();
327324
this._viewCells.forEach(cell => {
328325
if (cell.cellKind === CellKind.Markdown) {
329326
cell.triggerfoldingStateChange();

0 commit comments

Comments
 (0)