render normal vs. highlighted

Author: extrawurst

src/components/commitlist.rs

@@ -297,6 +297,7 @@ impl CommitList {
 
 	#[allow(clippy::too_many_arguments)]
 	fn get_entry_to_add<'a>(
+		&self,
 		e: &'a LogEntry,
 		selected: bool,
 		tags: Option<String>,
@@ -315,6 +316,9 @@ impl CommitList {
 		let splitter =
 			Span::styled(splitter_txt, theme.text(true, selected));
 
+		let normal = !self.items.highlighting()
+			|| (self.items.highlighting() && e.highlighted);
+
 		// marker
 		if let Some(marked) = marked {
 			txt.push(Span::styled(
@@ -331,15 +335,19 @@ impl CommitList {
 		// commit hash
 		txt.push(Span::styled(
 			Cow::from(&*e.hash_short),
-			theme.commit_hash(selected),
+			normal
+				.then(|| theme.commit_hash(selected))
+				.unwrap_or_else(|| theme.commit_unhighlighted()),
 		));
 
 		txt.push(splitter.clone());
 
 		// commit timestamp
 		txt.push(Span::styled(
 			Cow::from(e.time_to_string(now)),
-			theme.commit_time(selected),
+			normal
+				.then(|| theme.commit_time(selected))
+				.unwrap_or_else(|| theme.commit_unhighlighted()),
 		));
 
 		txt.push(splitter.clone());
@@ -351,30 +359,41 @@ impl CommitList {
 		// commit author
 		txt.push(Span::styled::<String>(
 			author,
-			theme.commit_author(selected),
+			normal
+				.then(|| theme.commit_author(selected))
+				.unwrap_or_else(|| theme.commit_unhighlighted()),
 		));
 
 		txt.push(splitter.clone());
 
 		// commit tags
 		if let Some(tags) = tags {
 			txt.push(splitter.clone());
-			txt.push(Span::styled(tags, theme.tags(selected)));
+			txt.push(Span::styled(
+				tags,
+				normal
+					.then(|| theme.tags(selected))
+					.unwrap_or_else(|| theme.commit_unhighlighted()),
+			));
 		}
 
 		if let Some(local_branches) = local_branches {
 			txt.push(splitter.clone());
 			txt.push(Span::styled(
 				local_branches,
-				theme.branch(selected, true),
+				normal
+					.then(|| theme.branch(selected, true))
+					.unwrap_or_else(|| theme.commit_unhighlighted()),
 			));
 		}
 
 		if let Some(remote_branches) = remote_branches {
 			txt.push(splitter.clone());
 			txt.push(Span::styled(
 				remote_branches,
-				theme.branch(selected, true),
+				normal
+					.then(|| theme.branch(selected, true))
+					.unwrap_or_else(|| theme.commit_unhighlighted()),
 			));
 		}
 
@@ -387,7 +406,9 @@ impl CommitList {
 		// commit msg
 		txt.push(Span::styled(
 			format!("{:message_width$}", &e.msg),
-			theme.text(true, selected),
+			normal
+				.then(|| theme.text(true, selected))
+				.unwrap_or_else(|| theme.commit_unhighlighted()),
 		));
 
 		Line::from(txt)
@@ -428,57 +449,18 @@ impl CommitList {
 						.join(" ")
 				});
 
-			let remote_branches = self
-				.remote_branches
-				.get(&e.id)
-				.and_then(|remote_branches| {
-					let filtered_branches: Vec<_> = remote_branches
-						.iter()
-						.filter(|remote_branch| {
-							self.local_branches
-								.get(&e.id)
-								.map_or(true, |local_branch| {
-									local_branch.iter().any(
-										|local_branch| {
-											let has_corresponding_local_branch = match &local_branch.details {
-												BranchDetails::Local(details) =>
-													details
-														.upstream
-														.as_ref()
-														.map_or(false, |upstream| upstream.reference == remote_branch.reference),
-												BranchDetails::Remote(_) =>
-														false,
-											};
-
-											!has_corresponding_local_branch
-										},
-									)
-								})
-						})
-						.map(|remote_branch| {
-							format!("[{0}]", remote_branch.name)
-						})
-						.collect();
-
-					if filtered_branches.is_empty() {
-						None
-					} else {
-						Some(filtered_branches.join(" "))
-					}
-				});
-
 			let marked = if any_marked {
 				self.is_marked(&e.id)
 			} else {
 				None
 			};
 
-			txt.push(Self::get_entry_to_add(
+			txt.push(self.get_entry_to_add(
 				e,
 				idx + self.scroll_top.get() == selection,
 				tags,
 				local_branches,
-				remote_branches,
+				self.remote_branches_string(e),
 				&self.theme,
 				width,
 				now,
@@ -489,6 +471,51 @@ impl CommitList {
 		txt
 	}
 
+	fn remote_branches_string(&self, e: &LogEntry) -> Option<String> {
+		self.remote_branches.get(&e.id).and_then(|remote_branches| {
+			let filtered_branches: Vec<_> = remote_branches
+				.iter()
+				.filter(|remote_branch| {
+					self.local_branches.get(&e.id).map_or(
+						true,
+						|local_branch| {
+							local_branch.iter().any(|local_branch| {
+								let has_corresponding_local_branch =
+									match &local_branch.details {
+										BranchDetails::Local(
+											details,
+										) => details
+											.upstream
+											.as_ref()
+											.map_or(
+												false,
+												|upstream| {
+													upstream.reference == remote_branch.reference
+												},
+											),
+										BranchDetails::Remote(_) => {
+											false
+										}
+									};
+
+								!has_corresponding_local_branch
+							})
+						},
+					)
+				})
+				.map(|remote_branch| {
+					format!("[{0}]", remote_branch.name)
+				})
+				.collect();
+
+			if filtered_branches.is_empty() {
+				None
+			} else {
+				Some(filtered_branches.join(" "))
+			}
+		})
+	}
+
 	#[allow(clippy::missing_const_for_fn)]
 	fn relative_selection(&self) -> usize {
 		self.selection.saturating_sub(self.items.index_offset())

src/components/file_revlog.rs

@@ -257,7 +257,7 @@ impl FileRevlogComponent {
 				//
 				// [gitui-issue]: https://github.com/extrawurst/gitui/issues/1560
 				// [tui-issue]: https://github.com/fdehau/tui-rs/issues/626
-				self.items.set_items(0, commits);
+				self.items.set_items(0, commits, &None);
 			}
 
 			self.table_state.set(table_state);

src/components/utils/logitems.rs

@@ -1,6 +1,6 @@
 use asyncgit::sync::{CommitId, CommitInfo};
 use chrono::{DateTime, Duration, Local, NaiveDateTime, Utc};
-use std::slice::Iter;
+use std::{collections::HashSet, slice::Iter};
 
 #[cfg(feature = "ghemoji")]
 use super::emoji::emojifi_string;
@@ -18,6 +18,7 @@ pub struct LogEntry {
 	//TODO: use tinyvec here
 	pub hash_short: BoxStr,
 	pub id: CommitId,
+	pub highlighted: bool,
 }
 
 impl From<CommitInfo> for LogEntry {
@@ -49,6 +50,7 @@ impl From<CommitInfo> for LogEntry {
 			time,
 			hash_short,
 			id: c.id,
+			highlighted: false,
 		}
 	}
 }
@@ -76,6 +78,7 @@ impl LogEntry {
 pub struct ItemBatch {
 	index_offset: usize,
 	items: Vec<LogEntry>,
+	highlighting: bool,
 }
 
 impl ItemBatch {
@@ -88,6 +91,11 @@ impl ItemBatch {
 		self.index_offset
 	}
 
+	///
+	pub const fn highlighting(&self) -> bool {
+		self.highlighting
+	}
+
 	/// shortcut to get an `Iter` of our internal items
 	pub fn iter(&self) -> Iter<'_, LogEntry> {
 		self.items.iter()
@@ -103,9 +111,24 @@ impl ItemBatch {
 		&mut self,
 		start_index: usize,
 		commits: Vec<CommitInfo>,
+		hightlighted: &Option<HashSet<CommitId>>,
 	) {
+		log::debug!("highlighted: {:?}", hightlighted);
 		self.items.clear();
-		self.items.extend(commits.into_iter().map(LogEntry::from));
+		self.items.extend(commits.into_iter().map(|c| {
+			let id = c.id;
+			let mut entry = LogEntry::from(c);
+			if hightlighted
+				.as_ref()
+				.map(|highlighted| highlighted.contains(&id))
+				.unwrap_or_default()
+			{
+				log::debug!("highlighting: {:?}", id);
+				entry.highlighted = true;
+			}
+			entry
+		}));
+		self.highlighting = hightlighted.is_some();
 		self.index_offset = start_index;
 	}
 

src/tabs/revlog.rs

@@ -24,7 +24,7 @@ use ratatui::{
 	layout::{Constraint, Direction, Layout, Rect},
 	Frame,
 };
-use std::time::Duration;
+use std::{collections::HashSet, time::Duration};
 use sync::CommitTags;
 
 const SLICE_SIZE: usize = 1200;
@@ -35,6 +35,7 @@ pub struct Revlog {
 	commit_details: CommitDetailsComponent,
 	list: CommitList,
 	git_log: AsyncLog,
+
 	git_tags: AsyncTags,
 	git_local_branches: AsyncSingleJob<AsyncBranchesJob>,
 	git_remote_branches: AsyncSingleJob<AsyncBranchesJob>,
@@ -184,7 +185,14 @@ impl Revlog {
 		);
 
 		if let Ok(commits) = commits {
-			self.list.items().set_items(want_min, commits);
+			let highlighted: HashSet<CommitId> =
+				commits.iter().map(|c| c.id).take(10).collect();
+
+			self.list.items().set_items(
+				want_min,
+				commits,
+				&Some(highlighted),
+			);
 		}
 
 		Ok(())

src/tabs/stashlist.rs

@@ -55,7 +55,7 @@ impl StashList {
 			)?;
 
 			self.list.set_count_total(commits.len());
-			self.list.items().set_items(0, commits);
+			self.list.items().set_items(0, commits, &None);
 		}
 
 		Ok(())

src/ui/style.rs

@@ -212,6 +212,10 @@ impl Theme {
 		)
 	}
 
+	pub fn commit_unhighlighted(&self) -> Style {
+		Style::default().fg(self.disabled_fg)
+	}
+
 	pub fn log_marker(&self, selected: bool) -> Style {
 		let mut style = Style::default()
 			.fg(self.commit_author)