Skip to content

Commit

Permalink
console, internal/jsre: fix autocomplete issues (ethereum#26518)
Browse files Browse the repository at this point in the history
Fixes ethereum#26505 where the console crashed when a property getter
raised an exception during autocompletion. I also noticed while fixing this
issue that autocomplete wasn't working for objects/fields with numbers in
them (most importantly web3.<tab><tab>) which is also now fixed.
  • Loading branch information
s1na authored and shekhirin committed Jun 6, 2023
1 parent 49b8044 commit 334d979
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
8 changes: 2 additions & 6 deletions console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,8 @@ func (c *Console) AutoCompleteInput(line string, pos int) (string, []string, str
start := pos - 1
for ; start > 0; start-- {
// Skip all methods and namespaces (i.e. including the dot)
if line[start] == '.' || (line[start] >= 'a' && line[start] <= 'z') || (line[start] >= 'A' && line[start] <= 'Z') {
continue
}
// Handle web3 in a special way (i.e. other numbers aren't auto completed)
if start >= 3 && line[start-3:start] == "web3" {
start -= 3
c := line[start]
if c == '.' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '1' && c <= '9') {
continue
}
// We've hit an unexpected character, autocomplete form here
Expand Down
13 changes: 12 additions & 1 deletion internal/jsre/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@
package jsre

import (
"regexp"
"sort"
"strings"

"github.com/dop251/goja"
)

// JS numerical token
var numerical = regexp.MustCompile(`^(NaN|-?((\d*\.\d+|\d+)([Ee][+-]?\d+)?|Infinity))$`)

// 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 {
Expand All @@ -43,6 +47,9 @@ func getCompletions(vm *goja.Runtime, line string) (results []string) {
// and "x.y" is an object, obj will reference "x.y".
obj := vm.GlobalObject()
for i := 0; i < len(parts)-1; i++ {
if numerical.MatchString(parts[i]) {
return nil
}
v := obj.Get(parts[i])
if v == nil || goja.IsNull(v) || goja.IsUndefined(v) {
return nil // No object was found
Expand All @@ -67,7 +74,11 @@ func getCompletions(vm *goja.Runtime, line string) (results []string) {
// Append opening parenthesis (for functions) or dot (for objects)
// if the line itself is the only completion.
if len(results) == 1 && results[0] == line {
obj := obj.Get(parts[len(parts)-1])
// Accessing the property will cause it to be evaluated.
// This can cause an error, e.g. in case of web3.eth.protocolVersion
// which has been dropped from geth. Ignore the error for autocompletion
// purposes.
obj := SafeGet(obj, parts[len(parts)-1])
if obj != nil {
if _, isfunc := goja.AssertFunction(obj); isfunc {
results[0] += "("
Expand Down

0 comments on commit 334d979

Please sign in to comment.