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

minor updates

Browse source
This commit is contained in:
Anthony Scopatz 2018-07-14 18:00:45 -05:00
parent be49714553
commit b5c354665f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xonsh/ptk2/shell.py
View file

@ -84,14 +84,14 @@ class PromptToolkit2Shell(BaseShell):
self.styler.style_name = env.get('XONSH_COLOR_STYLE') self.styler.style_name = env.get('XONSH_COLOR_STYLE')
completer = None if completions_display == 'none' else self.pt_completer completer = None if completions_display == 'none' else self.pt_completer
if not env.get('UPDATE_PROMPT_ON_KEYPRESS'): if env.get('UPDATE_PROMPT_ON_KEYPRESS'):
get_prompt_tokens = self.prompt_tokens(None)
get_rprompt_tokens = self.rprompt_tokens(None)
get_bottom_toolbar_tokens = self.bottom_toolbar_tokens(None)
else:
get_prompt_tokens = self.prompt_tokens get_prompt_tokens = self.prompt_tokens
get_rprompt_tokens = self.rprompt_tokens get_rprompt_tokens = self.rprompt_tokens
get_bottom_toolbar_tokens = self.bottom_toolbar_tokens get_bottom_toolbar_tokens = self.bottom_toolbar_tokens
else:
get_prompt_tokens = self.prompt_tokens()
get_rprompt_tokens = self.rprompt_tokens()
get_bottom_toolbar_tokens = self.bottom_toolbar_tokens()
if env.get('VI_MODE'): if env.get('VI_MODE'):
editing_mode = EditingMode.VI editing_mode = EditingMode.VI
@ -176,7 +176,7 @@ class PromptToolkit2Shell(BaseShell):
else: else:
break break
def prompt_tokens(self, cli): def prompt_tokens(self):
"""Returns a list of (token, str) tuples for the current prompt.""" """Returns a list of (token, str) tuples for the current prompt."""
p = builtins.__xonsh_env__.get('PROMPT') p = builtins.__xonsh_env__.get('PROMPT')
try: try:
@ -190,7 +190,7 @@ class PromptToolkit2Shell(BaseShell):
self.settitle() self.settitle()
return PygmentsTokens(toks) return PygmentsTokens(toks)
def rprompt_tokens(self, cli): def rprompt_tokens(self):
"""Returns a list of (token, str) tuples for the current right """Returns a list of (token, str) tuples for the current right
prompt. prompt.
""" """
@ -207,7 +207,7 @@ class PromptToolkit2Shell(BaseShell):
toks = partial_color_tokenize(p) toks = partial_color_tokenize(p)
return PygmentsTokens(toks) return PygmentsTokens(toks)
def bottom_toolbar_tokens(self, cli): def bottom_toolbar_tokens(self):
"""Returns a list of (token, str) tuples for the current bottom """Returns a list of (token, str) tuples for the current bottom
toolbar. toolbar.
""" """