Fix dangling active terminal on delete #32161
Merged
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
roblourens
reviewed
Aug 8, 2017
| @@ -95,6 +95,9 @@ export class QuickKillTerminalAction extends Action { | |||
| if (terminal) { | |||
| terminal.dispose(); | |||
| } | |||
| if (this.terminalService.activeTerminalInstanceIndex !== terminalIndex) { | |||
| this.terminalService.setActiveInstanceByIndex(Math.min(terminalIndex, this.terminalService.terminalInstances.length - 1)); | |||
There was a problem hiding this comment.
Is it a problem if there's only one terminal, and you delete it? Does it call this with -1?
There was a problem hiding this comment.
It works as expected, but we probably should check for that case
roblourens
approved these changes
Aug 9, 2017
|
I just realized that I get a green square for reviewing a PR, but not for merging it. |
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 an issue where if you delete a terminal that is not the last one and you also have the active terminal as the last one, the index doesn't get updated and the terminal panel title is blank.
Steps to reproduce: