jupyterlab_code_formatter 3.0.1 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/formatter.js +28 -17
- package/lib/index.js +1 -0
- package/package.json +1 -1
package/lib/formatter.js
CHANGED
|
@@ -45,27 +45,38 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
|
|
|
45
45
|
return codeCells;
|
|
46
46
|
}
|
|
47
47
|
getNotebookType() {
|
|
48
|
+
var _a, _b, _c, _d, _e;
|
|
49
|
+
// If there is no current notebook, there is nothing to do
|
|
48
50
|
if (!this.notebookTracker.currentWidget) {
|
|
49
51
|
return null;
|
|
50
52
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
return metadata.kernelspec.language.toLowerCase();
|
|
60
|
-
}
|
|
61
|
-
// otherwise, check language info code mirror mode
|
|
62
|
-
if (metadata.language_info && metadata.language_info.codemirror_mode) {
|
|
63
|
-
const mode = metadata.language_info.codemirror_mode;
|
|
64
|
-
if (typeof mode === 'string') {
|
|
65
|
-
return mode.toLowerCase();
|
|
53
|
+
// first, check the notebook's metadata for language info
|
|
54
|
+
const metadata = (_b = (_a = this.notebookTracker.currentWidget.content.model) === null || _a === void 0 ? void 0 : _a.sharedModel) === null || _b === void 0 ? void 0 : _b.metadata;
|
|
55
|
+
if (metadata) {
|
|
56
|
+
// prefer kernelspec language
|
|
57
|
+
if (metadata.kernelspec &&
|
|
58
|
+
metadata.kernelspec.language &&
|
|
59
|
+
typeof metadata.kernelspec.language === 'string') {
|
|
60
|
+
return metadata.kernelspec.language.toLowerCase();
|
|
66
61
|
}
|
|
67
|
-
|
|
68
|
-
|
|
62
|
+
// otherwise, check language info code mirror mode
|
|
63
|
+
if (metadata.language_info && metadata.language_info.codemirror_mode) {
|
|
64
|
+
const mode = metadata.language_info.codemirror_mode;
|
|
65
|
+
if (typeof mode === 'string') {
|
|
66
|
+
return mode.toLowerCase();
|
|
67
|
+
}
|
|
68
|
+
else if (typeof mode.name === 'string') {
|
|
69
|
+
return mode.name.toLowerCase();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
// in the absence of metadata, look in the current session's kernel spec
|
|
74
|
+
const sessionContext = this.notebookTracker.currentWidget.sessionContext;
|
|
75
|
+
const kernelName = (_d = (_c = sessionContext === null || sessionContext === void 0 ? void 0 : sessionContext.session) === null || _c === void 0 ? void 0 : _c.kernel) === null || _d === void 0 ? void 0 : _d.name;
|
|
76
|
+
if (kernelName) {
|
|
77
|
+
const specs = (_e = sessionContext.specsManager.specs) === null || _e === void 0 ? void 0 : _e.kernelspecs;
|
|
78
|
+
if (specs && kernelName in specs) {
|
|
79
|
+
return specs[kernelName].language;
|
|
69
80
|
}
|
|
70
81
|
}
|
|
71
82
|
return null;
|
package/lib/index.js
CHANGED
|
@@ -44,6 +44,7 @@ class JupyterLabCodeFormatter {
|
|
|
44
44
|
}
|
|
45
45
|
async onSave(context, state) {
|
|
46
46
|
if (state === 'started' && this.config.formatOnSave) {
|
|
47
|
+
await context.sessionContext.ready;
|
|
47
48
|
await this.notebookCodeFormatter.formatAllCodeCells(this.config, { saving: true }, undefined, undefined);
|
|
48
49
|
}
|
|
49
50
|
}
|