hcl/ast: Get should return a list

decoder.go

@@ -533,20 +533,11 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value)
 		// Determine the element we'll use to decode. If it is a single
 		// match (only object with the field), then we decode it exactly.
 		// If it is a prefix match, then we decode the matches.
-		var decodeNode ast.Node
+		prefixMatches := list.Prefix(fieldName)
-		matches := list.Prefix(fieldName)
+		matches := list.Get(fieldName)
-		if len(matches.Items) == 0 {
+		if len(matches.Items) == 0 && len(prefixMatches.Items) == 0 {
-			single := list.Get(fieldName)
-			if single == nil {
 			continue
 		}
-			decodeNode = single.Val
-			if ot, ok := decodeNode.(*ast.ObjectType); ok {
-				decodeNode = &ast.ObjectList{Items: ot.List.Items}
-			}
-		} else {
-			decodeNode = matches
-		}
 
 		// Track the used key
 		usedKeys[fieldName] = struct{}{}
@@ -554,9 +545,21 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value)
 		// Create the field name and decode. We range over the elements
 		// because we actually want the value.
 		fieldName = fmt.Sprintf("%s.%s", name, fieldName)
+		if len(prefixMatches.Items) > 0 {
+			if err := d.decode(fieldName, prefixMatches, field); err != nil {
+				return err
+			}
+		}
+		for _, match := range matches.Items {
+			var decodeNode ast.Node = match.Val
+			if ot, ok := decodeNode.(*ast.ObjectType); ok {
+				decodeNode = &ast.ObjectList{Items: ot.List.Items}
+			}
+
 			if err := d.decode(fieldName, decodeNode, field); err != nil {
 				return err
 			}
+		}
 
 		decodedFields = append(decodedFields, fieldType.Name)
 	}

hcl/ast/ast.go

@@ -45,19 +45,20 @@ func (o *ObjectList) Add(item *ObjectItem) {
 	o.Items = append(o.Items, item)
 }
 
-func (o *ObjectList) Get(key string) *ObjectItem {
+func (o *ObjectList) Get(key string) *ObjectList {
+	var result ObjectList
 	for _, item := range o.Items {
-		if len(item.Keys) == 0 {
+		if len(item.Keys) != 1 {
 			continue
 		}
 
 		text := item.Keys[0].Token.Text
 		if text == key || strings.EqualFold(text, key) {
-			return item
+			result.Add(item)
 		}
 	}
 
-	return nil
+	return &result
 }
 
 func (o *ObjectList) Prefix(keys ...string) *ObjectList {