development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt notebookWorkspaceEdit proposal internally (#149778)

Browse source 
This switches us to use the new `notebookWorkspaceEdit` proposal instead of `notebookEditorEdit`
This commit is contained in:
Matt Bierner 2022-05-17 18:51:25 -07:00 committed by GitHub
parent cf189907bb
commit c9c5990e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/ipynb/package.json
View file

@ -9,8 +9,7 @@
"vscode": "^1.57.0"
},
"enabledApiProposals": [
"notebookEditor",
"notebookEditorEdit"
"notebookEditor"
],
"activationEvents": [
"*"

4
extensions/ipynb/src/cellIdService.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ExtensionContext, NotebookDocument, NotebookDocumentChangeEvent, workspace, WorkspaceEdit } from 'vscode';
import { ExtensionContext, NotebookDocument, NotebookDocumentChangeEvent, NotebookEdit, workspace, WorkspaceEdit } from 'vscode';
import { v4 as uuid } from 'uuid';
import { getCellMetadata } from './serializers';
import { CellMetadata } from './common';
@ -34,7 +34,7 @@ function onDidChangeNotebookCells(e: NotebookDocumentChangeEvent) {
// Don't edit the metadata directly, always get a clone (prevents accidental singletons and directly editing the objects).
const updatedMetadata: CellMetadata = { ...JSON.parse(JSON.stringify(cellMetadata || {})) };
updatedMetadata.id = id;
edit.replaceNotebookCellMetadata(cell.notebook.uri, cell.index, { ...(cell.metadata), custom: updatedMetadata });
edit.set(cell.notebook.uri, [NotebookEdit.updateCellMetadata(cell.index, { ...(cell.metadata), custom: updatedMetadata })]);
workspace.applyEdit(edit);
});
});

4
extensions/ipynb/src/ipynbMain.ts
View file

@ -94,7 +94,7 @@ export function activate(context: vscode.ExtensionContext) {
}
const edit = new vscode.WorkspaceEdit();
edit.replaceNotebookMetadata(resource, {
edit.set(resource, [vscode.NotebookEdit.updateNotebookMetadata({
...document.metadata,
custom: {
...(document.metadata.custom ?? {}),
@ -103,7 +103,7 @@ export function activate(context: vscode.ExtensionContext) {
...metadata
},
}
});
})]);
return vscode.workspace.applyEdit(edit);
},
};

2
extensions/ipynb/tsconfig.json
View file

@ -10,6 +10,6 @@
"src/**/*",
"../../src/vscode-dts/vscode.d.ts",
"../../src/vscode-dts/vscode.proposed.notebookEditor.d.ts",
"../../src/vscode-dts/vscode.proposed.notebookEditorEdit.d.ts"
"../../src/vscode-dts/vscode.proposed.notebookWorkspaceEdit.d.ts"
]
}

1
extensions/vscode-notebook-tests/package.json
View file

@ -17,7 +17,6 @@
"notebookDeprecated",
"notebookEditor",
"notebookEditorDecorationType",
"notebookEditorEdit",
"notebookLiveShare",
"notebookMessaging",
"notebookMime"