go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

better hiding of underscores

Browse Source
This commit is contained in:
Jesse Duffield 2022-11-13 14:46:13 +11:00
parent 5964472ec1
commit a905a28e41
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/gui/style/basic_styles.go
View File

@ -1,20 +1,11 @@
package style package style
import ( import (
"os"
"text/template" "text/template"
"github.com/gookit/color" "github.com/gookit/color"
) )
// See https://github.com/xtermjs/xterm.js/issues/4238
// VSCode is soon to fix this in an upcoming update.
// Once that's done, we can scrap the HIDE_UNDERSCORES variable
// duplicating because init() isn't always called when we need it
func init() {
HIDE_UNDERSCORES = os.Getenv("TERM_PROGRAM") == "vscode"
}
var ( var (
FgWhite = FromBasicFg(color.FgWhite) FgWhite = FromBasicFg(color.FgWhite)
FgLightWhite = FromBasicFg(color.FgLightWhite) FgLightWhite = FromBasicFg(color.FgLightWhite)

18
pkg/gui/style/text_style.go
View File

@ -27,13 +27,21 @@ import (
// a string, we derive it when a new TextStyle is created and store it in the // a string, we derive it when a new TextStyle is created and store it in the
// `style` field. // `style` field.
var HIDE_UNDERSCORES bool
// See https://github.com/xtermjs/xterm.js/issues/4238 // See https://github.com/xtermjs/xterm.js/issues/4238
// VSCode is soon to fix this in an upcoming update. // VSCode is soon to fix this in an upcoming update.
// Once that's done, we can scrap the HIDE_UNDERSCORES variable // Once that's done, we can scrap the HIDE_UNDERSCORES variable
func init() { var (
HIDE_UNDERSCORES = os.Getenv("TERM_PROGRAM") == "vscode" underscoreEnvChecked bool
hideUnderscores bool
)
func hideUnderScores() bool {
if !underscoreEnvChecked {
hideUnderscores = os.Getenv("TERM_PROGRAM") == "vscode"
underscoreEnvChecked = true
}
return hideUnderscores
} }
type TextStyle struct { type TextStyle struct {
@ -75,7 +83,7 @@ func (b TextStyle) SetBold() TextStyle {
} }
func (b TextStyle) SetUnderline() TextStyle { func (b TextStyle) SetUnderline() TextStyle {
if HIDE_UNDERSCORES { if hideUnderScores() {
return b return b
} }