Fix quality issues (#1856)

* Add .deepsource.toml

* Remove unnecessary comparison with bool

* Remove unnecessary use of slice

* Replace multiple `append`s with one

* Remove unnecessary wrapping of function call

* Fix check for empty string

* Simplify error creation with `fmt.Errorf`

* Fix defers before error check

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Remove untrappable `os.Kill` signal

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Remove empty else branch

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Add missing error check

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Merge variable declaration and assignment

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Remove unnecessary `nil` check

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Revert changes to generated files

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
* Remove .deepsource.toml

Signed-off-by: sourya_deepsource <sourya@deepsource.io>
Co-authored-by: DeepSource Bot <bot@deepsource.io>
Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>

diff --git a/cmd/micro/initlua.go b/cmd/micro/initlua.go
index 8b1dca82311d066f4632cca47b914d2c15fa65f4..9d90b48239f4de2a5aa42ffa9d26f4507b7f37e0 100644 (file)
--- a/cmd/micro/initlua.go
+++ b/cmd/micro/initlua.go
@@ -50,9 +50,7 @@ func luaImportMicro() *lua.LTable {
        ulua.L.SetField(pkg, "CurPane", luar.New(ulua.L, func() action.Pane {
                return action.MainTab().CurPane()
        }))
-       ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, func() *action.Tab {
-               return action.MainTab()
-       }))
+       ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, action.MainTab))
        ulua.L.SetField(pkg, "Tabs", luar.New(ulua.L, func() *action.TabList {
                return action.Tabs
        }))

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index e669d4dbef1d8bdc0749b69d10e93867bf6766d2..502fb1376bca079c6ac4b41ca519daa645279e07 100644 (file)
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -272,7 +272,7 @@ func main() {
        }
 
        c := make(chan os.Signal, 1)
