Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix variable name for terminal colors used in Windows logger #1074

Merged
merged 1 commit into from
Mar 28, 2021
Merged

Fix variable name for terminal colors used in Windows logger #1074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions internal/logger/logger_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,45 +67,45 @@ func writeStringWithColor(file *os.File, text string) {
i++
continue

case strings.HasPrefix(text[i:], terminalColors.Reset):
i += len(terminalColors.Reset)
case strings.HasPrefix(text[i:], TerminalColors.Reset):
i += len(TerminalColors.Reset)
attributes = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE

case strings.HasPrefix(text[i:], terminalColors.Red):
i += len(terminalColors.Red)
case strings.HasPrefix(text[i:], TerminalColors.Red):
i += len(TerminalColors.Red)
attributes = FOREGROUND_RED

case strings.HasPrefix(text[i:], terminalColors.Green):
i += len(terminalColors.Green)
case strings.HasPrefix(text[i:], TerminalColors.Green):
i += len(TerminalColors.Green)
attributes = FOREGROUND_GREEN

case strings.HasPrefix(text[i:], terminalColors.Blue):
i += len(terminalColors.Blue)
case strings.HasPrefix(text[i:], TerminalColors.Blue):
i += len(TerminalColors.Blue)
attributes = FOREGROUND_BLUE

case strings.HasPrefix(text[i:], terminalColors.Cyan):
i += len(terminalColors.Cyan)
case strings.HasPrefix(text[i:], TerminalColors.Cyan):
i += len(TerminalColors.Cyan)
attributes = FOREGROUND_GREEN | FOREGROUND_BLUE

case strings.HasPrefix(text[i:], terminalColors.Magenta):
i += len(terminalColors.Magenta)
case strings.HasPrefix(text[i:], TerminalColors.Magenta):
i += len(TerminalColors.Magenta)
attributes = FOREGROUND_RED | FOREGROUND_BLUE

case strings.HasPrefix(text[i:], terminalColors.Yellow):
i += len(terminalColors.Yellow)
case strings.HasPrefix(text[i:], TerminalColors.Yellow):
i += len(TerminalColors.Yellow)
attributes = FOREGROUND_RED | FOREGROUND_GREEN

case strings.HasPrefix(text[i:], terminalColors.Dim):
i += len(terminalColors.Dim)
case strings.HasPrefix(text[i:], TerminalColors.Dim):
i += len(TerminalColors.Dim)
attributes = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE

case strings.HasPrefix(text[i:], terminalColors.Bold):
i += len(terminalColors.Bold)
case strings.HasPrefix(text[i:], TerminalColors.Bold):
i += len(TerminalColors.Bold)
attributes = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY

// Apparently underlines only work with the CJK locale on Windows :(
case strings.HasPrefix(text[i:], terminalColors.Underline):
i += len(terminalColors.Underline)
case strings.HasPrefix(text[i:], TerminalColors.Underline):
i += len(TerminalColors.Underline)
attributes = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE

default:
Expand Down