Skip to content

Commit 904084f

Browse files
authored
Update IJupyterKernelSpec to reflect that language may be undefined (microsoft#14421)
1 parent 02e4631 commit 904084f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/client/datascience/jupyter/kernels/kernelService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export class KernelService {
111111
const specs = await this.getKernelSpecs(sessionManager, cancelToken);
112112
if (isInterpreter(option)) {
113113
return specs.find((item) => {
114-
if (item.language.toLowerCase() !== PYTHON_LANGUAGE.toLowerCase()) {
114+
if (item.language?.toLowerCase() !== PYTHON_LANGUAGE.toLowerCase()) {
115115
return false;
116116
}
117117
return (

src/client/datascience/kernel-launcher/kernelFinder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class KernelFinder implements IKernelFinder {
144144

145145
private async findKernelSpecBasedOnLanguage(resource: Resource, language: string) {
146146
const specs = await this.listKernelSpecs(resource);
147-
return specs.find((item) => item.language.toLowerCase() === language.toLowerCase());
147+
return specs.find((item) => item.language?.toLowerCase() === language.toLowerCase());
148148
}
149149

150150
private async findResourceKernelSpecs(resource: Resource): Promise<IJupyterKernelSpec[]> {

src/client/datascience/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@ export interface IJupyterKernelSpec {
412412
*/
413413
id?: string;
414414
name: string;
415-
language: string;
415+
language?: string;
416416
path: string;
417-
env: NodeJS.ProcessEnv | undefined;
417+
env?: NodeJS.ProcessEnv | undefined;
418418
/**
419419
* Kernel display name.
420420
*

src/test/datascience/notebook/helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export async function waitForKernelToGetAutoSelected(expectedLanguage?: string)
197197
if (vscodeNotebook.activeNotebookEditor.kernel instanceof VSCodeNotebookKernelMetadata) {
198198
if (vscodeNotebook.activeNotebookEditor.kernel.selection.kind === 'startUsingKernelSpec') {
199199
return (
200-
vscodeNotebook.activeNotebookEditor.kernel.selection.kernelSpec.language.toLowerCase() ===
200+
vscodeNotebook.activeNotebookEditor.kernel.selection.kernelSpec.language?.toLowerCase() ===
201201
expectedLanguage.toLowerCase()
202202
);
203203
}

0 commit comments

Comments
 (0)