From a1e193d3196ba1e577256e2b68075f5b51aa782c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 1 Mar 2023 14:54:46 -0800 Subject: [PATCH] Remove notebook controller kind API proposal Fixes #168535 --- extensions/vscode-api-tests/package.json | 1 - .../api/browser/mainThreadNotebookKernels.ts | 6 ------ src/vs/workbench/api/common/extHost.protocol.ts | 1 - .../api/common/extHostNotebookKernels.ts | 9 --------- .../notebook/browser/controller/apiActions.ts | 1 - .../notebook/common/notebookKernelService.ts | 2 -- .../browser/notebookExecutionService.test.ts | 1 - .../extensions/common/extensionsApiProposals.ts | 1 - .../vscode.proposed.notebookControllerKind.d.ts | 16 ---------------- 9 files changed, 38 deletions(-) delete mode 100644 src/vscode-dts/vscode.proposed.notebookControllerKind.d.ts diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index 5044b091bb1fe..835214dbd886a 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -18,7 +18,6 @@ "findTextInFiles", "fsChunks", "notebookCellExecutionState", - "notebookControllerKind", "notebookDeprecated", "notebookLiveShare", "notebookMessaging", diff --git a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts index 3e0163c7e902b..80671ccc3862c 100644 --- a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts +++ b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts @@ -34,7 +34,6 @@ abstract class MainThreadKernel implements INotebookKernel { label: string; description?: string; detail?: string; - kind?: string; supportedLanguages: string[]; implementsExecutionOrder: boolean; localResourceRoot: URI; @@ -56,7 +55,6 @@ abstract class MainThreadKernel implements INotebookKernel { this.label = data.label; this.description = data.description; this.detail = data.detail; - this.kind = data.kind; this.supportedLanguages = isNonEmptyArray(data.supportedLanguages) ? data.supportedLanguages : _languageService.getRegisteredLanguageIds(); this.implementsExecutionOrder = data.supportsExecutionOrder ?? false; this.localResourceRoot = URI.revive(data.extensionLocation); @@ -79,10 +77,6 @@ abstract class MainThreadKernel implements INotebookKernel { this.detail = data.detail; event.detail = true; } - if (data.kind !== undefined) { - this.kind = data.kind; - event.kind = true; - } if (data.supportedLanguages !== undefined) { this.supportedLanguages = isNonEmptyArray(data.supportedLanguages) ? data.supportedLanguages : this._languageService.getRegisteredLanguageIds(); event.supportedLanguages = true; diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index e640b255e0ed7..84170d7952859 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1006,7 +1006,6 @@ export interface INotebookKernelDto2 { label: string; detail?: string; description?: string; - kind?: string; supportedLanguages?: string[]; supportsInterrupt?: boolean; supportsExecutionOrder?: boolean; diff --git a/src/vs/workbench/api/common/extHostNotebookKernels.ts b/src/vs/workbench/api/common/extHostNotebookKernels.ts index f941f9ba6e455..014c2782bfdf6 100644 --- a/src/vs/workbench/api/common/extHostNotebookKernels.ts +++ b/src/vs/workbench/api/common/extHostNotebookKernels.ts @@ -178,15 +178,6 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape { data.description = value; _update(); }, - get kind() { - checkProposedApiEnabled(extension, 'notebookControllerKind'); - return data.kind ?? ''; - }, - set kind(value) { - checkProposedApiEnabled(extension, 'notebookControllerKind'); - data.kind = value; - _update(); - }, get supportedLanguages() { return data.supportedLanguages; }, diff --git a/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts index d0c6379a54ba1..1d5d4405f0693 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts @@ -69,7 +69,6 @@ CommandsRegistry.registerCommand('_resolveNotebookKernels', async (accessor, arg return kernels.all.map(provider => ({ id: provider.id, label: provider.label, - kind: provider.kind, description: provider.description, detail: provider.detail, isPreferred: false, // todo@jrieken,@rebornix diff --git a/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts b/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts index 5786526435fad..f2dacb01c0eb1 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts @@ -30,7 +30,6 @@ export interface INotebookKernelChangeEvent { label?: true; description?: true; detail?: true; - kind?: true; supportedLanguages?: true; hasExecutionOrder?: true; hasInterruptHandler?: true; @@ -49,7 +48,6 @@ export interface INotebookKernel { label: string; description?: string; detail?: string; - kind?: string; supportedLanguages: string[]; implementsInterrupt?: boolean; implementsExecutionOrder?: boolean; diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts index b9923bf147ae0..7685307811975 100644 --- a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts +++ b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts @@ -181,7 +181,6 @@ class TestNotebookKernel implements INotebookKernel { constructor(opts?: { languages: string[] }) { this.supportedLanguages = opts?.languages ?? [PLAINTEXT_LANGUAGE_ID]; } - kind?: string | undefined; implementsInterrupt?: boolean | undefined; implementsExecutionOrder?: boolean | undefined; } diff --git a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts index 7d7b31d03f456..a718626dad244 100644 --- a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts +++ b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts @@ -45,7 +45,6 @@ export const allApiProposals = Object.freeze({ ipc: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts', notebookCellExecutionState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts', notebookControllerAffinityHidden: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts', - notebookControllerKind: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerKind.d.ts', notebookDeprecated: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts', notebookKernelSource: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookKernelSource.d.ts', notebookLiveShare: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookLiveShare.d.ts', diff --git a/src/vscode-dts/vscode.proposed.notebookControllerKind.d.ts b/src/vscode-dts/vscode.proposed.notebookControllerKind.d.ts deleted file mode 100644 index b8a4a5376e801..0000000000000 --- a/src/vscode-dts/vscode.proposed.notebookControllerKind.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - // https://github.com/microsoft/vscode-jupyter/issues/7373 - - export interface NotebookController { - /** - * The human-readable label used to categorise controllers. - */ - kind?: string; - } -}