Fixing tabhighlight and tabreverse options not applying properly

Author: Neko-Box-Coder

internal/config/colorscheme.go

@@ -208,6 +208,16 @@ func StringToStyle(str string) tcell.Style {
 	return style
 }
 
+func ReverseColor(s tcell.Style) tcell.Style {
+	_, _, attr := s.Decompose()
+	attr = attr ^ tcell.AttrReverse
+	if attr&tcell.AttrReverse == tcell.AttrReverse {
+		return s.Reverse(true)
+	} else {
+		return s.Reverse(false)
+	}
+}
+
 // StringToColor returns a tcell color from a string representation of a color
 // We accept either bright... or light... to mean the brighter version of a color
 func StringToColor(str string) (tcell.Color, bool) {

internal/config/settings.go

@@ -130,7 +130,7 @@ var DefaultGlobalOnlySettings = map[string]any{
 	"scrollbarchar":  "|",
 	"sucmd":          "sudo",
 	"tabhighlight":   false,
-	"tabreverse":     true,
+	"tabreverse":     false,
 	"xterm":          false,
 }
 

internal/display/tabwindow.go

@@ -2,7 +2,6 @@ package display
 
 import (
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
@@ -97,25 +96,23 @@ func (w *TabWindow) Display() {
 
 	globalTabReverse := config.GetGlobalOption("tabreverse").(bool)
 	globalTabHighlight := config.GetGlobalOption("tabhighlight").(bool)
+	tabBarStyle := config.DefStyle
 
-	// xor of reverse and tab highlight to get tab character (as in filename and surrounding characters) reverse state
-	tabCharHighlight := (globalTabReverse || globalTabHighlight) && !(globalTabReverse && globalTabHighlight)
-
-	reverseStyles := func(reverse bool) (tcell.Style, tcell.Style) {
-		tabBarStyle := config.DefStyle.Reverse(reverse)
-		if style, ok := config.Colorscheme["tabbar"]; ok {
-			tabBarStyle = style
-		}
-		tabBarActiveStyle := tabBarStyle
-		if style, ok := config.Colorscheme["tabbar.active"]; ok {
-			tabBarActiveStyle = style
-		}
-		return tabBarStyle, tabBarActiveStyle
+	if style, ok := config.Colorscheme["tabbar"]; ok {
+		tabBarStyle = style
+	}
+	if globalTabReverse {
+		tabBarStyle = config.ReverseColor(tabBarStyle)
+	}
+	tabBarActiveStyle := tabBarStyle
+	if globalTabHighlight {
+		tabBarActiveStyle = config.ReverseColor(tabBarStyle)
+	}
+	if style, ok := config.Colorscheme["tabbar.active"]; ok {
+		tabBarActiveStyle = style
 	}
 
-	draw := func(r rune, n int, active bool, reversed bool) {
-		tabBarStyle, tabBarActiveStyle := reverseStyles(reversed)
-
+	draw := func(r rune, n int, active bool, tab bool) {
 		style := tabBarStyle
 		if active {
 			style = tabBarActiveStyle
@@ -128,11 +125,11 @@ func (w *TabWindow) Display() {
 					c = ' '
 				}
 				if x == w.Width-1 && !done {
-					screen.SetContent(w.Width-1, w.Y, '>', nil, tabBarStyle)
+					screen.SetContent(w.Width-1, w.Y, '>', nil, style)
 					x++
 					break
 				} else if x == 0 && w.hscroll > 0 {
-					screen.SetContent(0, w.Y, '<', nil, tabBarStyle)
+					screen.SetContent(0, w.Y, '<', nil, style)
 				} else if x >= 0 && x < w.Width {
 					screen.SetContent(x, w.Y, c, nil, style)
 				}
@@ -143,25 +140,25 @@ func (w *TabWindow) Display() {
 
 	for i, n := range w.Names {
 		if i == w.active {
-			draw('[', 1, true, tabCharHighlight)
+			draw('[', 1, true, true)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
+			draw(' ', 1, false, true)
 		}
 
 		for _, c := range n {
-			draw(c, 1, i == w.active, tabCharHighlight)
+			draw(c, 1, i == w.active, true)
 		}
 
 		if i == len(w.Names)-1 {
 			done = true
 		}
 
 		if i == w.active {
-			draw(']', 1, true, tabCharHighlight)
-			draw(' ', 2, true, globalTabReverse)
+			draw(']', 1, true, true)
+			draw(' ', 2, true, false)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
-			draw(' ', 2, false, globalTabReverse)
+			draw(' ', 1, false, true)
+			draw(' ', 2, false, false)
 		}
 
 		if x >= w.Width {

runtime/colorschemes/gotham.micro

@@ -25,5 +25,6 @@ color-link cursor-line "#091F2E"
 color-link color-column "#11151C"
 color-link symbol "#99D1CE,#0C1014"
 color-link match-brace "#0C1014,#D26937"
+color-link tabbar "#0C1014,#99D1CE"
 color-link tab-error "#D75F5F"
 color-link trailingws "#D75F5F"

runtime/colorschemes/monokai-dark.micro

@@ -25,4 +25,5 @@ color-link cursor-line "#323232"
 color-link color-column "#323232"
 color-link match-brace "#1D0000,#AE81FF"
 color-link tab-error "#D75F5F"
+color-link tabbar "#1D0000,#D5D8D6"
 color-link trailingws "#D75F5F"

runtime/colorschemes/sunny-day.micro

@@ -26,4 +26,5 @@ color-link cursor-line "229"
 color-link current-line-number "246"
 color-link match-brace "230,22"
 color-link tab-error "210"
+color-link tabbar "230,0"
 color-link trailingws "210"

runtime/help/options.md

@@ -460,8 +460,9 @@ Here are the available options:
 
     default value: `true`
 
-* `tabhighlight`: inverts the tab characters' (filename, save indicator, etc)
-   colors with respect to the tab bar.
+
+* `tabhighlight`: highlighting the current active tab by using the inverted tab bar color.
+   Has no effect if `tabbar.active` is present in the current colorscheme.
 
     default value: `false`
 
@@ -471,9 +472,9 @@ Here are the available options:
 
     default value: `false`
 
-* `tabreverse`: reverses the tab bar colors when active.
+* `tabreverse`: reverses the tab bar colors.
 
-    default value: `true`
+    default value: `false`
 
 * `tabsize`: the size in spaces that a tab character should be displayed with.
 
@@ -626,7 +627,7 @@ so that you can see what the formatting should look like.
     "statusline": true,
     "sucmd": "sudo",
     "syntax": true,
-    "tabhighlight": true,
+    "tabhighlight": false,
     "tabmovement": false,
     "tabreverse": false,
     "tabsize": 4,