tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1658 from bas-vk/liner-ctrl-c

Browse Source 
Clear current line on ctrl-C
This commit is contained in:
Jeffrey Wilcke 2015-08-14 04:36:15 -07:00
commit cd81356ace
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/geth/js.go
View File

@ -383,6 +383,11 @@ func (self *jsre) interactive() {
for { for {
line, err := self.Prompt(<-prompt) line, err := self.Prompt(<-prompt)
if err != nil { if err != nil {
if err == liner.ErrPromptAborted { // ctrl-C
self.resetPrompt()
inputln <- ""
continue
}
return return
} }
inputln <- line inputln <- line
@ -467,6 +472,12 @@ func (self *jsre) parseInput(code string) {
var indentCount = 0 var indentCount = 0
var str = "" var str = ""
func (self *jsre) resetPrompt() {
indentCount = 0
str = ""
self.ps1 = "> "
}
func (self *jsre) setIndent() { func (self *jsre) setIndent() {
open := strings.Count(str, "{") open := strings.Count(str, "{")
open += strings.Count(str, "(") open += strings.Count(str, "(")