Extracting brace matching logic into its own public function

Author: Neko-Box-Coder

internal/buffer/buffer.go

@@ -1177,81 +1177,104 @@ func (b *Buffer) isLocInStringOrComment(loc Loc, sortedIndices []int) bool {
 	return false
 }
 
-func (b *Buffer) findMatchingBrace(braceType [2]rune, start Loc, char rune) (Loc, bool) {
-	if b.isLocInStringOrComment(start, nil) {
-		return start, 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 char == braceType[0] {
-		for y := start.Y; y < b.LinesNum(); y++ {
-			var sortedGroups []int
-			sortedGroupsPopulated := false
-			l := []rune(string(b.LineBytes(y)))
-			xInit := 0
-			if y == start.Y {
-				xInit = start.X
-			}
-			for x := xInit; x < len(l); x++ {
-				r := l[x]
-				if r == braceType[0] {
-					if !sortedGroupsPopulated {
-						sortedGroups = b.GetSortedSyntaxGroupIndices(y)
-						sortedGroupsPopulated = true
-					}
-					if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
-						i++
-					}
-				} else if r == braceType[1] {
-					if !sortedGroupsPopulated {
-						sortedGroups = b.GetSortedSyntaxGroupIndices(y)
-						sortedGroupsPopulated = true
-					}
-					if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
-						i--
-					}
-					if i == 0 {
-						return Loc{x, y}, true
-					}
+	if startChar == braceType[1] {
+		i = 0
+	} else {
+		i = 1
+	}
+	for y := start.Y; y >= 0; y-- {
+		var sortedGroups []int
+		sortedGroupsPopulated := false
+		l := []rune(string(b.lines[y].data))
+		xInit := len(l) - 1
+		if y == start.Y {
+			xInit = start.X
+		}
+		for x := xInit; x >= 0; x-- {
+			r := l[x]
+			if r == braceType[1] {
+				if !sortedGroupsPopulated {
+					sortedGroups = b.GetSortedSyntaxGroupIndices(y)
+					sortedGroupsPopulated = true
+				}
+			 	if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
+					i++
+				}
+			} else if r == braceType[0]{
+				if !sortedGroupsPopulated {
+					sortedGroups = b.GetSortedSyntaxGroupIndices(y)
+					sortedGroupsPopulated = true
+				}
+				if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
+					i--
+				}
+				if i == 0 {
+					return Loc{x, y}, true
 				}
 			}
 		}
-	} else if char == braceType[1] {
-		for y := start.Y; y >= 0; y-- {
-			var sortedGroups []int
-			sortedGroupsPopulated := false
-			l := []rune(string(b.lines[y].data))
-			xInit := len(l) - 1
-			if y == start.Y {
-				xInit = start.X
-			}
-			for x := xInit; x >= 0; x-- {
-				r := l[x]
-				if r == braceType[1] {
-					if !sortedGroupsPopulated {
-						sortedGroups = b.GetSortedSyntaxGroupIndices(y)
-						sortedGroupsPopulated = true
-					}
-				 	if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
-						i++
-					}
-				} else if r == braceType[0]{
-					if !sortedGroupsPopulated {
-						sortedGroups = b.GetSortedSyntaxGroupIndices(y)
-						sortedGroupsPopulated = true
-					}
-					if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
-						i--
-					}
-					if i == 0 {
-						return Loc{x, y}, true
-					}
+	}
+	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
+	} else {
+		i = 1
+	}
+	for y := start.Y; y < b.LinesNum(); y++ {
+		var sortedGroups []int
+		sortedGroupsPopulated := false
+		l := []rune(string(b.LineBytes(y)))
+		xInit := 0
+		if y == start.Y {
+			xInit = start.X
+		}
+		for x := xInit; x < len(l); x++ {
+			r := l[x]
+			if r == braceType[0] {
+				if !sortedGroupsPopulated {
+					sortedGroups = b.GetSortedSyntaxGroupIndices(y)
+					sortedGroupsPopulated = true
+				}
+				if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
+					i++
+				}
+			} else if r == braceType[1] {
+				if !sortedGroupsPopulated {
+					sortedGroups = b.GetSortedSyntaxGroupIndices(y)
+					sortedGroupsPopulated = true
+				}
+				if !b.isLocInStringOrComment(Loc{x, y}, sortedGroups) {
+					i--
+				}
+				if i == 0 {
+					return Loc{x, y}, true
 				}
 			}
 		}
 	}
 	return start, false
 }
 
+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)
+	} else if char == braceType[1] {
+		return b.FindOpeningBrace(braceType, start)
+	}
+	return start, false
+}
+
 // If there is a brace character (for example '{' or ']') at the given start location,
 // FindMatchingBrace returns the location of the matching brace for it (for example '}'
 // or '['). The second returned value is true if there was no matching brace found