Skip to content

Commit 9b4bc5a

Browse files
rebornixrebornix
committed
applyEdits.
1 parent 475b674 commit 9b4bc5a

File tree

8 files changed

+33
-33
lines changed

8 files changed

+33
-33
lines changed

‎src/vs/workbench/api/browser/mainThreadNotebook.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
162162
return false;
163163
}
164164
this._notebookService.transformEditsOutputs(textModel, cellEdits);
165-
return textModel.applyEdit(modelVersionId, cellEdits, true, undefined, () => undefined);
165+
return textModel.applyEdits(modelVersionId, cellEdits, true, undefined, () => undefined);
166166
}
167167

168168
private _isDeltaEmpty(delta: INotebookDocumentsAndEditorsDelta) {
@@ -460,7 +460,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
460460
this._notebookService.transformEditsOutputs(mainthreadTextModel, edits);
461461
await new Promise(resolve => {
462462
DOM.scheduleAtNextAnimationFrame(() => {
463-
const ret = mainthreadTextModel!.applyEdit(mainthreadTextModel!.versionId, edits, true, undefined, () => undefined);
463+
const ret = mainthreadTextModel!.applyEdits(mainthreadTextModel!.versionId, edits, true, undefined, () => undefined);
464464
resolve(ret);
465465
});
466466
});
@@ -577,7 +577,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
577577
return;
578578
}
579579

