Skip to content

Commit 5432268

Browse files
Neko-Box-CoderNeko-Box-Coder
committed
Adding showchars option and removing @ for wide rune in bufwindow, ...
Adding showchars option and deprecating indentchar Removing @ and display ' ' for wide rune instead Small refactoring for the draw function in bufwindow
1 parent 98ff79d commit 5432268

File tree

3 files changed

+196
-117
lines changed

3 files changed

+196
-117
lines changed

‎internal/config/settings.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var defaultCommonSettings = map[string]interface{}{
7070
"hltrailingws": false,
7171
"ignorecase": true,
7272
"incsearch": true,
73-
"indentchar": " ",
73+
"indentchar": " ", // Deprecated
7474
"keepautoindent": false,
7575
"matchbrace": true,
7676
"matchbraceleft": true,
@@ -88,6 +88,7 @@ var defaultCommonSettings = map[string]interface{}{
8888
"scrollbar": false,
8989
"scrollmargin": float64(3),
9090
"scrollspeed": float64(2),
91+
"showchars": "",
9192
"smartpaste": true,
9293
"softwrap": false,
9394
"splitbottom": true,
@@ -210,6 +211,7 @@ func validateParsedSettings() error {
210211
}
211212
continue
212213
}
214+
213215
if _, ok := defaults[k]; ok {
214216
if e := verifySetting(k, v, defaults[k]); e != nil {
215217
err = e

‎internal/display/bufwindow.go‎

Lines changed: 172 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package display
22

33
import (
44
"strconv"
5+
"strings"
56

67
runewidth "github.com/mattn/go-runewidth"
78
"github.com/micro-editor/tcell/v2"
@@ -450,6 +451,30 @@ func (w *BufWindow) displayBuffer() {
450451
cursors := b.GetCursors()
451452

452453
curStyle := config.DefStyle
454+
455+
// Parse showchars which is in the format of key1=val1,key2=val2,...
456+
spacechars := " "
457+
tabchars := b.Settings["indentchar"].(string)
458+
indentspacechars := " "
459+
indenttabchars := b.Settings["indentchar"].(string)
460+
for _, entry := range strings.Split(b.Settings["showchars"].(string), ",") {
461+
split := strings.SplitN(entry, "=", 2)
462+
if len(split) < 2 {
463+
continue
464+
}
465+
key, val := split[0], split[1]
466+
switch key {
467+
case "space":
468+
spacechars = val
469+
case "tab":
470+
tabchars = val
471+
case "ispace":
472+
indentspacechars = val
473+
case "itab":
474+
indenttabchars = val
475+
}
476+
}
477+
453478
for ; vloc.Y < w.bufHeight; vloc.Y++ {
454479
vloc.X = 0
455480

@@ -494,133 +519,170 @@ func (w *BufWindow) displayBuffer() {
494519
}
495520
bloc.X = bslice
496521

497-
draw := func(r rune, combc []rune, style tcell.Style, highlight bool, showcursor bool) {
498-
if nColsBeforeStart <= 0 && vloc.Y >= 0 {
499-
if highlight {
500-
if w.Buf.HighlightSearch && w.Buf.SearchMatch(bloc) {
501-
style = config.DefStyle.Reverse(true)
502-
if s, ok := config.Colorscheme["hlsearch"]; ok {
503-
style = s
522+
getRuneStyle := func(r rune, style tcell.Style, showoffset int, isplaceholder bool) (rune, tcell.Style, bool) {
523+
bgoverridable := true
524+
if nColsBeforeStart > 0 || vloc.Y < 0 || isplaceholder {
525+
return r, style, bgoverridable
526+
}
527+
528+
for _, mb := range matchingBraces {
529+
if mb.X == bloc.X && mb.Y == bloc.Y {
530+
if b.Settings["matchbracestyle"].(string) == "highlight" {
531+
if s, ok := config.Colorscheme["match-brace"]; ok {
532+
return r, s, bgoverridable
533+
} else {
534+
return r, style.Reverse(true), bgoverridable
504535
}
536+
} else {
537+
return r, style.Underline(true), bgoverridable
505538
}
539+
}
540+
}
506541

507-
_, origBg, _ := style.Decompose()
508-
_, defBg, _ := config.DefStyle.Decompose()
509-
510-
// syntax or hlsearch highlighting with non-default background takes precedence
511-
// over cursor-line and color-column
512-
dontOverrideBackground := origBg != defBg
513-
514-
if b.Settings["hltaberrors"].(bool) {
515-
if s, ok := config.Colorscheme["tab-error"]; ok {
516-
isTab := (r == '\t') || (r == ' ' && !showcursor)
517-
if (b.Settings["tabstospaces"].(bool) && isTab) ||
518-
(!b.Settings["tabstospaces"].(bool) && bloc.X < leadingwsEnd && r == ' ' && !isTab) {
519-
fg, _, _ := s.Decompose()
520-
style = style.Background(fg)
521-
dontOverrideBackground = true
522-
}
523-
}
542+
if r != '\t' && r != ' ' {
543+
return r, style, bgoverridable
544+
}
545+
546+
var indentrunes []rune
547+
switch r {
548+
case '\t':
549+
if bloc.X < leadingwsEnd && !b.Settings["tabstospaces"].(bool) {
550+
indentrunes = []rune(indenttabchars)
551+
} else {
552+
indentrunes = []rune(tabchars)
553+
}
554+
case ' ':
555+
if bloc.X%tabsize == 0 && bloc.X < leadingwsEnd && b.Settings["tabstospaces"].(bool) {
556+
indentrunes = []rune(indentspacechars)
557+
} else {
558+
indentrunes = []rune(spacechars)
559+
}
560+
}
561+
562+
var returnrune rune
563+
if showoffset < len(indentrunes) {
564+
returnrune = indentrunes[showoffset]
565+
} else {
566+
// use space if no showchars or after we showed showchars
567+
returnrune = ' '
568+
}
569+
570+
if s, ok := config.Colorscheme["indent-char"]; ok {
571+
fg, _, _ := s.Decompose()
572+
style = style.Foreground(fg)
573+
}
574+
575+
if b.Settings["hltaberrors"].(bool) && bloc.X < leadingwsEnd && !isplaceholder {
576+
if s, ok := config.Colorscheme["tab-error"]; ok {
577+
if b.Settings["tabstospaces"].(bool) && r == '\t' {
578+
fg, _, _ := s.Decompose()
579+
style = style.Background(fg)
580+
bgoverridable = false
581+
} else if !b.Settings["tabstospaces"].(bool) && r == ' ' {
582+
fg, _, _ := s.Decompose()
583+
style = style.Background(fg)
584+
bgoverridable = false
524585
}
586+
}
587+
}
525588

526-
if b.Settings["hltrailingws"].(bool) {
527-
if s, ok := config.Colorscheme["trailingws"]; ok {
528-
if bloc.X >= trailingwsStart && bloc.X < blineLen {
529-
hl := true
530-
for _, c := range cursors {
531-
if c.NewTrailingWsY == bloc.Y {
532-
hl = false
533-
break
534-
}
535-
}
536-
if hl {
537-
fg, _, _ := s.Decompose()
538-
style = style.Background(fg)
539-
dontOverrideBackground = true
540-
}
589+
if b.Settings["hltrailingws"].(bool) {
590+
if s, ok := config.Colorscheme["trailingws"]; ok {
591+
if bloc.X >= trailingwsStart && bloc.X < blineLen {
592+
hl := true
593+
for _, c := range cursors {
594+
if c.NewTrailingWsY == bloc.Y {
595+
hl = false
596+
break
541597
}
542598
}
599+
if hl {
600+
fg, _, _ := s.Decompose()
601+
style = style.Background(fg)
602+
bgoverridable = false
603+
}
543604
}
605+
}
606+
}
544607

545-
for _, c := range cursors {
546-
if c.HasSelection() &&
547-
(bloc.GreaterEqual(c.CurSelection[0]) && bloc.LessThan(c.CurSelection[1]) ||
548-
bloc.LessThan(c.CurSelection[0]) && bloc.GreaterEqual(c.CurSelection[1])) {
549-
// The current character is selected
550-
style = config.DefStyle.Reverse(true)
608+
return returnrune, style, bgoverridable
609+
}
551610

552-
if s, ok := config.Colorscheme["selection"]; ok {
553-
style = s
554-
}
555-
}
611+
draw := func(r rune, combc []rune, style tcell.Style, highlight bool, showcursor bool, bgoverridable bool) {
612+
defer func() {
613+
if nColsBeforeStart <= 0 {
614+
vloc.X++
615+
}
616+
nColsBeforeStart--
617+
}()
556618

557-
if b.Settings["cursorline"].(bool) && w.active && !dontOverrideBackground &&
558-
!c.HasSelection() && c.Y == bloc.Y {
559-
if s, ok := config.Colorscheme["cursor-line"]; ok {
560-
fg, _, _ := s.Decompose()
561-
style = style.Background(fg)
562-
}
563-
}
564-
}
619+
if nColsBeforeStart > 0 || vloc.Y < 0 {
620+
return
621+
}
565622

566-
for _, m := range b.Messages {
567-
if bloc.GreaterEqual(m.Start) && bloc.LessThan(m.End) ||
568-
bloc.LessThan(m.End) && bloc.GreaterEqual(m.Start) {
569-
style = style.Underline(true)
570-
break
571-
}
623+
if highlight {
624+
if w.Buf.HighlightSearch && w.Buf.SearchMatch(bloc) {
625+
style = config.DefStyle.Reverse(true)
626+
if s, ok := config.Colorscheme["hlsearch"]; ok {
627+
style = s
572628
}
629+
}
573630

574-
if r == '\t' {
575-
indentrunes := []rune(b.Settings["indentchar"].(string))
576-
// if empty indentchar settings, use space
577-
if len(indentrunes) == 0 {
578-
indentrunes = []rune{' '}
579-
}
631+
_, origBg, _ := style.Decompose()
632+
_, defBg, _ := config.DefStyle.Decompose()
580633

581-
r = indentrunes[0]
582-
if s, ok := config.Colorscheme["indent-char"]; ok && r != ' ' {
583-
fg, _, _ := s.Decompose()
584-
style = style.Foreground(fg)
634+
// syntax or hlsearch highlighting with non-default background takes precedence
635+
// over cursor-line and color-column
636+
if bgoverridable {
637+
bgoverridable = origBg == defBg
638+
}
639+
640+
for _, c := range cursors {
641+
if c.HasSelection() &&
642+
(bloc.GreaterEqual(c.CurSelection[0]) && bloc.LessThan(c.CurSelection[1]) ||
643+
bloc.LessThan(c.CurSelection[0]) && bloc.GreaterEqual(c.CurSelection[1])) {
644+
// The current character is selected
645+
style = config.DefStyle.Reverse(true)
646+
647+
if s, ok := config.Colorscheme["selection"]; ok {
648+
style = s
585649
}
586650
}
587651

588-
if s, ok := config.Colorscheme["color-column"]; ok {
589-
if colorcolumn != 0 && vloc.X-w.gutterOffset+w.StartCol == colorcolumn && !dontOverrideBackground {
652+
if b.Settings["cursorline"].(bool) && w.active && bgoverridable &&
653+
!c.HasSelection() && c.Y == bloc.Y {
654+
if s, ok := config.Colorscheme["cursor-line"]; ok {
590655
fg, _, _ := s.Decompose()
591656
style = style.Background(fg)
592657
}
593658
}
659+
}
594660

595-
for _, mb := range matchingBraces {
596-
if mb.X == bloc.X && mb.Y == bloc.Y {
597-
if b.Settings["matchbracestyle"].(string) == "highlight" {
598-
if s, ok := config.Colorscheme["match-brace"]; ok {
599-
style = s
600-
} else {
601-
style = style.Reverse(true)
602-
}
603-
} else {
604-
style = style.Underline(true)
605-
}
606-
}
661+
for _, m := range b.Messages {
662+
if bloc.GreaterEqual(m.Start) && bloc.LessThan(m.End) ||
663+
bloc.LessThan(m.End) && bloc.GreaterEqual(m.Start) {
664+
style = style.Underline(true)
665+
break
607666
}
608667
}
609668

610-
screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, combc, style)
611-
612-
if showcursor {
613-
for _, c := range cursors {
614-
if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
615-
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, c.Num == 0)
616-
}
669+
if s, ok := config.Colorscheme["color-column"]; ok {
670+
if colorcolumn != 0 && vloc.X-w.gutterOffset+w.StartCol == colorcolumn && bgoverridable {
671+
fg, _, _ := s.Decompose()
672+
style = style.Background(fg)
617673
}
618674
}
619675
}
620-
if nColsBeforeStart <= 0 {
621-
vloc.X++
676+
677+
screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, combc, style)
678+
679+
if showcursor {
680+
for _, c := range cursors {
681+
if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
682+
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, c.Num == 0)
683+
}
684+
}
622685
}
623-
nColsBeforeStart--
624686
}
625687

626688
wrap := func() {
@@ -692,7 +754,7 @@ func (w *BufWindow) displayBuffer() {
692754
// If a word (or just a wide rune) does not fit in the window
693755
if vloc.X+wordwidth > maxWidth && vloc.X > w.gutterOffset {
694756
for vloc.X < maxWidth {
695-
draw(' ', nil, config.DefStyle, false, false)
757+
draw(' ', nil, config.DefStyle, false, false, true)
696758
}
697759

698760
// We either stop or we wrap to draw the word in the next line
@@ -708,18 +770,17 @@ func (w *BufWindow) displayBuffer() {
708770
}
709771

710772
for _, r := range word {
711-
draw(r.r, r.combc, r.style, true, true)
712-
713-
// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
714-
if r.width > 1 {
715-
char := ' '
716-
if r.r != '\t' {
717-
char = '@'
718-
}
719-
720-
for i := 1; i < r.width; i++ {
721-
draw(char, nil, r.style, true, false)
773+
drawrune, drawstyle, bgoverridable := getRuneStyle(r.r, r.style, 0, false)
774+
draw(drawrune, r.combc, drawstyle, true, true, bgoverridable)
775+
776+
// Draw extra characters for tabs or wide runes
777+
for i := 1; i < r.width; i++ {
778+
if r.r == '\t' {
779+
drawrune, drawstyle, bgoverridable = getRuneStyle('\t', r.style, i, false)
780+
} else {
781+
drawrune, drawstyle, bgoverridable = getRuneStyle(' ', r.style, i, true)
722782
}
783+
draw(drawrune, nil, drawstyle, true, false, bgoverridable)
723784
}
724785
bloc.X++
725786
}
@@ -764,7 +825,8 @@ func (w *BufWindow) displayBuffer() {
764825

765826
if vloc.X != maxWidth {
766827
// Display newline within a selection
767-
draw(' ', nil, config.DefStyle, true, true)
828+
drawrune, drawstyle, bgoverridable := getRuneStyle(' ', config.DefStyle, 0, true)
829+
draw(drawrune, nil, drawstyle, true, true, bgoverridable)
768830
}
769831

770832
bloc.X = w.StartCol

0 commit comments

Comments
 (0)