Skip to content

Commit ea59b9f

Browse files
author
David Kutugata
authored
removed experiment code and extra setting (microsoft#13900)
* removed experiment code and extra setting * display the kernel picker if the kernel is not local
1 parent a1c4078 commit ea59b9f

File tree

18 files changed

+30
-88
lines changed

18 files changed

+30
-88
lines changed

‎package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,12 +2272,6 @@
22722272
"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.",
22732273
"scope": "resource"
22742274
},
2275-
"python.dataScience.showKernelSelectionOnInteractiveWindow": {
2276-
"type": "boolean",
2277-
"default": false,
2278-
"description": "When set to true, enables the kernel selector in the Interactive Window. By default, the Interactive Window will use your Python Interpreters kernel.",
2279-
"scope": "resource"
2280-
},
22812275
"python.dataScience.enableScrollingForCellOutputs": {
22822276
"type": "boolean",
22832277
"default": true,
@@ -3792,4 +3786,4 @@
37923786
"publisherDisplayName": "Microsoft",
37933787
"publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8"
37943788
}
3795-
}
3789+
}

‎src/client/common/experiments/groups.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@ export enum NotebookEditorSupport {
8080
nativeNotebookExperiment = 'NativeNotebook - experiment'
8181
}
8282

83-
// Experiment to remove the Kernel/Server Tooblar in the Interactive Window when running a local Jupyter Server.
84-
// It doesn't make sense to have it there, the user can already change the kernel
85-
// by changing the python interpreter on the status bar.
86-
export enum RemoveKernelToolbarInInteractiveWindow {
87-
experiment = 'RemoveKernelToolbarInInteractiveWindow'
88-
}
89-
9083
// Experiment to offer switch to Pylance language server
9184
export enum TryPylance {
9285
experiment = 'tryPylance'

‎src/client/common/startPage/startPage.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ export class StartPage extends WebviewPanelHost<IStartPageMapping>
6565
localize.StartPage.getStarted(),
6666
ViewColumn.One,
6767
false,
68-
false,
69-
Promise.resolve(false)
68+
false
7069
);
7170
this.timer = new StopWatch();
7271
}

‎src/client/common/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ export interface IDataScienceSettings {
398398
jupyterCommandLineArguments: string[];
399399
widgetScriptSources: WidgetCDNs[];
400400
alwaysScrollOnNewCell?: boolean;
401-
showKernelSelectionOnInteractiveWindow?: boolean;
402401
interactiveWindowMode: InteractiveWindowMode;
403402
}
404403

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ export class DataViewer extends WebviewPanelHost<IDataViewerMapping> implements
5858
localize.DataScience.dataExplorerTitle(),
5959
ViewColumn.One,
6060
useCustomEditorApi,
61-
false,
62-
Promise.resolve(false)
61+
false
6362
);
6463
}
6564

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,11 @@ import {
3434
} from '../../common/application/types';
3535
import { CancellationError } from '../../common/cancellation';
3636
import { EXTENSION_ROOT_DIR, isTestExecution, PYTHON_LANGUAGE } from '../../common/constants';
37-
import { RemoveKernelToolbarInInteractiveWindow, RunByLine } from '../../common/experiments/groups';
37+
import { RunByLine } from '../../common/experiments/groups';
3838
import { traceError, traceInfo, traceWarning } from '../../common/logger';
3939

