Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions src/formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,34 +92,44 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
return codeCells;
}

private getNotebookType() {
private getNotebookType(): string | null {
// If there is no current notebook, there is nothing to do
if (!this.notebookTracker.currentWidget) {
return null;
}

// first, check the notebook's metadata for language info
const metadata =
this.notebookTracker.currentWidget.content.model!.sharedModel.metadata;

if (!metadata) {
return null;
}
this.notebookTracker.currentWidget.content.model?.sharedModel?.metadata;

if (metadata) {
// prefer kernelspec language
if (
metadata.kernelspec &&
metadata.kernelspec.language &&
typeof metadata.kernelspec.language === 'string'
) {
return metadata.kernelspec.language.toLowerCase();
}

// prefer kernelspec language
if (
metadata.kernelspec &&
metadata.kernelspec.language &&
typeof metadata.kernelspec.language === 'string'
) {
return metadata.kernelspec.language.toLowerCase();
// otherwise, check language info code mirror mode
if (metadata.language_info && metadata.language_info.codemirror_mode) {
const mode = metadata.language_info.codemirror_mode;
if (typeof mode === 'string') {
return mode.toLowerCase();
} else if (typeof mode.name === 'string') {
return mode.name.toLowerCase();
}
}
}

// otherwise, check language info code mirror mode
if (metadata.language_info && metadata.language_info.codemirror_mode) {
const mode = metadata.language_info.codemirror_mode;
if (typeof mode === 'string') {
return mode.toLowerCase();
} else if (typeof mode.name === 'string') {
return mode.name.toLowerCase();
// in the absence of metadata, look in the current session's kernel spec
const sessionContext = this.notebookTracker.currentWidget.sessionContext;
const kernelName = sessionContext?.session?.kernel?.name;
if (kernelName) {
const specs = sessionContext.specsManager.specs?.kernelspecs;
if (specs && kernelName in specs) {
return specs[kernelName]!.language;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class JupyterLabCodeFormatter
state: DocumentRegistry.SaveState
) {
if (state === 'started' && this.config.formatOnSave) {
await context.sessionContext.ready;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 thanks!

await this.notebookCodeFormatter.formatAllCodeCells(
this.config,
{ saving: true },
Expand Down