Skip to content

Commit 5c92e33

Browse files
committed
♻️ refactor: rm duplicated code
1 parent d054086 commit 5c92e33

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

Diff for: src/popups/conventional_commit.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enum CommitType {
5050
CI,
5151
}
5252

53-
#[derive(Clone)]
53+
#[derive(Copy, Clone)]
5454
enum MoreInfoCommit {
5555
/// 🎨
5656
CodeStyle,
@@ -536,7 +536,9 @@ impl ConventionalCommitPopup {
536536
let query = query.borrow().to_lowercase();
537537
self.query = Some(query.clone());
538538

539-
if let Some(commit_type) = &self.seleted_commit_type {
539+
let new_len = if let Some(commit_type) =
540+
&self.seleted_commit_type
541+
{
540542
self.query_results_more_info = commit_type
541543
.more_info()
542544
.iter()
@@ -547,17 +549,10 @@ impl ConventionalCommitPopup {
547549
.to_lowercase()
548550
.contains(&query)
549551
})
550-
.cloned()
552+
.copied()
551553
.collect_vec();
552554

553-
if self.selected_index
554-
>= self.query_results_more_info.len()
555-
{
556-
self.selected_index = self
557-
.query_results_more_info
558-
.len()
559-
.saturating_sub(1);
560-
}
555+
self.query_results_more_info.len()
561556
} else {
562557
self.query_results_type = self
563558
.options
@@ -568,10 +563,11 @@ impl ConventionalCommitPopup {
568563
.copied()
569564
.collect_vec();
570565

571-
if self.selected_index >= self.query_results_type.len() {
572-
self.selected_index =
573-
self.query_results_type.len().saturating_sub(1);
574-
}
566+
self.query_results_type.len()
567+
};
568+
569+
if self.selected_index >= new_len {
570+
self.selected_index = new_len.saturating_sub(1);
575571
}
576572
}
577573

0 commit comments

Comments
 (0)