Refactor debug configuration providers (microsoft#3742)

For microsoft#3321 * Created a separate PR to refactor before introducing changes related to 3321 * Easier to review and merge (smaller changes)

Author: DonJayamanne

.vscode/tasks.json

@@ -38,7 +38,7 @@
  {
  "label": "Run Unit Tests",
  "type": "npm",
- "script": "test:unittests:cover",
+ "script": "test:unittests",
  "group": {
  "kind": "test",
  "isDefault": true

build/existingFiles.json

@@ -157,10 +157,10 @@
  "src/client/debugger/debugAdapter/serviceRegistry.ts",
  "src/client/debugger/debugAdapter/types.ts",
  "src/client/debugger/extension/banner.ts",
- "src/client/debugger/extension/configProviders/baseProvider.ts",
- "src/client/debugger/extension/configProviders/configurationProviderUtils.ts",
- "src/client/debugger/extension/configProviders/pythonV2Provider.ts",
- "src/client/debugger/extension/configProviders/types.ts",
+ "src/client/debugger/extension/configuration/baseProvider.ts",
+ "src/client/debugger/extension/configuration/configurationProviderUtils.ts",
+ "src/client/debugger/extension/configuration/pythonV2Provider.ts",
+ "src/client/debugger/extension/configuration/types.ts",
  "src/client/debugger/extension/hooks/childProcessAttachHandler.ts",
  "src/client/debugger/extension/hooks/childProcessAttachService.ts",
  "src/client/debugger/extension/hooks/constants.ts",

package.json

@@ -1860,10 +1860,10 @@
  "compile-webviews-verbose": "npx webpack --config webpack.datascience-ui.config.js",
  "postinstall": "node ./node_modules/vscode/bin/install",
  "test": "node ./out/test/standardTest.js && node ./out/test/multiRootTest.js",
- "test:unittests": "mocha --opts ./build/.mocha.unittests.opts",
+ "test:unittests": "mocha --require source-map-support/register --opts ./build/.mocha.unittests.opts",
  "test:unittests:cover": "nyc --nycrc-path ./build/.nycrc npm run test:unittests",
- "test:functional": "mocha --opts ./build/.mocha.functional.opts",
- "test:functional:cover": "nyc--nycrc-path ./build/.nycrc npm run test:functional",
+ "test:functional": "mocha --require source-map-support/register --opts ./build/.mocha.functional.opts",
+ "test:functional:cover": "nyc --nycrc-path ./build/.nycrc npm run test:functional",
  "testDebugger": "node ./out/test/debuggerTest.js",
  "testSingleWorkspace": "node ./out/test/standardTest.js",
  "testMultiWorkspace": "node ./out/test/multiRootTest.js",

src/client/debugger/extension/configProviders/baseProvider.ts

@@ -7,23 +7,19 @@ import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
 import { IApplicationShell } from '../../../common/application/types';
+import { traceError } from '../../../common/logger';
 import { IFileSystem } from '../../../common/platform/types';
 import { IPythonExecutionFactory } from '../../../common/process/types';
-import { ILogger } from '../../../common/types';
-import { IServiceContainer } from '../../../ioc/types';
+import { noop } from '../../../common/utils/misc';
 import { IConfigurationProviderUtils } from './types';
 
 const PSERVE_SCRIPT_FILE_NAME = 'pserve.py';
 
 @injectable()
 export class ConfigurationProviderUtils implements IConfigurationProviderUtils {
- private readonly executionFactory: IPythonExecutionFactory;
- private readonly fs: IFileSystem;
- private readonly logger: ILogger;
- constructor(@inject(IServiceContainer) private serviceContainer: IServiceContainer) {
- this.executionFactory = this.serviceContainer.get<IPythonExecutionFactory>(IPythonExecutionFactory);
- this.fs = this.serviceContainer.get<IFileSystem>(IFileSystem);
- this.logger = this.serviceContainer.get<ILogger>(ILogger);
+ constructor(@inject(IPythonExecutionFactory) private readonly executionFactory: IPythonExecutionFactory,
+ @inject(IFileSystem) private readonly fs: IFileSystem,
+ @inject(IApplicationShell) private readonly shell: IApplicationShell) {
  }
  public async getPyramidStartupScriptFilePath(resource?: Uri): Promise<string | undefined> {
  try {
@@ -33,9 +29,8 @@ export class ConfigurationProviderUtils implements IConfigurationProviderUtils {
  return await this.fs.fileExists(pserveFilePath) ? pserveFilePath : undefined;
  } catch (ex) {
  const message = 'Unable to locate \'pserve.py\' required for debugging of Pyramid applications.';
- this.logger.logError(message, ex);
- const app = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
- app.showErrorMessage(message);
+ traceError(message, ex);
+ this.shell.showErrorMessage(message).then(noop, noop);
  return;
  }
  }