580-
textModel.applyEdit(textModel.versionId, [
580+
textModel.applyEdits(textModel.versionId, [
581581
{
582582
editType: CellEditType.OutputsSplice,
583583
index: textModel.cells.indexOf(cell),
@@ -614,7 +614,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
614614
const textModel = this._notebookService.getNotebookTextModel(URI.from(resource));
615615

616616
if (textModel) {
617-
textModel.applyEdit(textModel.versionId, [
617+
textModel.applyEdits(textModel.versionId, [
618618
{
619619
editType: CellEditType.Unknown
620620
}

‎src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class BulkCellEdits {
5151
// apply edits
5252
const edits = group.map(entry => entry.cellEdit);
5353
this._notebookService.transformEditsOutputs(ref.object.notebook, edits);
54-
ref.object.notebook.applyEdit(ref.object.notebook.versionId, edits, true, undefined, () => undefined);
54+
ref.object.notebook.applyEdits(ref.object.notebook.versionId, edits, true, undefined, () => undefined);
5555
ref.dispose();
5656

5757
this._progress.report(undefined);

‎src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,10 +1301,10 @@ registerAction2(class extends NotebookCellAction {
13011301
return;
13021302
}
13031303

1304-
editor.viewModel.notebookDocument.applyEdit(editor.viewModel.notebookDocument.versionId, [{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined);
1304+
editor.viewModel.notebookDocument.applyEdits(editor.viewModel.notebookDocument.versionId, [{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined);
13051305

13061306
if (context.cell.metadata && context.cell.metadata?.runState !== NotebookCellRunState.Running) {
1307-
context.notebookEditor.viewModel!.notebookDocument.applyEdit(context.notebookEditor.viewModel!.notebookDocument.versionId, [{
1307+
context.notebookEditor.viewModel!.notebookDocument.applyEdits(context.notebookEditor.viewModel!.notebookDocument.versionId, [{
13081308
editType: CellEditType.Metadata, index, metadata: {
13091309
...context.cell.metadata,
13101310
runState: NotebookCellRunState.Idle,
@@ -1392,7 +1392,7 @@ export class ChangeCellLanguageAction extends NotebookCellAction {
13921392
await changeCellToKind(CellKind.Code, { cell: context.cell, notebookEditor: context.notebookEditor }, selection.languageId);
13931393
} else {
13941394
const index = context.notebookEditor.viewModel!.notebookDocument.cells.indexOf(context.cell.model);
1395-
context.notebookEditor.viewModel!.notebookDocument.applyEdit(
1395+
context.notebookEditor.viewModel!.notebookDocument.applyEdits(
13961396
context.notebookEditor.viewModel!.notebookDocument.versionId,
13971397
[{ editType: CellEditType.CellLanguage, index, language: selection.languageId }],
13981398
true, undefined, () => undefined
@@ -1443,7 +1443,7 @@ registerAction2(class extends NotebookAction {
14431443
return;
14441444
}
14451445

1446-
editor.viewModel.notebookDocument.applyEdit(editor.viewModel.notebookDocument.versionId,
1446+
editor.viewModel.notebookDocument.applyEdits(editor.viewModel.notebookDocument.versionId,
14471447
editor.viewModel.notebookDocument.cells.map((cell, index) => ({
14481448
editType: CellEditType.Output, index, outputs: []
14491449
})), true, undefined, () => undefined);
@@ -1580,7 +1580,7 @@ abstract class ChangeNotebookCellMetadataAction extends NotebookCellAction {
15801580
return;
15811581
}
15821582

1583-
textModel.applyEdit(textModel.versionId, [{ editType: CellEditType.Metadata, index, metadata: { ...context.cell.metadata, ...this.getMetadataDelta() } }], true, undefined, () => undefined);
1583+
textModel.applyEdits(textModel.versionId, [{ editType: CellEditType.Metadata, index, metadata: { ...context.cell.metadata, ...this.getMetadataDelta() } }], true, undefined, () => undefined);
15841584
}
15851585

15861586
abstract getMetadataDelta(): NotebookCellMetadata;

‎src/vs/workbench/contrib/notebook/browser/diff/cellComponents.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ abstract class AbstractCellRenderer extends Disposable {
473473

474474
if (newLangauge !== undefined && newLangauge !== this.cell.modified!.language) {
475475
const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!);
476-
this.notebookEditor.textModel!.applyEdit(
476+
this.notebookEditor.textModel!.applyEdits(
477477
this.notebookEditor.textModel!.versionId,
478478
[{ editType: CellEditType.CellLanguage, index, language: newLangauge }],
479479
true,
@@ -488,7 +488,7 @@ abstract class AbstractCellRenderer extends Disposable {
488488
return;
489489
}
490490

491-
this.notebookEditor.textModel!.applyEdit(this.notebookEditor.textModel!.versionId, [
491+
this.notebookEditor.textModel!.applyEdits(this.notebookEditor.textModel!.versionId, [
492492
{ editType: CellEditType.Metadata, index, metadata: result }
493493
], true, undefined, () => undefined);
494494
} catch {

‎src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,11 @@ abstract class AbstractCellRenderer {
340340
}
341341

342342
if (templateData.currentRenderedCell.metadata?.inputCollapsed) {
343-
textModel.applyEdit(textModel.versionId, [
343+
textModel.applyEdits(textModel.versionId, [
344344
{ editType: CellEditType.Metadata, index, metadata: { ...templateData.currentRenderedCell.metadata, inputCollapsed: false } }
345345
], true, undefined, () => undefined);
346346
} else if (templateData.currentRenderedCell.metadata?.outputCollapsed) {
347-
textModel.applyEdit(textModel.versionId, [
347+
textModel.applyEdits(textModel.versionId, [
348348
{ editType: CellEditType.Metadata, index, metadata: { ...templateData.currentRenderedCell.metadata, outputCollapsed: false } }
349349
], true, undefined, () => undefined);
350350
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
625625

626626
createCell(index: number, source: string, language: string, type: CellKind, metadata: NotebookCellMetadata | undefined, outputs: IProcessedOutput[], synchronous: boolean, pushUndoStop: boolean = true, previouslyFocused: ICellViewModel[] = []): CellViewModel {
627627
const beforeSelections = previouslyFocused.map(e => e.handle);
628-
this._notebook.applyEdit(this._notebook.versionId, [
628+
this._notebook.applyEdits(this._notebook.versionId, [
629629
{
630630
editType: CellEditType.Replace,
631631
index,
@@ -663,7 +663,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
663663
}
664664
}
665665

666-
this._notebook.applyEdit(this._notebook.versionId, [
666+
this._notebook.applyEdits(this._notebook.versionId, [
667667
{
668668
editType: CellEditType.Replace,
669669
index: index,
@@ -691,7 +691,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
691691
return false;
692692
}
693693

694-
this._notebook.applyEdit(this._notebook.versionId, [
694+
this._notebook.applyEdits(this._notebook.versionId, [
695695
{
696696
editType: CellEditType.Move,
697697
index,
@@ -785,7 +785,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
785785
const editorSelections = cell.getSelections();
786786
const language = cell.language;
787787
const kind = cell.cellKind;
788-
this._notebook.applyEdit(this._notebook.versionId, [
788+
this._notebook.applyEdits(this._notebook.versionId, [
789789
{
790790
editType: CellEditType.CellContent,
791791
index,

‎src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
291291
this._operationManager.pushStackElement(label, selectionState);
292292
}
293293

294-
applyEdit(modelVersionId: number, rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: number[] | undefined, endSelectionsComputer: () => number[] | undefined, computeUndoRedo: boolean = true): boolean {
294+
applyEdits(modelVersionId: number, rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: number[] | undefined, endSelectionsComputer: () => number[] | undefined, computeUndoRedo: boolean = true): boolean {
295295
if (modelVersionId !== this._versionId) {
296296
return false;
297297
}

‎src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ suite('NotebookTextModel', () => {
2929
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
3030
],
3131
(editor, viewModel, textModel) => {
32-
textModel.applyEdit(textModel.versionId, [
32+
textModel.applyEdits(textModel.versionId, [
3333
{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
3434
{ editType: CellEditType.Replace, index: 3, count: 0, cells: [new TestCell(viewModel.viewType, 6, 'var f = 6;', 'javascript', CellKind.Code, [], textModelService)] },
3535
], true, undefined, () => undefined);
@@ -54,7 +54,7 @@ suite('NotebookTextModel', () => {
5454
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
5555
],
5656
(editor, viewModel, textModel) => {
57-
textModel.applyEdit(textModel.versionId, [
57+
textModel.applyEdits(textModel.versionId, [
5858
{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
5959
{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 6, 'var f = 6;', 'javascript', CellKind.Code, [], textModelService)] },
6060
], true, undefined, () => undefined);
@@ -79,7 +79,7 @@ suite('NotebookTextModel', () => {
7979
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
8080
],
8181
(editor, viewModel, textModel) => {
82-
textModel.applyEdit(textModel.versionId, [
82+
textModel.applyEdits(textModel.versionId, [
8383
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
8484
{ editType: CellEditType.Replace, index: 3, count: 1, cells: [] },
8585
], true, undefined, () => undefined);
@@ -102,7 +102,7 @@ suite('NotebookTextModel', () => {
102102
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
103103
],
104104
(editor, viewModel, textModel) => {
105-
textModel.applyEdit(textModel.versionId, [
105+
textModel.applyEdits(textModel.versionId, [
106106
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
107107
{ editType: CellEditType.Replace, index: 3, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
108108
], true, undefined, () => undefined);
@@ -127,7 +127,7 @@ suite('NotebookTextModel', () => {
127127
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
128128
],
129129
(editor, viewModel, textModel) => {
130-
textModel.applyEdit(textModel.versionId, [
130+
textModel.applyEdits(textModel.versionId, [
131131
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
132132
{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
133133
], true, undefined, () => undefined);
@@ -152,7 +152,7 @@ suite('NotebookTextModel', () => {
152152
['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
153153
],
154154
(editor, viewModel, textModel) => {
155-
textModel.applyEdit(textModel.versionId, [
155+
textModel.applyEdits(textModel.versionId, [
156156
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
157157
], true, undefined, () => undefined);
158158

@@ -176,7 +176,7 @@ suite('NotebookTextModel', () => {
176176

177177
// invalid index 1
178178
assert.throws(() => {
179-
textModel.applyEdit(textModel.versionId, [{
179+
textModel.applyEdits(textModel.versionId, [{
180180
index: Number.MAX_VALUE,
181181
editType: CellEditType.Output,
182182
outputs: []
@@ -185,14 +185,14 @@ suite('NotebookTextModel', () => {
185185

186186
// invalid index 2
187187
assert.throws(() => {
188-
textModel.applyEdit(textModel.versionId, [{
188+
textModel.applyEdits(textModel.versionId, [{
189189
index: -1,
190190
editType: CellEditType.Output,
191191
outputs: []
192192
}], true, undefined, () => undefined);
193193
});
194194

195-
textModel.applyEdit(textModel.versionId, [{
195+
textModel.applyEdits(textModel.versionId, [{
196196
index: 0,
197197
editType: CellEditType.Output,
198198
outputs: [{
@@ -221,7 +221,7 @@ suite('NotebookTextModel', () => {
221221

222222
// invalid index 1
223223
assert.throws(() => {
224-
textModel.applyEdit(textModel.versionId, [{
224+
textModel.applyEdits(textModel.versionId, [{
225225
index: Number.MAX_VALUE,
226226
editType: CellEditType.Metadata,
227227
metadata: { editable: false }
@@ -230,14 +230,14 @@ suite('NotebookTextModel', () => {
230230

231231
// invalid index 2
232232
assert.throws(() => {
233-
textModel.applyEdit(textModel.versionId, [{
233+
textModel.applyEdits(textModel.versionId, [{
234234
index: -1,
235235
editType: CellEditType.Metadata,
236236
metadata: { editable: false }
237237
}], true, undefined, () => undefined);
238238
});
239239

240-
textModel.applyEdit(textModel.versionId, [{
240+
textModel.applyEdits(textModel.versionId, [{
241241
index: 0,
242242
editType: CellEditType.Metadata,
243243
metadata: { editable: false },
@@ -267,7 +267,7 @@ suite('NotebookTextModel', () => {
267267
});
268268
const version = textModel.versionId;
269269

270-
textModel.applyEdit(textModel.versionId, [
270+
textModel.applyEdits(textModel.versionId, [
271271
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
272272
{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
273273
], true, undefined, () => [0]);
@@ -304,7 +304,7 @@ suite('NotebookTextModel', () => {
304304
});
305305
const version = textModel.versionId;
306306

307-
textModel.applyEdit(textModel.versionId, [
307+
textModel.applyEdits(textModel.versionId, [
308308
{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
309309
{
310310
index: 0,

0 commit comments

Comments
 (0)