Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-15 12:51:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict resolve.

Browse Source
This commit is contained in:
rebornix
2020-09-08 14:13:22 -07:00
parent 1870a1c47e
commit ccc6fe63ab
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
-9
View File
@@ -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);
}
})
);
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+1 -1
View File
@@ -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';