Recover from internal errors without crashing

This commit is contained in:
Zachary Yedidia 2020-02-11 00:50:24 -05:00
parent 8176e8c6f8
commit 34724b941a
2 changed files with 52 additions and 40 deletions

View file

@ -11,6 +11,7 @@ import (
"github.com/go-errors/errors" "github.com/go-errors/errors"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
lua "github.com/yuin/gopher-lua"
"github.com/zyedidia/micro/internal/action" "github.com/zyedidia/micro/internal/action"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/internal/config"
@ -218,9 +219,6 @@ func main() {
screen.Init() screen.Init()
// If we have an error, we can exit cleanly and not completely
// mess up the terminal being worked in
// In other words we need to shut down tcell before the program crashes
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
screen.Screen.Fini() screen.Screen.Fini()
@ -284,48 +282,64 @@ func main() {
<-screen.DrawChan <-screen.DrawChan
} }
var event tcell.Event
// wait for initial resize event // wait for initial resize event
select { select {
case event = <-events: case event := <-events:
action.Tabs.HandleEvent(event) action.Tabs.HandleEvent(event)
case <-time.After(10 * time.Millisecond): case <-time.After(10 * time.Millisecond):
// time out after 10ms // time out after 10ms
} }
// Since this loop is very slow (waits for user input every time) it's
// okay to be inefficient and run it via a function every time
// We do this so we can recover from panics without crashing the editor
for { for {
// Display everything DoEvent()
screen.Screen.Fill(' ', config.DefStyle) }
screen.Screen.HideCursor() }
action.Tabs.Display()
for _, ep := range action.MainTab().Panes { // DoEvent runs the main action loop of the editor
ep.Display() func DoEvent() {
} var event tcell.Event
action.MainTab().Display()
action.InfoBar.Display() // recover from errors without crashing the editor
screen.Screen.Show() defer func() {
if err := recover(); err != nil {
event = nil if e, ok := err.(*lua.ApiError); ok {
screen.TermMessage("Lua API error:", e)
// Check for new events } else {
select { screen.TermMessage("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/zyedidia/micro/issues")
case f := <-shell.Jobs: }
// If a new job has finished while running in the background we should execute the callback }
f.Function(f.Output, f.Args) }()
case <-config.Autosave: // Display everything
for _, b := range buffer.OpenBuffers { screen.Screen.Fill(' ', config.DefStyle)
b.Save() screen.Screen.HideCursor()
} action.Tabs.Display()
case <-shell.CloseTerms: for _, ep := range action.MainTab().Panes {
case event = <-events: ep.Display()
case <-screen.DrawChan: }
} action.MainTab().Display()
action.InfoBar.Display()
if action.InfoBar.HasPrompt { screen.Screen.Show()
action.InfoBar.HandleEvent(event)
} else { // Check for new events
action.Tabs.HandleEvent(event) select {
} case f := <-shell.Jobs:
// If a new job has finished while running in the background we should execute the callback
f.Function(f.Output, f.Args)
case <-config.Autosave:
for _, b := range buffer.OpenBuffers {
b.Save()
}
case <-shell.CloseTerms:
case event = <-events:
case <-screen.DrawChan:
}
if action.InfoBar.HasPrompt {
action.InfoBar.HandleEvent(event)
} else {
action.Tabs.HandleEvent(event)
} }
} }

2
go.sum
View file

@ -50,8 +50,6 @@ github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s
github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE= github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpygApMFGweqw= github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpygApMFGweqw=
github.com/zyedidia/pty v2.0.0+incompatible/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA= github.com/zyedidia/pty v2.0.0+incompatible/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
github.com/zyedidia/tcell v1.4.2 h1:JWMDs6O1saINPIR5M3kNqlWJwkfnBZeZDZszEJi3BW8=
github.com/zyedidia/tcell v1.4.2/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
github.com/zyedidia/tcell v1.4.3 h1:s0nmxj22Jj+vyt4nVmnB6kbnwRxEay1zfS0j8IsbtfI= github.com/zyedidia/tcell v1.4.3 h1:s0nmxj22Jj+vyt4nVmnB6kbnwRxEay1zfS0j8IsbtfI=
github.com/zyedidia/tcell v1.4.3/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA= github.com/zyedidia/tcell v1.4.3/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc= github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc=