Token.{Menu,Toolbar}.Completer renamed to Token.{Menu.Toolbar}.Completions.

11 files changed, 84 insertions, 114 deletions

diff --git a/examples/autocompletion.py b/examples/autocompletion.py
index cd9c9359..f09320db 100755
--- a/examples/autocompletion.py
+++ b/examples/autocompletion.py
@@ -66,10 +66,10 @@ class AnimalCompleter(Completer):
 
 class AnimalStyle(Style):
     styles = {
-        Token.Menu.Completer.Completion.Current: 'bg:#00aaaa #000000',
-        Token.Menu.Completer.Completion:         'bg:#008888 #ffffff',
-        Token.Menu.Completer.ProgressButton:     'bg:#003333',
-        Token.Menu.Completer.ProgressBar:        'bg:#00aaaa',
+        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',
     }
 
 
diff --git a/examples/calculator.py b/examples/calculator.py
index d45ac387..e6a07da0 100755
--- a/examples/calculator.py
+++ b/examples/calculator.py
@@ -67,10 +67,10 @@ class ExampleStyle(Style):
         Token.Placeholder.Separator: "#ee7777",
         Token.Aborted:    '#aaaaaa',
 
-        Token.Menu.Completer.Completion.Current: 'bg:#00aaaa #000000',
-        Token.Menu.Completer.Completion:         'bg:#008888 #ffffff',
-        Token.Menu.Completer.ProgressButton:     'bg:#003333',
-        Token.Menu.Completer.ProgressBar:        'bg:#00aaaa',
+        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',
     }
 
 
diff --git a/examples/layout-test.py b/examples/layout-test.py
index 87f46801..63401e4f 100755
--- a/examples/layout-test.py
+++ b/examples/layout-test.py
@@ -51,15 +51,15 @@ class TestStyle(Style):
         Token.Layout.Toolbar.Arg: 'bg:#aaaaff #000088',
         Token.Layout.Toolbar.Arg.Text: 'bg:#aaaaff #000088 bold',
 
-        Token.Menu.Completer.Completion.Current: 'bg:#00aaaa #000000',
-        Token.Menu.Completer.Completion:         'bg:#008888 #ffffff',
-        Token.Menu.Completer.ProgressButton:     'bg:#003333',
-        Token.Menu.Completer.ProgressBar:        'bg:#00aaaa',
-
-        Token.Toolbar.Completer:  'bg:#888800 #000000',
-        Token.Toolbar.Completer.Arrow: 'bg:#888800 #000000',
-        Token.Toolbar.Completer.Completion:  'bg:#aaaa00 #000000',
-        Token.Toolbar.Completer.Completion.Current:  'bg:#ffffaa #000000 bold',
+        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.Toolbar.Completions:  'bg:#888800 #000000',
+        Token.Toolbar.Completions.Arrow: 'bg:#888800 #000000',
+        Token.Toolbar.Completions.Completion:  'bg:#aaaa00 #000000',
+        Token.Toolbar.Completions.Completion.Current:  'bg:#ffffaa #000000 bold',
 
         Token.SelectedText: 'bg:#000088 #ffffff',
     }
diff --git a/examples/pdb.py b/examples/pdb.py
index 6302bca4..ca4144cc 100755
--- a/examples/pdb.py
+++ b/examples/pdb.py
@@ -177,10 +177,10 @@ class PdbStyle(Style):
         Error:                        '#000000 bg:#ff8888',
 
         # Completion Menu
-        Token.Menu.Completer.Completion.Current: 'bg:#00aaaa #000000',
-        Token.Menu.Completer.Completion:         'bg:#008888 #ffffff',
-        Token.Menu.Completer.ProgressButton:     'bg:#003333',
-        Token.Menu.Completer.ProgressBar:        'bg:#00aaaa',
+        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',
     }
 
 
diff --git a/examples/shell-example.py b/examples/shell-example.py
index fa7f5296..2756b3c5 100755
--- a/examples/shell-example.py
+++ b/examples/shell-example.py
@@ -72,10 +72,10 @@ class ExampleStyle(Style):
         Token.Placeholder.Separator: "#ee7777",
         Token.Aborted:               '#aaaaaa',
 
