Skip to content

G
Geth-Modification
Commit cd81356a authored by Jeffrey Wilcke's avatar Jeffrey Wilcke
Browse files
Options

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

Clear current line on ctrl-C
parents 3a66c4ed c472b8f7
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
cmd/geth/js.go
View file @ cd81356a
...@@ -383,6 +383,11 @@ func (self *jsre) interactive() { ...@@ -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) { ...@@ -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, "(")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment