Skip to content

Commit

Permalink
refactor: split edge into separate config, its own launcher
Browse files Browse the repository at this point in the history
Also, moves configuration provides to inversify as well. The split right
now is pretty basic, just doing the minimium to move the
webview-specific code out of the browser launcher. With microsoft#267 they will
diverge a little more.

There's a decent amount of churn around configs here. But the way we
have them set up they're well typed-checked, so it's fairly safe.

Fixes microsoft#266
  • Loading branch information
connor4312 committed Feb 10, 2020
1 parent 7de2c6b commit 110d5d0
Show file tree
Hide file tree
Showing 41 changed files with 854 additions and 482 deletions.
7 changes: 4 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"reflect-metadata": "^0.1.13",
"source-map": "^0.7.3",
"split2": "^3.1.1",
"typescript": "^3.7.4",
"typescript": "^3.8.1-rc",
"vscode-nls": "^4.1.1",
"ws": "^7.0.1"
},
Expand Down
6 changes: 5 additions & 1 deletion src/binder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ export class Binder implements IDisposable {
provideLaunchParams(this._rootServices, params);
this._rootServices.get<ILogger>(ILogger).setup(resolveLoggerOptions(dap, params.trace));

const cts = CancellationTokenSource.withTimeout(params.timeout);
const cts =
params.timeout > 0
? CancellationTokenSource.withTimeout(params.timeout)
: new CancellationTokenSource();

if (params.rootPath) params.rootPath = urlUtils.platformPathToPreferredCase(params.rootPath);
this._launchParams = params;
let results = await Promise.all(
Expand Down
Loading

0 comments on commit 110d5d0

Please sign in to comment.