jsre: include constructor properties in auto-completion

3 files changed, 107 insertions, 14 deletions

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<tab><tab> 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 <http://www.gnu.org/licenses/>.
+
+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{}: