From 53deef6627b45e5bdd2532512f809f6a07872ccc Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Sat, 11 Sep 2021 23:20:35 +0200 Subject: [PATCH] refactor(comments): Clean up formatting Clean up formatting of the comments and simplify it. Signed-off-by: Matej Focko --- src/core/comments.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/comments.go b/src/core/comments.go index 4f92c56..25e8526 100644 --- a/src/core/comments.go +++ b/src/core/comments.go @@ -13,16 +13,14 @@ func GetSeparatorForMultiline(config *Config) string { if config.Language.OpeningOnSeparateLine { return "\n" } - return " " + return "" } func FormatComment(config *Config, body string, beenWrapped bool) string { if beenWrapped && !config.Language.OpeningOnSeparateLine { - body = " " + strings.TrimPrefix(body, " "+config.Language.Continuation) - } - if !beenWrapped && !config.Language.OpeningOnSeparateLine && !strings.HasSuffix(body, "\n") { - body = body + "\n" + body = strings.TrimPrefix(body, config.Language.Continuation) } + body = strings.TrimRightFunc(body, unicode.IsSpace) return fmt.Sprintf("%s%s%s", config.Language.Opening, body, config.Language.Closing) } @@ -32,8 +30,6 @@ func ProcessComment(config *Config, wrapper *wrap.Wrapper, comment *gitea.PullRe beenWrapped := len(body)+len(config.Language.Opening)+len(config.Language.Closing) > 100 if beenWrapped { body = GetSeparatorForMultiline(config) + wrapper.Wrap(body, 100) - } else { - body = " " + body } body = strings.Replace(body, "\r", "", -1)