From f45af0e3cf15154a1c1528cd41d91ff33f9a2e15 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 22 Jul 2020 10:37:47 +0200 Subject: [PATCH] fix multiple tags not being seperated in details view (fixes #212) --- CHANGELOG.md | 1 + src/components/commit_details/details.rs | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aacbc2dd..c979fb4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - min size for relative popups on small terminals ([#179](https://github.com/extrawurst/gitui/issues/179)) - fix crash on resizing terminal to very small width ([#198](https://github.com/extrawurst/gitui/issues/198)) - fix broken tags when using a different internal representation ([#206](https://github.com/extrawurst/gitui/issues/206)) +- tags are not cleanly seperated in details view ([#212](https://github.com/extrawurst/gitui/issues/212)) ## [0.8.1] - 2020-07-07 diff --git a/src/components/commit_details/details.rs b/src/components/commit_details/details.rs index 655bb98d..075e45e1 100644 --- a/src/components/commit_details/details.rs +++ b/src/components/commit_details/details.rs @@ -12,6 +12,7 @@ use asyncgit::{ CWD, }; use crossterm::event::Event; +use itertools::Itertools; use std::borrow::Cow; use sync::CommitTags; use tui::{ @@ -159,12 +160,20 @@ impl DetailsComponent { self.theme.text(false, false), )); - for tag in &self.tags { - res.push(Text::Styled( - Cow::from(tag), - self.theme.text(true, false), - )); - } + res.extend( + self.tags + .iter() + .map(|tag| { + Text::Styled( + Cow::from(tag), + self.theme.text(true, false), + ) + }) + .intersperse(Text::Styled( + Cow::from(","), + self.theme.text(true, false), + )), + ); } res