mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-09 10:51:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #797 from scopatz/color_fix

Browse source 
Aligns the colors with prompt_toolkit specification of colors.
This commit is contained in:
Anthony Scopatz 2016-04-20 11:22:31 -04:00
commit 4175d9f523
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xonsh/pyghooks.py
View file

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Hooks for pygments syntax highlighting.""" """Hooks for pygments syntax highlighting."""
import os
import re import re
import string import string
import builtins import builtins
@ -539,6 +540,29 @@ if hasattr(pygments.style, 'ansicolors'):
Color.WHITE: '#ansiwhite', Color.WHITE: '#ansiwhite',
Color.YELLOW: '#ansiyellow', Color.YELLOW: '#ansiyellow',
} }
elif ON_WINDOWS and 'CONEMUANSI' not in os.environ:
# These colors must match the color specification
# in prompt_toolkit, so the colors are converted
# correctly when using cmd.exe
DEFAULT_STYLE = {
Color.BLACK: '#000000',
Color.BLUE: '#0000AA',
Color.CYAN: '#00AAAA',
Color.GREEN: '#00AA00',
Color.INTENSE_BLACK: '#444444',
Color.INTENSE_BLUE: '#4444FF',
Color.INTENSE_CYAN: '#44FFFF',
Color.INTENSE_GREEN: '#44FF44',
Color.INTENSE_PURPLE: '#FF44FF',
Color.INTENSE_RED: '#FF4444',
Color.INTENSE_WHITE: '#888888',
Color.INTENSE_YELLOW: '#FFFF44',
Color.NO_COLOR: 'noinherit',
Color.PURPLE: '#AA00AA',
Color.RED: '#AA0000',
Color.WHITE: '#FFFFFF',
Color.YELLOW: '#AAAA00',
}
else: else:
DEFAULT_STYLE = { DEFAULT_STYLE = {
Color.BLACK: '#000000', Color.BLACK: '#000000',