Skip to content

Refactor debug configuration providers #3742

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
DonJayamanne merged 3 commits into from
Dec 18, 2018
Merged

Refactor debug configuration providers #3742

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
83169f4
Rename folder
DonJayamanne Dec 18, 2018
c420628
Refactor debug configuration provider
DonJayamanne Dec 18, 2018
1dd19c8
Fix injection
DonJayamanne Dec 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
2 changes: 1 addition & 1 deletion .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
"label": "Run Unit Tests",
"type": "npm",
"script": "test:unittests:cover",
"script": "test:unittests",
"group": {
"kind": "test",
"isDefault": true
Expand Down
8 changes: 4 additions & 4 deletions build/existingFiles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
133 changes: 0 additions & 133 deletions src/client/debugger/extension/configProviders/baseProvider.ts
View file
Open in desktop

This file was deleted.

154 changes: 0 additions & 154 deletions src/client/debugger/extension/configProviders/pythonV2Provider.ts
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/client/debugger/extension/configProviders/types.ts
View file
Open in desktop

This file was deleted.

19 changes: 7 additions & 12 deletions ...igProviders/configurationProviderUtils.ts → ...nfiguration/configurationProviderUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
}
Expand Down
Loading