Show modal while running linters

nakabonne · May 6, 2020 · bcc0a31 · bcc0a31
1 parent 6fe1383
commit bcc0a31
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
@@ -121,19 +121,20 @@ func (g *Gui) modal(p tview.Primitive, width, height int) *tview.Grid {
 }
 
 // message shows the given message as a modal.
-func (g *Gui) message(message, doneLabel string, doneFunc func()) {
+func (g *Gui) message(message, doneLabel string) {
 	modal := tview.NewModal().
 		SetText(message).
-		SetBackgroundColor(tcell.ColorBlack).
-		AddButtons([]string{doneLabel}).
-		SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-			if buttonLabel == doneLabel {
-				doneFunc()
-			}
-			g.switchPage(modalPageName, mainPageName)
-		})
-
-	g.pages.AddAndSwitchToPage("modal", g.modal(modal, 150, 60), true).ShowPage(mainPageName)
+		SetBackgroundColor(tcell.ColorBlack)
+
+	if doneLabel != "" {
+		modal.AddButtons([]string{doneLabel}).
+			SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+				if buttonLabel == doneLabel {
+					g.switchPage(modalPageName, mainPageName)
+				}
+			})
+	}
+	g.pages.AddAndSwitchToPage(modalPageName, g.modal(modal, 150, 60), true).ShowPage(mainPageName)
 }
 
 // registerPath adds path to golangci-lint runner as an arg.
@@ -154,7 +155,7 @@ func (g *Gui) enableLinter(node *tview.TreeNode, linter *config.Linter) {
 
 func (g *Gui) disableLinter(node *tview.TreeNode, linter *config.Linter) {
 	if err := g.runner.DisableLinter(linter.Name()); err != nil {
-		g.message(err.Error(), "Enter", func() {})
+		g.message(err.Error(), "Enter")
 		return
 	}
 	node.SetColor(item.DefaultLinterColor)

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
@@ -22,17 +22,26 @@ func (g *Gui) grobalKeybind(event *tcell.EventKey) {
 	case 'q':
 		g.application.Stop()
 	case 'r':
-		issues, err := g.runner.Run()
-		if err != nil {
-			g.resultsItem.ShowMessage(err.Error())
-			return
-		}
-		if len(issues) == 0 {
-			g.resultsItem.ShowMessage("no issues found")
-		} else {
-			g.resultsItem.SetLatestIssues(issues)
-			g.resultsItem.ShowLatestIssues()
-			g.switchPanel(g.resultsItem)
-		}
+		g.message("running linters...", "")
+
+		go func() {
+			issues, err := g.runner.Run()
+			g.switchPage(modalPageName, mainPageName)
+			if err != nil {
+				g.resultsItem.ShowMessage(err.Error())
+				g.application.Draw()
+				return
+			}
+
+			if len(issues) == 0 {
+				g.resultsItem.ShowMessage("no issues found")
+			} else {
+				g.resultsItem.SetLatestIssues(issues)
+				g.resultsItem.ShowLatestIssues()
+				g.switchPanel(g.resultsItem)
+			}
+			g.application.Draw()
+		}()
+
 	}
 }