-        Token.Menu.Completer.Completion.Current: 'bg:#00aaaa #000000',
-        Token.Menu.Completer.Completion:         'bg:#008888 #ffffff',
-        Token.Menu.Completer.ProgressButton:     'bg:#003333',
-        Token.Menu.Completer.ProgressBar:        'bg:#00aaaa',
+        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.Prompt.BeforeInput: '#105055 bold',
         Token.StatusBar: 'bg:#105055 #ffffff',
diff --git a/examples/tutorial/README.rst b/examples/tutorial/README.rst
index 3955009a..cb86e1e7 100755
--- a/examples/tutorial/README.rst
+++ b/examples/tutorial/README.rst
@@ -181,10 +181,10 @@ Let's get started!
 
        class DocumentStyle(Style):
            styles = {
-               Token.CompletionMenu.Completion.Current: 'bg:#00aaaa #000000',
-               Token.CompletionMenu.Completion: 'bg:#008888 #ffffff',
-               Token.CompletionMenu.ProgressButton: 'bg:#003333',
-               Token.CompletionMenu.ProgressBar: 'bg:#00aaaa',
+               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',
            }
            styles.update(DefaultStyle.styles)
 
@@ -245,10 +245,10 @@ Let's get started!
 
        class DocumentStyle(Style):
            styles = {
-               Token.CompletionMenu.Completion.Current: 'bg:#00aaaa #000000',
-               Token.CompletionMenu.Completion: 'bg:#008888 #ffffff',
-               Token.CompletionMenu.ProgressButton: 'bg:#003333',
-               Token.CompletionMenu.ProgressBar: 'bg:#00aaaa',
+               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',
            }
            styles.update(DefaultStyle.styles)
 
diff --git a/examples/tutorial/sqlite-cli.py b/examples/tutorial/sqlite-cli.py
index 85f52279..3d087a2b 100755
--- a/examples/tutorial/sqlite-cli.py
+++ b/examples/tutorial/sqlite-cli.py
@@ -28,10 +28,10 @@ class SqlCompleter(Completer):
 
 class DocumentStyle(Style):
     styles = {
-        Token.CompletionMenu.Completion.Current: 'bg:#00aaaa #000000',
-        Token.CompletionMenu.Completion: 'bg:#008888 #ffffff',
-        Token.CompletionMenu.ProgressButton: 'bg:#003333',
-        Token.CompletionMenu.ProgressBar: 'bg:#00aaaa',
+        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',
     }
     styles.update(DefaultStyle.styles)
 
