development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure orig_nbformat is not written to ipynb file (#192359)

Browse source
This commit is contained in:
Don Jayamanne 2023-09-07 12:20:07 +10:00 committed by GitHub
parent e71d562fd8
commit 9c17df54bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ type NotebookMetadata = {
pygments_lexer?: string;
[propName: string]: unknown;
};
orig_nbformat: number;
orig_nbformat?: number;
[propName: string]: unknown;
};
@ -76,9 +76,7 @@ export function activate(context: vscode.ExtensionContext) {
data.metadata = {
custom: {
cells: [],
metadata: {
orig_nbformat: 4
},
metadata: {},
nbformat: 4,
nbformat_minor: 2
}

8
extensions/ipynb/src/notebookSerializer.ts
View file

@ -63,7 +63,7 @@ export class NotebookSerializer implements vscode.NotebookSerializer {
// For notebooks without metadata default the language in metadata to the preferred language.
if (!json.metadata || (!json.metadata.kernelspec && !json.metadata.language_info)) {
json.metadata = json.metadata || { orig_nbformat: defaultNotebookFormat.major };
json.metadata = json.metadata || {};
json.metadata.language_info = json.metadata.language_info || { name: preferredCellLanguage };
}
@ -101,8 +101,8 @@ export class NotebookSerializer implements vscode.NotebookSerializer {
export function getNotebookMetadata(document: vscode.NotebookDocument | vscode.NotebookData) {
const notebookContent: Partial<nbformat.INotebookContent> = document.metadata?.custom || {};
notebookContent.cells = notebookContent.cells || [];
notebookContent.nbformat = notebookContent.nbformat || 4;
notebookContent.nbformat_minor = notebookContent.nbformat_minor ?? 2;
notebookContent.metadata = notebookContent.metadata || { orig_nbformat: 4 };
notebookContent.nbformat = notebookContent.nbformat || defaultNotebookFormat.major;
notebookContent.nbformat_minor = notebookContent.nbformat_minor ?? defaultNotebookFormat.minor;
notebookContent.metadata = notebookContent.metadata || {};
return notebookContent;
}