From 07d8189a07761b360ca35b974e2f39f437814b05 Mon Sep 17 00:00:00 2001
From: Jeremy Muriel <jeremy@jeremm.fr>
Date: Mon, 29 Apr 2024 17:24:07 +0200
Subject: [PATCH] lint: bump golangci-lint to v1.57

- update golangci config
- fix some new issues (revive)
---
 .github/workflows/golangci-lint.yml |  2 +-
 .golangci.yml                       | 48 ++++++++++++++++++++++++++---
 jdecode.go                          |  4 +--
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index e6309a3..ca9d458 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -16,5 +16,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v5
         with:
-          version: v1.56
+          version: v1.57
           args: -c .golangci.yml -v
diff --git a/.golangci.yml b/.golangci.yml
index e43c6ac..b1dbd33 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,21 +3,59 @@ run:
 linters:
   enable-all: true
   disable:
-    # maligned # deprecated 1.38 but govet-fieldalignment not usuable
+    - maligned # deprecated 1.38
     - interfacer # deprecated 1.38
     - scopelint # deprecated 1.39
     - golint # deprecated 1.41
     - exhaustivestruct # deprecated 1.46
-    # ifshort # deprecated 1.48 but no replacement
+    - ifshort # deprecated 1.48
     - nosnakecase # deprecated 1.48.1
-    - structcheck # deprecated 1.49.0
-    - deadcode # deprecated 1.49.0
-    - varcheck # deprecated 1.49.0
+    - deadcode # deprecated 1.49
+    - structcheck # deprecated 1.49
+    - varcheck # deprecated 1.49
     - wsl
     - gochecknoglobals
     - gomnd
     - nonamedreturns
     - depguard
 linters-settings:
+  gofumpt:
+    extra-rules: true
   govet:
     enable-all: true
+  revive:
+    rules:
+      # defaults
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: dot-imports
+      - name: empty-block
+      - name: error-naming
+      - name: error-return
+      - name: error-strings
+      - name: errorf
+      - name: exported
+      - name: increment-decrement
+      - name: indent-error-flow
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: redefines-builtin-id
+      - name: superfluous-else
+      - name: time-naming
+      - name: unexported-return
+      - name: unreachable-code
+      - name: unused-parameter
+      - name: var-declaration
+      - name: var-naming
+      # additionals
+      - name: confusing-naming
+      - name: import-alias-naming
+      - name: import-shadowing
+      - name: unhandled-error
+issues:
+  exclude-rules:
+    - path: '^example_test\.go$'
+      linters:
+        - revive
diff --git a/jdecode.go b/jdecode.go
index 4e469fb..f5fdb08 100644
--- a/jdecode.go
+++ b/jdecode.go
@@ -113,7 +113,7 @@ func newDictAlpha() dictAlpha {
 }
 
 // gapDecode.
-func gapDecode(gaps []int, dec []int) (string, error) {
+func gapDecode(gaps, dec []int) (string, error) {
 	var num int
 
 	if len(gaps) != len(dec) {
@@ -137,7 +137,7 @@ func nibble(cref string, length int) (string, string) {
 }
 
 // gap betwean characters.
-func (d *dictAlpha) gap(c1 string, c2 string) int {
+func (d *dictAlpha) gap(c1, c2 string) int {
 	c1rune := []rune(c1)
 	c2rune := []rune(c2)