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

Highlight code when using prompt_toolkit

Browse source 
rely on Pygments Python Lexer for now,
One need to write a XonshLexer, but lexers based on the current one dont'
work as they don't return whitespace.
This commit is contained in:
Matthias Bussonnier 2015-11-27 09:58:02 +01:00
parent 9338c6710f
commit 94a3826712
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xonsh/lexer.py
View file

@ -3,15 +3,12 @@
Written using a hybrid of ``tokenize`` and PLY. Written using a hybrid of ``tokenize`` and PLY.
""" """
import re
import sys
import tokenize import tokenize
from io import BytesIO from io import BytesIO
from keyword import kwlist from keyword import kwlist
from ply import lex from ply.lex import LexToken
from ply.lex import TOKEN, LexToken
from xonsh.tools import VER_3_5, VER_MAJOR_MINOR from xonsh.tools import VER_3_5, VER_MAJOR_MINOR

10
xonsh/prompt_toolkit_shell.py
View file

@ -1,15 +1,17 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""The prompt_toolkit based xonsh shell.""" """The prompt_toolkit based xonsh shell."""
import os
import builtins import builtins
from warnings import warn from warnings import warn
from prompt_toolkit.shortcuts import prompt from prompt_toolkit.shortcuts import prompt
from prompt_toolkit.key_binding.manager import KeyBindingManager from prompt_toolkit.key_binding.manager import KeyBindingManager
from prompt_toolkit.auto_suggest import AutoSuggestFromHistory from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
from prompt_toolkit.layout.lexers import PygmentsLexer
from prompt_toolkit.filters import Condition from prompt_toolkit.filters import Condition
from pygments.token import Token from pygments.token import Token
from pygments.style import Style from pygments.style import Style
from pygments.styles.default import DefaultStyle
from pygments.lexers import PythonLexer
from xonsh.base_shell import BaseShell from xonsh.base_shell import BaseShell
from xonsh.tools import format_prompt_for_prompt_toolkit from xonsh.tools import format_prompt_for_prompt_toolkit
@ -83,6 +85,7 @@ class PromptToolkitShell(BaseShell):
get_prompt_tokens=token_func, get_prompt_tokens=token_func,
style=style_cls, style=style_cls,
completer=completer, completer=completer,
lexer=PygmentsLexer(PythonLexer),
history=self.history, history=self.history,
key_bindings_registry=self.key_bindings_manager.registry, key_bindings_registry=self.key_bindings_manager.registry,
display_completions_in_columns=multicolumn) display_completions_in_columns=multicolumn)
@ -108,14 +111,15 @@ class PromptToolkitShell(BaseShell):
return list(zip(tokens, strings)) return list(zip(tokens, strings))
class CustomStyle(Style): class CustomStyle(Style):
styles = { styles = DefaultStyle.styles.copy()
styles.update({
Token.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000', Token.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000',
Token.Menu.Completions.Completion: 'bg:#008888 #ffffff', Token.Menu.Completions.Completion: 'bg:#008888 #ffffff',
Token.Menu.Completions.ProgressButton: 'bg:#003333', Token.Menu.Completions.ProgressButton: 'bg:#003333',
Token.Menu.Completions.ProgressBar: 'bg:#00aaaa', Token.Menu.Completions.ProgressBar: 'bg:#00aaaa',
Token.AutoSuggestion: '#666666', Token.AutoSuggestion: '#666666',
Token.Aborted: '#888888', Token.Aborted: '#888888',
} })
# update with the prompt styles # update with the prompt styles
styles.update({t: s for (t, s) in zip(tokens, cstyles)}) styles.update({t: s for (t, s) in zip(tokens, cstyles)})
# Update with with any user styles # Update with with any user styles