roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/geth: gofmt js.go and rename ethereum.js to web3.js

Browse Source 
Fixing the filename matters now because it will actually show
up in JS backtraces.
This commit is contained in:
Felix Lange 2016-02-12 02:20:18 +01:00
parent 2680e23b15
commit 4063d30b5e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/geth/js.go
View File

@ -91,8 +91,8 @@ func keywordCompleter(jsre *jsre, line string) []string {
objRef := "this" objRef := "this"
prefix := line prefix := line
if len(parts) > 1 { if len(parts) > 1 {
objRef = strings.Join(parts[0:len(parts) - 1], ".") objRef = strings.Join(parts[0:len(parts)-1], ".")
prefix = parts[len(parts) - 1] prefix = parts[len(parts)-1]
} }
result, _ := jsre.re.Run(fmt.Sprintf(autoCompleteStatement, objRef)) result, _ := jsre.re.Run(fmt.Sprintf(autoCompleteStatement, objRef))
@ -103,7 +103,7 @@ func keywordCompleter(jsre *jsre, line string) []string {
if objRef == "this" { if objRef == "this" {
results = append(results, fmt.Sprintf("%s", k)) results = append(results, fmt.Sprintf("%s", k))
} else { } else {
results = append(results, fmt.Sprintf("%s.%s", strings.Join(parts[:len(parts) - 1], "."), k)) results = append(results, fmt.Sprintf("%s.%s", strings.Join(parts[:len(parts)-1], "."), k))
} }
} }
} }
@ -112,7 +112,7 @@ func keywordCompleter(jsre *jsre, line string) []string {
// e.g. web3<tab><tab> append dot since its an object // e.g. web3<tab><tab> append dot since its an object
isObj, _ := jsre.re.Run(fmt.Sprintf("typeof(%s) === 'object'", line)) isObj, _ := jsre.re.Run(fmt.Sprintf("typeof(%s) === 'object'", line))
if isObject, _ := isObj.ToBoolean(); isObject { if isObject, _ := isObj.ToBoolean(); isObject {
results = append(results, line + ".") results = append(results, line+".")
} }
sort.Strings(results) sort.Strings(results)
@ -131,7 +131,7 @@ func apiWordCompleterWithContext(jsre *jsre) liner.WordCompleter {
if line[i] == '.' || (line[i] >= 'a' && line[i] <= 'z') || (line[i] >= 'A' && line[i] <= 'Z') { if line[i] == '.' || (line[i] >= 'a' && line[i] <= 'z') || (line[i] >= 'A' && line[i] <= 'Z') {
continue continue
} }
if i >= 3 && line[i] == '3' && line[i - 3] == 'w' && line[i - 2] == 'e' && line[i - 1] == 'b' { if i >= 3 && line[i] == '3' && line[i-3] == 'w' && line[i-2] == 'e' && line[i-1] == 'b' {
continue continue
} }
i += 1 i += 1
@ -280,7 +280,7 @@ func (js *jsre) apiBindings() error {
utils.Fatalf("Error loading bignumber.js: %v", err) utils.Fatalf("Error loading bignumber.js: %v", err)
} }
err = js.re.Compile("ethereum.js", re.Web3_JS) err = js.re.Compile("web3.js", re.Web3_JS)
if err != nil { if err != nil {
utils.Fatalf("Error loading web3.js: %v", err) utils.Fatalf("Error loading web3.js: %v", err)
} }