Fix map field autocomplete dispatch

Author: dheeraj12347

cli/completer.go

@@ -437,7 +437,45 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int)
 	// Auto-complete API arg
 	splitLine := strings.Split(string(line), " ")
 	line = trimSpaceLeft([]rune(splitLine[len(splitLine)-1]))
+
 	for _, arg := range apiFound.Args {
+
+		if arg.Type == "map" {
+			suggestions := mapFieldSuggestions(arg)
+			input := string(line)
+			mapName := strings.TrimSuffix(arg.Name, "=")
+
+			matchInput := input
+			matchOffset := len(line)
+
+			// Replace the trailing '=' in tags= with the indexed field.
+			if strings.HasSuffix(input, "=") &&
+				strings.TrimSuffix(input, "=") == mapName {
+				matchInput = mapName
+				matchOffset--
+			}
+
+			if matchInput == mapName ||
+				strings.HasPrefix(matchInput, mapName+"[") {
+				var mapOptions [][]rune
+
+				for _, suggestion := range suggestions {
+					if strings.HasPrefix(suggestion, matchInput) {
+						mapOptions = append(
+							mapOptions,
+							[]rune(suggestion[len(matchInput):]),
+						)
+					}
+				}
+
+				if len(mapOptions) > 0 {
+					options = append(options, mapOptions...)
+					offset = matchOffset
+					return
+				}
+			}
+		}
+
 		search := arg.Name
 		if !hasPrefix(line, []rune(search)) {
 			sLine, sOffset := doInternal(line, pos, len(line), []rune(search))
@@ -457,19 +495,6 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int)
 				return
 			}
 
-			if arg.Type == "map" {
-				suggestions := mapFieldSuggestions(arg)
-
-				for _, suggestion := range suggestions {
-					if strings.HasPrefix(suggestion, string(line)) {
-						options = append(options, []rune(suggestion[len(line):]))
-					}
-				}
-
-				offset = len(line)
-				return
-			}
-
 			if arg.Type == config.FAKE && arg.Name == "filter=" {
 				offset = 0
 				filterInputs := strings.Split(strings.Replace(argInput, ",", ",|", -1), "|")

cli/completer_test.go

@@ -389,3 +389,53 @@ func TestMapFieldSuggestionsWithNonKeyValueMap(t *testing.T) {
 		t.Fatalf("expected no suggestions, got %v", got)
 	}
 }
+
+func TestMapAutocompleteThroughDo(t *testing.T) {
+	cfg := &config.Config{}
+
+	// Restore the normal API cache after this test.
+	defer config.LoadCache(cfg)
+
+	cfg.UpdateCache(map[string]interface{}{
+		"count": 1,
+		"api": []interface{}{
+			map[string]interface{}{
+				"name":        "listVirtualMachines",
+				"isasync":     false,
+				"description": "List virtual machines",
+				"params": []interface{}{
+					map[string]interface{}{
+						"name":        "tags",
+						"type":        "map",
+						"required":    false,
+						"description": "List resources by tags (key/value pairs)",
+					},
+				},
+				"response": []interface{}{},
+			},
+		},
+	})
+
+	completer := &autoCompleter{Config: cfg}
+	line := []rune("list virtualmachines tags=")
+
+	options, offset := completer.Do(line, len(line))
+
+	var got []string
+	for _, option := range options {
+		got = append(got, string(option))
+	}
+
+	expected := []string{
+		"[0].key=",
+		"[0].value=",
+	}
+
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("expected suggestions %v, got %v", expected, got)
+	}
+
+	if offset != len("tags=")-1 {
+		t.Fatalf("expected offset %d, got %d", len("tags=")-1, offset)
+	}
+}