Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

correct fix for #63028

Browse Source
This commit is contained in:
Andre Weinand
2018-11-14 10:57:14 +01:00
parent 33c89529be
commit 3f6901d478
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/node/extHostDebugService.ts
View File

@@ -625,8 +625,6 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
type: 'implementation',
implementation: x.implementation
};
} else if (typeof (<any>x).type === 'string') {
return <IAdapterDescriptor>x;
} else {
throw new Error('unexpected type');
}
@@ -718,8 +716,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
}
if (adapterProvider) {
const adapterExecutable = ExecutableDebugAdapter.platformAdapterExecutable(this._extensionService.getAllExtensionDescriptions(), session.type);
return asThenable(() => adapterProvider.provideDebugAdapter(session, adapterExecutable, CancellationToken.None));
return asThenable(() => adapterProvider.provideDebugAdapter(session, this.daExecutableFromPackage(session), CancellationToken.None));
}
// try deprecated command based extension API "adapterExecutableCommand" to determine the executable
@@ -734,7 +731,12 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
}
// fallback: use executable information from package.json
return Promise.resolve(ExecutableDebugAdapter.platformAdapterExecutable(this._extensionService.getAllExtensionDescriptions(), session.type));
return Promise.resolve(this.daExecutableFromPackage(session));
}
private daExecutableFromPackage(session: ExtHostDebugSession): DebugAdapterExecutable {
const dae = ExecutableDebugAdapter.platformAdapterExecutable(this._extensionService.getAllExtensionDescriptions(), session.type);
return new DebugAdapterExecutable(dae.command, dae.args, dae.env, dae.cwd);
}
private startBreakpoints() {