Migrate over to using enabledApiProposals in package.json (#18269)

* Migrate over to using `enabledApiProposals` in `package.json`

* Update webpack build for browser

* Upgrade vscode engine

* Remove unused notebook class

* Remove unnecessary proposed API

Author: Kartik Raj

package-lock.json

@@ -18,7 +18,7 @@
     },
     "languageServerVersion": "0.5.30",
     "publisher": "ms-python",
-    "enableProposedApi": true,
+    "enabledApiProposals": ["languageStatus", "quickPickSortByLabel", "quickPickSeparators", "testObserver", "notebookEditor"],
     "author": {
         "name": "Microsoft Corporation"
     },
@@ -38,7 +38,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.61.0"
+        "vscode": "^1.63.0"
     },
     "keywords": [
         "python",
@@ -1954,7 +1954,7 @@
         "@types/tmp": "0.0.33",
         "@types/untildify": "^3.0.0",
         "@types/uuid": "^3.4.3",
-        "@types/vscode": "~1.53.0",
+        "@types/vscode": "~1.63.0",
         "@types/winreg": "^1.2.30",
         "@types/xml2js": "^0.4.2",
         "@typescript-eslint/eslint-plugin": "^3.7.0",

package.json

@@ -70,7 +70,9 @@ export class NodeLanguageServerActivator extends LanguageServerActivatorBase {
         if (languageClient) {
             // Turn our item into a ProtocolCompletionItem before we convert it. This preserves the .data
             // attribute that it has and is needed to match on the language server side.
-            const protoItem: ProtocolCompletionItem = new ProtocolCompletionItem(item.label);
+            const protoItem: ProtocolCompletionItem = new ProtocolCompletionItem(
+                typeof item.label === 'string' ? item.label : item.label.label,
+            );
             Object.assign(protoItem, item);
 
             const args = languageClient.code2ProtocolConverter.asCompletionItem(protoItem);

src/client/activation/node/activator.ts

@@ -28,7 +28,7 @@ export class DebugService implements IDebugService {
     public get activeDebugSession(): DebugSession | undefined {
         return debug.activeDebugSession;
     }
-    public get breakpoints(): Breakpoint[] {
+    public get breakpoints(): readonly Breakpoint[] {
         return debug.breakpoints;
     }
     public get onDidChangeActiveDebugSession(): Event<DebugSession | undefined> {

src/client/common/application/debugService.ts

@@ -29,7 +29,7 @@ export class DocumentManager implements IDocumentManager {
     public get activeTextEditor(): TextEditor | undefined {
         return window.activeTextEditor;
     }
-    public get visibleTextEditors(): TextEditor[] {
+    public get visibleTextEditors(): readonly TextEditor[] {
         return window.visibleTextEditors;
     }
     public get onDidChangeActiveTextEditor(): Event<TextEditor | undefined> {
@@ -38,7 +38,7 @@ export class DocumentManager implements IDocumentManager {
     public get onDidChangeTextDocument(): Event<TextDocumentChangeEvent> {
         return workspace.onDidChangeTextDocument;
     }
-    public get onDidChangeVisibleTextEditors(): Event<TextEditor[]> {
+    public get onDidChangeVisibleTextEditors(): Event<readonly TextEditor[]> {
         return window.onDidChangeVisibleTextEditors;
     }
     public get onDidChangeTextEditorSelection(): Event<TextEditorSelectionChangeEvent> {

src/client/common/application/documentManager.ts

@@ -59,7 +59,6 @@ import {
     WorkspaceFolderPickOptions,
     WorkspaceFoldersChangeEvent,
 } from 'vscode';
-import type { NotebookConcatTextDocument, NotebookDocument } from 'vscode-proposed';
 
 import { Channel } from '../constants';
 import { Resource } from '../types';
@@ -522,7 +521,7 @@ export interface IDocumentManager {
     /**
      * The currently visible editors or an empty array.
      */
-    readonly visibleTextEditors: TextEditor[];
+    readonly visibleTextEditors: readonly TextEditor[];
 
     /**
      * An [event](#Event) which fires when the [active editor](#window.activeTextEditor)
@@ -542,7 +541,7 @@ export interface IDocumentManager {
      * An [event](#Event) which fires when the array of [visible editors](#window.visibleTextEditors)
      * has changed.
      */
-    readonly onDidChangeVisibleTextEditors: Event<TextEditor[]>;
+    readonly onDidChangeVisibleTextEditors: Event<readonly TextEditor[]>;
 
     /**
      * An [event](#Event) which fires when the selection in an editor has changed.
@@ -874,7 +873,7 @@ export interface IDebugService {
     /**
      * List of breakpoints.
      */
-    readonly breakpoints: Breakpoint[];
+    readonly breakpoints: readonly Breakpoint[];
 
     /**
      * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
@@ -1099,10 +1098,3 @@ export interface IClipboard {
      */
     writeText(value: string): Promise<void>;
 }
-export const IVSCodeNotebook = Symbol('IVSCodeNotebook');
-export interface IVSCodeNotebook {
-    readonly notebookDocuments: ReadonlyArray<NotebookDocument>;
-    readonly onDidOpenNotebookDocument: Event<NotebookDocument>;
-    readonly onDidCloseNotebookDocument: Event<NotebookDocument>;
-    createConcatTextDocument(notebook: NotebookDocument, selector?: DocumentSelector): NotebookConcatTextDocument;
-}

src/client/common/application/notebook.ts

@@ -36,7 +36,6 @@ import { DebugSessionTelemetry } from './application/debugSessionTelemetry';
 import { DocumentManager } from './application/documentManager';
 import { Extensions } from './application/extensions';
 import { LanguageService } from './application/languageService';
-import { VSCodeNotebook } from './application/notebook';
 import { TerminalManager } from './application/terminalManager';
 import {
     IActiveResourceService,
@@ -50,7 +49,6 @@ import {
     IJupyterExtensionDependencyManager,
     ILanguageService,
     ITerminalManager,
-    IVSCodeNotebook,
     IWorkspaceService,
 } from './application/types';
 import { WorkspaceService } from './application/workspace';
@@ -123,7 +121,6 @@ export function registerTypes(serviceManager: IServiceManager): void {
     serviceManager.addSingleton<ITerminalServiceFactory>(ITerminalServiceFactory, TerminalServiceFactory);
     serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);
     serviceManager.addSingleton<IApplicationShell>(IApplicationShell, ApplicationShell);
-    serviceManager.addSingleton<IVSCodeNotebook>(IVSCodeNotebook, VSCodeNotebook);
     serviceManager.addSingleton<IClipboard>(IClipboard, ClipboardService);
     serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, CurrentProcess);
     serviceManager.addSingleton<IInstaller>(IInstaller, ProductInstaller);

src/client/common/application/types.ts

@@ -14,7 +14,7 @@ import {
 import { TestDiscoveryOptions } from '../../common/types';
 
 export type TestRunInstanceOptions = TestRunOptions & {
-    exclude?: TestItem[];
+    exclude?: readonly TestItem[];
     debug: boolean;
 };
 
@@ -51,8 +51,8 @@ export interface ITestController {
 }
 
 export interface ITestRun {
-    includes: TestItem[];
-    excludes: TestItem[];
+    includes: readonly TestItem[];
+    excludes: readonly TestItem[];
     runKind: TestRunProfileKind;
     runInstance: TestRun;
 }

src/client/common/serviceRegistry.ts

@@ -52,7 +52,7 @@ export class UnittestRunner implements ITestsRunner {
     }
 
     private async runTest(
-        testNodes: TestItem[],
+        testNodes: readonly TestItem[],
         runInstance: TestRun,
         options: TestRunInstanceOptions,
         idToRawData: Map<string, TestData>,

src/client/testing/testController/common/types.ts

@@ -25,7 +25,7 @@ suite('Terminal Auto Activation', () => {
     let terminal: Terminal;
 
     setup(() => {
-        terminal = {
+        terminal = ({
             dispose: noop,
             hide: noop,
             name: 'Python',
@@ -34,7 +34,7 @@ suite('Terminal Auto Activation', () => {
             sendText: noop,
             show: noop,
             exitStatus: { code: 0 },
-        };
+        } as unknown) as Terminal;
         terminalManager = mock(TerminalManager);
         activator = mock(TerminalActivator);
         activeResourceService = mock(ActiveResourceService);
@@ -68,7 +68,7 @@ suite('Terminal Auto Activation', () => {
         verify(activator.activateEnvironmentInTerminal(terminal, anything())).once();
     });
     test('New Terminals should not be activated if hidden from user', async () => {
-        terminal = {
+        terminal = ({
             dispose: noop,
             hide: noop,
             name: 'Python',
@@ -77,7 +77,7 @@ suite('Terminal Auto Activation', () => {
             sendText: noop,
             show: noop,
             exitStatus: { code: 0 },
-        };
+        } as unknown) as Terminal;
         type EventHandler = (e: Terminal) => void;
         let handler: undefined | EventHandler;
         const handlerDisposable = TypeMoq.Mock.ofType<IDisposable>();
@@ -98,7 +98,7 @@ suite('Terminal Auto Activation', () => {
         verify(activator.activateEnvironmentInTerminal(terminal, anything())).never();
     });
     test('New Terminals should not be activated if auto activation is to be disabled', async () => {
-        terminal = {
+        terminal = ({
             dispose: noop,
             hide: noop,
             name: 'Python',
@@ -107,7 +107,7 @@ suite('Terminal Auto Activation', () => {
             sendText: noop,
             show: noop,
             exitStatus: { code: 0 },
-        };
+        } as unknown) as Terminal;
         type EventHandler = (e: Terminal) => void;
         let handler: undefined | EventHandler;
         const handlerDisposable = TypeMoq.Mock.ofType<IDisposable>();