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') 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 ae5bc89cad98a4fd3176502b66678d768f2fd15f Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Mon, 15 Feb 2016 14:56:26 +0100 Subject: cmd/geth, jsre: improve auto-completion --- jsre/completion.go | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 jsre/completion.go (limited to 'jsre') diff --git a/jsre/completion.go b/jsre/completion.go new file mode 100644 index 000000000..2fda6ef0d --- /dev/null +++ b/jsre/completion.go @@ -0,0 +1,63 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see . + +package jsre + +import ( + "sort" + "strings" + + "github.com/robertkrimen/otto" +) + +// CompleteKeywords returns potential continuations for the given line. Since line is +// evaluated, callers need to make sure that evaluating line does not have side effects. +func (jsre *JSRE) CompleteKeywords(line string) []string { + var results []string + jsre.do(func(vm *otto.Otto) { results = getCompletions(vm, line) }) + return results +} + +func getCompletions(vm *otto.Otto, line string) (results []string) { + parts := strings.Split(line, ".") + objRef := "this" + prefix := line + if len(parts) > 1 { + objRef = strings.Join(parts[0:len(parts)-1], ".") + prefix = parts[len(parts)-1] + } + + res, err := vm.Eval(objRef) + if err != nil || !res.IsObject() { + return nil + } + for _, k := range res.Object().Keys() { + if strings.HasPrefix(k, prefix) { + if objRef == "this" { + results = append(results, k) + } else { + results = append(results, strings.Join(parts[:len(parts)-1], ".")+"."+k) + } + } + } + // e.g. web3 append dot since its an object + if lineRes, _ := vm.Eval(line); lineRes.IsObject() { + results = append(results, line+".") + } + + sort.Strings(results) + return results +} -- 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/completion.go | 10 +++--- jsre/completion_test.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ jsre/pretty.go | 28 +++++++++++------ 3 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 jsre/completion_test.go (limited to 'jsre') diff --git a/jsre/completion.go b/jsre/completion.go index 2fda6ef0d..e84a5b75c 100644 --- a/jsre/completion.go +++ b/jsre/completion.go @@ -40,11 +40,11 @@ func getCompletions(vm *otto.Otto, line string) (results []string) { prefix = parts[len(parts)-1] } - res, err := vm.Eval(objRef) - if err != nil || !res.IsObject() { + obj, _ := vm.Object(objRef) + if obj == nil { return nil } - for _, k := range res.Object().Keys() { + iterOwnAndConstructorKeys(vm, obj, func(k string) { if strings.HasPrefix(k, prefix) { if objRef == "this" { results = append(results, k) @@ -52,9 +52,9 @@ func getCompletions(vm *otto.Otto, line string) (results []string) { results = append(results, strings.Join(parts[:len(parts)-1], ".")+"."+k) } } - } + }) // e.g. web3 append dot since its an object - if lineRes, _ := vm.Eval(line); lineRes.IsObject() { + if obj, _ = vm.Object(line); obj != nil { results = append(results, line+".") } diff --git a/jsre/completion_test.go b/jsre/completion_test.go new file mode 100644 index 000000000..6d42b2bd1 --- /dev/null +++ b/jsre/completion_test.go @@ -0,0 +1,83 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see . + +package jsre + +import ( + "reflect" + "testing" +) + +func TestCompleteKeywords(t *testing.T) { + re := New("") + re.Run(` + function theClass() { + this.foo = 3; + this.gazonk = {xyz: 4}; + } + theClass.prototype.someMethod = function () {}; + var x = new theClass(); + var y = new theClass(); + y.someMethod = function override() {}; + `) + + var tests = []struct { + input string + want []string + }{ + { + input: "x", + want: []string{"x", "x."}, + }, + { + input: "x.", + want: []string{ + "x.constructor", + "x.foo", + "x.gazonk", + "x.someMethod", + }, + }, + { + input: "y.", + want: []string{ + "y.constructor", + "y.foo", + "y.gazonk", + "y.someMethod", + }, + }, + { + input: "x.gazonk.", + want: []string{ + "x.gazonk.constructor", + "x.gazonk.hasOwnProperty", + "x.gazonk.isPrototypeOf", + "x.gazonk.propertyIsEnumerable", + "x.gazonk.toLocaleString", + "x.gazonk.toString", + "x.gazonk.valueOf", + "x.gazonk.xyz", + }, + }, + } + for _, test := range tests { + cs := re.CompleteKeywords(test.input) + if !reflect.DeepEqual(cs, test.want) { + t.Errorf("wrong completions for %q\ngot %v\nwant %v", test.input, cs, test.want) + } + } +} 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