From ebe1cad53a95e378d176ae29f117c902a8e8e9ea Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Mon, 6 May 2024 21:26:38 +0900
Subject: [PATCH] code styles

---
 main.go               |  4 ++--
 src/algo/algo.go      |  2 +-
 src/algo/normalize.go |  2 +-
 src/ansi.go           |  2 +-
 src/server.go         |  3 +--
 src/terminal.go       | 11 +++++------
 src/tui/dummy.go      |  2 +-
 src/tui/light.go      |  4 ++--
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/main.go b/main.go
index ff882557..f0074b3e 100644
--- a/main.go
+++ b/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/junegunn/fzf/src/protector"
 )
 
-var version string = "0.51"
-var revision string = "devel"
+var version = "0.51"
+var revision = "devel"
 
 //go:embed shell/key-bindings.bash
 var bashKeyBindings []byte
diff --git a/src/algo/algo.go b/src/algo/algo.go
index 3e689746..c85ec82e 100644
--- a/src/algo/algo.go
+++ b/src/algo/algo.go
@@ -152,7 +152,7 @@ var (
 	// Extra bonus for word boundary after slash, colon, semi-colon, and comma
 	bonusBoundaryDelimiter int16 = bonusBoundary + 1
 
-	initialCharClass charClass = charWhite
+	initialCharClass = charWhite
 
 	// A minor optimization that can give 15%+ performance boost
 	asciiCharClasses [unicode.MaxASCII + 1]charClass
diff --git a/src/algo/normalize.go b/src/algo/normalize.go
index 93247908..25e92983 100644
--- a/src/algo/normalize.go
+++ b/src/algo/normalize.go
@@ -3,7 +3,7 @@
 
 package algo
 
-var normalized map[rune]rune = map[rune]rune{
+var normalized = map[rune]rune{
 	0x00E1: 'a', //  WITH ACUTE, LATIN SMALL LETTER
 	0x0103: 'a', //  WITH BREVE, LATIN SMALL LETTER
 	0x01CE: 'a', //  WITH CARON, LATIN SMALL LETTER
diff --git a/src/ansi.go b/src/ansi.go
index db1c9dcc..dbe4fd66 100644
--- a/src/ansi.go
+++ b/src/ansi.go
@@ -350,7 +350,7 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 	state256 := 0
 	ptr := &state.fg
 
-	var delimiter byte = 0
+	var delimiter byte
 	count := 0
 	for len(ansiCode) != 0 {
 		var num int
diff --git a/src/server.go b/src/server.go
index 42cb9854..0f325d8c 100644
--- a/src/server.go
+++ b/src/server.go
@@ -110,9 +110,8 @@ func startHttpServer(address listenAddress, actionChannel chan []*action, respon
 			if err != nil {
 				if errors.Is(err, net.ErrClosed) {
 					return
-				} else {
-					continue
 				}
+				continue
 			}
 			conn.Write([]byte(server.handleHttpRequest(conn)))
 			conn.Close()
diff --git a/src/terminal.go b/src/terminal.go
index cd9c0e13..6879db21 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -2244,9 +2244,8 @@ Loop:
 						t.pwindow.Move(height-1, maxWidth-1)
 						t.previewed.filled = true
 						break Loop
-					} else {
-						t.pwindow.MoveAndClear(y+requiredLines, 0)
 					}
+					t.pwindow.MoveAndClear(y+requiredLines, 0)
 				}
 			}
 
@@ -3173,7 +3172,7 @@ func (t *Terminal) Loop() error {
 	}
 
 	go func() {
-		var focusedIndex int32 = minItem.Index()
+		var focusedIndex = minItem.Index()
 		var version int64 = -1
 		running := true
 		code := ExitError
@@ -4072,10 +4071,10 @@ func (t *Terminal) Loop() error {
 				}
 
 				if me.Down {
-					mx_cons := util.Constrain(mx-t.promptLen, 0, len(t.input))
-					if my == t.promptLine() && mx_cons >= 0 {
+					mxCons := util.Constrain(mx-t.promptLen, 0, len(t.input))
+					if my == t.promptLine() && mxCons >= 0 {
 						// Prompt
-						t.cx = mx_cons + t.xoffset
+						t.cx = mxCons + t.xoffset
 					} else if my >= min {
 						t.vset(t.offset + my - min)
 						req(reqList)
diff --git a/src/tui/dummy.go b/src/tui/dummy.go
index 3456907f..1a761460 100644
--- a/src/tui/dummy.go
+++ b/src/tui/dummy.go
@@ -8,7 +8,7 @@ func HasFullscreenRenderer() bool {
 	return false
 }
 
-var DefaultBorderShape BorderShape = BorderRounded
+var DefaultBorderShape = BorderRounded
 
 func (a Attr) Merge(b Attr) Attr {
 	return a | b
diff --git a/src/tui/light.go b/src/tui/light.go
index 84a4c701..3ef8b60e 100644
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -29,8 +29,8 @@ const (
 
 const consoleDevice string = "/dev/tty"
 
-var offsetRegexp *regexp.Regexp = regexp.MustCompile("(.*)\x1b\\[([0-9]+);([0-9]+)R")
-var offsetRegexpBegin *regexp.Regexp = regexp.MustCompile("^\x1b\\[[0-9]+;[0-9]+R")
+var offsetRegexp = regexp.MustCompile("(.*)\x1b\\[([0-9]+);([0-9]+)R")
+var offsetRegexpBegin = regexp.MustCompile("^\x1b\\[[0-9]+;[0-9]+R")
 
 func (r *LightRenderer) PassThrough(str string) {
 	r.queued.WriteString("\x1b7" + str + "\x1b8")