2
2
// Licensed under the MIT License.
3
3
'use strict' ;
4
4
import { IExtensionSingleActivationService } from '../activation/types' ;
5
- import { IApplicationEnvironment , IWorkspaceService } from '../common/application/types' ;
5
+ import { IApplicationEnvironment } from '../common/application/types' ;
6
6
import { UseCustomEditorApi } from '../common/constants' ;
7
7
import { IServiceManager } from '../ioc/types' ;
8
8
import { Activation } from './activation' ;
@@ -48,9 +48,6 @@ import { IPyWidgetMessageDispatcherFactory } from './ipywidgets/ipyWidgetMessage
48
48
import { IPyWidgetScriptSource } from './ipywidgets/ipyWidgetScriptSource' ;
49
49
import { JupyterCommandLineSelector } from './jupyter/commandLineSelector' ;
50
50
import { JupyterCommandFactory } from './jupyter/interpreter/jupyterCommand' ;
51
- import { JupyterCommandFinder } from './jupyter/interpreter/jupyterCommandFinder' ;
52
- import { JupyterCommandInterpreterDependencyService } from './jupyter/interpreter/jupyterCommandInterpreterDependencyService' ;
53
- import { JupyterCommandFinderInterpreterExecutionService } from './jupyter/interpreter/jupyterCommandInterpreterExecutionService' ;
54
51
import { JupyterInterpreterDependencyService } from './jupyter/interpreter/jupyterInterpreterDependencyService' ;
55
52
import { JupyterInterpreterOldCacheStateStore } from './jupyter/interpreter/jupyterInterpreterOldCacheStateStore' ;
56
53
import { JupyterInterpreterSelectionCommand } from './jupyter/interpreter/jupyterInterpreterSelectionCommand' ;
@@ -189,7 +186,6 @@ export function registerTypes(serviceManager: IServiceManager) {
189
186
serviceManager . addSingleton < IPlotViewerProvider > ( IPlotViewerProvider , PlotViewerProvider ) ;
190
187
serviceManager . addSingleton < IStatusProvider > ( IStatusProvider , StatusProvider ) ;
191
188
serviceManager . addSingleton < IThemeFinder > ( IThemeFinder , ThemeFinder ) ;
192
- serviceManager . addSingleton < JupyterCommandFinder > ( JupyterCommandFinder , JupyterCommandFinder ) ;
193
189
serviceManager . addSingleton < JupyterCommandLineSelector > ( JupyterCommandLineSelector , JupyterCommandLineSelector ) ;
194
190
serviceManager . addSingleton < JupyterCommandLineSelectorCommand > ( JupyterCommandLineSelectorCommand , JupyterCommandLineSelectorCommand ) ;
195
191
serviceManager . addSingleton < JupyterInterpreterDependencyService > ( JupyterInterpreterDependencyService , JupyterInterpreterDependencyService ) ;
@@ -211,16 +207,8 @@ export function registerTypes(serviceManager: IServiceManager) {
211
207
serviceManager . addSingleton < IJupyterServerProvider > ( IJupyterServerProvider , NotebookServerProvider ) ;
212
208
serviceManager . add < IJMPConnection > ( IJMPConnection , EnchannelJMPConnection ) ;
213
209
serviceManager . addSingleton < IPyWidgetMessageDispatcherFactory > ( IPyWidgetMessageDispatcherFactory , IPyWidgetMessageDispatcherFactory ) ;
214
-
215
- // Temporary code, to allow users to revert to the old behavior.
216
- const cfg = serviceManager . get < IWorkspaceService > ( IWorkspaceService ) . getConfiguration ( 'python.dataScience' , undefined ) ;
217
- if ( cfg . get < boolean > ( 'useOldJupyterServer' , false ) ) {
218
- serviceManager . addSingleton < IJupyterInterpreterDependencyManager > ( IJupyterInterpreterDependencyManager , JupyterCommandInterpreterDependencyService ) ;
219
- serviceManager . addSingleton < IJupyterSubCommandExecutionService > ( IJupyterSubCommandExecutionService , JupyterCommandFinderInterpreterExecutionService ) ;
220
- } else {
221
- serviceManager . addSingleton < IJupyterInterpreterDependencyManager > ( IJupyterInterpreterDependencyManager , JupyterInterpreterSubCommandExecutionService ) ;
222
- serviceManager . addSingleton < IJupyterSubCommandExecutionService > ( IJupyterSubCommandExecutionService , JupyterInterpreterSubCommandExecutionService ) ;
223
- }
210
+ serviceManager . addSingleton < IJupyterInterpreterDependencyManager > ( IJupyterInterpreterDependencyManager , JupyterInterpreterSubCommandExecutionService ) ;
211
+ serviceManager . addSingleton < IJupyterSubCommandExecutionService > ( IJupyterSubCommandExecutionService , JupyterInterpreterSubCommandExecutionService ) ;
224
212
225
213
registerGatherTypes ( serviceManager ) ;
226
214
}
0 commit comments