Merge pull request #3719 from niten94/sbuf-switch-skipsave

Skip save on `open` or `term` command if buffer is shared

internal/action/actions.go

@@ -1907,30 +1907,29 @@ func (h *BufPane) ForceQuit() bool {
 	return true
 }
 
+// closePrompt displays a prompt to save the buffer before closing it to proceed
+// with a different action or command
+func (h *BufPane) closePrompt(action string, callback func()) {
+	InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
+		if !canceled && !yes {
+			callback()
+		} else if !canceled && yes {
+			h.SaveCB(action, callback)
+		}
+	})
+}
+
 // Quit this will close the current tab or view that is open
 func (h *BufPane) Quit() bool {
-	if h.Buf.Modified() {
+	if h.Buf.Modified() && !h.Buf.Shared() {
-		for _, b := range buffer.OpenBuffers {
-			if b != h.Buf && b.SharedBuffer == h.Buf.SharedBuffer {
-				h.ForceQuit()
-				return true
-			}
-		}
-
 		if config.GlobalSettings["autosave"].(float64) > 0 && h.Buf.Path != "" {
 			// autosave on means we automatically save when quitting
 			h.SaveCB("Quit", func() {
 				h.ForceQuit()
 			})
 		} else {
-			InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
+			h.closePrompt("Quit", func() {
-				if !canceled && !yes {
+				h.ForceQuit()
-					h.ForceQuit()
-				} else if !canceled && yes {
-					h.SaveCB("Quit", func() {
-						h.ForceQuit()
-					})
-				}
 			})
 		}
 	} else {

internal/action/command.go

@@ -308,15 +308,8 @@ func (h *BufPane) OpenCmd(args []string) {
 			}
 			h.OpenBuffer(b)
 		}
-		if h.Buf.Modified() {
+		if h.Buf.Modified() && !h.Buf.Shared() {
-			InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
+			h.closePrompt("Save", open)
-				if !canceled && !yes {
-					open()
-				} else if !canceled && yes {
-					h.Save()
-					open()
-				}
-			})
 		} else {
 			open()
 		}
@@ -1121,14 +1114,9 @@ func (h *BufPane) TermCmd(args []string) {
 
 	for i, p := range ps {
 		if p.ID() == h.ID() {
-			if h.Buf.Modified() {
+			if h.Buf.Modified() && !h.Buf.Shared() {
-				InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
+				h.closePrompt("Save", func() {
-					if !canceled && !yes {
+					term(i, false)
-						term(i, false)
-					} else if !canceled && yes {
-						h.Save()
-						term(i, false)
-					}
 				})
 			} else {
 				term(i, false)

internal/buffer/buffer.go

@@ -620,6 +620,16 @@ func (b *Buffer) WordAt(loc Loc) []byte {
 	return b.Substr(start, end)
 }
 
+// Shared returns if there are other buffers with the same file as this buffer
+func (b *Buffer) Shared() bool {
+	for _, buf := range OpenBuffers {
+		if buf != b && buf.SharedBuffer == b.SharedBuffer {
+			return true
+		}
+	}
+	return false
+}
+
 // Modified returns if this buffer has been modified since
 // being opened
 func (b *Buffer) Modified() bool {