Skip to content

Commit

Permalink
Merge pull request #59819 from Microsoft/isidorn/debugRestartResolve
Browse files Browse the repository at this point in the history
debug: restart shuold also resolve configuration by providers when changed
  • Loading branch information
isidorn committed Oct 2, 2018
2 parents 99b5434 + ccd11a3 commit 60db21f
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,13 @@ export class DebugService implements IDebugService {
}
}

(needsToSubstitute ? this.substituteVariables(launch, unresolved) : TPromise.as(session.configuration)).then(resolved => {
let configPromise = TPromise.as(session.configuration);
if (needsToSubstitute) {
configPromise = this.configurationManager.resolveConfigurationByProviders(launch.workspace && launch.workspace.uri, unresolved.type, unresolved)
.then(resolved => this.substituteVariables(launch, resolved));
}

configPromise.then(resolved => {
session.setConfiguration({ resolved, unresolved });
session.configuration.__restart = restartData;

Expand Down

0 comments on commit 60db21f

Please sign in to comment.