add details to notebook kernel.

rebornix · rebornix · commit 23faaa293bc9 · 2020-08-31T12:07:11.000-07:00
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -1648,6 +1648,7 @@ declare module 'vscode' {
 		readonly id?: string;
 		label: string;
 		description?: string;
+		detail?: string;
 		isPreferred?: boolean;
 		preloads?: Uri[];
 		executeCell(document: NotebookDocument, cell: NotebookCell): void;
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -829,6 +829,7 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 				extension: this._extension.identifier,
 				extensionLocation: this._extension.extensionLocation,
 				description: kernel.description,
+				detail: kernel.detail,
 				isPreferred: kernel.isPreferred,
 				preloads: kernel.preloads
 			};
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
@@ -56,17 +56,16 @@ registerAction2(class extends Action2 {
 				label: a.label,
 				picked: a.id === activeKernel?.id,
 				description:
-					(a as INotebookKernelInfo2).description
-						? (a as INotebookKernelInfo2).description
+					a.description
+						? a.description
 						: a.extension.value + (a.id === activeKernel?.id
 							? nls.localize('currentActiveKernel', " (Currently Active)")
 							: ''),
+				detail: a.detail,
 				kernelProviderId: a.extension.value,
 				run: async () => {
 					editor.activeKernel = a;
-					if ((a as any).resolve) {
-						(a as INotebookKernelInfo2).resolve(editor.uri!, editor.getId(), tokenSource.token);
-					}
+					a.resolve(editor.uri!, editor.getId(), tokenSource.token);
 				},
 				buttons: [{
 					iconClass: 'codicon-settings-gear',
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
@@ -579,6 +579,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 					id: dto.id,
 					label: dto.label,
 					description: dto.description,
+					detail: dto.detail,
 					isPreferred: dto.isPreferred,
 					preloads: dto.preloads,
 					providerHandle: dto.providerHandle,
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -762,6 +762,7 @@ export interface INotebookKernelInfoDto2 {
 	extensionLocation: URI;
 	providerHandle?: number;
 	description?: string;
+	detail?: string;
 	isPreferred?: boolean;
 	preloads?: UriComponents[];
 }

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,7 @@ export interface INotebookKernelInfoDto2 {`
`762`	`762`	`extensionLocation: URI;`
`763`	`763`	`providerHandle?: number;`
`764`	`764`	`description?: string;`
	`765`	`+ detail?: string;`
`765`	`766`	`isPreferred?: boolean;`
`766`	`767`	`preloads?: UriComponents[];`
`767`	`768`	`}`