Merge branch 'MoreCharOptions' into dev

Author: Neko-Box-Coder

README.md

@@ -9,15 +9,14 @@
 > - [Add wrapindent option to allow wrapping and hanging indents #3107](https://github.com/zyedidia/micro/pull/3107)
 > - [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)
-> - [Exposing replacement functions for deprecated IOUtil functions #3393](https://github.com/zyedidia/micro/pull/3393)
 > - [Adding timeout when fetching plugin & more clear plugin error message #3389](https://github.com/zyedidia/micro/pull/3389)
 > - [Adding Jumping to opening and closing brace logic and actions #3384](https://github.com/zyedidia/micro/pull/3384)
 > - [Adding auto complete support for multi cursors #3442](https://github.com/zyedidia/micro/pull/3442)
 > - [Fixing comment plugin not using user settings when overriding default setting #3424](https://github.com/zyedidia/micro/pull/3424)
 > - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
 > - [Adding error screen for lua functions running in status line #3691](https://github.com/zyedidia/micro/pull/3691)
 > - [Adding lua function to use result of RunBackgroundShell #3692](https://github.com/zyedidia/micro/pull/3692)
-> - [Fix unable to perform proportional resize caused by chained parents after quiting a nested HSplit inside a VSplit #3708](https://github.com/zyedidia/micro/pull/3708)
+> - [Adding indenttabchar, indentspacechar and spacechar options #3760](https://github.com/zyedidia/micro/pull/3760)
 >
 > 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/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

@@ -495,7 +495,7 @@ func (w *BufWindow) displayBuffer() {
 		}
 		bloc.X = bslice
 
-		draw := func(r rune, combc []rune, style tcell.Style, highlight bool, showcursor bool) {
+		draw := func(r rune, combc []rune, validrune 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,9 +572,20 @@ func (w *BufWindow) displayBuffer() {
 						}
 					}
 
-					if r == '\t' {
-						indentrunes := []rune(b.Settings["indentchar"].(string))
-						// if empty indentchar settings, use space
+					if r == '\t' || (r == ' ' && bloc.X < blineLen && validrune) {
+						var indentrunes []rune
+						switch r {
+						case '\t':
+							indentrunes = []rune(b.Settings["indenttabchar"].(string))
+						case ' ':
+							if bloc.X%tabsize == 0 && bloc.X < leadingwsEnd {
+								indentrunes = []rune(b.Settings["indentspacechar"].(string))
+							} else {
+								indentrunes = []rune(b.Settings["spacechar"].(string))
+							}
+						}
+
+						// if no override for current character, use space
 						if len(indentrunes) == 0 {
 							indentrunes = []rune{' '}
 						}
@@ -693,7 +704,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, config.DefStyle, false, false)
+					draw(' ', nil, false, config.DefStyle, false, false)
 				}
 
 				// We either stop or we wrap to draw the word in the next line
@@ -717,7 +728,7 @@ func (w *BufWindow) displayBuffer() {
 			}
 
 			for _, r := range word {
-				draw(r.r, r.combc, r.style, true, true)
+				draw(r.r, r.combc, true, r.style, true, true)
 
 				// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
 				if r.width > 1 {
@@ -727,7 +738,7 @@ func (w *BufWindow) displayBuffer() {
 					}
 
 					for i := 1; i < r.width; i++ {
-						draw(char, nil, r.style, true, false)
+						draw(char, nil, false, r.style, true, false)
 					}
 				}
 				bloc.X++
@@ -781,7 +792,7 @@ func (w *BufWindow) displayBuffer() {
 
 		if vloc.X != maxWidth {
 			// Display newline within a selection
-			draw(' ', nil, config.DefStyle, true, true)
+			draw(' ', nil, false, config.DefStyle, true, true)
 		}
 
 		bloc.X = w.StartCol

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)