debug: varios todos

src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts

@@ -232,8 +232,8 @@ export class ConfigurationManager implements IConfigurationManager {
 		this.toDispose = [];
 		this.registerListeners();
 		this.initLaunches();
-		// TODO@isidor select the appropriate Launch
-		this.selectConfiguration(this.launches.length ? this.launches[0] : undefined, this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE, null));
+		const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, StorageScope.WORKSPACE);
+		this.selectConfiguration(this.launches.filter(l => l.workspaceUri.toString() === previousSelectedRoot).pop(), this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE));
 	}
 
 	private registerListeners(): void {
@@ -285,8 +285,8 @@ export class ConfigurationManager implements IConfigurationManager {
 		}));
 
 		this.toDispose.push(this.configurationService.onDidUpdateConfiguration((event) => {
-			if (event.sourceConfig) {
-				// TODO@Isidor react on user changing the launch.json
+			if (event.sourceConfig.launch) {
+				this.selectConfiguration(this.selectedLaunch);
 			}
 		}));
 	}

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -869,7 +869,7 @@ export class DebugService implements debug.IDebugService {
 					watchExpressionsCount: this.model.getWatchExpressions().length,
 					extensionName: `${adapter.extensionDescription.publisher}.${adapter.extensionDescription.name}`,
 					isBuiltin: adapter.extensionDescription.isBuiltin,
-					launchJsonExists: this.contextService.hasWorkspace() && !!this.configurationService.getConfiguration<debug.IGlobalConfig>('launch', { resource: this.contextService.getLegacyWorkspace().resource }) // TODO@Isidor (https://github.com/Microsoft/vscode/issues/29245)
+					launchJsonExists: this.contextService.hasWorkspace() && !!this.configurationService.getConfiguration<debug.IGlobalConfig>('launch', { resource: root })
 				});
 			}).then(() => process, (error: any) => {
 				if (error instanceof Error && error.message === 'Canceled') {