From 2680e23b1589f686c53d080b1384ba67f5dc3326 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 12 Feb 2016 02:19:52 +0100 Subject: jsre: fix pretty printer for upstream otto change --- jsre/pretty.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'jsre/pretty.go') diff --git a/jsre/pretty.go b/jsre/pretty.go index 99aa9b33e..64f0a95c9 100644 --- a/jsre/pretty.go +++ b/jsre/pretty.go @@ -202,8 +202,17 @@ func (ctx ppctx) doOwnProperties(v otto.Value, f func(string)) { Object, _ := ctx.vm.Object("Object") rv, _ := Object.Call("getOwnPropertyNames", v) gv, _ := rv.Export() - for _, v := range gv.([]interface{}) { - f(v.(string)) + switch gv := gv.(type) { + case []interface{}: + for _, v := range gv { + f(v.(string)) + } + case []string: + for _, v := range gv { + f(v) + } + default: + panic(fmt.Errorf("Object.getOwnPropertyNames returned unexpected type %T", gv)) } } -- cgit v1.2.3 From 6ba7bbbe29029c8bf2bf75f8ebcbd3847eafa401 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Mon, 15 Feb 2016 16:42:39 +0100 Subject: jsre: include constructor properties in auto-completion --- jsre/pretty.go | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'jsre/pretty.go') diff --git a/jsre/pretty.go b/jsre/pretty.go index 64f0a95c9..d0b42cd01 100644 --- a/jsre/pretty.go +++ b/jsre/pretty.go @@ -187,20 +187,30 @@ func (ctx ppctx) fields(obj *otto.Object) []string { vals = append(vals, k) } } - // add own properties - ctx.doOwnProperties(obj.Value(), add) - // add properties of the constructor - if cp := constructorPrototype(obj); cp != nil { - ctx.doOwnProperties(cp.Value(), add) - } + iterOwnAndConstructorKeys(ctx.vm, obj, add) sort.Strings(vals) sort.Strings(methods) return append(vals, methods...) } -func (ctx ppctx) doOwnProperties(v otto.Value, f func(string)) { - Object, _ := ctx.vm.Object("Object") - rv, _ := Object.Call("getOwnPropertyNames", v) +func iterOwnAndConstructorKeys(vm *otto.Otto, obj *otto.Object, f func(string)) { + seen := make(map[string]bool) + iterOwnKeys(vm, obj, func(prop string) { + seen[prop] = true + f(prop) + }) + if cp := constructorPrototype(obj); cp != nil { + iterOwnKeys(vm, cp, func(prop string) { + if !seen[prop] { + f(prop) + } + }) + } +} + +func iterOwnKeys(vm *otto.Otto, obj *otto.Object, f func(string)) { + Object, _ := vm.Object("Object") + rv, _ := Object.Call("getOwnPropertyNames", obj.Value()) gv, _ := rv.Export() switch gv := gv.(type) { case []interface{}: -- cgit v1.2.3