Skip to content

Commit 49f160a

Browse files
authored
All languages in native notebooks, default Python (#13786)
* All languages in native notebooks, default Python * Fix tests
1 parent f41bef9 commit 49f160a

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/client/datascience/notebook/helpers/helpers.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { JupyterNotebookView } from '../constants';
2727
const vscodeNotebookEnums = require('vscode') as typeof import('vscode-proposed');
2828
// tslint:disable-next-line: no-require-imports
2929
import cloneDeep = require('lodash/cloneDeep');
30+
import { isUntitledFile } from '../../../common/utils/misc';
3031
import { KernelConnectionMetadata } from '../../jupyter/kernels/types';
3132
import { updateNotebookMetadata } from '../../notebookStorage/baseModel';
3233
import { VSCodeNotebookModel } from '../../notebookStorage/vscNotebookModel';
@@ -95,9 +96,18 @@ export function notebookModelToVSCNotebookData(model: VSCodeNotebookModel): Note
9596
.map((item) => item!);
9697

9798
const defaultLanguage = getDefaultCodeLanguage(model);
99+
if (cells.length === 0 && isUntitledFile(model.file)) {
100+
cells.push({
101+
cellKind: vscodeNotebookEnums.CellKind.Code,
102+
language: defaultLanguage,
103+
metadata: {},
104+
outputs: [],
105+
source: ''
106+
});
107+
}
98108
return {
99109
cells,
100-
languages: [defaultLanguage],
110+
languages: ['*'],
101111
metadata: {
102112
custom: model.notebookContentWithoutCells,
103113
cellEditable: model.isTrusted,

src/test/datascience/notebook/contentProvider.unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ suite('DataScience - NativeNotebook ContentProvider', () => {
6262
const notebook = await contentProvider.openNotebook(fileUri, {});
6363

6464
assert.isOk(notebook);
65-
assert.deepEqual(notebook.languages, [PYTHON_LANGUAGE]);
65+
assert.deepEqual(notebook.languages, ['*']);
6666
// ignore metadata we add.
6767
const cellsWithoutCustomMetadata = notebook.cells.map((cell) => {
6868
const cellToCompareWith = cloneDeep(cell);
@@ -142,7 +142,7 @@ suite('DataScience - NativeNotebook ContentProvider', () => {
142142
const notebook = await contentProvider.openNotebook(fileUri, {});
143143

144144
assert.isOk(notebook);
145-
assert.deepEqual(notebook.languages, ['csharp']);
145+
assert.deepEqual(notebook.languages, ['*']);
146146

147147
assert.equal(notebook.metadata.cellEditable, isNotebookTrusted);
148148
assert.equal(notebook.metadata.cellRunnable, isNotebookTrusted);

src/test/datascience/notebook/helpers.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ suite('DataScience - NativeNotebook helpers', () => {
4949
const notebook = notebookModelToVSCNotebookData(model as any);
5050

5151
assert.isOk(notebook);
52-
assert.deepEqual(notebook.languages, [PYTHON_LANGUAGE]);
52+
assert.deepEqual(notebook.languages, ['*']);
5353
// ignore metadata we add.
5454
const cellsWithoutCustomMetadata = notebook.cells.map((cell) => {
5555
const cellToCompareWith = cloneDeep(cell);

0 commit comments

Comments
 (0)