Add a default_diff_view setting - #48669
Closed
JosephTLyons wants to merge 6 commits into
Closed
Conversation
Introduces a new `default_diff_view` setting under the `git` settings section with two options: `stacked` (default) and `side_by_side`. When opening the project diff, the editor now reads this setting and initializes directly in the correct mode during construction, before the first render, so there is no visual flash. - Define `DefaultDiffView` enum in settings_content - Add `default_diff_view` to `GitSettings` in both settings content and project settings - Add `SplittableEditor::do_split()` as a public method that accepts an optional project to avoid re-borrowing the workspace during entity construction - Check the setting in `ProjectDiff::new_impl` and split immediately if `side_by_side` is configured - Add tests for both default (stacked) and side-by-side modes
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
Member
|
While you’re at it @JosephTLyons do you think you can update the docs as well? If not, you can ping me and I’ll do it. |
Collaborator
Author
Yep, I'll do that. I'll wait until it hits review in case anyone prefers different naming. Maybe docs should also be included in the new PR template checklist we have. |
Member
A solid yes on that. |
Collaborator
Author
|
Dupe of: #48440 |
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
2 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.
For the person reviewing:
I didn't add the setting to settings editor in this PR, figured I'd do that in a follow up.
I kept the default as stacked, but we might want to consider the results here.
Release Notes: