Merge pull request #1125 from nabeelomer/master

[micro.git] / cmd / micro / autocomplete.go

diff --git a/cmd/micro/autocomplete.go b/cmd/micro/autocomplete.go
index 9fba8f53afbc547e11be6588a3512e233fbfce18..3ecc3f16569bf300612b95561e0cf6f3dffd7552 100644 (file)
--- a/cmd/micro/autocomplete.go
+++ b/cmd/micro/autocomplete.go
@@ -4,8 +4,6 @@ import (
        "io/ioutil"
        "os"
        "strings"
-
-       "github.com/mitchellh/go-homedir"
 )
 
 var pluginCompletions []func(string) []string
@@ -22,13 +20,9 @@ func FileComplete(input string) (string, []string) {
        var files []os.FileInfo
        var err error
        if len(dirs) > 1 {
-               home, _ := homedir.Dir()
-
                directories := strings.Join(dirs[:len(dirs)-1], sep) + sep
 
-               if strings.HasPrefix(directories, "~") {
-                       directories = strings.Replace(directories, "~", home, 1)
-               }
+               directories = ReplaceHome(directories)
                files, err = ioutil.ReadDir(directories)
        } else {
                files, err = ioutil.ReadDir(".")
@@ -148,6 +142,7 @@ func OptionComplete(input string) (string, []string) {
        return chosen, suggestions
 }
 
+// OptionValueComplete completes values for various options
 func OptionValueComplete(inputOpt, input string) (string, []string) {
        inputOpt = strings.TrimSpace(inputOpt)
        var suggestions []string
@@ -187,6 +182,13 @@ func OptionValueComplete(inputOpt, input string) (string, []string) {
                        if strings.HasPrefix("dos", input) {
                                suggestions = append(suggestions, "dos")
                        }
+               case "sucmd":
+                       if strings.HasPrefix("sudo", input) {
+                               suggestions = append(suggestions, "sudo")
+                       }
+                       if strings.HasPrefix("doas", input) {
+                               suggestions = append(suggestions, "doas")
+                       }
                }
        }
 
@@ -218,6 +220,7 @@ func PluginComplete(complete Completion, input string) (chosen string, suggestio
        return
 }
 
+// PluginCmdComplete completes with possible choices for the `> plugin` command
 func PluginCmdComplete(input string) (chosen string, suggestions []string) {
        for _, cmd := range []string{"install", "remove", "search", "update", "list"} {
                if strings.HasPrefix(cmd, input) {
@@ -231,6 +234,7 @@ func PluginCmdComplete(input string) (chosen string, suggestions []string) {
        return chosen, suggestions
 }
 
+// PluginnameComplete completes with the names of loaded plugins
 func PluginNameComplete(input string) (chosen string, suggestions []string) {
        for _, pp := range GetAllPluginPackages() {
                if strings.HasPrefix(pp.Name, input) {