Fixes

Author: DonJayamanne

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

@@ -16,13 +16,14 @@ import { IKernelSelectionListProvider, IKernelSpecQuickPickItem } from './types'
 /**
  * Given a kernel spec, this will return a quick pick item with appropriate display names and the like.
  *
+ * @param {boolean} activeKernel Whether this is an active kernel in a jupyter session.
  * @param {IJupyterKernelSpec} kernelSpec
  * @returns {IKernelSpecQuickPickItem}
  */
-function getQuickPickFromKernelSpec(kernelSpec: IJupyterKernelSpec): IKernelSpecQuickPickItem {
+function getQuickPickFromKernelSpec(activeKernel: boolean, kernelSpec: IJupyterKernelSpec): IKernelSpecQuickPickItem {
     return {
-        label: kernelSpec.display_name || kernelSpec.name || '',
-        description: '',
+        label: kernelSpec.display_name,
+        description: activeKernel ? '(active kernel)' : '(kernel)',
         selection: { kernelSpec: kernelSpec, interpreter: undefined }
     };
 }
@@ -38,7 +39,7 @@ export class ActiveJupyterSessionKernelSelectionListProvider implements IKernelS
     constructor(private readonly session: IJupyterSessionManager) {}
     public async getKernelSelections(_cancelToken?: CancellationToken | undefined): Promise<IKernelSpecQuickPickItem[]> {
         const items = await this.session.getActiveKernelSpecs();
-        return items.filter(item => item.display_name || item.name).map(getQuickPickFromKernelSpec);
+        return items.filter(item => item.display_name || item.name).map(getQuickPickFromKernelSpec.bind(undefined, true));
     }
 }
 
@@ -53,7 +54,7 @@ export class JupyterKernelSelectionListProvider implements IKernelSelectionListP
     constructor(private readonly kernelService: KernelService) {}
     public async getKernelSelections(cancelToken?: CancellationToken | undefined): Promise<IKernelSpecQuickPickItem[]> {
         const items = await this.kernelService.getLocalKernelSpecs(cancelToken);
-        return items.filter(item => item.display_name || item.name).map(getQuickPickFromKernelSpec);
+        return items.filter(item => item.display_name || item.name).map(getQuickPickFromKernelSpec.bind(undefined, false));
     }
 }
 
@@ -71,6 +72,7 @@ export class InterpreterKernelSelectionListProvider implements IKernelSelectionL
         return items.map(item => {
             return {
                 ...item,
+                description: '(register and use interpreter as kernel)',
                 selection: { interpreter: item.interpreter, kernelSpec: undefined }
             };
         });

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

@@ -13,10 +13,9 @@ import { PythonInterpreter } from '../../../interpreter/contracts';
 import { IJupyterKernelSpec, IJupyterSessionManager } from '../../types';
 import { KernelSelectionProvider } from './kernelSelections';
 import { KernelService } from './kernelService';
-import { IKernelSelector } from './types';
 
 @injectable()
-export class KernelSelector implements IKernelSelector {
+export class KernelSelector {
     constructor(
         @inject(KernelSelectionProvider) private readonly selectionProvider: KernelSelectionProvider,
         @inject(IApplicationShell) private readonly applicationShell: IApplicationShell,

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

@@ -18,11 +18,6 @@ export interface IKernelSpecQuickPickItem extends QuickPickItem {
     selection: { kernelSpec: IJupyterKernelSpec; interpreter: undefined } | { kernelSpec: undefined; interpreter: PythonInterpreter };
 }
 
-export interface IKernelSelector {
-    selectRemoteKernel(session: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined>;
-    selectLocalKernel(session?: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined>;
-}
-
 export interface IKernelSelectionListProvider {
     getKernelSelections(cancelToken?: CancellationToken): Promise<IKernelSpecQuickPickItem[]>;
 }

src/client/datascience/serviceRegistry.ts

@@ -38,6 +38,7 @@ import { JupyterPasswordConnect } from './jupyter/jupyterPasswordConnect';
 import { JupyterServerFactory } from './jupyter/jupyterServerFactory';
 import { JupyterSessionManagerFactory } from './jupyter/jupyterSessionManagerFactory';
 import { JupyterVariables } from './jupyter/jupyterVariables';
+import { KernelSelector } from './jupyter/kernels/kernelSelector';
 import { PlotViewer } from './plotting/plotViewer';
 import { PlotViewerProvider } from './plotting/plotViewerProvider';
 import { StatusProvider } from './statusProvider';
@@ -76,6 +77,7 @@ import {
     IStatusProvider,
     IThemeFinder
 } from './types';
+import { KernelSelectionProvider } from './jupyter/kernels/kernelSelections';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IDataScienceCodeLensProvider>(IDataScienceCodeLensProvider, DataScienceCodeLensProvider);
@@ -121,4 +123,6 @@ export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IDebugLocationTracker>(IDebugLocationTracker, DebugLocationTrackerFactory);
     serviceManager.addSingleton<JupyterCommandFinder>(JupyterCommandFinder, JupyterCommandFinder);
     serviceManager.addSingleton<IExtensionSingleActivationService>(IExtensionSingleActivationService, Activation);
+    serviceManager.addSingleton<KernelSelector>(KernelSelector, KernelSelector);
+    serviceManager.addSingleton<KernelSelectionProvider>(KernelSelectionProvider, KernelSelectionProvider);
 }