Update ungron.go: fix bug: merge json.Number type

davidpelfree · davidpelfree · commit 7bf201ab3c69 · 2020-10-26T14:37:17.000+02:00
diff --git a/ungron.go b/ungron.go
@@ -19,6 +19,7 @@ import (
 	"strings"
 	"unicode"
 	"unicode/utf8"
+        "reflect"
 
 	"github.com/pkg/errors"
 )
@@ -456,12 +457,12 @@ func recursiveMerge(a, b interface{}) (interface{}, error) {
 		}
 		return recursiveSliceMerge(a.([]interface{}), bSlice)
 
-	case string, int, float64, bool, nil:
+	case string, int, float64, bool, nil, json.Number:
 		// Can't merge them, second one wins
 		return b, nil
 
 	default:
-		return nil, fmt.Errorf("unexpected data type for merge")
+		return nil, fmt.Errorf("unexpected data type for merge: `%s`", reflect.TypeOf(a))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"strings"`
`20`	`20`	`"unicode"`
`21`	`21`	`"unicode/utf8"`
	`22`	`+ "reflect"`
`22`	`23`
`23`	`24`	`"github.com/pkg/errors"`
`24`	`25`	`)`
`@@ -456,12 +457,12 @@ func recursiveMerge(a, b interface{}) (interface{}, error) {`
`456`	`457`	`}`
`457`	`458`	`return recursiveSliceMerge(a.([]interface{}), bSlice)`
`458`	`459`
`459`		`- case string, int, float64, bool, nil:`
	`460`	`+ case string, int, float64, bool, nil, json.Number:`
`460`	`461`	`// Can't merge them, second one wins`
`461`	`462`	`return b, nil`
`462`	`463`
`463`	`464`	`default:`
`464`		`- return nil, fmt.Errorf("unexpected data type for merge")`
	`465`	+ return nil, fmt.Errorf("unexpected data type for merge: `%s`", reflect.TypeOf(a))
`465`	`466`	`}`
`466`	`467`	`}`
`467`	`468`