Skip to content

Move service registrations from debug adapter host to extension host #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Don Jayamanne (DonJayamanne) merged 2 commits into from
Jul 18, 2018
Merged

Move service registrations from debug adapter host to extension host #2193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c149d02
Move service registrations from debug adapter host to extension host
DonJayamanne Jul 18, 2018
c0e9df6
Fix linter issues
DonJayamanne Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move service registrations from debug adapter host to extension host
  • Loading branch information
@DonJayamanne
DonJayamanne committed Jul 18, 2018
commit c149d026731e7d69d3f195d9b031f251ffa278d2
5 changes: 5 additions & 0 deletions src/client/activation/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(IExtensionActivationService, ExtensionActivationService);
serviceManager.add<IExtensionActivator>(IExtensionActivator, JediExtensionActivator, ExtensionActivators.Jedi);
serviceManager.add<IExtensionActivator>(IExtensionActivator, LanguageServerExtensionActivator, ExtensionActivators.DotNet);
serviceManager.addSingleton<IPythonExtensionBanner>(IPythonExtensionBanner, LanguageServerSurveyBanner, BANNER_NAME_LS_SURVEY);
serviceManager.addSingleton<IPythonExtensionBanner>(IPythonExtensionBanner, ProposeLanguageServerBanner, BANNER_NAME_PROPOSE_LS);
}
7 changes: 1 addition & 6 deletions src/client/debugger/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -45,6 +42,4 @@ function registerDebuggerTypes(serviceManager: IServiceManager) {

export function registerTypes(serviceManager: IServiceManager) {
serviceManager.addSingleton<IExperimentalDebuggerBanner>(IExperimentalDebuggerBanner, ExperimentalDebuggerBanner);
serviceManager.addSingleton<IPythonExtensionBanner>(IPythonExtensionBanner, LanguageServerSurveyBanner, BANNER_NAME_LS_SURVEY);
serviceManager.addSingleton<IPythonExtensionBanner>(IPythonExtensionBanner, ProposeLanguageServerBanner, BANNER_NAME_PROPOSE_LS);
}