mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1761 from t184256/reeval-prompt-on-keypress

Browse source 
Add $XONSH_UPDATE_PROMPT_ON_KEYPRESS option
This commit is contained in:
Anthony Scopatz 2016-09-25 14:08:13 -04:00 • committed by GitHub
commit eff262629a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xonsh/environ.py
View file

@ -160,6 +160,7 @@ def DEFAULT_ENSURERS():
'XONSH_STORE_STDIN': (is_bool, to_bool, bool_to_str),
'XONSH_TRACEBACK_LOGFILE': (is_logfile_opt, to_logfile_opt, logfile_opt_to_str),
'XONSH_DATETIME_FORMAT': (is_string, ensure_string, ensure_string),
'UPDATE_PROMPT_ON_KEYPRESS': (is_bool, to_bool, bool_to_str),
}
@ -300,6 +301,7 @@ def DEFAULT_VALUES():
'XONSH_STORE_STDOUT': False,
'XONSH_TRACEBACK_LOGFILE': None,
'XONSH_DATETIME_FORMAT': '%Y-%m-%d %H:%M',
'UPDATE_PROMPT_ON_KEYPRESS': False,
}
if hasattr(locale, 'LC_MESSAGES'):
dv['LC_MESSAGES'] = locale.setlocale(locale.LC_MESSAGES)
@ -672,6 +674,10 @@ def DEFAULT_DOCS():
'XONSH_DATETIME_FORMAT': VarDocs(
'The format that is used for ``datetime.strptime()`` in various places'
'i.e the history timestamp option'),
'UPDATE_PROMPT_ON_KEYPRESS': VarDocs(
'Disables caching the prompt between commands, '
'so that it would be reevaluated on each keypress. '
'Disabled by default because of the incurred performance penalty.'),
}

12
xonsh/ptk/shell.py
View file

@ -58,10 +58,14 @@ class PromptToolkitShell(BaseShell):
multicolumn = (completions_display == 'multi')
self.styler.style_name = env.get('XONSH_COLOR_STYLE')
completer = None if completions_display == 'none' else self.pt_completer
prompt_tokens = self.prompt_tokens(None)
get_prompt_tokens = lambda cli: prompt_tokens
rprompt_tokens = self.rprompt_tokens(None)
get_rprompt_tokens = lambda cli: rprompt_tokens
if not env.get('UPDATE_PROMPT_ON_KEYPRESS'):
prompt_tokens_cached = self.prompt_tokens(None)
get_prompt_tokens = lambda cli: prompt_tokens_cached
rprompt_tokens_cached = self.rprompt_tokens(None)
get_rprompt_tokens = lambda cli: rprompt_tokens_cached
else:
get_prompt_tokens = self.prompt_tokens
get_rprompt_tokens = self.rprompt_tokens
with self.prompter:
prompt_args = {
'mouse_support': mouse_support,