utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-11 16:16:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor logic

Browse source
This commit is contained in:
Yuki Osaki 2021-10-31 23:16:04 +09:00
parent 769a6cd069
commit b36f6db521
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/gui/branches_panel.go
View file

@ -101,9 +101,7 @@ func (gui *Gui) handleBranchPress() error {
func (gui *Gui) handleCreateOrShowPullRequestPress() error {
branch := gui.getSelectedBranch()
prs, _ := gui.GitCommand.GenerateGithubPullRequestMap(gui.State.GithubRecentPRs, []*models.Branch{branch})
pr, hasPr := prs[branch]
pr, hasPr := gui.GetPr(branch)
if hasPr {
return gui.OSCommand.OpenLink(pr.Url)

7
pkg/gui/gui.go
View file

@ -731,3 +731,10 @@ func (gui *Gui) setColorScheme() error {
return nil
}
func (gui *Gui) GetPr(branch *models.Branch) (*models.GithubPullRequest, bool) {
prs, _ := gui.GitCommand.GenerateGithubPullRequestMap(gui.State.GithubRecentPRs, []*models.Branch{branch})
pr, hasPr := prs[branch]
return pr, hasPr
}

5
pkg/gui/pull_request_menu_panel.go
View file

@ -39,12 +39,11 @@ func (gui *Gui) createOrOpenPullRequestMenu(selectedBranch *models.Branch, check
}
}
prs, _ := gui.GitCommand.GenerateGithubPullRequestMap(gui.State.GithubRecentPRs, []*models.Branch{selectedBranch})
pr, hasPr := prs[selectedBranch]
pr, hasPr := gui.GetPr(selectedBranch)
if hasPr {
menuItems = append(menuItems, &menuItem{
displayString: gui.GitCommand.Tr.OpenPr + strconv.Itoa(pr.Number),
displayString: gui.GitCommand.Tr.MustSpecifyOriginError + strconv.Itoa(pr.Number),
onPress: func() error {
return gui.OSCommand.OpenLink(pr.Url)
},