maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge ba36ba86bc into 153a028f3b

Browse source
This commit is contained in:
jram 2021-11-26 14:28:04 +00:00 committed by GitHub
parent 153a028f3b ba36ba86bc
commit f49ca01e53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/contrib/debug/browser/debugService.ts
View file

@ -423,10 +423,16 @@ export class DebugService implements IDebugService {
if (activeEditor && activeEditor.resource) {
type = this.chosenEnvironments[activeEditor.resource.toString()];
}
if (!type) {
guess = await this.adapterManager.guessDebugger(false);
if (guess) {
type = guess.type;
// Set the Live Share guest debug type when the user has joined a collaboration session
if (this.configurationManager.hasDebugConfigurationProvider('*') && this.configurationManager.hasDebugConfigurationProvider('vslsJoin')) {
type = 'vslsJoin';
} else {
guess = await this.adapterManager.guessDebugger(false);
if (guess) {
type = guess.type;
}
}
}
}