Merge pull request #359 from boombuler/params

Params

cmd/micro/autocomplete.go

@@ -18,12 +18,14 @@ var pluginCompletions []func(string) []string
 func FileComplete(input string) (string, []string) {
 	var sep string = string(os.PathSeparator)
 	dirs := strings.Split(input, sep)
+
 	var files []os.FileInfo
 	var err error
 	if len(dirs) > 1 {
 		home, _ := homedir.Dir()
 
-		directories := strings.Join(dirs[:len(dirs)-1], sep)
+		directories := strings.Join(dirs[:len(dirs)-1], sep) + sep
+
 		if strings.HasPrefix(directories, "~") {
 			directories = strings.Replace(directories, "~", home, 1)
 		}
@@ -31,6 +33,7 @@ func FileComplete(input string) (string, []string) {
 	} else {
 		files, err = ioutil.ReadDir(".")
 	}
+
 	var suggestions []string
 	if err != nil {
 		return "", suggestions

cmd/micro/util.go

@@ -230,42 +230,64 @@ func FuncName(i interface{}) string {
 // The returned slice contains at least one string
 func SplitCommandArgs(input string) []string {
 	var result []string
+	var curQuote *bytes.Buffer = nil
+
 	curArg := new(bytes.Buffer)
-	inQuote := false
 	escape := false
 
-	appendResult := func() {
-		str := curArg.String()
-		inQuote = false
-		escape = false
-		if strings.HasPrefix(str, `"`) && strings.HasSuffix(str, `"`) {
-			if unquoted, err := strconv.Unquote(str); err == nil {
-				str = unquoted
-			}
+	finishQuote := func() {
+		if curQuote == nil {
+			return
 		}
+		str := curQuote.String()
+		if unquoted, err := strconv.Unquote(str); err == nil {
+			str = unquoted
+		}
+		curArg.WriteString(str)
+		curQuote = nil
+	}
+
+	appendResult := func() {
+		finishQuote()
+		escape = false
+
+		str := curArg.String()
 		result = append(result, str)
 		curArg.Reset()
 	}
 
 	for _, r := range input {
-		if r == ' ' && !inQuote {
+		if r == ' ' && curQuote == nil {
 			appendResult()
 		} else {
-			curArg.WriteRune(r)
+			runeHandled := false
+			appendRuneToBuff := func() {
+				if curQuote != nil {
+					curQuote.WriteRune(r)
+				} else {
+					curArg.WriteRune(r)
+				}
+				runeHandled = true
+			}
 
-			if r == '"' && !inQuote {
-				inQuote = true
+			if r == '"' && curQuote == nil {
+				curQuote = new(bytes.Buffer)
+				appendRuneToBuff()
 			} else {
-				if inQuote && !escape {
+				if curQuote != nil && !escape {
 					if r == '"' {
-						inQuote = false
-					}
-					if r == '\\' {
+						appendRuneToBuff()
+						finishQuote()
+					} else if r == '\\' {
+						appendRuneToBuff()
 						escape = true
 						continue
 					}
 				}
 			}
+			if !runeHandled {
+				appendRuneToBuff()
+			}
 		}
 
 		escape = false

cmd/micro/util_test.go

@@ -100,9 +100,14 @@ func TestJoinAndSplitCommandArgs(t *testing.T) {
 		Query  string
 		Wanted []string
 	}{
-		{`"hallo""Welt"`, []string{`"hallo""Welt"`}},
+		{`"hallo""Welt"`, []string{`halloWelt`}},
+		{`"hallo" "Welt"`, []string{`hallo`, `Welt`}},
 		{`\"`, []string{`\"`}},
+		{`"foo`, []string{`"foo`}},
+		{`"foo"`, []string{`foo`}},
 		{`"\"`, []string{`"\"`}},
+		{`"C:\\"foo.txt`, []string{`C:\foo.txt`}},
+		{`"\n"new"\n"line`, []string{"\nnew\nline"}},
 	}
 
 	for i, test := range splitTests {