diff --git a/prompt_toolkit/contrib/python_input.py b/prompt_toolkit/contrib/python_input.py
index 291751c6..b13c2f94 100644
--- a/prompt_toolkit/contrib/python_input.py
+++ b/prompt_toolkit/contrib/python_input.py
@@ -64,75 +64,75 @@ class PythonStyle(Style):
     background_color = None
     styles = {
         # Build-ins from the Pygments lexer.
-        Comment:                                    '#0000dd',
-        Error:                                      '#000000 bg:#ff8888',
-        Keyword:                                    '#ee00ee',
-        Name.Decorator:                             '#aa22ff',
-        Name.Namespace:                             '#008800 underline',
-        Name:                                       '#008800',
-        Number:                                     '#ff0000',
-        Operator:                                   '#ff6666 bold',
-        String:                                     '#ba4444 bold',
+        Comment:                                      '#0000dd',
+        Error:                                        '#000000 bg:#ff8888',
+        Keyword:                                      '#ee00ee',
+        Name.Decorator:                               '#aa22ff',
+        Name.Namespace:                               '#008800 underline',
+        Name:                                         '#008800',
+        Number:                                       '#ff0000',
+        Operator:                                     '#ff6666 bold',
+        String:                                       '#ba4444 bold',
 
         # Highlighting of search matches in document.
-        Token.SearchMatch:                          '#ffffff bg:#4444aa',
-        Token.SearchMatch.Current:                  '#ffffff bg:#44aa44',
+        Token.SearchMatch:                            '#ffffff bg:#4444aa',
+        Token.SearchMatch.Current:                    '#ffffff bg:#44aa44',
 
         # Highlighting of select text in document.
-        Token.SelectedText:                         '#ffffff bg:#6666aa',
+        Token.SelectedText:                           '#ffffff bg:#6666aa',
 
         # (Python) Prompt: "In [1]:"
-        Token.Prompt:                               'bold #008800',
+        Token.Prompt:                                 'bold #008800',
 
         # Line numbers.
-        Token.Layout.LeftMargin:                    '#aa6666',
+        Token.Layout.LeftMargin:                      '#aa6666',
 
         # Search toolbar.
-        Token.Toolbar.Search:                       '#22aaaa noinherit',
-        Token.Toolbar.Search.Text:                  'noinherit',
-        Token.Toolbar.Search.Text.NoMatch:          'bg:#aa4444 #ffffff',
+        Token.Toolbar.Search:                         '#22aaaa noinherit',
+        Token.Toolbar.Search.Text:                    'noinherit',
+        Token.Toolbar.Search.Text.NoMatch:            'bg:#aa4444 #ffffff',
 
         # System toolbar
-        Token.Toolbar.System.Prefix:                '#22aaaa noinherit',
+        Token.Toolbar.System.Prefix:                  '#22aaaa noinherit',
 
         # "arg" toolbar.
-        Token.Toolbar.Arg:                          '#22aaaa noinherit',
-        Token.Toolbar.Arg.Text:                     'noinherit',
+        Token.Toolbar.Arg:                            '#22aaaa noinherit',
+        Token.Toolbar.Arg.Text:                       'noinherit',
 
         # Signature toolbar.
-        Token.Toolbar.Signature:                    '#888888',
-        Token.Toolbar.Signature.CurrentName:        'bold underline #888888',
-        Token.Toolbar.Signature.Operator:           'bold #888888',
+        Token.Toolbar.Signature:                      '#888888',
+        Token.Toolbar.Signature.CurrentName:          'bold underline #888888',
+        Token.Toolbar.Signature.Operator:             'bold #888888',
 
         # Validation toolbar.
-        Token.Toolbar.Validation:                   'bg:#440000 #aaaaaa',
+        Token.Toolbar.Validation:                     'bg:#440000 #aaaaaa',
 
         # Status toolbar.
-        Token.Toolbar.Status:                       'bg:#222222 #aaaaaa',
-        Token.Toolbar.Status.InputMode:             'bg:#222222 #ffffaa',
-        Token.Toolbar.Status.Off:                   'bg:#222222 #888888',
-        Token.Toolbar.Status.On:                    'bg:#222222 #ffffff',
-        Token.Toolbar.Status.PythonVersion:         'bg:#222222 #ffffff bold',
+        Token.Toolbar.Status:                         'bg:#222222 #aaaaaa',
+        Token.Toolbar.Status.InputMode:               'bg:#222222 #ffffaa',
+        Token.Toolbar.Status.Off:                     'bg:#222222 #888888',
+        Token.Toolbar.Status.On:                      'bg:#222222 #ffffff',
+        Token.Toolbar.Status.PythonVersion:           'bg:#222222 #ffffff bold',
 
         # Completer toolbar.
-        Token.Toolbar.Completer:                    'noinherit',
-        Token.Toolbar.Completer.Arrow:              'bold #888888',
-        Token.Toolbar.Completer.Completion:         '#888888 noinherit',
-        Token.Toolbar.Completer.Completion.Current: 'bold noinherit',
+        Token.Toolbar.Completions:                    'noinherit',
+        Token.Toolbar.Completions.Arrow:              'bold #888888',
+        Token.Toolbar.Completions.Completion:         '#888888 noinherit',
+        Token.Toolbar.Completions.Completion.Current: 'bold noinherit',
 
         # Completer menu.
-        Token.Menu.Completer.Completion:            'bg:#888888 #ffffbb',
-        Token.Menu.Completer.Completion.Current:    'bg:#dddddd #000000',
-        Token.Menu.Completer.Meta:                  'bg:#888888 #cccccc',
-        Token.Menu.Completer.Meta.Current:          'bg:#bbbbbb #000000',
-        Token.Menu.Completer.ProgressBar:           'bg:#aaaaaa',
-        Token.Menu.Completer.ProgressButton:        'bg:#000000',
+        Token.Menu.Completions.Completion:            'bg:#888888 #ffffbb',
+        Token.Menu.Completions.Completion.Current:    'bg:#dddddd #000000',
+        Token.Menu.Completions.Meta:                  'bg:#888888 #cccccc',
+        Token.Menu.Completions.Meta.Current:          'bg:#bbbbbb #000000',
+        Token.Menu.Completions.ProgressBar:           'bg:#aaaaaa',
+        Token.Menu.Completions.ProgressButton:        'bg:#000000',
 
         # When Control-C has been pressed. Grayed.
-        Token.Aborted:                              '#888888',
+        Token.Aborted:                                '#888888',
 
         # Vi-style tildes.
-        Token.Leftmargin.Tilde:                     '#888888',
+        Token.Leftmargin.Tilde:                       '#888888',
     }
 
 
