Merge branch 'MoreCharOptions' into dev

Author: Neko-Box-Coder

internal/config/settings.go

@@ -70,9 +70,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"hltrailingws":    false,
 	"ignorecase":      true,
 	"incsearch":       true,
-	"indenttabchar":   " ",
-	"indentspacechar": " ",
-	"spacechar":       " ",
+	"indentchar":      " ", // Deprecated
 	"keepautoindent":  false,
 	"matchbrace":      true,
 	"matchbraceleft":  true,
@@ -90,6 +88,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"scrollbar":       false,
 	"scrollmargin":    float64(3),
 	"scrollspeed":     float64(2),
+	"showchars":       "",
 	"smartpaste":      true,
 	"softwrap":        false,
 	"splitbottom":     true,
@@ -215,12 +214,6 @@ func validateParsedSettings() error {
 			continue
 		}
 
-		if k == "indentchar" {
-			// migrate to "indenttabchar" from "indentchar"
-			parsedSettings["indenttabchar"] = v
-			err = errors.New("indentchar has been deprecated, use indenttabchar instead")
-		}
-
 		if _, ok := defaults[k]; ok {
 			if e := verifySetting(k, v, defaults[k]); e != nil {
 				err = e

internal/display/bufwindow.go

@@ -2,6 +2,7 @@ package display
 
 import (
 	"strconv"
+	"strings"
 
 	runewidth "github.com/mattn/go-runewidth"
 	"github.com/micro-editor/tcell/v2"
@@ -451,6 +452,32 @@ func (w *BufWindow) displayBuffer() {
 	cursors := b.GetCursors()
 
 	curStyle := config.DefStyle
+
+	// Parse showchars which is in the format of option1=val1,option2=val2,...
+	spacechars := " "
+	tabchars := b.Settings["indentchar"].(string)
+	indentspacechars := " "
+	indenttabchars := b.Settings["indentchar"].(string)
+
+	charsentries := strings.Split(b.Settings["showchars"].(string), ",")
+	for _, entry := range charsentries {
+		if !strings.Contains(entry, "=") {
+			continue
+		}
+		entrykey := strings.Split(entry, "=")[0]
+		entryval := strings.Split(entry, "=")[1]
+		switch entrykey {
+		case "space":
+			spacechars = entryval
+		case "tab":
+			tabchars = entryval
+		case "ispace":
+			indentspacechars = entryval
+		case "itab":
+			indenttabchars = entryval
+		}
+	}
+
 	for ; vloc.Y < w.bufHeight; vloc.Y++ {
 		vloc.X = 0
 
@@ -495,7 +522,7 @@ func (w *BufWindow) displayBuffer() {
 		}
 		bloc.X = bslice
 
-		draw := func(r rune, combc []rune, validrune bool, style tcell.Style, highlight bool, showcursor bool) {
+		draw := func(r rune, showoffset int, combc []rune, isplaceholder bool, style tcell.Style, highlight bool, showcursor bool) {
 			if nColsBeforeStart <= 0 && vloc.Y >= 0 {
 				if highlight {
 					if w.Buf.HighlightSearch && w.Buf.SearchMatch(bloc) {
@@ -572,25 +599,30 @@ func (w *BufWindow) displayBuffer() {
 						}
 					}
 
-					if r == '\t' || (r == ' ' && bloc.X < blineLen && validrune) {
+					if (r == '\t' || r == ' ') && !isplaceholder {
 						var indentrunes []rune
 						switch r {
 						case '\t':
-							indentrunes = []rune(b.Settings["indenttabchar"].(string))
+							if bloc.X < leadingwsEnd && !b.Settings["tabstospaces"].(bool) {
+								indentrunes = []rune(indenttabchars)
+							} else {
+								indentrunes = []rune(tabchars)
+							}
 						case ' ':
-							if bloc.X%tabsize == 0 && bloc.X < leadingwsEnd {
-								indentrunes = []rune(b.Settings["indentspacechar"].(string))
+							if bloc.X%tabsize == 0 && bloc.X < leadingwsEnd && b.Settings["tabstospaces"].(bool) {
+								indentrunes = []rune(indentspacechars)
 							} else {
-								indentrunes = []rune(b.Settings["spacechar"].(string))
+								indentrunes = []rune(spacechars)
 							}
 						}
 
-						// if no override for current character, use space
-						if len(indentrunes) == 0 {
-							indentrunes = []rune{' '}
+						if showoffset < len(indentrunes) {
+							r = indentrunes[showoffset]
+						} else {
+							// use space if no showchars or after we showed showchars
+							r = ' '
 						}
 
-						r = indentrunes[0]
 						if s, ok := config.Colorscheme["indent-char"]; ok && r != ' ' {
 							fg, _, _ := s.Decompose()
 							style = style.Foreground(fg)
@@ -704,7 +736,7 @@ func (w *BufWindow) displayBuffer() {
 			// If a word (or just a wide rune) does not fit in the window
 			if vloc.X+wordwidth > maxWidth && vloc.X > w.gutterOffset {
 				for vloc.X < maxWidth {
-					draw(' ', nil, false, config.DefStyle, false, false)
+					draw(' ', 0, nil, true, config.DefStyle, false, false)
 				}
 
 				// We either stop or we wrap to draw the word in the next line
@@ -728,17 +760,14 @@ func (w *BufWindow) displayBuffer() {
 			}
 
 			for _, r := range word {
-				draw(r.r, r.combc, true, r.style, true, true)
+				draw(r.r, 0, r.combc, false, r.style, true, true)
 
-				// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
-				if r.width > 1 {
-					char := ' '
+				// Draw any extra characters for tabs
+				for i := 1; i < r.width; i++ {
 					if r.r != '\t' {
-						char = '@'
-					}
-
-					for i := 1; i < r.width; i++ {
-						draw(char, nil, false, r.style, true, false)
+						draw(' ', i, nil, true, r.style, true, false)
+					} else {
+						draw('\t', i, nil, false, r.style, true, false)
 					}
 				}
 				bloc.X++
@@ -792,7 +821,7 @@ func (w *BufWindow) displayBuffer() {
 
 		if vloc.X != maxWidth {
 			// Display newline within a selection
-			draw(' ', nil, false, config.DefStyle, true, true)
+			draw(' ', 0, nil, true, config.DefStyle, true, true)
 		}
 
 		bloc.X = w.StartCol

runtime/help/options.md

@@ -203,24 +203,21 @@ Here are the available options:
 
     default value: `true`
 
-* `indenttabchar`: sets the indentation character for tabs. This will not be
-   inserted into files; it is only a visual indicator that whitespace is present.
-   If set to a printing character, it functions as a subset of the
-   "show invisibles" setting available in many other text editors. The color of
-   this character is determined by the `indent-char` field in the current theme
-   rather than the default text color.
+* `showchars`: sets what characters to be shown for various inivisible characters
+   in the file. This is similar to `listchars` in vim and the characters shown
+   will not be inserted into files. This option supersedes the `indentchar`
+   option.
+   The color of the shown character is determined by the `indent-char`
+   field in the current theme rather than the default text color.
+   This field is specified in the form of `option1=value1,option2=value2,...`.
+   Here are the list of options:
+   - `ispace`: indent space characters (space before first visible character)
+   - `itab`: indent tab characters (tab before first visible character)
+   - `space`: space characters (space after first visible character)
+   - `tab`: tab characters (tab after first visible character)
+   An example of this option could be `tab=>,space=.,itab=|>,ispace=|`
 
-    default value: ` ` (space)
-
-* `indentspacechar`: same as `indenttabchar` except for spaces that are at
-   locations that are divisible by `tabsize`.
-
-    default value: ` ` (space)
-
-* `spacechar`: same as `indenttabchar` but for all spaces. `indentspacechar`
-   takes precedence over this option.
-
-    default value: ` ` (space)
+    default value: ``
 
 * `infobar`: enables the line at the bottom of the editor where messages are
    printed. This option is `global only`.
@@ -599,6 +596,7 @@ so that you can see what the formatting should look like.
     "scrollbarchar": "|",
     "scrollmargin": 3,
     "scrollspeed": 2,
+    "showchars": " ",
     "smartpaste": true,
     "softwrap": false,
     "splitbottom": true,