Skip to content

Commit

Permalink
Fix 'pickString' evaluation (#12100)
Browse files Browse the repository at this point in the history
Similar to 'promptString', 'pickString' can be used to replace variables in task and
launch configurations. However 'pickString' values were not correctly handled which
prevented them from being evaluated. This is now fixed.

Fixes #11585

Contributed on behalf of STMicroelectronics
  • Loading branch information
sdirix authored Jan 24, 2023
1 parent b597a04 commit f925bdb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

- [plugin] added support for `isTransient` of `TerminalOptions` and `ExternalTerminalOptions` VS Code API [#12055](https://github.com/eclipse-theia/theia/pull/12055) - Contributed on behalf of STMicroelectronics
- [terminal] added support for preference `terminal.integrated.enablePersistentSessions` to allow disabling restoring terminals on reload [#12055](https://github.com/eclipse-theia/theia/pull/12055) - Contributed on behalf of STMicroelectronics
- [variable-resolver] fixed evaluations of `pickString` variables [#12100](https://github.com/eclipse-theia/theia/pull/12100) - Contributed on behalf of STMicroelectronics

<a name="breaking_changes_1.34.0">[Breaking Changes:](#breaking_changes_1.34.0)</a>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ export class CommonVariableContribution implements VariableContribution {
});
}
}
return this.quickInputService?.showQuickPick(elements, { placeholder: input.description });
const selectedPick = await this.quickInputService?.showQuickPick(elements, { placeholder: input.description });
return selectedPick?.value;
}
if (input.type === 'command') {
if (typeof input.command !== 'string') {
Expand Down

0 comments on commit f925bdb

Please sign in to comment.