4040
import { isNil } from 'lodash';
41-
import {
42-
IConfigurationService,
43-
IDisposableRegistry,
44-
IExperimentService,
45-
IExperimentsManager
46-
} from '../../common/types';
41+
import { IConfigurationService, IDisposableRegistry, IExperimentsManager } from '../../common/types';
4742
import { createDeferred, Deferred } from '../../common/utils/async';
4843
import * as localize from '../../common/utils/localize';
4944
import { isUntitledFile, noop } from '../../common/utils/misc';
@@ -171,7 +166,6 @@ export abstract class InteractiveBase extends WebviewPanelHost<IInteractiveWindo
171166
experimentsManager: IExperimentsManager,
172167
private readonly notebookProvider: INotebookProvider,
173168
useCustomEditorApi: boolean,
174-
expService: IExperimentService,
175169
private selector: KernelSelector
176170
) {
177171
super(
@@ -186,8 +180,7 @@ export abstract class InteractiveBase extends WebviewPanelHost<IInteractiveWindo
186180
title,
187181
viewColumn,
188182
useCustomEditorApi,
189-
experimentsManager.inExperiment(RunByLine.experiment),
190-
expService.inExperiment(RemoveKernelToolbarInInteractiveWindow.experiment)
183+
experimentsManager.inExperiment(RunByLine.experiment)
191184
);
192185

193186
// Create our unique id. We use this to skip messages we send to other interactive windows

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
IAsyncDisposableRegistry,
3232
IConfigurationService,
3333
IDisposableRegistry,
34-
IExperimentService,
3534
IExperimentsManager,
3635
Resource
3736
} from '../../common/types';
@@ -182,7 +181,6 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
182181
notebookProvider: INotebookProvider,
183182
useCustomEditorApi: boolean,
184183
private trustService: ITrustService,
185-
expService: IExperimentService,
186184
private _model: INotebookModel,
187185
webviewPanel: WebviewPanel | undefined,
188186
selector: KernelSelector,
@@ -223,7 +221,6 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
223221
experimentsManager,
224222
notebookProvider,
225223
useCustomEditorApi,
226-
expService,
227224
selector
228225
);
229226
asyncRegistry.push(this);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
IAsyncDisposableRegistry,
2121
IConfigurationService,
2222
IDisposableRegistry,
23-
IExperimentService,
2423
IExperimentsManager
2524
} from '../../common/types';
2625
import * as localize from '../../common/utils/localize';
@@ -101,7 +100,6 @@ export class NativeEditorOldWebView extends NativeEditor {
101100
useCustomEditorApi: boolean,
102101
private readonly storage: INotebookStorageProvider,
103102
trustService: ITrustService,
104-
expService: IExperimentService,
105103
model: INotebookModel,
106104
webviewPanel: WebviewPanel | undefined,
107105
selector: KernelSelector,
@@ -137,7 +135,6 @@ export class NativeEditorOldWebView extends NativeEditor {
137135
notebookProvider,
138136
useCustomEditorApi,
139137
trustService,
140-
expService,
141138
model,
142139
webviewPanel,
143140
selector,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
IAsyncDisposableRegistry,
2323
IConfigurationService,
2424
IDisposableRegistry,
25-
IExperimentService,
2625
IExperimentsManager,
2726
IMemento,
2827
WORKSPACE_MEMENTO
@@ -226,7 +225,6 @@ export class NativeEditorProviderOld extends NativeEditorProvider {
226225
this.serviceContainer.get<boolean>(UseCustomEditorApi),
227226
this.serviceContainer.get<INotebookStorageProvider>(INotebookStorageProvider),
228227
this.serviceContainer.get<ITrustService>(ITrustService),
229-
this.serviceContainer.get<IExperimentService>(IExperimentService),
230228
model,
231229
panel,
232230
this.serviceContainer.get<KernelSelector>(KernelSelector),

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { traceError } from '../../common/logger';
1818
import {
1919
IConfigurationService,
2020
IDisposableRegistry,
21-
IExperimentService,
2221
IExperimentsManager,
2322
InteractiveWindowMode,
2423
IPersistentStateFactory,
@@ -125,7 +124,6 @@ export class InteractiveWindow extends InteractiveBase implements IInteractiveWi
125124
experimentsManager: IExperimentsManager,
126125
notebookProvider: INotebookProvider,
127126
useCustomEditorApi: boolean,
128-
expService: IExperimentService,
129127
private exportUtil: ExportUtil,
130128
owner: Resource,
131129
mode: InteractiveWindowMode,
@@ -167,7 +165,6 @@ export class InteractiveWindow extends InteractiveBase implements IInteractiveWi
167165
experimentsManager,
168166
notebookProvider,
169167
useCustomEditorApi,
170-
expService,
171168
selector
172169
);
173170

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
IAsyncDisposableRegistry,
2323
IConfigurationService,
2424
IDisposableRegistry,
25-
IExperimentService,
2625
IExperimentsManager,
2726
IMemento,
2827
InteractiveWindowMode,
@@ -192,7 +191,6 @@ export class InteractiveWindowProvider implements IInteractiveWindowProvider, IA
192191
this.serviceContainer.get<IExperimentsManager>(IExperimentsManager),
193192
this.serviceContainer.get<INotebookProvider>(INotebookProvider),
194193
this.serviceContainer.get<boolean>(UseCustomEditorApi),
195-
this.serviceContainer.get<IExperimentService>(IExperimentService),
196194
this.serviceContainer.get<ExportUtil>(ExportUtil),
197195
resource,
198196
mode,

‎src/client/datascience/notebookStorage/nativeEditorProvider.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import {
2929
IAsyncDisposableRegistry,
3030
IConfigurationService,
3131
IDisposableRegistry,
32-
IExperimentService,
3332
IExperimentsManager,
3433
IMemento,
3534
WORKSPACE_MEMENTO
@@ -262,7 +261,6 @@ export class NativeEditorProvider implements INotebookEditorProvider, CustomEdit
262261
this.serviceContainer.get<INotebookProvider>(INotebookProvider),
263262
this.serviceContainer.get<boolean>(UseCustomEditorApi),
264263
this.serviceContainer.get<ITrustService>(ITrustService),
265-
this.serviceContainer.get<IExperimentService>(IExperimentService),
266264
model,
267265
panel,
268266
this.serviceContainer.get<KernelSelector>(KernelSelector),

‎src/client/datascience/plotting/plotViewer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ export class PlotViewer extends WebviewPanelHost<IPlotViewerMapping> implements
4848
localize.DataScience.plotViewerTitle(),
4949
ViewColumn.One,
5050
useCustomEditorApi,
51-
false,
52-
Promise.resolve(false)
51+
false
5352
);
5453
// Load the web panel using our current directory as we don't expect to load any other files
5554
super.loadWebPanel(process.cwd()).catch(traceError);

‎src/client/datascience/types.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -837,10 +837,6 @@ export interface IDataScienceExtraSettings extends IDataScienceSettings {
837837
enableDuringDebugger: boolean;
838838
};
839839

840-
webviewExperiments: {
841-
removeKernelToolbarInInteractiveWindow: boolean;
842-
};
843-
844840
gatherIsInstalled: boolean;
845841
}
846842

‎src/client/datascience/webviews/webviewHost.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
3+
34
'use strict';
5+
46
import '../../common/extensions';
57

68
import { injectable, unmanaged } from 'inversify';
@@ -19,20 +21,22 @@ import { ICodeCssGenerator, IDataScienceExtraSettings, IThemeFinder } from '../t
1921
@injectable() // For some reason this is necessary to get the class hierarchy to work.
2022
export abstract class WebviewHost<IMapping> implements IDisposable {
2123
protected webview?: IWebview;
22-
protected disposed: boolean = false;
24+
25+
protected disposed = false;
2326

2427
protected themeIsDarkPromise: Deferred<boolean> | undefined = createDeferred<boolean>();
28+
2529
protected webviewInit: Deferred<void> | undefined = createDeferred<void>();
2630

2731
protected readonly _disposables: IDisposable[] = [];
32+
2833
constructor(
2934
@unmanaged() protected configService: IConfigurationService,
3035
@unmanaged() private cssGenerator: ICodeCssGenerator,
3136
@unmanaged() protected themeFinder: IThemeFinder,
3237
@unmanaged() protected workspaceService: IWorkspaceService,
3338
@unmanaged() protected readonly useCustomEditorApi: boolean,
34-
@unmanaged() private readonly enableVariablesDuringDebugging: boolean,
35-
@unmanaged() private readonly hideKernelToolbarInInteractiveWindow: Promise<boolean>
39+
@unmanaged() private readonly enableVariablesDuringDebugging: boolean
3640
) {
3741
// Listen for settings changes from vscode.
3842
this._disposables.push(this.workspaceService.onDidChangeConfiguration(this.onPossibleSettingsChange, this));
@@ -83,7 +87,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
8387
return this.postMessageInternal(type.toString(), payload);
8488
}
8589

86-
//tslint:disable-next-line:no-any
90+
// tslint:disable-next-line:no-any
8791
protected onMessage(message: string, payload: any) {
8892
switch (message) {
8993
case CssMessages.GetCssRequest:
@@ -124,7 +128,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
124128
fontSize: this.getValue(editor, 'fontSize', 14),
125129
fontFamily: this.getValue(editor, 'fontFamily', "Consolas, 'Courier New', monospace")
126130
},
127-
theme: theme,
131+
theme,
128132
useCustomEditorApi: this.useCustomEditorApi
129133
},
130134
intellisenseOptions: {
@@ -145,10 +149,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
145149
variableOptions: {
146150
enableDuringDebugger: this.enableVariablesDuringDebugging
147151
},
148-
webviewExperiments: {
149-
removeKernelToolbarInInteractiveWindow: await this.hideKernelToolbarInInteractiveWindow
150-
},
151-
gatherIsInstalled: ext ? true : false
152+
gatherIsInstalled: !!ext
152153
};
153154
}
154155

@@ -164,7 +165,7 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
164165
await this.webviewInit.promise;
165166

166167
// Then send it the message
167-
this.webview?.postMessage({ type: type.toString(), payload: payload });
168+
this.webview?.postMessage({ type: type.toString(), payload });
168169
}
169170
}
170171

