From d09f594aac8ec4924d649cc15dd2e2ac7e614da8 Mon Sep 17 00:00:00 2001 From: contact Date: Fri, 25 Feb 2022 10:32:09 +0000 Subject: [PATCH] irc: simplify isHighlight git-svn-id: file:///srv/svn/repo/suika/trunk@786 f0ae65fe-ee39-954e-97ec-027ff2717ef4 --- irc.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/irc.go b/irc.go index ba44048..aa725cd 100644 --- a/irc.go +++ b/irc.go @@ -681,10 +681,8 @@ func (cm *monitorCasemapMap) Value(name string) (online bool) { func isWordBoundary(r rune) bool { switch r { - case '-', '_', '|': + case '-', '_', '|': // inspired from weechat.look.highlight_regex return false - case '\u00A0': - return true default: return !unicode.IsLetter(r) && !unicode.IsNumber(r) } @@ -697,14 +695,8 @@ func isHighlight(text, nick string) bool { return false } - // Detect word boundaries - var left, right rune - if i > 0 { - left, _ = utf8.DecodeLastRuneInString(text[:i]) - } - if i < len(text) { - right, _ = utf8.DecodeRuneInString(text[i+len(nick):]) - } + left, _ := utf8.DecodeLastRuneInString(text[:i]) + right, _ := utf8.DecodeRuneInString(text[i+len(nick):]) if isWordBoundary(left) && isWordBoundary(right) { return true }