From 4af1a385073f3ebd40ab5f2e3c823fcf0dc713d5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 24 Sep 2023 09:06:15 +0530
Subject: [PATCH] More linter fixes

---
 tools/tui/loop/api.go    | 8 ++++----
 tools/tui/loop/timers.go | 3 ++-
 tools/tui/loop/write.go  | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/tui/loop/api.go b/tools/tui/loop/api.go
index 1236e6212..2ec8db8e3 100644
--- a/tools/tui/loop/api.go
+++ b/tools/tui/loop/api.go
@@ -426,10 +426,10 @@ type DefaultColor int
 
 const (
 	BACKGROUND   DefaultColor = 11
-	FOREGROUND                = 10
-	CURSOR                    = 12
-	SELECTION_BG              = 17
-	SELECTION_FG              = 19
+	FOREGROUND   DefaultColor = 10
+	CURSOR       DefaultColor = 12
+	SELECTION_BG DefaultColor = 17
+	SELECTION_FG DefaultColor = 19
 )
 
 func (self *Loop) SetDefaultColor(which DefaultColor, val style.RGBA) {
diff --git a/tools/tui/loop/timers.go b/tools/tui/loop/timers.go
index 6be7a8ebe..3ade482cf 100644
--- a/tools/tui/loop/timers.go
+++ b/tools/tui/loop/timers.go
@@ -13,6 +13,7 @@ import (
 )
 
 var debugprintln = tty.DebugPrintln
+var _ = debugprintln
 
 type timer struct {
 	interval time.Duration
@@ -27,7 +28,7 @@ func (self *timer) update_deadline(now time.Time) {
 }
 
 func (self timer) String() string {
-	return fmt.Sprintf("Timer(id=%d, callback=%s, deadline=%s, repeats=%v)", self.id, utils.FunctionName(self.callback), self.deadline.Sub(time.Now()), self.repeats)
+	return fmt.Sprintf("Timer(id=%d, callback=%s, deadline=%s, repeats=%v)", self.id, utils.FunctionName(self.callback), time.Until(self.deadline), self.repeats)
 }
 
 func (self *Loop) add_timer(interval time.Duration, repeats bool, callback TimerCallback) (IdType, error) {
diff --git a/tools/tui/loop/write.go b/tools/tui/loop/write.go
index 1c53f6adb..166383582 100644
--- a/tools/tui/loop/write.go
+++ b/tools/tui/loop/write.go
@@ -79,7 +79,7 @@ func (self *Loop) wait_for_write_to_complete(sentinel IdType, tty_write_channel
 
 	end_time := time.Now().Add(timeout)
 	for num_sent < len(self.pending_writes) {
-		timeout = end_time.Sub(time.Now())
+		timeout = time.Until(end_time)
 		if timeout <= 0 {
 			return os.ErrDeadlineExceeded
 		}
@@ -104,7 +104,7 @@ func (self *Loop) wait_for_write_to_complete(sentinel IdType, tty_write_channel
 		}
 	}
 	for {
-		timeout = end_time.Sub(time.Now())
+		timeout = time.Until(end_time)
 		if timeout <= 0 {
 			return os.ErrDeadlineExceeded
 		}