-       signal.Notify(c, os.Kill, syscall.SIGTERM)
+       signal.Notify(c, syscall.SIGTERM)
 
        go func() {
                <-c

diff --git a/internal/action/actions.go b/internal/action/actions.go
index 4bc5034b69d5ee4b5abcb9aa54e978b0c9f9c7fa..b69ac2d0dc0ea6b25942f92444c7fd6311b80c1a 100644 (file)
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
@@ -991,7 +991,7 @@ func (h *BufPane) CutLine() bool {
        if !h.Cursor.HasSelection() {
                return false
        }
-       if h.freshClip == true {
+       if h.freshClip {
                if h.Cursor.HasSelection() {
                        if clip, err := clipboard.Read(clipboard.ClipboardReg); err != nil {
                                InfoBar.Error(err)
@@ -999,7 +999,7 @@ func (h *BufPane) CutLine() bool {
                                clipboard.WriteMulti(clip+string(h.Cursor.GetSelection()), clipboard.ClipboardReg, h.Cursor.Num, h.Buf.NumCursors())
                        }
                }
-       } else if time.Since(h.lastCutTime)/time.Second > 10*time.Second || h.freshClip == false {
+       } else if time.Since(h.lastCutTime)/time.Second > 10*time.Second || !h.freshClip {
                h.Copy()
        }
        h.freshClip = true

diff --git a/internal/action/bindings.go b/internal/action/bindings.go
index 80a7acffec75f75a76ef1ee92715470e8684bd57..fb924f58a6abc0df2f91df93556f655ba627e010 100644 (file)
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -159,7 +159,7 @@ modSearch:
                }
        }
 
-       if len(k) == 0 {
+       if k == "" {
                return KeyEvent{}, false
        }
 

diff --git a/internal/buffer/autocomplete.go b/internal/buffer/autocomplete.go
index 7af3f0b7f4429c574a8cf6d27e8e2b22035a04aa..b1c061cdd0f3388bbbc98b2bfbb24a85038c100d 100644 (file)
--- a/internal/buffer/autocomplete.go
+++ b/internal/buffer/autocomplete.go
@@ -54,8 +54,6 @@ func (b *Buffer) CycleAutocomplete(forward bool) {
        end := c.Loc
        if prevSuggestion < len(b.Suggestions) && prevSuggestion >= 0 {
                start = end.Move(-util.CharacterCountInString(b.Completions[prevSuggestion]), b)
-       } else {
-               // end = start.Move(1, b)
        }
 
        b.Replace(start, end, b.Completions[b.CurSuggestion])

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index 419b4a9bda46843be4d124cd3a46a51652637aa7..7ea9dbb2a39bc103ea3823c417c9b0d43bfe6432 100644 (file)
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -69,7 +69,7 @@ func (b *Buffer) Backup() error {
        }
 
        backupdir, err := util.ReplaceHome(b.Settings["backupdir"].(string))
-       if len(backupdir) == 0 || err != nil {
+       if backupdir == "" || err != nil {
                backupdir = filepath.Join(config.ConfigDir, "backups")
        }
        if _, err := os.Stat(backupdir); os.IsNotExist(err) {

diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index ae66be4b753dad07e4b0c2cf6cfedb147c4309f7..43be4a81ef689292930b02721edf9d07e147b1b4 100644 (file)
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -610,6 +610,9 @@ func (b *Buffer) UpdateRules() {
                }
 
                header, err = highlight.MakeHeaderYaml(data)
+               if err != nil {
+                       screen.TermMessage("Error parsing header for syntax file " + f.Name() + ": " + err.Error())
+               }
                file, err := highlight.ParseFile(data)
                if err != nil {
                        screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())

diff --git a/internal/buffer/line_array.go b/internal/buffer/line_array.go
index 717a9c002a6a279ed6c9ce60791518d4d6ee3eeb..a764ad23466cf780e3ffcad4c0ce53f91cddb272 100644 (file)
--- a/internal/buffer/line_array.go
+++ b/internal/buffer/line_array.go
@@ -130,7 +130,7 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
                if err != nil {
                        if err == io.EOF {
                                la.lines = Append(la.lines, Line{
-                                       data:        data[:],
+                                       data:        data,
                                        state:       nil,
                                        match:       nil,
                                        rehighlight: false,

diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go
index c6a7c7424de422e4da7c25ea49ce717162d230f5..e72311da8b6ae06fc1396b6a4fe843bd712f8706 100644 (file)
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -51,8 +51,8 @@ func (b *Buffer) Unserialize() error {
                return nil
        }
        file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
-       defer file.Close()
        if err == nil {
+               defer file.Close()
                var buffer SerializedBuffer
                decoder := gob.NewDecoder(file)
                err = decoder.Decode(&buffer)

diff --git a/internal/config/colorscheme.go b/internal/config/colorscheme.go
index 7d2fd9cf6929d1d636bc6ff20d9dd07eeb288d9c..2e64efdd9448b588c6780d0c5542a95b087a3245 100644 (file)
--- a/internal/config/colorscheme.go
+++ b/internal/config/colorscheme.go
@@ -121,8 +121,7 @@ func ParseColorscheme(text string) (map[string]tcell.Style, error) {
 func StringToStyle(str string) tcell.Style {
        var fg, bg string
        spaceSplit := strings.Split(str, " ")
-       var split []string
-       split = strings.Split(spaceSplit[len(spaceSplit)-1], ",")
+       split := strings.Split(spaceSplit[len(spaceSplit)-1], ",")
        if len(split) > 1 {
                fg, bg = split[0], split[1]
        } else {

diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go
index 2d2e8026218506dfcdc41a2d6baaa0ea918d497d..14d4033061a78a19df1b10276176d98a992eaf1b 100644 (file)
--- a/internal/config/plugin_installer.go
+++ b/internal/config/plugin_installer.go
@@ -479,9 +479,7 @@ func (pl PluginPackages) GetAllVersions(name string) PluginVersions {
        result := make(PluginVersions, 0)
        p := pl.Get(name)
        if p != nil {
-               for _, v := range p.Versions {
-                       result = append(result, v)
-               }
+               result = append(result, p.Versions...)
        }
        return result
 }

diff --git a/internal/config/settings.go b/internal/config/settings.go
index efbc671ad23610b283e45a2d4b41aec8c76f02e2..317e116b893d51b283608a19615ca429be388506 100644 (file)
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -104,7 +104,7 @@ func InitGlobalSettings() error {
        for k, v := range parsedSettings {
                if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
                        if _, ok := GlobalSettings[k]; ok && !verifySetting(k, reflect.TypeOf(v), reflect.TypeOf(GlobalSettings[k])) {
-                               err = errors.New(fmt.Sprintf("Global Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v), GlobalSettings[k], reflect.TypeOf(GlobalSettings[k])))
+                               err = fmt.Errorf("Global Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v), GlobalSettings[k], reflect.TypeOf(GlobalSettings[k]))
                                continue
                        }
 
@@ -125,7 +125,7 @@ func InitLocalSettings(settings map[string]interface{}, path string) error {
                                if settings["filetype"].(string) == k[3:] {
                                        for k1, v1 := range v.(map[string]interface{}) {
                                                if _, ok := settings[k1]; ok && !verifySetting(k1, reflect.TypeOf(v1), reflect.TypeOf(settings[k1])) {
-                                                       parseError = errors.New(fmt.Sprintf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1])))
+                                                       parseError = fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1]))
                                                        continue
                                                }
                                                settings[k1] = v1
@@ -141,7 +141,7 @@ func InitLocalSettings(settings map[string]interface{}, path string) error {
                                if g.MatchString(path) {
                                        for k1, v1 := range v.(map[string]interface{}) {
                                                if _, ok := settings[k1]; ok && !verifySetting(k1, reflect.TypeOf(v1), reflect.TypeOf(settings[k1])) {
-                                                       parseError = errors.New(fmt.Sprintf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1])))
+                                                       parseError = fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1]))
                                                        continue
                                                }
                                                settings[k1] = v1

diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go
index f6c01de46a503b9c224c55a76a56ef728e723d61..afcfa5bc129736b4ee8a063ad4075fee22a82631 100644 (file)
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
@@ -557,7 +557,7 @@ func (w *BufWindow) displayBuffer() {
                                if r == '\t' {
                                        indentrunes := []rune(b.Settings["indentchar"].(string))
                                        // if empty indentchar settings, use space
-                                       if indentrunes == nil || len(indentrunes) == 0 {
+                                       if len(indentrunes) == 0 {
                                                indentrunes = []rune{' '}
                                        }
 

diff --git a/internal/info/history.go b/internal/info/history.go
index 193185ca3f00998817f4576a719331f1177d7798..722a22f78704c0725edd9e416223e752d03b5c32 100644 (file)
--- a/internal/info/history.go
+++ b/internal/info/history.go
@@ -14,9 +14,9 @@ import (
 func (i *InfoBuf) LoadHistory() {
        if config.GetGlobalOption("savehistory").(bool) {
                file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", "history"))
-               defer file.Close()
                var decodedMap map[string][]string
                if err == nil {
+                       defer file.Close()
                        decoder := gob.NewDecoder(file)
                        err = decoder.Decode(&decodedMap)
 
@@ -48,8 +48,8 @@ func (i *InfoBuf) SaveHistory() {
                }
 
                file, err := os.Create(filepath.Join(config.ConfigDir, "buffers", "history"))
-               defer file.Close()
                if err == nil {
+                       defer file.Close()
                        encoder := gob.NewEncoder(file)
 
                        err = encoder.Encode(i.History)

diff --git a/internal/info/infobuffer.go b/internal/info/infobuffer.go
index a3b4e368a6e6f14939fd2dee57ce0688454b05b7..048e3cb28135cf634ee0815d2850f459f4a1dfbe 100644 (file)
--- a/internal/info/infobuffer.go
+++ b/internal/info/infobuffer.go
@@ -54,7 +54,7 @@ func (i *InfoBuf) Close() {
 func (i *InfoBuf) Message(msg ...interface{}) {
        // only display a new message if there isn't an active prompt
        // this is to prevent overwriting an existing prompt to the user
-       if i.HasPrompt == false {
+       if !i.HasPrompt {
                displayMessage := fmt.Sprint(msg...)
                // if there is no active prompt then style and display the message as normal
                i.Msg = displayMessage
@@ -78,7 +78,7 @@ func (i *InfoBuf) ClearGutter() {
 func (i *InfoBuf) Error(msg ...interface{}) {
        // only display a new message if there isn't an active prompt
        // this is to prevent overwriting an existing prompt to the user
-       if i.HasPrompt == false {
+       if !i.HasPrompt {
                // if there is no active prompt then style and display the message as normal
                i.Msg = fmt.Sprint(msg...)
                i.HasMessage, i.HasError = false, true