Fix/scrollbar marks shell integration #19185
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
- Add NotifyShellIntegrationMark() method to ITerminalApi interface - Implement the method in Terminal to call _NotifyScrollEvent() - Call the notification method from AdaptDispatch::DoFinalTermAction() when FTCS sequences (OSC 133 A/B/C/D) add marks to the buffer This fixes the issue where scrollbar marks created by shell integration (autoMarkPrompts) would not appear until the first scroll event occurred. The marks were being created in the buffer but the scrollbar UI was not being invalidated/refreshed. Fixes microsoft#19104
- Add NotifyShellIntegrationMark() method declaration to outputStream.hpp - Implement empty method in outputStream.cpp with appropriate comment - Fixes abstract class compilation error for ITerminalApi interface - Shell integration marks are a Terminal app feature, not implemented in conhost
- Implement missing method in unit test mock class - Ensures all ITerminalApi implementations are complete - Required for compilation after adding method to interface
- Add notification to OSC1337;SetMark (iTerm2 shell integration) - Add notification to OSC9;12 (ConEmu shell integration) - Ensures all shell integration mark creation methods trigger scrollbar refresh - Maintains consistency with FTCS sequence handlers
lhecker
approved these changes
Jul 29, 2025
| void Terminal::NotifyShellIntegrationMark() | ||
| { | ||
| // Notify the scrollbar that marks have been added so it can refresh the mark indicators | ||
| _NotifyScrollEvent(); |
There was a problem hiding this comment.
(To the terminal team:) The synchronous coupling of the output thread --> buffer --> control is a continuously increasing issue IMO. Not just from a perf. standpoint where these callbacks trigger logic while holding the global lock, but also due to us having to painstakingly add logic like this. = Development and runtime overhead. It should be tackled as a proper task in the near-term IMO.
There was a problem hiding this comment.
heard. would love to do something about it - without stopping to rewrite the world :)
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Thanks so much for fixing this! |
DHowett
pushed a commit
that referenced
this pull request
Jul 29, 2025
This PR resolves an issue where scrollbar marks created by shell integration sequences (OSC 133 FTCS, OSC 1337 iTerm2, and OSC 9;12 ConEmu sequences) were not visible on the scrollbar until the user manually scrolled. The problem was that while marks were being created in the buffer correctly, the UI wasn't being notified to refresh the scrollbar display. The fix adds a new NotifyShellIntegrationMark() method to the ITerminalApi interface that calls _NotifyScrollEvent() to trigger scrollbar refresh, and updates all shell integration sequence handlers in AdaptDispatch to call this notification method after creating marks. This ensures scrollbar marks appear immediately when shell integration sequences are processed, bringing feature parity between auto-detected and shell-integration-based marks. Closes #19104 (cherry picked from commit e818daf) Service-Card-Id: PVTI_lADOAF3p4s4AxadtzgdFukU Service-Version: 1.23
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.
Fix scrollbar marks not showing with shell integration
Fixes #19104
This PR resolves an issue where scrollbar marks created by shell integration sequences (OSC 133 FTCS, OSC 1337 iTerm2, and OSC 9;12 ConEmu sequences) were not visible on the scrollbar until the user manually scrolled. The problem was that while marks were being created in the buffer correctly, the UI wasn't being notified to refresh the scrollbar display. The fix adds a new NotifyShellIntegrationMark() method to the ITerminalApi interface that calls _NotifyScrollEvent() to trigger scrollbar refresh, and updates all shell integration sequence handlers in AdaptDispatch to call this notification method after creating marks. This ensures scrollbar marks appear immediately when shell integration sequences are processed, bringing feature parity between auto-detected and shell-integration-based marks.
PR Checklist