From ccc6fe63abbd1facfa55b352755e0ba00a356f74 Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 8 Sep 2020 14:13:22 -0700 Subject: [PATCH] merge conflict resolve. --- .../notebook/browser/viewModel/notebookViewModel.ts | 9 --------- .../contrib/notebook/common/model/notebookTextModel.ts | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts index 5151d3adc2f..4553fdd0412 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts @@ -771,9 +771,6 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD }, deleteCell: (index: number) => { this.deleteCell(index, true, false); - }, - emitSelections: (selections: number[]) => { - this.updateSelectionsFromEdits(selections); } } )); @@ -850,9 +847,6 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD }, createCellViewModel: (cell: NotebookCellTextModel) => { return createCellViewModel(this._instantiationService, this, cell); - }, - emitSelections: (selections: number[]) => { - this.updateSelectionsFromEdits(selections); } }) ); @@ -904,9 +898,6 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD }, createCellViewModel: (cell: NotebookCellTextModel) => { return createCellViewModel(this._instantiationService, this, cell); - }, - emitSelections: (selections: number[]) => { - this.updateSelectionsFromEdits(selections); } }) ); diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts index 9cfc7aad971..5537f5d9f15 100644 --- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts +++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts @@ -8,7 +8,7 @@ import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel'; -import { INotebookTextModel, NotebookCellOutputsSplice, NotebookDocumentMetadata, NotebookCellMetadata, ICellEditOperation, CellEditType, CellUri, CellKind, IProcessedOutput, notebookDocumentMetadataDefaults, diff, NotebookCellsChangeType, ICellDto2, TransientOptions, NotebookTextModelChangedEvent, NotebookCellTextModelSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon'; +import { INotebookTextModel, NotebookCellOutputsSplice, NotebookDocumentMetadata, NotebookCellMetadata, ICellEditOperation, CellEditType, CellUri, CellKind, IProcessedOutput, notebookDocumentMetadataDefaults, diff, NotebookCellsChangeType, ICellDto2, TransientOptions, NotebookTextModelChangedEvent } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { ITextSnapshot } from 'vs/editor/common/model'; import { IUndoRedoService, UndoRedoElementType, IUndoRedoElement, IResourceUndoRedoElement } from 'vs/platform/undoRedo/common/undoRedo'; import { InsertCellEdit, DeleteCellEdit, MoveCellEdit, SpliceCellsEdit, CellMetadataEdit } from 'vs/workbench/contrib/notebook/common/model/cellEdit';