diff options
author | Hubert Hirtz <hubert@hirtz.pm> | 2021-09-11 19:29:44 +0200 |
---|---|---|
committer | Hubert Hirtz <hubert@hirtz.pm> | 2021-09-11 19:29:44 +0200 |
commit | b4f3d87adaf88b2ad9793d2140dfc3a323431302 (patch) | |
tree | 4f980014388c454018f5166935c8940713e9f865 | |
parent | Fix typos (diff) |
Random code improvements/tidying
Diffstat (limited to '')
-rw-r--r-- | app.go | 18 | ||||
-rw-r--r-- | ui/buffers.go | 2 | ||||
-rw-r--r-- | ui/editor.go | 2 |
3 files changed, 10 insertions, 12 deletions
@@ -515,7 +515,7 @@ func (app *App) handleIRCEvent(ev interface{}) { // TODO: support autojoining channels with keys app.s.Join(channel, "") } - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.WriteString("Connected to the server") if app.s.Nick() != app.cfg.Nick { body.WriteString(" as ") @@ -527,7 +527,7 @@ func (app *App) handleIRCEvent(ev interface{}) { Body: body.StyledString(), }) case irc.SelfNickEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.FormerNick) + 4 + len(app.s.Nick())) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorGray)) body.WriteString(ev.FormerNick) @@ -543,7 +543,7 @@ func (app *App) handleIRCEvent(ev interface{}) { Highlight: true, }) case irc.UserNickEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.FormerNick) + 4 + len(ev.User)) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorGray)) body.WriteString(ev.FormerNick) @@ -579,7 +579,7 @@ func (app *App) handleIRCEvent(ev interface{}) { app.printTopic(ev.Channel) } case irc.UserJoinEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.User) + 1) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorGreen)) body.WriteByte('+') @@ -595,7 +595,7 @@ func (app *App) handleIRCEvent(ev interface{}) { case irc.SelfPartEvent: app.win.RemoveBuffer(ev.Channel) case irc.UserPartEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.User) + 1) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorRed)) body.WriteByte('-') @@ -609,7 +609,7 @@ func (app *App) handleIRCEvent(ev interface{}) { Mergeable: true, }) case irc.UserQuitEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.User) + 1) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorRed)) body.WriteByte('-') @@ -625,7 +625,7 @@ func (app *App) handleIRCEvent(ev interface{}) { }) } case irc.TopicChangeEvent: - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder body.Grow(len(ev.Topic) + 18) body.SetStyle(tcell.StyleDefault.Foreground(tcell.ColorGray)) body.WriteString("Topic changed to: ") @@ -846,11 +846,11 @@ func (app *App) formatMessage(ev irc.MessageEvent) (buffer string, line ui.Line, } content := strings.TrimSuffix(ev.Content, "\x01") - content = strings.TrimRightFunc(ev.Content, unicode.IsSpace) + content = strings.TrimRightFunc(content, unicode.IsSpace) if isAction { content = content[7:] } - body := new(ui.StyledStringBuilder) + var body ui.StyledStringBuilder if isNotice { color := identColor(ev.User) body.SetStyle(tcell.StyleDefault.Foreground(color)) diff --git a/ui/buffers.go b/ui/buffers.go index cb12c1e..db2bc97 100644 --- a/ui/buffers.go +++ b/ui/buffers.go @@ -408,7 +408,6 @@ func (bs *BufferList) DrawVerticalBufferList(screen tcell.Screen, x0, y0, width, } screen.SetContent(x0+width, y, 0x2590, nil, st) } - y++ } } @@ -472,7 +471,6 @@ func (bs *BufferList) DrawVerticalMemberList(screen tcell.Screen, x0, y0, width, } name := truncate(m.Name.Name, width-(x-x0), "\u2026") printString(screen, &x, y, Styled(name, st)) - y++ } } diff --git a/ui/editor.go b/ui/editor.go index ec4a868..5e3105b 100644 --- a/ui/editor.go +++ b/ui/editor.go @@ -447,7 +447,7 @@ func runeToLower(r rune) rune { // runeOffset returns the rune index of the rune starting at byte i in string s func runeOffset(s string, pos int) int { n := 0 - for i, _ := range s { + for i := range s { if i >= pos { return n } |