Skip to content

Disable debugging configuration provider #4022

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
d3r3kk merged 3 commits into from
Jan 17, 2019
Merged

Disable debugging configuration provider #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb124a5
Disable debugging configuration provider for now.
d3r3kk Jan 16, 2019
2799fc1
Remove news entry for disabled feature
d3r3kk Jan 16, 2019
72fc3eb
Update tests for debugging provider to handle disabled feature
d3r3kk Jan 16, 2019
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
1 change: 0 additions & 1 deletion news/1 Enhancements/3321.md
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/client/debugger/extension/configuration/debugConfigurationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@ export class PythonDebugConfigurationService implements IDebugConfigurationServi
constructor(@inject(IDebugConfigurationResolver) @named('attach') private readonly attachResolver: IDebugConfigurationResolver<AttachRequestArguments>,
@inject(IDebugConfigurationResolver) @named('launch') private readonly launchResolver: IDebugConfigurationResolver<LaunchRequestArguments>,
@inject(IDebugConfigurationProviderFactory) private readonly providerFactory: IDebugConfigurationProviderFactory,
// tslint:disable-next-line:no-unused-variable
@inject(IMultiStepInputFactory) private readonly multiStepFactory: IMultiStepInputFactory,
@inject(IFileSystem) private readonly fs: IFileSystem) {
}
public async provideDebugConfigurations(folder: WorkspaceFolder | undefined, token?: CancellationToken): Promise<DebugConfiguration[] | undefined> {
const config: Partial<DebugConfigurationArguments> = {};
const state = { config, folder, token };
const multiStep = this.multiStepFactory.create<DebugConfigurationState>();
await multiStep.run((input, s) => this.pickDebugConfiguration(input, s), state);

// Disabled until configuration issues are addressed by VS Code. See #4007
// const multiStep = this.multiStepFactory.create<DebugConfigurationState>();
// await multiStep.run((input, s) => this.pickDebugConfiguration(input, s), state);

if (Object.keys(state.config).length === 0) {
return this.getDefaultDebugConfig();
} else {
Expand Down
12 changes: 10 additions & 2 deletions src/test/debugger/extension/configuration/debugConfigurationService.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ suite('Debugging - Configuration Service', () => {
multiStepInput.verifyAll();
expect(Object.keys(state.config)).to.be.lengthOf(0);
});
test('Ensure generated config is returned', async () => {
test('Ensure generated config is returned', async function () {
// Disable this test until this is resolved:
// Issue #4007: Disable debugging configuration provider temporarily
// tslint:disable-next-line:no-invalid-this
return this.skip();

const expectedConfig = { yes: 'Updated' };
const multiStepInput = {
run: (_, state) => {
Expand Down Expand Up @@ -148,7 +153,10 @@ suite('Debugging - Configuration Service', () => {
when(fs.readFile(jsFile)).thenResolve(JSON.stringify([expectedConfig]));
const config = await configService.provideDebugConfigurations!({} as any);

multiStepFactory.verifyAll();
// Disable this check until this is resolved:
// Issue #4007: Disable debugging configuration provider temporarily
// multiStepFactory.verifyAll();

expect(config).to.deep.equal([expectedConfig]);
});
});