##// END OF EJS Templates
Merge pull request #10375 from Carreau/fix-rst...
Paul Ivanov -
r23466:f91d7091 merge
parent child Browse files
Show More
@@ -406,7 +406,7 b' def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:'
406
406
407 :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though
407 :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though
408 the Jupyter Protocol requires them to behave like so. This will readjust
408 the Jupyter Protocol requires them to behave like so. This will readjust
409 the completion to have the same ``start`` and ``end` by padding both
409 the completion to have the same ``start`` and ``end`` by padding both
410 extremities with surrounding text.
410 extremities with surrounding text.
411
411
412 During stabilisation should support a ``_debug`` option to log which
412 During stabilisation should support a ``_debug`` option to log which
@@ -744,8 +744,8 b' def cursor_to_position(text:int, line:int, column:int)->int:'
744 Convert the (line,column) position of the cursor in text to an offset in a
744 Convert the (line,column) position of the cursor in text to an offset in a
745 string.
745 string.
746
746
747 Parameter
747 Parameters
748 ---------
748 ----------
749
749
750 text : str
750 text : str
751 The text in which to calculate the cursor offset
751 The text in which to calculate the cursor offset
@@ -775,8 +775,8 b' def position_to_cursor(text:str, offset:int)->(int, int):'
775
775
776 Position should be a valid position in ``text``.
776 Position should be a valid position in ``text``.
777
777
778 Parameter
778 Parameters
779 ---------
779 ----------
780
780
781 text : str
781 text : str
782 The text in which to calculate the cursor offset
782 The text in which to calculate the cursor offset
@@ -21,6 +21,7 b' from prompt_toolkit.key_binding.bindings.completion import display_completions_l'
21
21
22 from IPython.utils.decorators import undoc
22 from IPython.utils.decorators import undoc
23
23
24 @undoc
24 @Condition
25 @Condition
25 def cursor_in_leading_ws(cli):
26 def cursor_in_leading_ws(cli):
26 before = cli.application.buffer.document.current_line_before_cursor
27 before = cli.application.buffer.document.current_line_before_cursor
@@ -230,6 +230,7 b" intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),"
230 'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
230 'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
231 'jedi': ('https://jedi.readthedocs.io/en/latest/', None),
231 'jedi': ('https://jedi.readthedocs.io/en/latest/', None),
232 'traitlets': ('https://traitlets.readthedocs.io/en/latest/', None),
232 'traitlets': ('https://traitlets.readthedocs.io/en/latest/', None),
233 'ipykernel': ('https://ipykernel.readthedocs.io/en/latest/', None),
233 }
234 }
234
235
235 # Options for LaTeX output
236 # Options for LaTeX output
@@ -56,12 +56,12 b' completer interface:'
56
56
57 The appearance of the completer is controlled by the
57 The appearance of the completer is controlled by the
58 ``c.TerminalInteractiveShell.display_completions`` option that will show the
58 ``c.TerminalInteractiveShell.display_completions`` option that will show the
59 type differently depending on the value among ``'column'``,``'multicolumn'``
59 type differently depending on the value among ``'column'``, ``'multicolumn'``
60 and ``'readlinelike'``
60 and ``'readlinelike'``
61
61
62 The use of Jedi also full fill a number of request and fix a number of bugs
62 The use of Jedi also full fill a number of request and fix a number of bugs
63 like case insensitive completion, completion after division operator: See
63 like case insensitive completion, completion after division operator: See
64 :ghpull:`ipython/ipython#10182`.
64 :ghpull:`10182`.
65
65
66 Extra patches and updates will be needed to the :any:`ipykernel` package for
66 Extra patches and updates will be needed to the :any:`ipykernel` package for
67 this feature to be available to other clients like jupyter Notebook, Lab,
67 this feature to be available to other clients like jupyter Notebook, Lab,
@@ -149,7 +149,7 b' Functions Deprecated in 6.x Development cycle'
149
149
150
150
151 - ``IPython.utils.warn`` was deprecated in IPython 4.0, and has now been removed.
151 - ``IPython.utils.warn`` was deprecated in IPython 4.0, and has now been removed.
152 instead of ``IPython.utils.warn`` inbuilt :any:`warning` module is used.
152 instead of ``IPython.utils.warn`` inbuilt :any:`warnings` module is used.
153
153
154
154
155 - The function `IPython.core.oinspect.py:call_tip` is unused, was marked as
155 - The function `IPython.core.oinspect.py:call_tip` is unused, was marked as
@@ -169,7 +169,7 b' development cycle marked for Milestone 6.0.'
169 - ``IPython/utils/process.py`` - ``pycmd2argv``
169 - ``IPython/utils/process.py`` - ``pycmd2argv``
170
170
171 - The `--deep-reload` flag and the corresponding options to inject `dreload` or
171 - The `--deep-reload` flag and the corresponding options to inject `dreload` or
172 `reload` into the interactive namespace have been removed. You have to
172 `reload` into the interactive namespace have been removed. You have to
173 explicitly import `reload` from `IPython.lib.deepreload` to use it.
173 explicitly import `reload` from `IPython.lib.deepreload` to use it.
174
174
175 .. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
175 .. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
General Comments 0
You need to be logged in to leave comments. Login now