diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-12 22:19:20 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-14 22:22:47 +1100 |
| commit | f15e47bb67f39904c624846cc8392f3ad14358a9 (patch) | |
| tree | 2203a588fbd990e53a6eab534e39a78b8d127941 /pkg/gui/files_panel.go | |
| parent | 7995d56a858fdeb399ed884a6983008aa2089cfb (diff) | |
add file watching for modified files
log createErrorPanel error
swallow error when adding file to watcher
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index af021c132..ae3328eed 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -105,6 +105,13 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bo } func (gui *Gui) refreshFiles() error { + gui.State.RefreshingFilesMutex.Lock() + gui.State.IsRefreshingFiles = true + defer func() { + gui.State.IsRefreshingFiles = false + gui.State.RefreshingFilesMutex.Unlock() + }() + selectedFile, _ := gui.getSelectedFile(gui.g) filesView := gui.getFilesView() @@ -126,7 +133,7 @@ func (gui *Gui) refreshFiles() error { } fmt.Fprint(filesView, list) - if filesView == g.CurrentView() { + if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && gui.State.Context == "merging") { newSelectedFile, _ := gui.getSelectedFile(gui.g) alreadySelected := newSelectedFile.Name == selectedFile.Name return gui.handleFileSelect(g, filesView, alreadySelected) @@ -387,6 +394,11 @@ func (gui *Gui) refreshStateFiles() error { // get files to stage files := gui.GitCommand.GetStatusFiles() gui.State.Files = gui.GitCommand.MergeStatusFiles(gui.State.Files, files) + + if err := gui.addFilesToFileWatcher(files); err != nil { + return err + } + gui.refreshSelectedLine(&gui.State.Panels.Files.SelectedLine, len(gui.State.Files)) return gui.updateWorkTreeState() } |