Ensure users can override defaults in experimental debugger (microsoft#1540)

* Ensure users can override defaults in experimental debugger * Fixes microsoft#1539

Author: DonJayamanne

src/client/debugger/configProviders/baseProvider.ts

@@ -12,7 +12,7 @@ import { IDocumentManager, IWorkspaceService } from '../../common/application/ty
 import { PYTHON_LANGUAGE } from '../../common/constants';
 import { IConfigurationService } from '../../common/types';
 import { IServiceContainer } from '../../ioc/types';
-import { BaseAttachRequestArguments, BaseLaunchRequestArguments, DebuggerType, DebugOptions } from '../Common/Contracts';
+import { BaseAttachRequestArguments, BaseLaunchRequestArguments, DebuggerType } from '../Common/Contracts';
 
 export type PythonLaunchDebugConfiguration<T extends BaseLaunchRequestArguments> = DebugConfiguration & T;
 export type PythonAttachDebugConfiguration<T extends BaseAttachRequestArguments> = DebugConfiguration & T;
@@ -78,10 +78,6 @@ export abstract class BaseConfigurationProvider<L extends BaseLaunchRequestArgum
  if (!Array.isArray(debugConfiguration.debugOptions)) {
  debugConfiguration.debugOptions = [];
  }
- // Always redirect output.
- if (debugConfiguration.debugOptions.indexOf(DebugOptions.RedirectOutput) === -1) {
- debugConfiguration.debugOptions.push(DebugOptions.RedirectOutput);
- }
  }
  private getWorkspaceFolder(folder: WorkspaceFolder | undefined): Uri | undefined {
  if (folder) {

src/client/debugger/configProviders/pythonProvider.ts

@@ -17,6 +17,10 @@ export class PythonDebugConfigurationProvider extends BaseConfigurationProvider<
  }
  protected async provideLaunchDefaults(workspaceFolder: Uri, debugConfiguration: PythonLaunchDebugConfiguration<LaunchRequestArgumentsV1>): Promise<void> {
  await super.provideLaunchDefaults(workspaceFolder, debugConfiguration);
+ // Always redirect output.
+ if (debugConfiguration.debugOptions!.indexOf(DebugOptions.RedirectOutput) === -1) {
+ debugConfiguration.debugOptions!.push(DebugOptions.RedirectOutput);
+ }
  if (debugConfiguration.debugOptions!.indexOf(DebugOptions.Pyramid) >= 0) {
  const utils = this.serviceContainer.get<IConfigurationProviderUtils>(IConfigurationProviderUtils);
  debugConfiguration.program = (await utils.getPyramidStartupScriptFilePath(workspaceFolder))!;

src/test/debugger/configProvider/provider.test.ts

@@ -15,7 +15,8 @@ import { IFileSystem, IPlatformService } from '../../../client/common/platform/t
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
 import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
 import { PythonDebugConfigurationProvider, PythonV2DebugConfigurationProvider } from '../../../client/debugger';
-import { DebugOptions } from '../../../client/debugger/Common/Contracts';
+import { DebugOptions, LaunchRequestArguments } from '../../../client/debugger/Common/Contracts';
+import { PythonLaunchDebugConfiguration } from '../../../client/debugger/configProviders/baseProvider';
 import { ConfigurationProviderUtils } from '../../../client/debugger/configProviders/configurationProviderUtils';
 import { IConfigurationProviderUtils } from '../../../client/debugger/configProviders/types';
 import { IServiceContainer } from '../../../client/ioc/types';
@@ -279,6 +280,23 @@ import { IServiceContainer } from '../../../client/ioc/types';
  expect(debugConfig).to.have.property('debugOptions');
  expect((debugConfig as any).debugOptions).to.be.deep.equal([DebugOptions.RedirectOutput]);
  });
+ test('Test overriding defaults of experimental debugger', async () => {
+ if (provider.debugType !== 'pythonExperimental') {
+ return;
+ }
+ const pythonPath = `PythonPath_${new Date().toString()}`;
+ const workspaceFolder = createMoqWorkspaceFolder(__dirname);
+ const pythonFile = 'xyz.py';
+ setupIoc(pythonPath);
+ setupActiveEditor(pythonFile, PYTHON_LANGUAGE);
+
+ const debugConfig = await debugProvider.resolveDebugConfiguration!(workspaceFolder, { redirectOutput: false } as PythonLaunchDebugConfiguration<LaunchRequestArguments>);
+
+ expect(debugConfig).to.have.property('console', 'integratedTerminal');
+ expect(debugConfig).to.have.property('stopOnEntry', false);
+ expect(debugConfig).to.have.property('debugOptions');
+ expect((debugConfig as any).debugOptions).to.be.deep.equal([]);
+ });
  async function testFixFilePathCase(isWindows: boolean, isMac: boolean, isLinux: boolean) {
  const pythonPath = `PythonPath_${new Date().toString()}`;
  const workspaceFolder = createMoqWorkspaceFolder(__dirname);