fix: app wasn't re-rendered in some cases

Author: mk-5

internal/app/app.go

@@ -172,7 +172,7 @@ func (a *App) Close() {
 func (a *App) Loading(flag bool) {
 	a.spinner.text = "Fetching"
 	a.loading = flag
-	a.dirty = true
+	a.setDirty()
 }
 
 func (a *App) IsLoading() bool {
@@ -190,7 +190,7 @@ func (a *App) LoadingWithText(flag bool, text string) {
 
 func (a *App) SetView(view View) {
 	a.viewMutex.Lock()
-	a.dirty = true
+	a.setDirty()
 	if a.view != nil {
 		a.view.Destroy()
 		delete(a.keepAlive, a.view)
@@ -258,14 +258,14 @@ func (a *App) AddFlash(flash Drawable, duration time.Duration) {
 		resizable.Resize(a.ScreenX, a.ScreenY)
 	}
 	timer := time.NewTimer(duration)
-	a.dirty = true
+	a.setDirty()
 	go func() {
 		defer a.PanicRecover()
 		<-timer.C
 		a.changeMutex.Lock()
 		a.flash = nil // it could lead to removing just-added flash message. For now, it's a good-enough solution
 		a.changeMutex.Unlock()
-		a.dirty = true
+		a.setDirty()
 	}()
 }
 
@@ -305,7 +305,7 @@ func (a *App) SetDirty() {
 }
 
 func (a *App) ClearNow() {
-	a.dirty = true
+	a.setDirty()
 	a.clear()
 	// a.screen.Clear() is preserving terminal buffer (not alternate screen buffer) :/ different then in 1.3
 	//a.screen.Clear()
@@ -329,6 +329,13 @@ func (a *App) PanicRecover() {
 	}
 }
 
+func (a *App) setDirty() {
+	a.dirty = true
+	a.RunOnAppRoutine(func() {
+		a.dirty = true
+	})
+}
+
 func (a *App) clear() {
 	a.changeMutex.Lock()
 	a.drawables = nil
@@ -357,7 +364,7 @@ func (a *App) processTerminalEvents() {
 		ev := a.screen.PollEvent()
 		switch ev := ev.(type) {
 		case *tcell.EventResize:
-			a.dirty = true
+			a.setDirty()
 			a.screen.Sync()
 			x, y := a.screen.Size()
 			a.ScreenX = x
@@ -368,7 +375,7 @@ func (a *App) processTerminalEvents() {
 				}
 			}
 		case *tcell.EventKey:
-			a.dirty = true
+			a.setDirty()
 			if ev.Key() == tcell.KeyCtrlC {
 				a.Quit()
 				return

internal/app/fuzzy_find.go

@@ -144,7 +144,7 @@ func (f *FuzzyFind) Update() {
 }
 
 func (f *FuzzyFind) ForceUpdate() {
-	f.dirty = true
+	f.markAsDirty()
 	f.Update()
 }
 
@@ -153,7 +153,7 @@ func (f *FuzzyFind) HandleKeyEvent(ev *tcell.EventKey) {
 		f.Complete <- FuzzyFindResult{Index: -1, Match: ""}
 	}
 	if ev.Key() == tcell.KeyEnter {
-		f.dirty = true
+		f.markAsDirty()
 		f.Update()
 		if len(f.matches) > 0 && f.selected >= 0 {
 			match := f.matches[f.selected].Str
@@ -167,7 +167,7 @@ func (f *FuzzyFind) HandleKeyEvent(ev *tcell.EventKey) {
 		if f.buffer.Len() > 0 {
 			f.buffer.Truncate(f.buffer.Len() - 1)
 		}
-		f.dirty = true
+		f.markAsDirty()
 	}
 	if ev.Key() == tcell.KeyUp || ev.Key() == tcell.KeyTab {
 		f.selected = ClampInt(f.selected+1, 0, f.matches.Len()-1)
@@ -179,7 +179,7 @@ func (f *FuzzyFind) HandleKeyEvent(ev *tcell.EventKey) {
 	}
 	if f.isEventWritable(ev) {
 		f.buffer.WriteRune(ev.Rune())
-		f.dirty = true
+		f.markAsDirty()
 	}
 }
 
@@ -194,7 +194,7 @@ func (f *FuzzyFind) GetQuery() string {
 
 func (f *FuzzyFind) SetQuery(q string) {
 	f.buffer.WriteString(q)
-	f.dirty = true
+	f.markAsDirty()
 }
 
 func (f *FuzzyFind) AlwaysShowAllResults() {
@@ -260,7 +260,7 @@ func (f *FuzzyFind) updateRecordsFromSupplier() {
 			Index: i,
 		})
 	}
-	f.dirty = true
+	f.markAsDirty()
 }
 
 func (f *FuzzyFind) isEventWritable(ev *tcell.EventKey) bool {
@@ -270,6 +270,18 @@ func (f *FuzzyFind) isEventWritable(ev *tcell.EventKey) bool {
 		ev.Rune() == '!'
 }
 
+func (f *FuzzyFind) markAsDirty() {
+	f.dirty = true
+	// it couples fuzzyFinder with app ... which is not nice,
+	// but it's the easy way to make sure that app is re-rendered
+	// whenever fuzzy search is updated. Another solution would be to
+	// expose dirty channel from here... and handle it from every place
+	// which is using fuzzy finder. Let's stick to that one for a time being...
+	GetApp().RunOnAppRoutine(func() {
+		GetApp().SetDirty()
+	})
+}
+
 func contains(needle int, haystack []int) bool {
 	for _, i := range haystack {
 		if needle == i {