Merge branch 'EscapeBracesInStringOrComments' into dev

Author: Neko-Box-Coder

README.md

@@ -9,6 +9,7 @@
 > - [Add wrapindent option to allow wrapping and hanging indents #3107](https://github.com/zyedidia/micro/pull/3107)
 > - [Fixing tabmove not working properly when there's a split in pane #3371](https://github.com/zyedidia/micro/pull/3371)
 > - [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)
 >
 > 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/buffer/buffer.go

@@ -16,6 +16,7 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+	"sort"
 
 	luar "layeh.com/gopher-luar"
 
@@ -1140,7 +1141,41 @@ var BracePairs = [][2]rune{
 	{'[', ']'},
 }
 
+func (b *Buffer) getSortedSyntaxIndices(lineN int) []int {
+	keys := make([]int, 0, len(b.Match(lineN)))
+	for k := range b.Match(lineN) {
+		keys = append(keys, k)
+	}
+	sort.Ints(keys)
+	return keys
+}
+
+// Returns the Group (syntax highlight group ID) at the specified location and a boolean
+// that indicates if a group is found or not
+func (b *Buffer) GetGroupAtLoc(loc Loc) (highlight.Group, bool) {
+	sortedIndices := b.getSortedSyntaxIndices(loc.Y)
+	i := sort.SearchInts(sortedIndices, loc.X)
+	if i == 0 || i == len(sortedIndices) {
+		return 0, false
+	}
+	if sortedIndices[i] == loc.X && b.Match(loc.Y)[sortedIndices[i]] != 0 {
+		return b.Match(loc.Y)[sortedIndices[i]], true
+	}
+	return b.Match(loc.Y)[sortedIndices[i - 1]], true
+}
+
+func (b *Buffer) isLocInStringOrComment(loc Loc) bool {
+	g, gFound := b.GetGroupAtLoc(loc)
+	if gFound && (g.String() == "constant.string" || strings.Contains(g.String(), "comment")) {
+		return true
+	}
+	return false
+}
+
 func (b *Buffer) findMatchingBrace(braceType [2]rune, start Loc, char rune) (Loc, bool) {
+	if b.isLocInStringOrComment(start) {
+		return start, false
+	}
 	var i int
 	if char == braceType[0] {
 		for y := start.Y; y < b.LinesNum(); y++ {
@@ -1151,9 +1186,9 @@ func (b *Buffer) findMatchingBrace(braceType [2]rune, start Loc, char rune) (Loc
 			}
 			for x := xInit; x < len(l); x++ {
 				r := l[x]
-				if r == braceType[0] {
+				if r == braceType[0] && !b.isLocInStringOrComment(Loc{x, y}) {
 					i++
-				} else if r == braceType[1] {
+				} else if r == braceType[1] && !b.isLocInStringOrComment(Loc{x, y}) {
 					i--
 					if i == 0 {
 						return Loc{x, y}, true
@@ -1170,9 +1205,9 @@ func (b *Buffer) findMatchingBrace(braceType [2]rune, start Loc, char rune) (Loc
 			}
 			for x := xInit; x >= 0; x-- {
 				r := l[x]
-				if r == braceType[1] {
+				if r == braceType[1] && !b.isLocInStringOrComment(Loc{x, y}){
 					i++
-				} else if r == braceType[0] {
+				} else if r == braceType[0] && !b.isLocInStringOrComment(Loc{x, y}){
 					i--
 					if i == 0 {
 						return Loc{x, y}, true