Fix terminal quick fix bugs #247345
Merged
Fix terminal quick fix bugs #247345
Conversation
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
meganrogge
changed the title
Tyriar
reviewed
Apr 25, 2025
Member
There was a problem hiding this comment.
The trim there was intentional I believe to combating potential whitespace cells that are left around from previous renders on that line. For example if when you backspace on a shell, it prints the space character instead of actually clearing it.
What this is doing is very similar to prompt input model, I wonder if we could leverage that logic here instead of doing it manually? PromptInputModel is owned by CommandDetectionCapability, so it might just be a matter of using PromptInputModel.value instead (removing ghost text is ghostTextIndex is !== -1).
rzhao271
reviewed
Apr 28, 2025
src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
Show resolved
Hide resolved
rzhao271
approved these changes
Apr 29, 2025
Contributor
Author
|
This was supposed to be merged in May... my bad for leaving auto-merge enabled on it. It's probably fine. |
NikolaRHristov
pushed a commit
to CodeEditorLand/Editor
that referenced
this pull request
Apr 30, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #211857
Previously, both the Create PR and Push Upstream terminal quick fixes required the command line to match a specific regex:
vscode/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts
Line 12 in 7de10c3
However, in certain cases, the captured
commandLinewas incorrectly set togitpushinstead ofgit push. This occurred when the user enteredgitandpushon separate lines — such as when a command wrapped due to line length.During the
executephase, the command was correctly recognized. But by thefinishedphase, the space had been lost, breaking the match:The issue was caused by trimming whitespace before combining wrapped lines — which removed the space between command parts.
Daniel suggested instead of changing that logic, we replace it and use the
promptInputModel.valueinstead which does not have this issue.