Service container registrations update

src/extension.node.ts

@@ -63,7 +63,7 @@ import {
 import { createDeferred } from './platform/common/utils/async';
 import { Common, OutputChannelNames } from './platform/common/utils/localize';
 import { IServiceContainer, IServiceManager } from './platform/ioc/types';
-import { sendErrorTelemetry, sendStartupTelemetry } from './platform/startupTelemetry';
+import { sendErrorTelemetry, sendStartupTelemetry } from './telemetry/startupTelemetry';
 import { noop } from './platform/common/utils/misc';
 import { PythonExtension } from './webviews/webview-side/common/constants';
 import { registerTypes as registerPlatformTypes } from './platform/serviceRegistry.node';

src/extension.web.ts

@@ -60,7 +60,7 @@ import {
 import { createDeferred } from './platform/common/utils/async';
 import { Common, OutputChannelNames } from './platform/common/utils/localize';
 import { IServiceContainer, IServiceManager } from './platform/ioc/types';
-import { sendErrorTelemetry, sendStartupTelemetry } from './platform/startupTelemetry';
+import { sendErrorTelemetry, sendStartupTelemetry } from './telemetry/startupTelemetry';
 import { noop } from './platform/common/utils/misc';
 import { PythonExtension } from './webviews/webview-side/common/constants';
 import { registerTypes as registerPlatformTypes } from './platform/serviceRegistry.web';

src/intellisense/serviceRegistry.node.ts

@@ -7,11 +7,19 @@ import { IExtensionSingleActivationService, IExtensionSyncActivationService } fr
 import { IServiceManager } from '../platform/ioc/types';
 import { NotebookCellBangInstallDiagnosticsProvider } from './diagnosticsProvider';
 import { IntellisenseProvider } from './intellisenseProvider.node';
+import { LogReplayService } from './logReplayService.node';
 import { NotebookPythonPathService } from './notebookPythonPathService.node';
 import { PythonKernelCompletionProvider } from './pythonKernelCompletionProvider';
 import { PythonKernelCompletionProviderRegistration } from './pythonKernelCompletionProviderRegistration';
 
-export function registerTypes(serviceManager: IServiceManager, _isDevMode: boolean) {
+export function registerTypes(serviceManager: IServiceManager, isDevMode: boolean) {
+    if (isDevMode) {
+        serviceManager.addSingleton<IExtensionSingleActivationService>(
+            IExtensionSingleActivationService,
+            LogReplayService
+        );
+    }
+
     serviceManager.addSingleton<PythonKernelCompletionProvider>(
         PythonKernelCompletionProvider,
         PythonKernelCompletionProvider

src/interactive-window/serviceRegistry.node.ts

@@ -4,7 +4,7 @@
 
 import { ITracebackFormatter } from '../kernels/types';
 import { IExtensionSyncActivationService, IExtensionSingleActivationService } from '../platform/activation/types';
-import { IDataScienceCommandListener } from '../platform/common/types';
+import { IDataScienceCommandListener, IJupyterExtensionBanner } from '../platform/common/types';
 import { IServiceManager } from '../platform/ioc/types';
 import { CommandRegistry } from './commands/commandRegistry';
 import { CodeGeneratorFactory } from './editor-integration/codeGeneratorFactory';
@@ -28,6 +28,7 @@ import { InteractiveWindowTracebackFormatter } from './outputs/tracebackFormatte
 import { IInteractiveWindowDebugger, IInteractiveWindowDebuggingManager, IInteractiveWindowProvider } from './types';
 import { InteractiveWindowDebugger } from './debugger/interactiveWindowDebugger.node';
 import { InteractiveWindowDebuggingManager } from './debugger/jupyter/debuggingManager';
+import { BANNER_NAME_INTERACTIVE_SHIFTENTER, InteractiveShiftEnterBanner } from './shiftEnterBanner';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IInteractiveWindowProvider>(IInteractiveWindowProvider, InteractiveWindowProvider);
@@ -63,4 +64,9 @@ export function registerTypes(serviceManager: IServiceManager) {
         undefined,
         [IExtensionSingleActivationService]
     );
+    serviceManager.addSingleton<IJupyterExtensionBanner>(
+        IJupyterExtensionBanner,
+        InteractiveShiftEnterBanner,
+        BANNER_NAME_INTERACTIVE_SHIFTENTER
+    );
 }

src/interactive-window/shiftEnterBanner.ts

@@ -12,6 +12,8 @@ import { IJupyterExtensionBanner, IPersistentStateFactory, IConfigurationService
 import * as localize from '../platform/common/utils/localize';
 import { sendTelemetryEvent, captureTelemetry } from '../telemetry';
 
+export const BANNER_NAME_INTERACTIVE_SHIFTENTER: string = 'InteractiveShiftEnterBanner';
+
 export enum InteractiveShiftEnterStateKeys {
     ShowBanner = 'InteractiveShiftEnterBanner'
 }

src/kernels/serviceRegistry.node.ts

@@ -29,7 +29,7 @@ import { KernelVariables } from './variables/kernelVariables';
 import { PreWarmActivatedJupyterEnvironmentVariables } from './variables/preWarmVariables.node';
 import { PythonVariablesRequester } from './variables/pythonVariableRequester';
 import { MultiplexingDebugService } from './debugger/multiplexingDebugService';
-import { IJupyterDebugService } from './debugger/types';
+import { IDebugLocationTracker, IDebugLocationTrackerFactory, IJupyterDebugService } from './debugger/types';
 import { IKernelDependencyService, IKernelFinder, IKernelProvider } from './types';
 import { IJupyterVariables, IKernelVariableRequester } from './variables/types';
 import { KernelCrashMonitor } from './kernelCrashMonitor';
@@ -40,8 +40,12 @@ import { KernelProvider } from './kernelProvider.node';
 import { KernelFinder } from './kernelFinder.node';
 import { ServerConnectionType } from './jupyter/launcher/serverConnectionType';
 import { CellOutputDisplayIdTracker } from './execution/cellDisplayIdTracker';
+import { DebugLocationTrackerFactory } from './debugger/debugLocationTrackerFactory';
+import { Activation } from './activation.node';
 
 export function registerTypes(serviceManager: IServiceManager, isDevMode: boolean) {
+    serviceManager.addSingleton<IExtensionSingleActivationService>(IExtensionSingleActivationService, Activation);
+
     serviceManager.addSingleton<IRawNotebookSupportedService>(
         IRawNotebookSupportedService,
         RawNotebookSupportedService
@@ -125,4 +129,8 @@ export function registerTypes(serviceManager: IServiceManager, isDevMode: boolea
     const rawService = serviceManager.get<IRawNotebookSupportedService>(IRawNotebookSupportedService);
     setSharedProperty('rawKernelSupported', rawService.isSupported ? 'true' : 'false');
     serviceManager.addSingleton<CellOutputDisplayIdTracker>(CellOutputDisplayIdTracker, CellOutputDisplayIdTracker);
+
+    serviceManager.addSingleton<IDebugLocationTracker>(IDebugLocationTracker, DebugLocationTrackerFactory, undefined, [
+        IDebugLocationTrackerFactory
+    ]);
 }

src/kernels/serviceRegistry.web.ts

@@ -19,13 +19,14 @@ import { KernelProvider } from './kernelProvider.web';
 import { KernelFinder } from './kernelFinder.web';
 import { PreferredRemoteKernelIdProvider } from './jupyter/preferredRemoteKernelIdProvider';
 import { MultiplexingDebugService } from './debugger/multiplexingDebugService';
-import { IJupyterDebugService } from './debugger/types';
+import { IDebugLocationTracker, IDebugLocationTrackerFactory, IJupyterDebugService } from './debugger/types';
 import { DebuggerVariables } from './variables/debuggerVariables';
 import { IJupyterVariables, IKernelVariableRequester } from './variables/types';
 import { KernelVariables } from './variables/kernelVariables';
 import { JupyterVariables } from './variables/jupyterVariables';
 import { PythonVariablesRequester } from './variables/pythonVariableRequester';
 import { CellOutputDisplayIdTracker } from './execution/cellDisplayIdTracker';
+import { DebugLocationTrackerFactory } from './debugger/debugLocationTrackerFactory';
 
 @injectable()
 class RawNotebookSupportedService implements IRawNotebookSupportedService {
@@ -86,4 +87,9 @@ export function registerTypes(serviceManager: IServiceManager, isDevMode: boolea
     registerJupyterTypes(serviceManager, isDevMode);
 
     serviceManager.addSingleton<CellOutputDisplayIdTracker>(CellOutputDisplayIdTracker, CellOutputDisplayIdTracker);
+
+    // debugging
+    serviceManager.addSingleton<IDebugLocationTracker>(IDebugLocationTracker, DebugLocationTrackerFactory, undefined, [
+        IDebugLocationTrackerFactory
+    ]);
 }

src/notebooks/serviceRegistry.node.ts

@@ -20,7 +20,7 @@ import { CondaControllerRefresher } from './controllers/condaControllerRefresher
 import { RemoteKernelControllerWatcher } from './controllers/remoteKernelControllerWatcher';
 import { ITracebackFormatter } from '../kernels/types';
 import { NotebookTracebackFormatter } from './outputs/tracebackFormatter';
-import { IJupyterDebugService } from '../kernels/debugger/types';
+import { IDebuggingManager, IJupyterDebugService } from '../kernels/debugger/types';
 import { Identifiers } from '../platform/common/constants';
 import { JupyterDebugService } from './debugger/jupyterDebugService.node';
 import { NotebookIPyWidgetCoordinator } from './controllers/notebookIPyWidgetCoordinator';
@@ -29,6 +29,7 @@ import { JupyterServerSelectorCommand } from './serverSelector';
 import { InterpreterPackageTracker } from './telemetry/interpreterPackageTracker';
 import { NotebookCellLanguageService } from './languages/cellLanguageService';
 import { EmptyNotebookCellLanguageService } from './languages/emptyNotebookCellLanguageService';
+import { DebuggingManager } from './debugger/debuggingManager';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IExtensionSingleActivationService>(IExtensionSingleActivationService, RemoteSwitcher);
@@ -89,4 +90,8 @@ export function registerTypes(serviceManager: IServiceManager) {
         IExtensionSingleActivationService,
         EmptyNotebookCellLanguageService
     );
+
+    serviceManager.addSingleton<IDebuggingManager>(IDebuggingManager, DebuggingManager, undefined, [
+        IExtensionSingleActivationService
+    ]);
 }

src/notebooks/serviceRegistry.web.ts

@@ -24,6 +24,8 @@ import { NotebookCommandListener } from './notebookCommandListener';
 import { InterpreterPackageTracker } from './telemetry/interpreterPackageTracker';
 import { NotebookCellLanguageService } from './languages/cellLanguageService';
 import { EmptyNotebookCellLanguageService } from './languages/emptyNotebookCellLanguageService';
+import { IDebuggingManager } from '../kernels/debugger/types';
+import { DebuggingManager } from './debugger/debuggingManager';
 import { ErrorRendererCommunicationHandler } from './outputs/errorRendererComms';
 
 export function registerTypes(serviceManager: IServiceManager) {
@@ -71,6 +73,10 @@ export function registerTypes(serviceManager: IServiceManager) {
         IExtensionSingleActivationService,
         EmptyNotebookCellLanguageService
     );
+
+    serviceManager.addSingleton<IDebuggingManager>(IDebuggingManager, DebuggingManager, undefined, [
+        IExtensionSingleActivationService
+    ]);
     serviceManager.addSingleton<IExtensionSyncActivationService>(
         IExtensionSyncActivationService,
         ErrorRendererCommunicationHandler

src/platform/activation/serviceRegistry.node.ts

@@ -1,25 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { BANNER_NAME_INTERACTIVE_SHIFTENTER, IJupyterExtensionBanner, ISurveyBanner } from '../common/types';
+import { ISurveyBanner } from '../common/types';
 import { DataScienceSurveyBanner } from '../common/dataScienceSurveyBanner.node';
 import { IServiceManager } from '../ioc/types';
 import { ExtensionActivationManager } from './activationManager';
 
 import { IExtensionActivationManager, IExtensionSingleActivationService } from './types';
-import { InteractiveShiftEnterBanner } from '../../interactive-window/shiftEnterBanner';
 import { WorkspaceActivation } from './workspaceActivation.node';
 
 // eslint-disable-next-line
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.add<IExtensionActivationManager>(IExtensionActivationManager, ExtensionActivationManager);
     serviceManager.addSingleton<ISurveyBanner>(ISurveyBanner, DataScienceSurveyBanner);
     serviceManager.addBinding(ISurveyBanner, IExtensionSingleActivationService);
-    serviceManager.addSingleton<IJupyterExtensionBanner>(
-        IJupyterExtensionBanner,
-        InteractiveShiftEnterBanner,
-        BANNER_NAME_INTERACTIVE_SHIFTENTER
-    );
     serviceManager.addSingleton<IExtensionSingleActivationService>(
         IExtensionSingleActivationService,
         WorkspaceActivation

src/platform/common/application/commands.ts

@@ -14,7 +14,7 @@ import {
     ViewColumn
 } from 'vscode';
 import { IShowDataViewerFromVariablePanel } from '../../messageTypes';
-import { Commands as DSCommands } from '../../../webviews/webview-side/common/constants';
+import { Commands as DSCommands } from '../../../platform/common/constants';
 import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { CommandSource } from '../../testing/common/constants';
 import { Channel } from './types';

src/platform/common/types.ts

@@ -248,7 +248,6 @@ export interface IJupyterExtensionBanner {
     isEnabled(type: BannerType): boolean;
     showBanner(type: BannerType): Promise<void>;
 }
-export const BANNER_NAME_INTERACTIVE_SHIFTENTER: string = 'InteractiveShiftEnterBanner';
 
 export const ISurveyBanner = Symbol('ISurveyBanner');
 export interface ISurveyBanner extends IExtensionSingleActivationService, IJupyterExtensionBanner {}

src/platform/messageTypes.ts

@@ -3,7 +3,7 @@
 'use strict';
 import { Uri } from 'vscode';
 import type { KernelMessage } from '@jupyterlab/services';
-import { NativeKeyboardCommandTelemetry, NativeMouseCommandTelemetry } from '../webviews/webview-side/common/constants';
+import { NativeKeyboardCommandTelemetry, NativeMouseCommandTelemetry } from '../platform/common/constants';
 import {
     IVariableExplorerHeight,
     CommonActionType

src/platform/serviceRegistry.node.ts

@@ -9,27 +9,11 @@ import { registerTypes as registerTerminalTypes } from './terminals/serviceRegis
 import { registerTypes as registerActivationTypes } from './activation/serviceRegistry.node';
 import { registerTypes as registerDevToolTypes } from './devTools/serviceRegistry';
 import { DataScienceStartupTime } from './common/constants';
-import { LogReplayService } from '../intellisense/logReplayService.node';
-import { Activation } from '../kernels/activation.node';
-import { DataViewer } from '../webviews/extension-side/dataviewer/dataViewer.node';
-import { DataViewerDependencyService } from '../webviews/extension-side/dataviewer/dataViewerDependencyService.node';
-import { DataViewerFactory } from '../webviews/extension-side/dataviewer/dataViewerFactory';
-import {
-    IDataViewer,
-    IDataViewerDependencyService,
-    IDataViewerFactory
-} from '../webviews/extension-side/dataviewer/types';
-import { PlotViewer } from '../webviews/extension-side/plotting/plotViewer.node';
-import { PlotViewerProvider } from '../webviews/extension-side/plotting/plotViewerProvider.node';
-import { IPlotViewer, IPlotViewerProvider } from '../webviews/extension-side/plotting/types';
-import { NotebookWatcher } from '../webviews/extension-side/variablesView/notebookWatcher';
-import { INotebookWatcher } from '../webviews/extension-side/variablesView/types';
 import { IExtensionSingleActivationService, IExtensionSyncActivationService } from './activation/types';
 import { ExtensionRecommendationService } from './common/extensionRecommendation.node';
 import { GlobalActivation } from './common/globalActivation';
 import { PreReleaseChecker } from './common/prereleaseChecker.node';
 import { IConfigurationService, IDataScienceCommandListener, IExtensionContext } from './common/types';
-import { DebugLocationTrackerFactory } from '../kernels/debugger/debugLocationTrackerFactory';
 import { DataScienceErrorHandler } from './errors/errorHandler';
 import { IDataScienceErrorHandler } from './errors/types';
 import { ExportBase } from './export/exportBase.node';
@@ -55,11 +39,8 @@ import { IFileSystem } from './common/platform/types';
 import { IFileSystemNode } from './common/platform/types.node';
 import { FileSystem } from './common/platform/fileSystem.node';
 import { WorkspaceService } from './common/application/workspace.node';
-import { ExtensionSideRenderer, IExtensionSideRenderer } from '../webviews/extension-side/renderer';
 import { OutputCommandListener } from './logging/outputCommandListener';
 import { ExportUtilBase } from './export/exportUtil';
-import { DebuggingManager } from '../notebooks/debugger/debuggingManager';
-import { IDebuggingManager, IDebugLocationTracker, IDebugLocationTrackerFactory } from '../kernels/debugger/types';
 
 export function registerTypes(context: IExtensionContext, serviceManager: IServiceManager, isDevMode: boolean) {
     serviceManager.addSingleton<FileSystem>(FileSystem, FileSystem);
@@ -78,27 +59,9 @@ export function registerTypes(context: IExtensionContext, serviceManager: IServi
 
     // Root platform types
     serviceManager.addSingletonInstance<number>(DataScienceStartupTime, Date.now());
-    serviceManager.addSingletonInstance<IExtensionSideRenderer>(IExtensionSideRenderer, new ExtensionSideRenderer());
     serviceManager.addSingleton<IDataScienceErrorHandler>(IDataScienceErrorHandler, DataScienceErrorHandler);
-    serviceManager.add<IDataViewer>(IDataViewer, DataViewer);
-    serviceManager.add<IPlotViewer>(IPlotViewer, PlotViewer);
-    serviceManager.addSingleton<IDataViewerDependencyService>(
-        IDataViewerDependencyService,
-        DataViewerDependencyService
-    );
+
     serviceManager.addSingleton<IExtensionSingleActivationService>(IExtensionSingleActivationService, GlobalActivation);
-    serviceManager.addSingleton<IDataViewerFactory>(IDataViewerFactory, DataViewerFactory);
-    serviceManager.addSingleton<IDebugLocationTracker>(IDebugLocationTracker, DebugLocationTrackerFactory, undefined, [
-        IDebugLocationTrackerFactory
-    ]);
-    serviceManager.addSingleton<IExtensionSingleActivationService>(IExtensionSingleActivationService, Activation);
-    if (isDevMode) {
-        serviceManager.addSingleton<IExtensionSingleActivationService>(
-            IExtensionSingleActivationService,
-            LogReplayService
-        );
-    }
-    serviceManager.addSingleton<IPlotViewerProvider>(IPlotViewerProvider, PlotViewerProvider);
     serviceManager.addSingleton<IStatusProvider>(IStatusProvider, StatusProvider);
     serviceManager.addSingleton<ProgressReporter>(ProgressReporter, ProgressReporter);
     serviceManager.addSingleton<IFileConverter>(IFileConverter, FileConverter);
@@ -114,7 +77,6 @@ export function registerTypes(context: IExtensionContext, serviceManager: IServi
     serviceManager.addSingleton<ExportUtilBase>(ExportUtilBase, ExportUtilBase);
     serviceManager.addSingleton<ExportUtil>(ExportUtil, ExportUtil);
     serviceManager.addSingleton<IExportDialog>(IExportDialog, ExportDialog);
-    serviceManager.addSingleton<INotebookWatcher>(INotebookWatcher, NotebookWatcher);
     serviceManager.addSingleton<IExtensionSyncActivationService>(
         IExtensionSyncActivationService,
         ExtensionRecommendationService
@@ -123,9 +85,6 @@ export function registerTypes(context: IExtensionContext, serviceManager: IServi
         IExtensionSyncActivationService,
         KernelProgressReporter
     );
-    serviceManager.addSingleton<IDebuggingManager>(IDebuggingManager, DebuggingManager, undefined, [
-        IExtensionSingleActivationService
-    ]);
     serviceManager.addSingleton<IExtensionSingleActivationService>(
         IExtensionSingleActivationService,
         PreReleaseChecker