Backend (crates/vcs/src/merge.rs, cmd/git_merge.rs via start_with):
git.merge {branch} -> {result: merged|upToDate|conflicts, conflicts},
git.mergeAbort, git.conflictVersions {path} -> {base?, ours, theirs,
binary, tooLarge} from the index stages :1:/:2:/:3:, git.markResolved
{paths}. Repo::lock becomes pub(crate) so merge and abort hold the
mutation lock.
UI (ui/src/components/vcs/merge/): merge dialog with branch picker,
conflicts list from the shared status store, a three-pane resolve view
(ours / editable result / theirs) with accept left/right per chunk,
accept all, previous/next conflict, Apply through the file's buffer then
mark resolved, keep-a-side for modify/delete, abort after confirmation.
Own three-way line merge on @codemirror/merge's diff. UI commands
vcs.merge, vcs.resolveConflicts, vcs.abortMerge (no default shortcuts);
the Changes window opens conflicted rows in the resolve view.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
78 lines
2.7 KiB
Rust
78 lines
2.7 KiB
Rust
//! Built-in commands, one module per area.
|
|
|
|
mod app;
|
|
mod buffer;
|
|
mod file;
|
|
pub mod git;
|
|
pub mod git_lines;
|
|
pub mod git_log;
|
|
pub mod git_merge;
|
|
pub mod git_remote;
|
|
pub mod goto;
|
|
mod lsp_assist;
|
|
mod lsp_diagnostics;
|
|
mod lsp_nav;
|
|
mod params;
|
|
mod project;
|
|
mod recovery;
|
|
pub mod search;
|
|
mod settings;
|
|
pub mod syntax;
|
|
pub mod terminal;
|
|
pub mod theme;
|
|
pub mod toolchain;
|
|
pub mod ui;
|
|
|
|
use crate::{EngineError, Registry};
|
|
|
|
/// Registers every built-in command.
|
|
///
|
|
/// # Errors
|
|
/// Returns [`EngineError::Internal`] if two commands share an id.
|
|
pub fn register_builtins(registry: &mut Registry) -> Result<(), EngineError> {
|
|
registry.register(Box::new(app::About))?;
|
|
registry.register(Box::new(app::Quit))?;
|
|
registry.register(Box::new(project::Open))?;
|
|
registry.register(Box::new(project::OpenDialog))?;
|
|
registry.register(Box::new(project::Close))?;
|
|
registry.register(Box::new(project::Children))?;
|
|
registry.register(Box::new(file::Open))?;
|
|
registry.register(Box::new(file::Save))?;
|
|
registry.register(Box::new(file::SaveAll))?;
|
|
registry.register(Box::new(buffer::Get))?;
|
|
registry.register(Box::new(buffer::Edit))?;
|
|
registry.register(Box::new(buffer::Close))?;
|
|
registry.register(Box::new(recovery::List))?;
|
|
registry.register(Box::new(recovery::Restore))?;
|
|
registry.register(Box::new(recovery::Discard))?;
|
|
registry.register(Box::new(settings::List))?;
|
|
registry.register(Box::new(settings::Get))?;
|
|
registry.register(Box::new(settings::Set))?;
|
|
registry.register(Box::new(settings::Reset))?;
|
|
registry.register(Box::new(theme::List))?;
|
|
registry.register(Box::new(theme::SystemPreference))?;
|
|
registry.register(Box::new(ui::RegisterCommands))?;
|
|
registry.register(Box::new(search::Find))?;
|
|
registry.register(Box::new(search::Cancel))?;
|
|
registry.register(Box::new(goto::Status))?;
|
|
registry.register(Box::new(goto::File))?;
|
|
registry.register(Box::new(goto::Class))?;
|
|
registry.register(Box::new(goto::Symbol))?;
|
|
registry.register(Box::new(syntax::OutlineCommand))?;
|
|
registry.register(Box::new(toolchain::Status))?;
|
|
registry.register(Box::new(toolchain::DownloadPhpactor))?;
|
|
registry.register(Box::new(buffer::List))?;
|
|
registry.register(Box::new(terminal::Create))?;
|
|
registry.register(Box::new(terminal::Input))?;
|
|
registry.register(Box::new(terminal::Resize))?;
|
|
registry.register(Box::new(terminal::Close))?;
|
|
lsp_diagnostics::register(registry)?;
|
|
lsp_assist::register(registry)?;
|
|
lsp_nav::register(registry)?;
|
|
git::register(registry)?;
|
|
git_lines::register(registry)?;
|
|
git_log::register(registry)?;
|
|
git_remote::register(registry)?;
|
|
git_merge::register(registry)?;
|
|
Ok(())
|
|
}
|