removed experiment code and extra setting

package.json

@@ -2272,12 +2272,6 @@
                     "description": "Automatically scroll the interactive window to show the output of the last statement executed. If false, the interactive window will only automatically scroll if the bottom of the prior cell is visible.",
                     "scope": "resource"
                 },
-                "python.dataScience.showKernelSelectionOnInteractiveWindow": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "When set to true, enables the kernel selector in the Interactive Window. By default, the Interactive Window will use your Python Interpreters kernel.",
-                    "scope": "resource"
-                },
                 "python.dataScience.enableScrollingForCellOutputs": {
                     "type": "boolean",
                     "default": true,
@@ -3792,4 +3786,4 @@
         "publisherDisplayName": "Microsoft",
         "publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8"
     }
-}
+}

src/client/common/experiments/groups.ts

@@ -80,13 +80,6 @@ export enum NotebookEditorSupport {
     nativeNotebookExperiment = 'NativeNotebook - experiment'
 }
 
-// Experiment to remove the Kernel/Server Tooblar in the Interactive Window when running a local Jupyter Server.
-// It doesn't make sense to have it there, the user can already change the kernel
-// by changing the python interpreter on the status bar.
-export enum RemoveKernelToolbarInInteractiveWindow {
-    experiment = 'RemoveKernelToolbarInInteractiveWindow'
-}
-
 // Experiment to offer switch to Pylance language server
 export enum TryPylance {
     experiment = 'tryPylance'

src/client/common/startPage/startPage.ts

@@ -65,8 +65,7 @@ export class StartPage extends WebviewPanelHost<IStartPageMapping>
             localize.StartPage.getStarted(),
             ViewColumn.One,
             false,
-            false,
-            Promise.resolve(false)
+            false
         );
         this.timer = new StopWatch();
     }

src/client/common/types.ts

@@ -398,7 +398,6 @@ export interface IDataScienceSettings {
     jupyterCommandLineArguments: string[];
     widgetScriptSources: WidgetCDNs[];
     alwaysScrollOnNewCell?: boolean;
-    showKernelSelectionOnInteractiveWindow?: boolean;
     interactiveWindowMode: InteractiveWindowMode;
 }
 

src/client/datascience/data-viewing/dataViewer.ts

@@ -58,8 +58,7 @@ export class DataViewer extends WebviewPanelHost<IDataViewerMapping> implements
             localize.DataScience.dataExplorerTitle(),
             ViewColumn.One,
             useCustomEditorApi,
-            false,
-            Promise.resolve(false)
+            false
         );
     }
 

src/client/datascience/interactive-common/interactiveBase.ts

@@ -34,16 +34,11 @@ import {
 } from '../../common/application/types';
 import { CancellationError } from '../../common/cancellation';
 import { EXTENSION_ROOT_DIR, isTestExecution, PYTHON_LANGUAGE } from '../../common/constants';
-import { RemoveKernelToolbarInInteractiveWindow, RunByLine } from '../../common/experiments/groups';
+import { RunByLine } from '../../common/experiments/groups';
 import { traceError, traceInfo, traceWarning } from '../../common/logger';
 
 import { isNil } from 'lodash';
-import {
-    IConfigurationService,
-    IDisposableRegistry,
-    IExperimentService,
-    IExperimentsManager
-} from '../../common/types';
+import { IConfigurationService, IDisposableRegistry, IExperimentsManager } from '../../common/types';
 import { createDeferred, Deferred } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
 import { isUntitledFile, noop } from '../../common/utils/misc';
@@ -171,7 +166,6 @@ export abstract class InteractiveBase extends WebviewPanelHost<IInteractiveWindo
         experimentsManager: IExperimentsManager,
         private readonly notebookProvider: INotebookProvider,
         useCustomEditorApi: boolean,
-        expService: IExperimentService,
         private selector: KernelSelector
     ) {
         super(
@@ -186,8 +180,7 @@ export abstract class InteractiveBase extends WebviewPanelHost<IInteractiveWindo
             title,
             viewColumn,
             useCustomEditorApi,
-            experimentsManager.inExperiment(RunByLine.experiment),
-            expService.inExperiment(RemoveKernelToolbarInInteractiveWindow.experiment)
+            experimentsManager.inExperiment(RunByLine.experiment)
         );
 
         // Create our unique id. We use this to skip messages we send to other interactive windows

src/client/datascience/interactive-ipynb/nativeEditor.ts

@@ -31,7 +31,6 @@ import {
     IAsyncDisposableRegistry,
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager,
     Resource
 } from '../../common/types';
@@ -182,7 +181,6 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
         notebookProvider: INotebookProvider,
         useCustomEditorApi: boolean,
         private trustService: ITrustService,
-        expService: IExperimentService,
         private _model: INotebookModel,
         webviewPanel: WebviewPanel | undefined,
         selector: KernelSelector,
@@ -223,7 +221,6 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
             experimentsManager,
             notebookProvider,
             useCustomEditorApi,
-            expService,
             selector
         );
         asyncRegistry.push(this);

