Merge from vscode b16b467d3e03e1a1ae05b5836e4e5a5af504e86d

This commit is contained in:
ADS Merger
2020-07-01 03:37:27 +00:00
parent 1e805a4156
commit f6b44865cc
51 changed files with 339 additions and 167 deletions

View File

@@ -98,7 +98,10 @@ export class ConfigureAction extends AbstractDebugAction {
launch = launches[0];
} else {
const picks = launches.map(l => ({ label: l.name, launch: l }));
const picked = await this.quickInputService.pick<{ label: string, launch: ILaunch }>(picks, { activeItem: picks[0], placeHolder: nls.localize('selectWorkspaceFolder', "Select a workspace folder to create a launch.json file in or add it to the workspace config file") });
const picked = await this.quickInputService.pick<{ label: string, launch: ILaunch }>(picks, {
activeItem: picks[0],
placeHolder: nls.localize({ key: 'selectWorkspaceFolder', comment: ['User picks a workspace folder or a workspace configuration file here. Workspace configuration files can contain settings and thus a launch.json configuration can be written into one.'] }, "Select a workspace folder to create a launch.json file in or add it to the workspace config file")
});
if (picked) {
launch = picked.launch;
}