cleanup

Author: extrawurst

Diff for: src/components/commitlist.rs

@@ -332,22 +332,34 @@ impl CommitList {
 			txt.push(splitter.clone());
 		}
 
+		let style_hash = normal
+			.then(|| theme.commit_hash(selected))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_time = normal
+			.then(|| theme.commit_time(selected))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_author = normal
+			.then(|| theme.commit_author(selected))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_tags = normal
+			.then(|| theme.tags(selected))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_branches = normal
+			.then(|| theme.branch(selected, true))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_msg = normal
+			.then(|| theme.text(true, selected))
+			.unwrap_or_else(|| theme.commit_unhighlighted());
+
 		// commit hash
-		txt.push(Span::styled(
-			Cow::from(&*e.hash_short),
-			normal
-				.then(|| theme.commit_hash(selected))
-				.unwrap_or_else(|| theme.commit_unhighlighted()),
-		));
+		txt.push(Span::styled(Cow::from(&*e.hash_short), style_hash));
 
 		txt.push(splitter.clone());
 
 		// commit timestamp
 		txt.push(Span::styled(
 			Cow::from(e.time_to_string(now)),
-			normal
-				.then(|| theme.commit_time(selected))
-				.unwrap_or_else(|| theme.commit_unhighlighted()),
+			style_time,
 		));
 
 		txt.push(splitter.clone());
@@ -357,44 +369,23 @@ impl CommitList {
 		let author = string_width_align(&e.author, author_width);
 
 		// commit author
-		txt.push(Span::styled::<String>(
-			author,
-			normal
-				.then(|| theme.commit_author(selected))
-				.unwrap_or_else(|| theme.commit_unhighlighted()),
-		));
+		txt.push(Span::styled::<String>(author, style_author));
 
 		txt.push(splitter.clone());
 
 		// commit tags
 		if let Some(tags) = tags {
 			txt.push(splitter.clone());
-			txt.push(Span::styled(
-				tags,
-				normal
-					.then(|| theme.tags(selected))
-					.unwrap_or_else(|| theme.commit_unhighlighted()),
-			));
+			txt.push(Span::styled(tags, style_tags));
 		}
 
 		if let Some(local_branches) = local_branches {
 			txt.push(splitter.clone());
-			txt.push(Span::styled(
-				local_branches,
-				normal
-					.then(|| theme.branch(selected, true))
-					.unwrap_or_else(|| theme.commit_unhighlighted()),
-			));
+			txt.push(Span::styled(local_branches, style_branches));
 		}
-
 		if let Some(remote_branches) = remote_branches {
 			txt.push(splitter.clone());
-			txt.push(Span::styled(
-				remote_branches,
-				normal
-					.then(|| theme.branch(selected, true))
-					.unwrap_or_else(|| theme.commit_unhighlighted()),
-			));
+			txt.push(Span::styled(remote_branches, style_branches));
 		}
 
 		txt.push(splitter);
@@ -406,9 +397,7 @@ impl CommitList {
 		// commit msg
 		txt.push(Span::styled(
 			format!("{:message_width$}", &e.msg),
-			normal
-				.then(|| theme.text(true, selected))
-				.unwrap_or_else(|| theme.commit_unhighlighted()),
+			style_msg,
 		));
 
 		Line::from(txt)