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

Merge branch 'master' into sleepless

Browse source
This commit is contained in:
Anthony Scopatz 2016-11-06 09:23:15 -05:00
commit 45d1ace7c3
3 changed files with 45 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
docs/_static/console_colors.reg vendored
View file

@ -9,14 +9,14 @@ Windows Registry Editor Version 5.00
; -- ------- ------ --------- ------- --------
; 00 Black 000000 00000000 #0A0A0A 000A0A0A
; 01 Blue 000080 00800000 #4080D6 00D68040
; 02 Green 008000 00008000 #00CD00 0000CD00
; 02 Green 008000 00008000 #00BB00 0000BB00
; 03 Aqua 008080 00808000 #00CDCD 00CDCD00
; 04 Red 800000 00000080 #CD0000 000000CD
; 05 Purple 800080 00800080 #CD00CD 00CD00CD
; 06 Yellow 808000 00008080 #CDCD00 0000CDCD
; 06 Yellow 808000 00008080 #BEBE28 0028BEBE
; 07 White C0C0C0 00C0C0C0 #C8C8C8 00C8C8C8
; 08 Gray 808080 00808080 #7F7F7F 007F7F7F
; 09 LightBlue 0000FF 00FF0000 #40A0FF 00FFA040
; 09 LightBlue 0000FF 00FF0000 #46AAFF 00FFAA46
; 10 LightGreen 00FF00 0000FF00 #00FF00 0000FF00
; 11 LightAqua 00FFFF 00FFFF00 #00FFFF 00FFFF00
; 12 LightRed FF0000 000000FF #FF0000 000000FF
@ -28,14 +28,14 @@ Windows Registry Editor Version 5.00
[HKEY_CURRENT_USER\Console]
"ColorTable00"=dword:000A0A0A
"ColorTable01"=dword:00D68040
"ColorTable02"=dword:0000CD00
"ColorTable02"=dword:0000BB00
"ColorTable03"=dword:00CDCD00
"ColorTable04"=dword:000000CD
"ColorTable05"=dword:00CD00CD
"ColorTable06"=dword:0000CDCD
"ColorTable06"=dword:0028BEBE
"ColorTable07"=dword:00C8C8C8
"ColorTable08"=dword:007F7F7F
"ColorTable09"=dword:00FFA040
"ColorTable09"=dword:00FFAA46
"ColorTable10"=dword:0000FF00
"ColorTable11"=dword:00FFFF00
"ColorTable12"=dword:000000FF
@ -46,20 +46,20 @@ Windows Registry Editor Version 5.00
"PopupColors" =dword:000000f8
"FontFamily" =dword:00000036
"FontSize" =dword:00100000
"FontWeight" =dword:000002BC
"FontWeight" =dword:00000400
"FaceName" ="Consolas"
[HKEY_CURRENT_USER\Console\%SystemRoot%_cmd.exe]
"ColorTable00"=dword:000A0A0A
"ColorTable01"=dword:00D68040
"ColorTable02"=dword:0000CD00
"ColorTable02"=dword:0000BB00
"ColorTable03"=dword:00CDCD00
"ColorTable04"=dword:000000CD
"ColorTable05"=dword:00CD00CD
"ColorTable06"=dword:0000CDCD
"ColorTable06"=dword:0028BEBE
"ColorTable07"=dword:00C8C8C8
"ColorTable08"=dword:007F7F7F
"ColorTable09"=dword:00FFA040
"ColorTable09"=dword:00FFAA46
"ColorTable10"=dword:0000FF00
"ColorTable11"=dword:00FFFF00
"ColorTable12"=dword:000000FF
@ -70,5 +70,5 @@ Windows Registry Editor Version 5.00
"PopupColors"=dword: 000000f8
"FontFamily" =dword:00000036
"FontSize" =dword:00100000
"FontWeight" =dword:000002BC
"FontWeight" =dword:00000400
"FaceName" ="Consolas"

15
news/ptk_menu.rst Normal file
View file

@ -0,0 +1,15 @@
**Added:** None
**Changed:**
* The style for the prompt toolkit completion menu is now lightgray/darkgray instead of turquoise/teal
**Deprecated:** None
**Removed:** None
**Fixed:**
* The scroll bars in the PTK completions menus are back.
**Security:** None

33
xonsh/pyghooks.py
View file

@ -450,10 +450,11 @@ class XonshStyle(Style):
env = builtins.__xonsh_env__
# Ensure we are not using ConEmu
if 'CONEMUANSI' not in env:
# Auto suggest needs to be a darker shade to be distinguishable
# from the default color
self.styles[Token.AutoSuggestion] = '#444444'
self._smap.update(expand_gray_colors_for_cmd_exe(self._smap))
if not hasattr(pygments.style, 'ansicolors'):
# Auto suggest needs to be a darker shade to be distinguishable
# from the default color
self.styles[Token.AutoSuggestion] = '#444444'
self._smap.update(expand_gray_colors_for_cmd_exe(self._smap))
if env.get('INTENSIFY_COLORS_ON_WIN', False):
has_ansi = hasattr(pygments.style, 'ansicolors')
newcolors = intensify_colors_for_cmd_exe(self._smap, ansi=has_ansi)
@ -476,21 +477,25 @@ def xonsh_style_proxy(styler):
if hasattr(pygments.style, 'ansicolors'):
PTK_STYLE = {
Token.Menu.Completions.Completion.Current: 'bg:#ansiturquoise #ansiblack',
Token.Menu.Completions.Completion: 'bg:#ansiteal #ansiwhite',
Token.Menu.Completions.ProgressButton: 'bg:#ansidarkgray',
Token.Menu.Completions.ProgressBar: 'bg:#ansiturquoise',
Token.Menu.Completions: 'bg:#ansilightgray #ansiblack',
Token.Menu.Completions.Completion: '',
Token.Menu.Completions.Completion.Current: 'bg:#ansidarkgray #ansiwhite',
Token.Scrollbar: 'bg:#ansidarkgray',
Token.Scrollbar.Button: 'bg:#ansiblack',
Token.Scrollbar.Arrow: 'bg:#ansiblack #ansiwhite bold',
Token.AutoSuggestion: '#ansidarkgray',
Token.Aborted: '#ansilightgray',
Token.Aborted: '#ansidarkgray',
}
else:
PTK_STYLE = {
Token.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000',
Token.Menu.Completions.Completion: 'bg:#008888 #ffffff',
Token.Menu.Completions.ProgressButton: 'bg:#003333',
Token.Menu.Completions.ProgressBar: 'bg:#00aaaa',
Token.Menu.Completions: 'bg:#888888 #000000',
Token.Menu.Completions.Completion: '',
Token.Menu.Completions.Completion.Current: 'bg:#555555 #ffffff',
Token.Scrollbar: 'bg:#555555',
Token.Scrollbar.Button: 'bg:#000000',
Token.Scrollbar.Arrow: 'bg:#000000 #ffffff bold',
Token.AutoSuggestion: '#666666',
Token.Aborted: '#888888',
Token.Aborted: '#666666',
}
if hasattr(pygments.style, 'ansicolors'):