Show collapsed comma

main.go

@@ -479,6 +479,9 @@ func (m *model) View() string {
 				screen = append(screen, dot3...)
 				screen = append(screen, closeSquareBracket...)
 			}
+			if n.end != nil && n.end.comma {
+				screen = append(screen, comma...)
+			}
 		}
 		if n.comma {
 			screen = append(screen, comma...)
@@ -534,13 +537,13 @@ func (m *model) prettyKey(node *node, selected bool) []byte {
 
 	if indexes, ok := m.search.keys[node]; ok {
 		var out []byte
-		for i, кусочек := range splitBytesByIndexes(b, indexes) {
+		for i, p := range splitBytesByIndexes(b, indexes) {
 			if i%2 == 0 {
-				out = append(out, style(кусочек.b)...)
-			} else if кусочек.index == m.search.cursor {
-				out = append(out, currentTheme.Cursor(кусочек.b)...)
+				out = append(out, style(p.b)...)
+			} else if p.index == m.search.cursor {
+				out = append(out, currentTheme.Cursor(p.b)...)
 			} else {
-				out = append(out, currentTheme.Search(кусочек.b)...)
+				out = append(out, currentTheme.Search(p.b)...)
 			}
 		}
 		return out
@@ -565,13 +568,13 @@ func (m *model) prettyPrint(node *node, selected bool) []byte {
 
 	if indexes, ok := m.search.values[node]; ok {
 		var out []byte
-		for i, кусочек := range splitBytesByIndexes(b, indexes) {
+		for i, p := range splitBytesByIndexes(b, indexes) {
 			if i%2 == 0 {
-				out = append(out, style(кусочек.b)...)
-			} else if кусочек.index == m.search.cursor {
-				out = append(out, currentTheme.Cursor(кусочек.b)...)
+				out = append(out, style(p.b)...)
+			} else if p.index == m.search.cursor {
+				out = append(out, currentTheme.Cursor(p.b)...)
 			} else {
-				out = append(out, currentTheme.Search(кусочек.b)...)
+				out = append(out, currentTheme.Search(p.b)...)
 			}
 		}
 		return out

search.go

@@ -21,20 +21,20 @@ type match struct {
 	index      int
 }
 
-type кусочек struct {
+type piece struct {
 	b     []byte
 	index int
 }
 
-func splitBytesByIndexes(b []byte, indexes []match) []кусочек {
-	out := make([]кусочек, 0, 1)
+func splitBytesByIndexes(b []byte, indexes []match) []piece {
+	out := make([]piece, 0, 1)
 	pos := 0
 	for _, pair := range indexes {
-		out = append(out, кусочек{safeSlice(b, pos, pair.start), -1})
-		out = append(out, кусочек{safeSlice(b, pair.start, pair.end), pair.index})
+		out = append(out, piece{safeSlice(b, pos, pair.start), -1})
+		out = append(out, piece{safeSlice(b, pair.start, pair.end), pair.index})
 		pos = pair.end
 	}
-	out = append(out, кусочек{safeSlice(b, pos, len(b)), -1})
+	out = append(out, piece{safeSlice(b, pos, len(b)), -1})
 	return out
 }