go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00
Code Issues Releases Activity

defend against race condition in editors

Browse Source
This commit is contained in:
Jesse Duffield
2021-03-29 23:47:32 +11:00
parent 7e0d48c2a1
commit 049849264e
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/jesseduffield/gocui/edit.go generated vendored
View File

@ -65,6 +65,10 @@ func simpleEditor(v *View, key Key, ch rune, mod Modifier) {
// EditWrite writes a rune at the cursor position.
func (v *View) EditWrite(ch rune) {
w := runewidth.RuneWidth(ch)
if w == 0 {
return
}
v.writeRune(v.cx, v.cy, ch)
v.moveCursor(w, 0, true)
}
@ -326,6 +330,9 @@ func (v *View) moveCursor(dx, dy int, writeMode bool) {
// buffer is increased if the point is out of bounds. Overwrite mode is
// governed by the value of View.overwrite.
func (v *View) writeRune(x, y int, ch rune) error {
v.writeMutex.Lock()
defer v.writeMutex.Unlock()
v.tainted = true
x, y, err := v.realPosition(x, y)
@ -377,6 +384,9 @@ func (v *View) writeRune(x, y int, ch rune) error {
// position corresponding to the point (x, y).
// returns the amount of columns that where removed.
func (v *View) deleteRune(x, y int) (int, error) {
v.writeMutex.Lock()
defer v.writeMutex.Unlock()
v.tainted = true
x, y, err := v.realPosition(x, y)
@ -404,6 +414,9 @@ func (v *View) deleteRune(x, y int) (int, error) {
// mergeLines merges the lines "y" and "y+1" if possible.
func (v *View) mergeLines(y int) error {
v.writeMutex.Lock()
defer v.writeMutex.Unlock()
v.tainted = true
_, y, err := v.realPosition(0, y)
@ -425,6 +438,9 @@ func (v *View) mergeLines(y int) error {
// breakLine breaks a line of the internal buffer at the position corresponding
// to the point (x, y).
func (v *View) breakLine(x, y int) error {
v.writeMutex.Lock()
defer v.writeMutex.Unlock()
v.tainted = true
x, y, err := v.realPosition(x, y)