From 2a35dc90acf328763ca68afd9b8c6d5ecf597667 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 4 Nov 2019 08:56:31 -0800 Subject: [PATCH] Take ptvsd experiment into account --- src/client/datascience/jupyter/jupyterDebugger.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/datascience/jupyter/jupyterDebugger.ts b/src/client/datascience/jupyter/jupyterDebugger.ts index 4b869ad2f7ea..40eb56172b06 100644 --- a/src/client/datascience/jupyter/jupyterDebugger.ts +++ b/src/client/datascience/jupyter/jupyterDebugger.ts @@ -8,7 +8,7 @@ import * as uuid from 'uuid/v4'; import { DebugConfiguration } from 'vscode'; import * as vsls from 'vsls/vscode'; import { IApplicationShell, ICommandManager, IDebugService, IWorkspaceService } from '../../common/application/types'; -import { DebugAdapterDescriptorFactory } from '../../common/experimentGroups'; +import { DebugAdapterDescriptorFactory, DebugAdapterNewPtvsd } from '../../common/experimentGroups'; import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IPlatformService } from '../../common/platform/types'; import { IConfigurationService, IExperimentsManager, Version } from '../../common/types'; @@ -184,7 +184,8 @@ export class JupyterDebugger implements IJupyterDebugger, ICellHashListener { */ private async getPtvsdPath(notebook: INotebook): Promise { const oldPtvsd = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'lib', 'python', 'old_ptvsd'); - if (!this.experimentsManager.inExperiment(DebugAdapterDescriptorFactory.experiment)){ + if (!this.experimentsManager.inExperiment(DebugAdapterDescriptorFactory.experiment) || + !this.experimentsManager.inExperiment(DebugAdapterNewPtvsd.experiment)){ return oldPtvsd; } const pythonVersion = await this.getKernelPythonVersion(notebook);