Merge branch 'master' into dev

Author: Neko-Box-Coder

internal/action/actions.go

@@ -1467,10 +1467,14 @@ func (h *BufPane) paste(clip string) {
 func (h *BufPane) JumpToMatchingBrace() bool {
 	matchingBrace, left, found := h.Buf.FindMatchingBrace(h.Cursor.Loc)
 	if found {
-		if left {
-			h.Cursor.GotoLoc(matchingBrace)
+		if h.Buf.Settings["matchbraceleft"].(bool) {
+			if left {
+				h.Cursor.GotoLoc(matchingBrace)
+			} else {
+				h.Cursor.GotoLoc(matchingBrace.Move(1, h.Buf))
+			}
 		} else {
-			h.Cursor.GotoLoc(matchingBrace.Move(1, h.Buf))
+			h.Cursor.GotoLoc(matchingBrace)
 		}
 		h.Relocate()
 		return true

internal/buffer/buffer.go

@@ -65,10 +65,6 @@ var (
 	// BTStdout is a buffer that only writes to stdout
 	// when closed
 	BTStdout = BufType{6, false, true, true}
-
-	// ErrFileTooLarge is returned when the file is too large to hash
-	// (fastdirty is automatically enabled)
-	ErrFileTooLarge = errors.New("File is too large to hash")
 )
 
 // SharedBuffer is a struct containing info that is shared among buffers
@@ -555,7 +551,11 @@ func (b *Buffer) ReOpen() error {
 
 	err = b.UpdateModTime()
 	if !b.Settings["fastdirty"].(bool) {
-		calcHash(b, &b.origHash)
+		if len(data) > LargeFileThreshold {
+			b.Settings["fastdirty"] = true
+		} else {
+			calcHash(b, &b.origHash)
+		}
 	}
 	b.isModified = false
 	b.RelocateCursors()
@@ -650,37 +650,23 @@ func (b *Buffer) Size() int {
 }
 
 // calcHash calculates md5 hash of all lines in the buffer
-func calcHash(b *Buffer, out *[md5.Size]byte) error {
+func calcHash(b *Buffer, out *[md5.Size]byte) {
 	h := md5.New()
 
-	size := 0
 	if len(b.lines) > 0 {
-		n, e := h.Write(b.lines[0].data)
-		if e != nil {
-			return e
-		}
-		size += n
+		h.Write(b.lines[0].data)
 
 		for _, l := range b.lines[1:] {
-			n, e = h.Write([]byte{'\n'})
-			if e != nil {
-				return e
-			}
-			size += n
-			n, e = h.Write(l.data)
-			if e != nil {
-				return e
+			if b.Endings == FFDos {
+				h.Write([]byte{'\r', '\n'})
+			} else {
+				h.Write([]byte{'\n'})
 			}
-			size += n
+			h.Write(l.data)
 		}
 	}
 
-	if size > LargeFileThreshold {
-		return ErrFileTooLarge
-	}
-
 	h.Sum((*out)[:0])
-	return nil
 }
 
 func parseDefFromFile(f config.RuntimeFile, header *highlight.Header) *highlight.Def {
@@ -1373,17 +1359,19 @@ func (b *Buffer) FindMatchingBrace(start Loc) (Loc, bool, bool) {
 		}
 	}
 
-	// failed to find matching brace for the given location, so try to find matching
-	// brace for the location one character left of it
-	if start.X-1 >= 0 && start.X-1 < len(curLine) {
-		leftChar := curLine[start.X-1]
-		left := Loc{start.X - 1, start.Y}
+	if b.Settings["matchbraceleft"].(bool) {
+		// failed to find matching brace for the given location, so try to find matching
+		// brace for the location one character left of it
+		if start.X-1 >= 0 && start.X-1 < len(curLine) {
+			leftChar := curLine[start.X-1]
+			left := Loc{start.X - 1, start.Y}
 
-		for _, bp := range BracePairs {
-			if leftChar == bp[0] || leftChar == bp[1] {
-				mb, found := b.findMatchingBrace(bp, left, leftChar)
-				if found {
-					return mb, true, true
+			for _, bp := range BracePairs {
+				if leftChar == bp[0] || leftChar == bp[1] {
+					mb, found := b.findMatchingBrace(bp, left, leftChar)
+					if found {
+						return mb, true, true
+					}
 				}
 			}
 		}

internal/buffer/eventhandler.go

@@ -291,13 +291,9 @@ func (eh *EventHandler) UndoOneEvent() {
 	eh.UndoTextEvent(t)
 
 	// Set the cursor in the right place
-	teCursor := t.C
-	if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
-		t.C = *eh.cursors[teCursor.Num]
-		eh.cursors[teCursor.Num].Goto(teCursor)
-		eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
-	} else {
-		teCursor.Num = -1
+	if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
+		eh.cursors[t.C.Num].Goto(t.C)
+		eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
 	}
 
 	// Push it to the redo stack
@@ -336,13 +332,9 @@ func (eh *EventHandler) RedoOneEvent() {
 		return
 	}
 
-	teCursor := t.C
-	if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
-		t.C = *eh.cursors[teCursor.Num]
-		eh.cursors[teCursor.Num].Goto(teCursor)
-		eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
-	} else {
-		teCursor.Num = -1
+	if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
+		eh.cursors[t.C.Num].Goto(t.C)
+		eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
 	}
 
 	// Modifies the text event

internal/buffer/settings.go

@@ -1,6 +1,8 @@
 package buffer
 
 import (
+	"crypto/md5"
+
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 )
@@ -10,10 +12,14 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
 
 	if option == "fastdirty" {
 		if !nativeValue.(bool) {
-			if !b.Modified() {
-				e := calcHash(b, &b.origHash)
-				if e == ErrFileTooLarge {
-					b.Settings["fastdirty"] = false
+			if b.Size() > LargeFileThreshold {
+				b.Settings["fastdirty"] = true
+			} else {
+				if !b.isModified {
+					calcHash(b, &b.origHash)
+				} else {
+					// prevent using an old stale origHash value
+					b.origHash = [md5.Size]byte{}
 				}
 			}
 		}

internal/config/settings.go

@@ -71,6 +71,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"indentchar":      " ",
 	"keepautoindent":  false,
 	"matchbrace":      true,
+	"matchbraceleft":  true,
 	"matchbracestyle": "underline",
 	"mkparents":       false,
 	"permbackup":      false,

runtime/help/options.md

@@ -231,7 +231,19 @@ Here are the available options:
     default value: `false`
 
 * `matchbrace`: show matching braces for '()', '{}', '[]' when the cursor
-   is on a brace character or next to it.
+   is on a brace character or (if `matchbraceleft` is enabled) next to it.
+
+    default value: `true`
+
+* `matchbraceleft`: simulate I-beam cursor behavior (cursor located not on a
+   character but "between" characters): when showing matching braces, if there
+   is no brace character directly under the cursor, match the brace character
+   to the left of the cursor instead. Also when jumping to the matching brace,
+   move the cursor either to the matching brace character or to the character
+   next to it, depending on whether the initial cursor position was on the
+   brace character or next to it (i.e. "inside" or "outside" the braces).
+   With `matchbraceleft` disabled, micro will only match the brace directly
+   under the cursor and will only jump to precisely to the matching brace.
 
     default value: `true`
 
@@ -533,6 +545,7 @@ so that you can see what the formatting should look like.
     "linter": true,
     "literate": true,
     "matchbrace": true,
+    "matchbraceleft": true,
     "matchbracestyle": "underline",
     "mkparents": false,
     "mouse": true,