diff --git a/prompt_toolkit/layout/menus.py b/prompt_toolkit/layout/menus.py
index 1748fd7e..c3c9c7ec 100644
--- a/prompt_toolkit/layout/menus.py
+++ b/prompt_toolkit/layout/menus.py
@@ -15,7 +15,7 @@ class CompletionMenu(object):
     def __init__(self, max_height=5, line_name='default'):
         self.max_height = max_height
         self.line_name = line_name
-        self.token = Token.Menu.Completer
+        self.token = Token.Menu.Completions
 
     def is_visible(self, cli):
         """
diff --git a/prompt_toolkit/layout/toolbars.py b/prompt_toolkit/layout/toolbars.py
index fa4899da..1a12dc3d 100644
--- a/prompt_toolkit/layout/toolbars.py
+++ b/prompt_toolkit/layout/toolbars.py
@@ -154,7 +154,7 @@ class CompletionToolbar(Toolbar):
     (Similar to Vim's wildmenu.)
     """
     def __init__(self, token=None):
-        token = token or Token.Toolbar.Completer
+        token = token or Token.Toolbar.Completions
         super(CompletionToolbar, self).__init__(token=token)
 
     def is_visible(self, cli):
diff --git a/tests/old_tests.py b/tests/old_tests.py
index e59ed404..8a6bcf2c 100644
--- a/tests/old_tests.py
+++ b/tests/old_tests.py
@@ -8,43 +8,13 @@ from __future__ import unicode_literals
 
 import unittest
 
-
-#class PromptTest(unittest.TestCase):
-#    def setUp(self):
-#        self.line = Line()
-#        self.line.insert_text('some text')
-#
-#        self.code = Code(self.line.document)
-#        self.prompt = Prompt(self.line, self.code)
-#
-#    def _test_token_text_list(self, data):
-#        # Test whether data is list of (Token, text) tuples.
-#        for token, text in data:
-#            self.assertIsInstance(token, pygments.token._TokenType)
-#            self.assertIsInstance(text, six.text_type)
-#
-#    def test_get_prompt(self):
-#        result = list(self.prompt.get_prompt())
-#        self._test_token_text_list(result)
-#
-#    def test_second_line_prefix(self):
-#        result = list(self.prompt.get_second_line_prefix())
-#        self._test_token_text_list(result)
-#
-#    def test_get_help_tokens(self):
-#        result = list(self.prompt.get_second_line_prefix())
-#        self._test_token_text_list(result)
-#
-
-#--
-
-
-from prompt_toolkit.contrib.shell.lexer import ParametersLexer, TextToken
+from prompt_toolkit.contrib.shell.lexer import ShellLexer, TextToken
 from pygments.token import Token
 
-class ParameterLexerTest(unittest.TestCase):
+
+class ShellLexerTest(unittest.TestCase):
     def setUp(self):
-        self.lexer = ParametersLexer(stripnl=False, stripall=False, ensurenl=False)
+        self.lexer = ShellLexer(stripnl=False, stripall=False, ensurenl=False)
 
     def test_simple(self):
         t = list(self.lexer.get_tokens('aaa bbb ccc'))