Upstream merge 3 - #15984
Closed
gj1118 wants to merge 573 commits into
Closed
Conversation
…ditor.rs conflicts (keep bufferline and file_explorer; unify theme+icons imports)
…me was not updated
code refactorings
Added the new method `update_positions_with_helper` for `ChangeSet` Added the new module `text_folding::transaction`
…l with the adventure theme from Ghostty
…it tests. Apologies for the same
merge from upstream
putting fullscreen overlay behind a setting
Upstream merge
Upstream merge 2
adding case conversion pr
…ete does not panic
fix: making sure that in the short terminal windows, the command pallete does not panic
Resolved conflict in helix-core/src/case_conversion.rs: kept our implementation (handles camelCase transitions correctly) over upstream's to_camel_case_with (which has a bug - doesn't handle internal camelCase boundaries)
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
10 participants
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.
No description provided.