From c149d026731e7d69d3f195d9b031f251ffa278d2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 18 Jul 2018 16:35:34 -0700 Subject: [PATCH 1/2] Move service registrations from debug adapter host to extension host --- src/client/activation/serviceRegistry.ts | 5 +++++ src/client/debugger/serviceRegistry.ts | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/activation/serviceRegistry.ts b/src/client/activation/serviceRegistry.ts index f9d8dfdf549d..3e7e3e8c7a42 100644 --- a/src/client/activation/serviceRegistry.ts +++ b/src/client/activation/serviceRegistry.ts @@ -8,9 +8,14 @@ import { ExtensionActivationService } from './activationService'; import { JediExtensionActivator } from './jedi'; import { LanguageServerExtensionActivator } from './languageServer'; import { ExtensionActivators, IExtensionActivationService, IExtensionActivator } from './types'; +import { IPythonExtensionBanner, BANNER_NAME_LS_SURVEY, BANNER_NAME_PROPOSE_LS } from '../common/types'; +import { LanguageServerSurveyBanner } from '../languageServices/languageServerSurveyBanner'; +import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguageServerBanner'; export function registerTypes(serviceManager: IServiceManager) { serviceManager.addSingleton(IExtensionActivationService, ExtensionActivationService); serviceManager.add(IExtensionActivator, JediExtensionActivator, ExtensionActivators.Jedi); serviceManager.add(IExtensionActivator, LanguageServerExtensionActivator, ExtensionActivators.DotNet); + serviceManager.addSingleton(IPythonExtensionBanner, LanguageServerSurveyBanner, BANNER_NAME_LS_SURVEY); + serviceManager.addSingleton(IPythonExtensionBanner, ProposeLanguageServerBanner, BANNER_NAME_PROPOSE_LS); } diff --git a/src/client/debugger/serviceRegistry.ts b/src/client/debugger/serviceRegistry.ts index efb44040b4cf..3030f77d91e7 100644 --- a/src/client/debugger/serviceRegistry.ts +++ b/src/client/debugger/serviceRegistry.ts @@ -9,13 +9,10 @@ import { FileSystem } from '../common/platform/fileSystem'; import { PlatformService } from '../common/platform/platformService'; import { IFileSystem, IPlatformService } from '../common/platform/types'; import { CurrentProcess } from '../common/process/currentProcess'; -import { BANNER_NAME_LS_SURVEY, BANNER_NAME_PROPOSE_LS, ICurrentProcess, - IExperimentalDebuggerBanner, IPythonExtensionBanner, ISocketServer } from '../common/types'; +import { ICurrentProcess, IExperimentalDebuggerBanner, ISocketServer } from '../common/types'; import { ServiceContainer } from '../ioc/container'; import { ServiceManager } from '../ioc/serviceManager'; import { IServiceContainer, IServiceManager } from '../ioc/types'; -import { LanguageServerSurveyBanner } from '../languageServices/languageServerSurveyBanner'; -import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguageServerBanner'; import { ExperimentalDebuggerBanner } from './banner'; import { DebugStreamProvider } from './Common/debugStreamProvider'; import { ProtocolLogger } from './Common/protocolLogger'; @@ -45,6 +42,4 @@ function registerDebuggerTypes(serviceManager: IServiceManager) { export function registerTypes(serviceManager: IServiceManager) { serviceManager.addSingleton(IExperimentalDebuggerBanner, ExperimentalDebuggerBanner); - serviceManager.addSingleton(IPythonExtensionBanner, LanguageServerSurveyBanner, BANNER_NAME_LS_SURVEY); - serviceManager.addSingleton(IPythonExtensionBanner, ProposeLanguageServerBanner, BANNER_NAME_PROPOSE_LS); } From c0e9df646276dd93d892876ef20361fd6b16c3c0 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 18 Jul 2018 16:37:04 -0700 Subject: [PATCH 2/2] Fix linter issues --- src/client/activation/serviceRegistry.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/activation/serviceRegistry.ts b/src/client/activation/serviceRegistry.ts index 3e7e3e8c7a42..23dffa6cd365 100644 --- a/src/client/activation/serviceRegistry.ts +++ b/src/client/activation/serviceRegistry.ts @@ -3,14 +3,14 @@ 'use strict'; +import { BANNER_NAME_LS_SURVEY, BANNER_NAME_PROPOSE_LS, IPythonExtensionBanner } from '../common/types'; import { IServiceManager } from '../ioc/types'; +import { LanguageServerSurveyBanner } from '../languageServices/languageServerSurveyBanner'; +import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguageServerBanner'; import { ExtensionActivationService } from './activationService'; import { JediExtensionActivator } from './jedi'; import { LanguageServerExtensionActivator } from './languageServer'; import { ExtensionActivators, IExtensionActivationService, IExtensionActivator } from './types'; -import { IPythonExtensionBanner, BANNER_NAME_LS_SURVEY, BANNER_NAME_PROPOSE_LS } from '../common/types'; -import { LanguageServerSurveyBanner } from '../languageServices/languageServerSurveyBanner'; -import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguageServerBanner'; export function registerTypes(serviceManager: IServiceManager) { serviceManager.addSingleton(IExtensionActivationService, ExtensionActivationService);