Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make git panel entries clickable #22329

Merged
merged 9 commits into from
Dec 21, 2024
Merged

Make git panel entries clickable #22329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d6bfd9
Draft multi buffer data generation out of git panel visible entries
SomeoneToIgnore Dec 19, 2024
9a05529
Add more files into the multi buffer
SomeoneToIgnore Dec 19, 2024
9aae7ce
Navigate to first buffer's diff hunk on git panel entry click
SomeoneToIgnore Dec 20, 2024
2adf74f
Implement basic selection functionality in the Git panel
SomeoneToIgnore Dec 20, 2024
c0ea898
Fix list refresh and hover effects
SomeoneToIgnore Dec 20, 2024
0715af6
Fix incorrect entry selection
SomeoneToIgnore Dec 20, 2024
13d17fa
Always scroll multi buffer on selection, and do that debounced
SomeoneToIgnore Dec 20, 2024
3b39656
Rebase fixes
SomeoneToIgnore Dec 21, 2024
2548a78
Add change sets after the multi buffer excerpts
SomeoneToIgnore Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions crates/editor/src/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ use multi_buffer::{
ExpandExcerptDirection, MultiBufferDiffHunk, MultiBufferPoint, MultiBufferRow, ToOffsetUtf16,
};
use project::{
buffer_store::BufferChangeSet,
lsp_store::{FormatTarget, FormatTrigger, OpenLspBufferHandle},
project_settings::{GitGutterSetting, ProjectSettings},
CodeAction, Completion, CompletionIntent, DocumentHighlight, InlayHint, Location, LocationLink,
Expand Down Expand Up @@ -12950,6 +12951,14 @@ impl Editor {
.and_then(|item| item.to_any().downcast_ref::<T>())
}

pub fn add_change_set(
&mut self,
change_set: Model<BufferChangeSet>,
cx: &mut ViewContext<Self>,
) {
self.diff_map.add_change_set(change_set, cx);
}

fn character_size(&self, cx: &mut ViewContext<Self>) -> gpui::Point<Pixels> {
let text_layout_details = self.text_layout_details(cx);
let style = &text_layout_details.editor_style;
Expand Down
4 changes: 4 additions & 0 deletions crates/git_ui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ path = "src/git_ui.rs"
[dependencies]
anyhow.workspace = true
db.workspace = true
editor.workspace = true
futures.workspace = true
gpui.workspace = true
language.workspace = true
menu.workspace = true
project.workspace = true
schemars.workspace = true
serde.workspace = true
Expand Down
Loading
Loading