Merge branch 'JumpToBraces' into dev

Author: Neko-Box-Coder

README.md

@@ -9,7 +9,6 @@
 > - [Add wrapindent option to allow wrapping and hanging indents #3107](https://github.com/zyedidia/micro/pull/3107)
 > - [add next/prev split/tab support for terminal pane #3165](https://github.com/zyedidia/micro/pull/3165)
 > - [Escape braces that are in string or comments when finding matching brace #3372](https://github.com/zyedidia/micro/pull/3372)
-> - [ Adding selection for ParagraphPrevious and ParagraphNext. #3353](https://github.com/zyedidia/micro/pull/3353)
 >
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
 

internal/action/actions.go

@@ -1478,6 +1478,28 @@ func (h *BufPane) JumpToMatchingBrace() bool {
 	return false
 }
 
+// JumpToOpeningBrace moves the cursor to the opening brace in current brace scope
+func (h *BufPane) JumpToOpeningBrace() bool {
+	matchingBrace, found := h.Buf.FindOpeningBrace(h.Cursor.Loc)
+	if found {
+		h.Cursor.GotoLoc(matchingBrace)
+		h.Relocate()
+		return true
+	}
+	return false
+}
+
+// JumpToClosingBrace moves the cursor to the closing brace in current brace scope
+func (h *BufPane) JumpToClosingBrace() bool {
+	matchingBrace, found := h.Buf.FindClosingBrace(h.Cursor.Loc)
+	if found {
+		h.Cursor.GotoLoc(matchingBrace)
+		h.Relocate()
+		return true
+	}
+	return false
+}
+
 // SelectAll selects the entire buffer
 func (h *BufPane) SelectAll() bool {
 	h.Cursor.SetSelectionStart(h.Buf.Start())

internal/action/bufpane.go

@@ -842,6 +842,8 @@ var BufKeyActions = map[string]BufKeyAction{
 	"RemoveAllMultiCursors":     (*BufPane).RemoveAllMultiCursors,
 	"SkipMultiCursor":           (*BufPane).SkipMultiCursor,
 	"JumpToMatchingBrace":       (*BufPane).JumpToMatchingBrace,
+	"JumpToOpeningBrace":        (*BufPane).JumpToOpeningBrace,
+	"JumpToClosingBrace":        (*BufPane).JumpToClosingBrace,
 	"JumpLine":                  (*BufPane).JumpLine,
 	"Deselect":                  (*BufPane).Deselect,
 	"ClearInfo":                 (*BufPane).ClearInfo,
@@ -924,4 +926,6 @@ var MultiActions = map[string]bool{
 	"StartOfTextToggle":         true,
 	"EndOfLine":                 true,
 	"JumpToMatchingBrace":       true,
+	"JumpToOpeningBrace":        true,
+	"JumpToClosingBrace":        true,
 }

internal/action/defaults_darwin.go

@@ -76,6 +76,8 @@ var bufdefaults = map[string]string{
 	"Ctrl-u":         "ToggleMacro",
 	"Ctrl-j":         "PlayMacro",
 	"Insert":         "ToggleOverwriteMode",
+	"Alt-<":          "JumpToOpeningBrace",
+	"Alt->":          "JumpToClosingBrace",
 
 	// Emacs-style keybindings
 	"Alt-f": "WordRight",

internal/action/defaults_other.go

@@ -79,6 +79,8 @@ var bufdefaults = map[string]string{
 	"Ctrl-u":         "ToggleMacro",
 	"Ctrl-j":         "PlayMacro",
 	"Insert":         "ToggleOverwriteMode",
+	"Alt-<":          "JumpToOpeningBrace",
+	"Alt->":          "JumpToClosingBrace",
 
 	// Emacs-style keybindings
 	"Alt-f": "WordRight",

internal/buffer/buffer.go

@@ -1177,18 +1177,34 @@ func (b *Buffer) isLocInStringOrComment(loc Loc, sortedIndices []int) bool {
 	return false
 }
 
-func (b *Buffer) FindOpeningBrace(braceType [2]rune, start Loc) (Loc, bool) {
-	startChar := []rune(string(b.LineBytes(start.Y)))[start.X]
-	var i int
-	if startChar == braceType[1] {
-		i = 0
-	} else {
-		i = 1
+func (b *Buffer) findOpeningBrace(braceType [2]rune, start Loc) (Loc, bool) {
+	// Bound guard
+	start = clamp(start, b.LineArray)
+	if len(b.lines) == 0 {
+		return start, false
+	}
+	lineLen := len([]rune(string(b.LineBytes(start.Y))))
+	if start.X >= lineLen {
+		start.X = lineLen - 1
+	}
+	if start.X < 0 {
+		start.X = 0
+	}
+
+	var i int = 1
+	if lineLen > 0 {
+		startChar := []rune(string(b.LineBytes(start.Y)))[start.X]
+		if startChar == braceType[1] {
+			i = 0
+		}
 	}
 	for y := start.Y; y >= 0; y-- {
 		var sortedGroups []int
 		sortedGroupsPopulated := false
 		l := []rune(string(b.lines[y].data))
+		if len(l) == 0 {
+			continue
+		}
 		xInit := len(l) - 1
 		if y == start.Y {
 			xInit = start.X
@@ -1220,13 +1236,49 @@ func (b *Buffer) FindOpeningBrace(braceType [2]rune, start Loc) (Loc, bool) {
 	return start, false
 }
 
-func (b *Buffer) FindClosingBrace(braceType [2]rune, start Loc) (Loc, bool) {
-	startChar := []rune(string(b.LineBytes(start.Y)))[start.X]
-	var i int
-	if startChar == braceType[0] {
-		i = 0
+// Returns the opening brace in current brace scope starting at the start location and a boolean
+// indicating if an opening brace is found
+func (b *Buffer) FindOpeningBrace(start Loc) (Loc, bool) {
+	currentDist := -1
+	currentMb := Loc{-1, -1}
+	for _, bp := range BracePairs {
+		mb, found := b.findOpeningBrace(bp, start)
+		if found {
+			dist := DiffLA(start, mb, b.LineArray)
+			if currentDist < 0 || dist < currentDist {
+				currentMb = mb
+				currentDist = dist
+			}
+		}
+	}
+
+	if currentDist == -1 {
+		return start, false
 	} else {
-		i = 1
+		return currentMb, true
+	}
+}
+
+func (b *Buffer) findClosingBrace(braceType [2]rune, start Loc) (Loc, bool) {
+	// Bound guard
+	start = clamp(start, b.LineArray)
+	if len(b.lines) == 0 {
+		return start, false
+	}
+	lineLen := len([]rune(string(b.LineBytes(start.Y))))
+	if start.X >= lineLen {
+		start.X = lineLen - 1
+	}
+	if start.X < 0 {
+		start.X = 0
+	}
+
+	var i int = 1
+	if lineLen > 0 {
+		startChar := []rune(string(b.LineBytes(start.Y)))[start.X]
+		if startChar == braceType[0] {
+			i = 0
+		}
 	}
 	for y := start.Y; y < b.LinesNum(); y++ {
 		var sortedGroups []int
@@ -1263,14 +1315,37 @@ func (b *Buffer) FindClosingBrace(braceType [2]rune, start Loc) (Loc, bool) {
 	return start, false
 }
 
+// Returns the closing brace in current brace scope starting at the start location and a boolean
+// indicating if an closing brace is found
+func (b *Buffer) FindClosingBrace(start Loc) (Loc, bool) {
+	currentDist := -1
+	currentMb := Loc{-1, -1}
+	for _, bp := range BracePairs {
+		mb, found := b.findClosingBrace(bp, start)
+		if found {
+			dist := DiffLA(start, mb, b.LineArray)
+			if currentDist < 0 || dist < currentDist {
+				currentMb = mb
+				currentDist = dist
+			}
+		}
+	}
+
+	if currentDist == -1 {
+		return start, false
+	} else {
+		return currentMb, true
+	}
+}
+
 func (b *Buffer) findMatchingBrace(braceType [2]rune, start Loc, char rune) (Loc, bool) {
 	if b.isLocInStringOrComment(start, nil) {
 		return start, false
 	}
 	if char == braceType[0] {
-		return b.FindClosingBrace(braceType, start)
+		return b.findClosingBrace(braceType, start)
 	} else if char == braceType[1] {
-		return b.FindOpeningBrace(braceType, start)
+		return b.findOpeningBrace(braceType, start)
 	}
 	return start, false
 }

runtime/help/defaultkeys.md

@@ -33,6 +33,8 @@ can change it!
 | PageDown                    | Move cursor down one page                                                                 |
 | Ctrl-Home or Ctrl-UpArrow   | Move cursor to start of document                                                          |
 | Ctrl-End or Ctrl-DownArrow  | Move cursor to end of document                                                            |
+| Alt-<                       | Move cursor to opening brace in current brace scope                                       |
+| Alt->                       | Move cursor to closing brace in current brace scope                                       |
 | Ctrl-l                      | Jump to a line in the file (prompts with #)                                               |
 | Ctrl-w                      | Cycle between splits in the current tab (use `> vsplit` or `> hsplit` to create a split)  |
 

runtime/help/keybindings.md

@@ -272,6 +272,8 @@ RemoveAllMultiCursors
 SkipMultiCursor
 None
 JumpToMatchingBrace
+JumpToOpeningBrace
+JumpToClosingBrace
 Autocomplete
 ```
 
@@ -526,6 +528,8 @@ conventions for text editing defaults.
     "Ctrl-u":         "ToggleMacro",
     "Ctrl-j":         "PlayMacro",
     "Insert":         "ToggleOverwriteMode",
+    "Alt-<":          "JumpToOpeningBrace",
+    "Alt->":          "JumpToClosingBrace",
 
     // Emacs-style keybindings
     "Alt-f": "WordRight",