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

component creation refactor #2043

Merged
merged 2 commits into from
Feb 12, 2024
Merged

component creation refactor #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9e57c
(refactor) shorten component creation by grouping common items in an …
alexmaco Oct 3, 2022
c06ff5d
updates and fixes
dependabot[bot] Oct 25, 2023
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
280 changes: 77 additions & 203 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,41 @@ pub struct App {
file_to_open: Option<String>,
}

pub struct Environment {
pub queue: Queue,
pub theme: SharedTheme,
pub key_config: SharedKeyConfig,
pub repo: RepoPathRef,
pub options: SharedOptions,
pub sender_git: Sender<AsyncGitNotification>,
pub sender_app: Sender<AsyncAppNotification>,
}

/// The need to construct a "whatever" environment only arises in testing right now
#[cfg(test)]
impl Environment {
pub fn test_env() -> Self {
use crossbeam_channel::unbounded;
Self {
queue: Queue::new(),
theme: Default::default(),
key_config: Default::default(),
repo: RefCell::new(RepoPath::Path(Default::default())),
options: Rc::new(RefCell::new(Options::test_env())),
sender_git: unbounded().0,
sender_app: unbounded().0,
}
}
}

// public interface
impl App {
///
#[allow(clippy::too_many_lines)]
pub fn new(
repo: RepoPathRef,
sender: &Sender<AsyncGitNotification>,
sender_app: &Sender<AsyncAppNotification>,
sender_git: Sender<AsyncGitNotification>,
sender_app: Sender<AsyncAppNotification>,
input: Input,
theme: Theme,
key_config: KeyConfig,
Expand All @@ -130,219 +157,66 @@ impl App {
let repo_path_text =
repo_work_dir(&repo.borrow()).unwrap_or_default();

let queue = Queue::new();
let theme = Rc::new(theme);
let key_config = Rc::new(key_config);
let options = Options::new(repo.clone());
let env = Environment {
queue: Queue::new(),
theme: Rc::new(theme),
key_config: Rc::new(key_config),
options: Options::new(repo.clone()),
repo,
sender_git,
sender_app,
};

let tab = options.borrow().current_tab();
let tab = env.options.borrow().current_tab();

let mut app = Self {
input,
reset: ConfirmComponent::new(
queue.clone(),
theme.clone(),
key_config.clone(),
),
commit: CommitComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
options.clone(),
),
reset: ConfirmComponent::new(&env),
commit: CommitComponent::new(&env),
blame_file_popup: BlameFileComponent::new(
&repo,
&queue,
sender,
&strings::blame_title(&key_config),
theme.clone(),
key_config.clone(),
),
file_revlog_popup: FileRevlogComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
options.clone(),
),
revision_files_popup: RevisionFilesPopup::new(
repo.clone(),
&queue,
sender_app,
sender.clone(),
theme.clone(),
key_config.clone(),
),
stashmsg_popup: StashMsgComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
),
inspect_commit_popup: InspectCommitComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
options.clone(),
),
compare_commits_popup: CompareCommitsComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
options.clone(),
),
external_editor_popup: ExternalEditorComponent::new(
theme.clone(),
key_config.clone(),
),
push_popup: PushComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
),
push_tags_popup: PushTagsComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
),
reset_popup: ResetPopupComponent::new(
&queue,
&repo,
theme.clone(),
key_config.clone(),
),
pull_popup: PullComponent::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
),
fetch_popup: FetchComponent::new(
repo.clone(),
&queue,
sender,
theme.clone(),
key_config.clone(),
),
tag_commit_popup: TagCommitComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
),
create_branch_popup: CreateBranchComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
),
rename_branch_popup: RenameBranchComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
),
select_branch_popup: BranchListComponent::new(
repo.clone(),
queue.clone(),
theme.clone(),
key_config.clone(),
),
tags_popup: TagListComponent::new(
repo.clone(),
&queue,
sender,
theme.clone(),
key_config.clone(),
),
options_popup: OptionsPopupComponent::new(
&queue,
theme.clone(),
key_config.clone(),
options.clone(),
),
submodule_popup: SubmodulesListComponent::new(
repo.clone(),
&queue,
theme.clone(),
key_config.clone(),
),
log_search_popup: LogSearchPopupComponent::new(
repo.clone(),
&queue,
theme.clone(),
key_config.clone(),
),
fuzzy_find_popup: FuzzyFindPopup::new(
&queue,
theme.clone(),
key_config.clone(),
&env,
&strings::blame_title(&env.key_config),
),
file_revlog_popup: FileRevlogComponent::new(&env),
revision_files_popup: RevisionFilesPopup::new(&env),
stashmsg_popup: StashMsgComponent::new(&env),
inspect_commit_popup: InspectCommitComponent::new(&env),
compare_commits_popup: CompareCommitsComponent::new(&env),
external_editor_popup: ExternalEditorComponent::new(&env),
push_popup: PushComponent::new(&env),
push_tags_popup: PushTagsComponent::new(&env),
reset_popup: ResetPopupComponent::new(&env),
pull_popup: PullComponent::new(&env),
fetch_popup: FetchComponent::new(&env),
tag_commit_popup: TagCommitComponent::new(&env),
create_branch_popup: CreateBranchComponent::new(&env),
rename_branch_popup: RenameBranchComponent::new(&env),
select_branch_popup: BranchListComponent::new(&env),
tags_popup: TagListComponent::new(&env),
options_popup: OptionsPopupComponent::new(&env),
submodule_popup: SubmodulesListComponent::new(&env),
log_search_popup: LogSearchPopupComponent::new(&env),
fuzzy_find_popup: FuzzyFindPopup::new(&env),
do_quit: QuitState::None,
cmdbar: RefCell::new(CommandBar::new(
theme.clone(),
key_config.clone(),
env.theme.clone(),
env.key_config.clone(),
)),
help: HelpComponent::new(
theme.clone(),
key_config.clone(),
),
msg: MsgComponent::new(theme.clone(), key_config.clone()),
revlog: Revlog::new(
&repo,
&queue,
sender,
theme.clone(),
key_config.clone(),
),
status_tab: Status::new(
repo.clone(),
&queue,
sender,
theme.clone(),
key_config.clone(),
options.clone(),
),
stashing_tab: Stashing::new(
&repo,
sender,
&queue,
theme.clone(),
key_config.clone(),
),
stashlist_tab: StashList::new(
repo.clone(),
&queue,
theme.clone(),
key_config.clone(),
),
files_tab: FilesTab::new(
repo.clone(),
sender_app,
sender.clone(),
&queue,
theme.clone(),
key_config.clone(),
),
help: HelpComponent::new(&env),
msg: MsgComponent::new(&env),
revlog: Revlog::new(&env),
status_tab: Status::new(&env),
stashing_tab: Stashing::new(&env),
stashlist_tab: StashList::new(&env),
files_tab: FilesTab::new(&env),
tab: 0,
queue,
theme,
options,
key_config,
queue: env.queue,
theme: env.theme,
options: env.options,
key_config: env.key_config,
requires_redraw: Cell::new(false),
file_to_open: None,
repo,
repo: env.repo,
repo_path_text,
popup_stack: PopupStack::default(),
};
Expand Down
23 changes: 8 additions & 15 deletions src/components/blame_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use super::{
InspectCommitOpen,
};
use crate::{
app::Environment,
components::{utils::string_width_align, ScrollType},
keys::{key_match, SharedKeyConfig},
queue::{InternalEvent, Queue, StackablePopupOpen},
Expand All @@ -13,10 +14,9 @@ use crate::{
};
use anyhow::Result;
use asyncgit::{
sync::{BlameHunk, CommitId, FileBlame, RepoPathRef},
sync::{BlameHunk, CommitId, FileBlame},
AsyncBlame, AsyncGitNotification, BlameParams,
};
use crossbeam_channel::Sender;
use crossterm::event::Event;
use ratatui::{
backend::Backend,
Expand Down Expand Up @@ -272,28 +272,21 @@ impl Component for BlameFileComponent {

impl BlameFileComponent {
///
pub fn new(
repo: &RepoPathRef,
queue: &Queue,
sender: &Sender<AsyncGitNotification>,
title: &str,
theme: SharedTheme,
key_config: SharedKeyConfig,
) -> Self {
pub fn new(env: &Environment, title: &str) -> Self {
Self {
title: String::from(title),
theme,
theme: env.theme.clone(),
async_blame: AsyncBlame::new(
repo.borrow().clone(),
sender,
env.repo.borrow().clone(),
&env.sender_git,
),
queue: queue.clone(),
queue: env.queue.clone(),
visible: false,
params: None,
file_blame: None,
open_request: None,
table_state: std::cell::Cell::new(TableState::default()),
key_config,
key_config: env.key_config.clone(),
current_height: std::cell::Cell::new(0),
}
}
Expand Down
Loading
Loading