go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-11 11:42:12 +02:00
Code Issues Releases Activity

small fixes

Browse Source
This commit is contained in:
Jesse Duffield 2021-10-17 17:38:59 +11:00 committed by github-actions[bot]
parent 345c90ac05
commit e7c27b6f4a
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -20,7 +20,7 @@ require (
github.com/imdario/mergo v0.3.11
github.com/integrii/flaggy v1.4.0
github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4
github.com/jesseduffield/gocui v0.3.1-0.20211017041119-0ec562dfd23b
github.com/jesseduffield/gocui v0.3.1-0.20211017063715-c74848d8ad00
github.com/jesseduffield/yaml v2.1.0+incompatible
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect

2
go.sum
View File

@ -73,6 +73,8 @@ github.com/jesseduffield/gocui v0.3.1-0.20211017035223-b68948e63cc3 h1:J5s/4Y860
github.com/jesseduffield/gocui v0.3.1-0.20211017035223-b68948e63cc3/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
github.com/jesseduffield/gocui v0.3.1-0.20211017041119-0ec562dfd23b h1:kepukaDQfZ6LBSvHUYReFvVSW5Lx5ZQZDgGhXj0Mx7U=
github.com/jesseduffield/gocui v0.3.1-0.20211017041119-0ec562dfd23b/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
github.com/jesseduffield/gocui v0.3.1-0.20211017063715-c74848d8ad00 h1:5TusU8ir9OHg3By2PPmLwa2y+2G9F+16QRK8bpofsC0=
github.com/jesseduffield/gocui v0.3.1-0.20211017063715-c74848d8ad00/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=

2
pkg/gui/commit_message_panel.go
View File

@ -23,8 +23,8 @@ func (gui *Gui) handleCommitConfirm() error {
cmdStr := gui.GitCommand.CommitCmdStr(message, flags)
gui.OnRunCommand(oscommands.NewCmdLogEntry(cmdStr, gui.Tr.Spans.Commit, true))
return gui.withGpgHandling(cmdStr, gui.Tr.CommittingStatus, func() error {
gui.Views.CommitMessage.ClearTextArea()
_ = gui.returnFromContext()
gui.clearEditorView(gui.Views.CommitMessage)
return nil
})
}

2
pkg/gui/credentials_panel.go
View File

@ -43,7 +43,7 @@ func (gui *Gui) handleSubmitCredential() error {
credentialsView := gui.Views.Credentials
message := strings.TrimSpace(credentialsView.TextArea.GetContent())
gui.credentials <- message
gui.clearEditorView(credentialsView)
credentialsView.ClearTextArea()
if err := gui.returnFromContext(); err != nil {
return err
}

5
pkg/gui/view_helpers.go
View File

@ -340,11 +340,6 @@ func (gui *Gui) secondaryViewFocused() bool {
return state != nil && state.SecondaryFocused
}
func (gui *Gui) clearEditorView(v *gocui.View) {
v.TextArea.Clear()
v.RenderTextArea()
}
func (gui *Gui) onViewTabClick(viewName string, tabIndex int) error {
context := gui.State.ViewTabContextMap[viewName][tabIndex].contexts[0]

8
vendor/github.com/jesseduffield/gocui/view.go generated vendored
View File

@ -1160,6 +1160,12 @@ func updatedCursorAndOrigin(prevOrigin int, size int, cursor int) (int, int) {
}
func (v *View) ClearTextArea() {
v.TextArea.Clear()
v.Clear()
v.writeMutex.Lock()
defer v.writeMutex.Unlock()
v.TextArea.Clear()
_ = v.SetOrigin(0, 0)
_ = v.SetCursor(0, 0)
}

2
vendor/modules.txt vendored
View File

@ -152,7 +152,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem
github.com/jesseduffield/go-git/v5/utils/merkletrie/index
github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame
github.com/jesseduffield/go-git/v5/utils/merkletrie/noder
# github.com/jesseduffield/gocui v0.3.1-0.20211017041119-0ec562dfd23b
# github.com/jesseduffield/gocui v0.3.1-0.20211017063715-c74848d8ad00
## explicit
github.com/jesseduffield/gocui
# github.com/jesseduffield/yaml v2.1.0+incompatible