refactor: use a more modern writing style to simplify code (zyedidia#3834)

Signed-off-by: deepdring <[email protected]>

Author: deepdring

internal/action/actions.go

@@ -2083,14 +2083,14 @@ func (h *BufPane) LastSplit() bool {
 	return true
 }
 
-var curmacro []interface{}
+var curmacro []any
 var recordingMacro bool
 
 // ToggleMacro toggles recording of a macro
 func (h *BufPane) ToggleMacro() bool {
 	recordingMacro = !recordingMacro
 	if recordingMacro {
-		curmacro = []interface{}{}
+		curmacro = []any{}
 		InfoBar.Message("Recording")
 	} else {
 		InfoBar.Message("Stopped recording")

internal/action/bindings.go

@@ -36,7 +36,7 @@ func createBindingsIfNotExist(fname string) {
 
 // InitBindings intializes the bindings map by reading from bindings.json
 func InitBindings() {
-	var parsed map[string]interface{}
+	var parsed map[string]any
 
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
@@ -66,7 +66,7 @@ func InitBindings() {
 		switch val := v.(type) {
 		case string:
 			BindKey(k, val, Binder["buffer"])
-		case map[string]interface{}:
+		case map[string]any:
 			bind, ok := Binder[k]
 			if !ok || bind == nil {
 				screen.TermMessage(fmt.Sprintf("%s is not a valid pane type", k))
@@ -265,7 +265,7 @@ func eventsEqual(e1 Event, e2 Event) bool {
 // Returns true if the keybinding already existed and a possible error
 func TryBindKey(k, v string, overwrite bool) (bool, error) {
 	var e error
-	var parsed map[string]interface{}
+	var parsed map[string]any
 
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
@@ -318,7 +318,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 // UnbindKey removes the binding for a key from the bindings.json file
 func UnbindKey(k string) error {
 	var e error
-	var parsed map[string]interface{}
+	var parsed map[string]any
 
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)

internal/action/bufpane.go

@@ -16,7 +16,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/util"
 )
 
-type BufAction interface{}
+type BufAction any
 
 // BufKeyAction represents an action bound to a key.
 type BufKeyAction func(*BufPane) bool
@@ -324,7 +324,7 @@ func (h *BufPane) ResizePane(size int) {
 // error if there is one and returns the aggregate boolean response.
 // The bufpane is passed as the first argument to the callbacks,
 // optional args are passed as the next arguments.
-func (h *BufPane) PluginCB(cb string, args ...interface{}) bool {
+func (h *BufPane) PluginCB(cb string, args ...any) bool {
 	largs := []lua.LValue{luar.New(ulua.L, h)}
 	for _, a := range args {
 		largs = append(largs, luar.New(ulua.L, a))

internal/action/command.go

@@ -569,7 +569,7 @@ func (h *BufPane) NewTabCmd(args []string) {
 	}
 }
 
-func doSetGlobalOptionNative(option string, nativeValue interface{}) error {
+func doSetGlobalOptionNative(option string, nativeValue any) error {
 	if reflect.DeepEqual(config.GlobalSettings[option], nativeValue) {
 		return nil
 	}
@@ -628,7 +628,7 @@ func doSetGlobalOptionNative(option string, nativeValue interface{}) error {
 	return nil
 }
 
-func SetGlobalOptionNative(option string, nativeValue interface{}) error {
+func SetGlobalOptionNative(option string, nativeValue any) error {
 	if err := config.OptionIsValid(option, nativeValue); err != nil {
 		return err
 	}
@@ -737,7 +737,7 @@ func (h *BufPane) ShowCmd(args []string) {
 		return
 	}
 
-	var option interface{}
+	var option any
 	if opt, ok := h.Buf.Settings[args[0]]; ok {
 		option = opt
 	} else if opt, ok := config.GlobalSettings[args[0]]; ok {

internal/action/infocomplete.go

@@ -193,7 +193,7 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 	inputOpt = strings.TrimSpace(inputOpt)
 	var suggestions []string
 	// localSettings := config.DefaultLocalSettings()
-	var optionVal interface{}
+	var optionVal any
 	for k, option := range config.GlobalSettings {
 		if k == inputOpt {
 			optionVal = option

internal/action/terminal_supported.go

@@ -14,7 +14,7 @@ const TermEmuSupported = true
 // if wait is true it will wait for the user to exit by pressing enter once the executable has terminated
 // if getOutput is true it will redirect the stdout of the process to a pipe which will be passed to the
 // callback which is a function that takes a string and a list of optional user arguments
-func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
+func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback func(out string, userargs []any), userargs []any) error {
 	args, err := shellquote.Split(input)
 	if err != nil {
 		return err

internal/action/terminal_unsupported.go

@@ -8,6 +8,6 @@ import "errors"
 const TermEmuSupported = false
 
 // RunTermEmulator returns an error for unsupported systems (non-unix systems
-func RunTermEmulator(input string, wait bool, getOutput bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
+func RunTermEmulator(input string, wait bool, getOutput bool, callback func(out string, userargs []any), userargs []any) error {
 	return errors.New("Unsupported operating system")
 }

internal/buffer/buffer.go

@@ -82,7 +82,7 @@ type SharedBuffer struct {
 	toStdout bool
 
 	// Settings customized by the user
-	Settings map[string]interface{}
+	Settings map[string]any
 	// LocalSettings customized by the user for this buffer only
 	LocalSettings map[string]bool
 
@@ -236,7 +236,7 @@ type Buffer struct {
 	// is properly updated when needed. This is a workaround for the fact that
 	// the buffer module cannot directly call the display's API (it would mean
 	// a circular dependency between packages).
-	OptionCallback func(option string, nativeValue interface{})
+	OptionCallback func(option string, nativeValue any)
 
 	// The display module registers its own GetVisualX function for getting
 	// the correct visual x location of a cursor when softwrap is used.

internal/buffer/message.go

@@ -84,7 +84,7 @@ func (b *Buffer) ClearAllMessages() {
 }
 
 type Messager interface {
-	Message(msg ...interface{})
+	Message(msg ...any)
 }
 
 var prompt Messager

internal/buffer/settings.go

@@ -59,7 +59,7 @@ func (b *Buffer) ReloadSettings(reloadFiletype bool) {
 	}
 }
 
-func (b *Buffer) DoSetOptionNative(option string, nativeValue interface{}) {
+func (b *Buffer) DoSetOptionNative(option string, nativeValue any) {
 	oldValue := b.Settings[option]
 	if reflect.DeepEqual(oldValue, nativeValue) {
 		return
@@ -138,7 +138,7 @@ func (b *Buffer) DoSetOptionNative(option string, nativeValue interface{}) {
 	b.doCallbacks(option, oldValue, nativeValue)
 }
 
-func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
+func (b *Buffer) SetOptionNative(option string, nativeValue any) error {
 	if err := config.OptionIsValid(option, nativeValue); err != nil {
 		return err
 	}
@@ -163,7 +163,7 @@ func (b *Buffer) SetOption(option, value string) error {
 	return b.SetOptionNative(option, nativeValue)
 }
 
-func (b *Buffer) doCallbacks(option string, oldValue interface{}, newValue interface{}) {
+func (b *Buffer) doCallbacks(option string, oldValue any, newValue any) {
 	if b.OptionCallback != nil {
 		b.OptionCallback(option, newValue)
 	}