Refactor command result handling (fix #255503)#301995
Open
dimateos wants to merge 1 commit intomicrosoft:mainfrom
Open
Refactor command result handling (fix #255503)#301995dimateos wants to merge 1 commit intomicrosoft:mainfrom
dimateos wants to merge 1 commit intomicrosoft:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors ${input} command input result handling in the configuration resolver so that commands can signal “user canceled” by returning undefined/null, restoring the ability to abandon tasks/debug/launch flows (fixes #255503 regression).
Changes:
- Treat
undefined/nullreturned from aninputs[].type: "command"command as cancellation (returnundefined), instead of a valid resolved input. - Keep the existing error path for non-string, non-nullish command results.
Comment on lines
342
to
+347
| return this.userInputAccessQueue.queue(() => this.commandService.executeCommand<string>(info.command, info.args)).then(result => { | ||
| if (typeof result === 'string' || Types.isUndefinedOrNull(result)) { | ||
| if (typeof result === 'string') { | ||
| return { value: result, input: info }; | ||
| } | ||
| if (Types.isUndefinedOrNull(result)) { | ||
| return undefined; |
Comment on lines
+343
to
349
| if (typeof result === 'string') { | ||
| return { value: result, input: info }; | ||
| } | ||
| if (Types.isUndefinedOrNull(result)) { | ||
| return undefined; | ||
| } | ||
| throw new VariableError(VariableKind.Input, localize('inputVariable.command.noStringType', "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.", variable, info.command)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refactor suggested to fix regression pointed out in #255503 and rioj7/command-variable#114
This should allow again the user to cancel commands/tasks/launchs when an invoked input is cancelled.