src/client/datascience/interactive-ipynb/nativeEditorOldWebView.ts

@@ -20,7 +20,6 @@ import {
     IAsyncDisposableRegistry,
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager
 } from '../../common/types';
 import * as localize from '../../common/utils/localize';
@@ -101,7 +100,6 @@ export class NativeEditorOldWebView extends NativeEditor {
         useCustomEditorApi: boolean,
         private readonly storage: INotebookStorageProvider,
         trustService: ITrustService,
-        expService: IExperimentService,
         model: INotebookModel,
         webviewPanel: WebviewPanel | undefined,
         selector: KernelSelector,
@@ -137,7 +135,6 @@ export class NativeEditorOldWebView extends NativeEditor {
             notebookProvider,
             useCustomEditorApi,
             trustService,
-            expService,
             model,
             webviewPanel,
             selector,

src/client/datascience/interactive-ipynb/nativeEditorProviderOld.ts

@@ -22,7 +22,6 @@ import {
     IAsyncDisposableRegistry,
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager,
     IMemento,
     WORKSPACE_MEMENTO
@@ -226,7 +225,6 @@ export class NativeEditorProviderOld extends NativeEditorProvider {
             this.serviceContainer.get<boolean>(UseCustomEditorApi),
             this.serviceContainer.get<INotebookStorageProvider>(INotebookStorageProvider),
             this.serviceContainer.get<ITrustService>(ITrustService),
-            this.serviceContainer.get<IExperimentService>(IExperimentService),
             model,
             panel,
             this.serviceContainer.get<KernelSelector>(KernelSelector),

src/client/datascience/interactive-window/interactiveWindow.ts

@@ -18,7 +18,6 @@ import { traceError } from '../../common/logger';
 import {
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager,
     InteractiveWindowMode,
     IPersistentStateFactory,
@@ -125,7 +124,6 @@ export class InteractiveWindow extends InteractiveBase implements IInteractiveWi
         experimentsManager: IExperimentsManager,
         notebookProvider: INotebookProvider,
         useCustomEditorApi: boolean,
-        expService: IExperimentService,
         private exportUtil: ExportUtil,
         owner: Resource,
         mode: InteractiveWindowMode,
@@ -167,7 +165,6 @@ export class InteractiveWindow extends InteractiveBase implements IInteractiveWi
             experimentsManager,
             notebookProvider,
             useCustomEditorApi,
-            expService,
             selector
         );
 

src/client/datascience/interactive-window/interactiveWindowProvider.ts

@@ -22,7 +22,6 @@ import {
     IAsyncDisposableRegistry,
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager,
     IMemento,
     InteractiveWindowMode,
@@ -192,7 +191,6 @@ export class InteractiveWindowProvider implements IInteractiveWindowProvider, IA
             this.serviceContainer.get<IExperimentsManager>(IExperimentsManager),
             this.serviceContainer.get<INotebookProvider>(INotebookProvider),
             this.serviceContainer.get<boolean>(UseCustomEditorApi),
-            this.serviceContainer.get<IExperimentService>(IExperimentService),
             this.serviceContainer.get<ExportUtil>(ExportUtil),
             resource,
             mode,

src/client/datascience/notebookStorage/nativeEditorProvider.ts

@@ -29,7 +29,6 @@ import {
     IAsyncDisposableRegistry,
     IConfigurationService,
     IDisposableRegistry,
-    IExperimentService,
     IExperimentsManager,
     IMemento,
     WORKSPACE_MEMENTO
@@ -262,7 +261,6 @@ export class NativeEditorProvider implements INotebookEditorProvider, CustomEdit
             this.serviceContainer.get<INotebookProvider>(INotebookProvider),
             this.serviceContainer.get<boolean>(UseCustomEditorApi),
             this.serviceContainer.get<ITrustService>(ITrustService),
-            this.serviceContainer.get<IExperimentService>(IExperimentService),
             model,
             panel,
             this.serviceContainer.get<KernelSelector>(KernelSelector),

src/client/datascience/plotting/plotViewer.ts

@@ -48,8 +48,7 @@ export class PlotViewer extends WebviewPanelHost<IPlotViewerMapping> implements
             localize.DataScience.plotViewerTitle(),
             ViewColumn.One,
             useCustomEditorApi,
-            false,
-            Promise.resolve(false)
+            false
         );
         // Load the web panel using our current directory as we don't expect to load any other files
         super.loadWebPanel(process.cwd()).catch(traceError);

src/client/datascience/types.ts

@@ -837,10 +837,6 @@ export interface IDataScienceExtraSettings extends IDataScienceSettings {
         enableDuringDebugger: boolean;
     };
 
-    webviewExperiments: {
-        removeKernelToolbarInInteractiveWindow: boolean;
-    };
-
     gatherIsInstalled: boolean;
 }
 

src/client/datascience/webviews/webviewHost.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+
 'use strict';
+
 import '../../common/extensions';
 
 import { injectable, unmanaged } from 'inversify';
@@ -19,20 +21,22 @@ import { ICodeCssGenerator, IDataScienceExtraSettings, IThemeFinder } from '../t
 @injectable() // For some reason this is necessary to get the class hierarchy to work.
 export abstract class WebviewHost<IMapping> implements IDisposable {
     protected webview?: IWebview;
-    protected disposed: boolean = false;
+
+    protected disposed = false;
 
     protected themeIsDarkPromise: Deferred<boolean> | undefined = createDeferred<boolean>();
+
     protected webviewInit: Deferred<void> | undefined = createDeferred<void>();
 
     protected readonly _disposables: IDisposable[] = [];
+
     constructor(
         @unmanaged() protected configService: IConfigurationService,
         @unmanaged() private cssGenerator: ICodeCssGenerator,
         @unmanaged() protected themeFinder: IThemeFinder,
         @unmanaged() protected workspaceService: IWorkspaceService,
         @unmanaged() protected readonly useCustomEditorApi: boolean,
-        @unmanaged() private readonly enableVariablesDuringDebugging: boolean,
-        @unmanaged() private readonly hideKernelToolbarInInteractiveWindow: Promise<boolean>
+        @unmanaged() private readonly enableVariablesDuringDebugging: boolean
     ) {
         // Listen for settings changes from vscode.
         this._disposables.push(this.workspaceService.onDidChangeConfiguration(this.onPossibleSettingsChange, this));
@@ -83,7 +87,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
         return this.postMessageInternal(type.toString(), payload);
     }
 
-    //tslint:disable-next-line:no-any
+    // tslint:disable-next-line:no-any
     protected onMessage(message: string, payload: any) {
         switch (message) {
             case CssMessages.GetCssRequest:
@@ -124,7 +128,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
                     fontSize: this.getValue(editor, 'fontSize', 14),
                     fontFamily: this.getValue(editor, 'fontFamily', "Consolas, 'Courier New', monospace")
                 },
-                theme: theme,
+                theme,
                 useCustomEditorApi: this.useCustomEditorApi
             },
             intellisenseOptions: {
@@ -145,10 +149,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
             variableOptions: {
                 enableDuringDebugger: this.enableVariablesDuringDebugging
             },
-            webviewExperiments: {
-                removeKernelToolbarInInteractiveWindow: await this.hideKernelToolbarInInteractiveWindow
-            },
-            gatherIsInstalled: ext ? true : false
+            gatherIsInstalled: !!ext
         };
     }
 
@@ -164,7 +165,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
             await this.webviewInit.promise;
 
             // Then send it the message
-            this.webview?.postMessage({ type: type.toString(), payload: payload });
+            this.webview?.postMessage({ type: type.toString(), payload });
         }
     }
 

src/client/datascience/webviews/webviewPanelHost.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+
 'use strict';
+
 import '../../common/extensions';
 
 import { injectable, unmanaged } from 'inversify';
@@ -28,9 +30,13 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
     protected get isDisposed(): boolean {
         return this.disposed;
     }
+
     protected viewState: { visible: boolean; active: boolean } = { visible: false, active: false };
+
     private webPanel: IWebviewPanel | undefined;
+
     private messageListener: IWebviewPanelMessageListener;
+
     private startupStopwatch = new StopWatch();
 
     constructor(
@@ -50,17 +56,15 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
         @unmanaged() private _title: string,
         @unmanaged() private viewColumn: ViewColumn,
         @unmanaged() protected readonly useCustomEditorApi: boolean,
-        @unmanaged() enableVariablesDuringDebugging: boolean,
-        @unmanaged() hideKernelToolbarInInteractiveWindow: Promise<boolean>
+        @unmanaged() enableVariablesDuringDebugging: boolean
     ) {
         super(
             configService,
             cssGenerator,
             themeFinder,
             workspaceService,
             useCustomEditorApi,
-            enableVariablesDuringDebugging,
-            hideKernelToolbarInInteractiveWindow
+            enableVariablesDuringDebugging
         );
 
         // Create our message listener for our web panel.
@@ -97,6 +101,7 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
 
         super.dispose();
     }
+
     public get title() {
         return this._title;
     }
@@ -108,7 +113,7 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
         }
     }
 
-    //tslint:disable-next-line:no-any
+    // tslint:disable-next-line:no-any
     protected onMessage(message: string, payload: any) {
         switch (message) {
             case SharedMessages.Started: