##// END OF EJS Templates
First step in reintegrating Jedi...
First step in reintegrating Jedi If Jedi is installed expose a private API use it with prompt toolkit. Jedi does not _yet_ provide all the completion IPython has, so this is still a bit awkward. In order to debug this (and see what is Jedi provided we for now inject a fake Jedi/IPython delimiter in the menu. Jedi completion and this behavior are enabled by default, but could likely be opt-in. Add also a number of debug flags to be able to track why jedi is not working, and/or what completions are found by IPython and not Jedi. That should give us a bit of heads up and feedback to know whether we can remove part of the IPython completer, and more especially if we can drop `python_matches`. Once `python_matches` is dropped and some other of the current matchers are either dropped or converted to the new API, that should simplify the internal quite a bit. That would just be too much for an already BIG pull-request.

File last commit:

r23274:0f79628c
r23284:3ff1be2e
Show More
debugger.py
98 lines | 3.5 KiB | text/x-python | PythonLexer
Thomas Kluyver
Create separate class for debugger using prompt_toolkit
r22391 from IPython.core.debugger import Pdb
from IPython.core.completer import IPCompleter
from .ptutils import IPythonPTCompleter
from prompt_toolkit.token import Token
from prompt_toolkit.shortcuts import create_prompt_application
from prompt_toolkit.interface import CommandLineInterface
from prompt_toolkit.enums import EditingMode
tillahoffmann
Add frame parameter to terminal debugger.
r22874 import sys
Thomas Kluyver
Create separate class for debugger using prompt_toolkit
r22391
class TerminalPdb(Pdb):
def __init__(self, *args, **kwargs):
Pdb.__init__(self, *args, **kwargs)
self._ptcomp = None
self.pt_init()
def pt_init(self):
def get_prompt_tokens(cli):
return [(Token.Prompt, self.prompt)]
Thomas Kluyver
Fix error tab completing in the debugger...
r23274 def patch_stdout(**kwargs):
return self.pt_cli.patch_stdout_context(**kwargs)
Thomas Kluyver
Create separate class for debugger using prompt_toolkit
r22391 if self._ptcomp is None:
compl = IPCompleter(shell=self.shell,
namespace={},
global_namespace={},
parent=self.shell,
)
Thomas Kluyver
Fix error tab completing in the debugger...
r23274 self._ptcomp = IPythonPTCompleter(compl, patch_stdout=patch_stdout)
Thomas Kluyver
Create separate class for debugger using prompt_toolkit
r22391
self._pt_app = create_prompt_application(
editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
history=self.shell.debugger_history,
completer= self._ptcomp,
enable_history_search=True,
mouse_support=self.shell.mouse_support,
get_prompt_tokens=get_prompt_tokens
)
self.pt_cli = CommandLineInterface(self._pt_app, eventloop=self.shell._eventloop)
def cmdloop(self, intro=None):
"""Repeatedly issue a prompt, accept input, parse an initial prefix
off the received input, and dispatch to action methods, passing them
the remainder of the line as argument.
override the same methods from cmd.Cmd to provide prompt toolkit replacement.
"""
if not self.use_rawinput:
raise ValueError('Sorry ipdb does not support use_rawinput=False')
self.preloop()
try:
if intro is not None:
self.intro = intro
if self.intro:
self.stdout.write(str(self.intro)+"\n")
stop = None
while not stop:
if self.cmdqueue:
line = self.cmdqueue.pop(0)
else:
self._ptcomp.ipy_completer.namespace = self.curframe_locals
self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
try:
line = self.pt_cli.run(reset_current_buffer=True).text
except EOFError:
line = 'EOF'
line = self.precmd(line)
stop = self.onecmd(line)
stop = self.postcmd(stop, line)
self.postloop()
except Exception:
raise
Matthias Bussonnier
Make clearer and simpler how to user prompt-toolkit PDB...
r22724
tillahoffmann
Add frame parameter to terminal debugger.
r22874
def set_trace(frame=None):
"""
Start debugging from `frame`.
If frame is not specified, debugging starts from caller's frame.
"""
TerminalPdb().set_trace(frame or sys._getframe().f_back)
Matthias Bussonnier
Make clearer and simpler how to user prompt-toolkit PDB...
r22724
mbyt
-m IPython.terminal.debugger...
r22858
if __name__ == '__main__':
import pdb
mbyt
enable quitting for -m IPython.terminal.debugger
r22879 # IPython.core.debugger.Pdb.trace_dispatch shall not catch
mbyt
fixing typo in comment
r22901 # bdb.BdbQuit. When started through __main__ and an exception
mbyt
fixing another typo in comment
r22902 # happened after hitting "c", this is needed in order to
mbyt
enable quitting for -m IPython.terminal.debugger
r22879 # be able to quit the debugging session (see #9950).
old_trace_dispatch = pdb.Pdb.trace_dispatch
mbyt
-m IPython.terminal.debugger...
r22858 pdb.Pdb = TerminalPdb
mbyt
enable quitting for -m IPython.terminal.debugger
r22879 pdb.Pdb.trace_dispatch = old_trace_dispatch
mbyt
-m IPython.terminal.debugger...
r22858 pdb.main()