From d7d654e2ec0a1d001f936b1575a3e6af3973a874 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 24 Apr 2018 22:49:41 +0300 Subject: Flatten calculateBufferWithText() and gofmt --- ui/messages/textbase.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'ui/messages') diff --git a/ui/messages/textbase.go b/ui/messages/textbase.go index 79913f8..f44d5d5 100644 --- a/ui/messages/textbase.go +++ b/ui/messages/textbase.go @@ -72,14 +72,18 @@ func (msg *BaseTextMessage) calculateBufferWithText(text tstring.TString, width } matches := boundaryPattern.FindAllStringIndex(extract.String(), -1) - if len(matches) > 0 { - match := matches[len(matches)-1] - if len(match) > 1 { - until := match[1] - if until < len(extract) { - extract = extract[:until] - } - } + if len(matches) == 0 { + continue + } + + match := matches[len(matches)-1] + if len(match) < 2 { + continue + } + + until := match[1] + if until < len(extract) { + extract = extract[:until] } } msg.buffer = append(msg.buffer, extract) -- cgit v1.2.3