‎src/client/datascience/webviews/webviewPanelHost.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
3+
34
'use strict';
5+
46
import '../../common/extensions';
57

68
import { injectable, unmanaged } from 'inversify';
@@ -28,9 +30,13 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
2830
protected get isDisposed(): boolean {
2931
return this.disposed;
3032
}
33+
3134
protected viewState: { visible: boolean; active: boolean } = { visible: false, active: false };
35+
3236
private webPanel: IWebviewPanel | undefined;
37+
3338
private messageListener: IWebviewPanelMessageListener;
39+
3440
private startupStopwatch = new StopWatch();
3541

3642
constructor(
@@ -50,17 +56,15 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
5056
@unmanaged() private _title: string,
5157
@unmanaged() private viewColumn: ViewColumn,
5258
@unmanaged() protected readonly useCustomEditorApi: boolean,
53-
@unmanaged() enableVariablesDuringDebugging: boolean,
54-
@unmanaged() hideKernelToolbarInInteractiveWindow: Promise<boolean>
59+
@unmanaged() enableVariablesDuringDebugging: boolean
5560
) {
5661
super(
5762
configService,
5863
cssGenerator,
5964
themeFinder,
6065
workspaceService,
6166
useCustomEditorApi,
62-
enableVariablesDuringDebugging,
63-
hideKernelToolbarInInteractiveWindow
67+
enableVariablesDuringDebugging
6468
);
6569

6670
// Create our message listener for our web panel.
@@ -97,6 +101,7 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
97101

98102
super.dispose();
99103
}
104+
100105
public get title() {
101106
return this._title;
102107
}
@@ -108,7 +113,7 @@ export abstract class WebviewPanelHost<IMapping> extends WebviewHost<IMapping> i
108113
}
109114
}
110115

111-
//tslint:disable-next-line:no-any
116+
// tslint:disable-next-line:no-any
112117
protected onMessage(message: string, payload: any) {
113118
switch (message) {
114119
case SharedMessages.Started:

0 commit comments

Comments
 (0)