Merge branch 'MoreCharOptions' into dev

Author: Neko-Box-Coder

internal/config/settings.go

@@ -70,7 +70,9 @@ var defaultCommonSettings = map[string]interface{}{
 	"hltrailingws":    false,
 	"ignorecase":      true,
 	"incsearch":       true,
-	"indentchar":      " ",
+	"indenttabchar":   " ",
+	"indentspacechar": " ",
+	"spacechar":       " ",
 	"keepautoindent":  false,
 	"matchbrace":      true,
 	"matchbraceleft":  true,
@@ -213,6 +215,13 @@ 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

@@ -572,8 +572,25 @@ func (w *BufWindow) displayBuffer() {
 						}
 					}
 
-					if r == '\t' {
-						indentrunes := []rune(b.Settings["indentchar"].(string))
+					if r == '\t' || (r == ' ' && bloc.X < blineLen) {
+						var indentrunes []rune
+						switch r {
+						case '\t':
+							indentrunes = []rune(b.Settings["indentchar"].(string))
+						case ' ':
+							if bloc.X%tabsize == 0 && bloc.X < leadingwsEnd {
+								indentrunes = []rune(b.Settings["indentspacechar"].(string))
+							} else {
+								indentrunes = []rune(b.Settings["spacechar"].(string))
+							}
+						}
+
+						if len(indentrunes) == 0 {
+							r = ' '
+						} else {
+							r = indentrunes[0]
+						}
+
 						// if empty indentchar settings, use space
 						if len(indentrunes) == 0 {
 							indentrunes = []rune{' '}

runtime/help/options.md

@@ -203,12 +203,22 @@ Here are the available options:
 
     default value: `true`
 
-* `indentchar`: sets the indentation character. 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.
+* `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.
+
+    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)