From 81bc2dda5bba0c6bd6c813f7c3b156932e698311 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Sat, 1 Mar 2025 11:30:02 +0100
Subject: [PATCH] update linter

---
 .github/workflows/lint.yml | 2 +-
 .golangci.yml              | 5 +++--
 Makefile                   | 2 +-
 ui.go                      | 6 +++---
 utils.go                   | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0ccc03a..322879d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
 
     - uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.59.1
+        version: v1.64.5
 
   go-mod-tidy:
     runs-on: ubuntu-22.04
diff --git a/.golangci.yml b/.golangci.yml
index b418e77..4bfbdcf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,9 +3,10 @@ linters:
   - asciicheck
   - bidichk
   - bodyclose
+  #- contextcheck
+  - copyloopvar
   - dupl
   - errorlint
-  - exportloopref
   - gochecknoinits
   - gocritic
   - gofmt
@@ -18,7 +19,7 @@ linters:
   - revive
   - usestdlibvars
   - unconvert
-  - tenv
+  #- usetesting
   - tparallel
   - wastedassign
   - whitespace
diff --git a/Makefile b/Makefile
index e52053a..6fde7e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 BASE_IMAGE = golang:1.21-alpine3.18
-LINT_IMAGE = golangci/golangci-lint:v1.59.1
+LINT_IMAGE = golangci/golangci-lint:v1.64.5
 
 .PHONY: $(shell ls)
 
diff --git a/ui.go b/ui.go
index 61e4197..6129dec 100644
--- a/ui.go
+++ b/ui.go
@@ -527,9 +527,9 @@ func (u *ui) drawScrollbar(vertical bool, fixedCoord int, start int,
 	}
 
 	scrollZone := (scrollbarMaxSize - scrollbarSize)
-	min := scrollbarMaxSize - pageSize
-	if min != 0 {
-		start += (scrollZone - scrollZone*(cur-min)/(-min))
+	minVal := scrollbarMaxSize - pageSize
+	if minVal != 0 {
+		start += (scrollZone - scrollZone*(cur-minVal)/(-minVal))
 	}
 
 	if vertical {
diff --git a/utils.go b/utils.go
index 2d97e6c..c3c7b6d 100644
--- a/utils.go
+++ b/utils.go
@@ -105,14 +105,14 @@ func randInt63n(n int64) (int64, error) {
 		return v & (n - 1), nil
 	}
 
-	max := int64((1 << 63) - 1 - (1<<63)%uint64(n))
+	maxVal := int64((1 << 63) - 1 - (1<<63)%uint64(n))
 
 	v, err := randInt63()
 	if err != nil {
 		return 0, err
 	}
 
-	for v > max {
+	for v > maxVal {
 		v, err = randInt63()
 		if err != nil {
 			return 0, err