Mercurial Repositories > eric / changeset

--- a/eric7/APIs/Python3/eric7.api	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/APIs/Python3/eric7.api	Tue Oct 05 19:48:08 2021 +0200
@@ -1341,9 +1341,10 @@
 eric7.EricWidgets.EricLineEditButton.EricLineEditButton?1(parent=None)
 eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.getSelection?4()
 eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemChanged?4(itm)
+eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemDoubleClicked?4(item)
 eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemSelectionChanged?4()
 eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog?1(entries, selectionMode=QAbstractItemView.SelectionMode
-                 .ExtendedSelection, title="", message="", checkBoxSelection=False, parent=None)
+                 .ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, parent=None)
 eric7.EricWidgets.EricListView.EricListView.keyPressEvent?4(evt)
 eric7.EricWidgets.EricListView.EricListView.removeAll?4()
 eric7.EricWidgets.EricListView.EricListView.removeSelected?4()
@@ -2330,9 +2331,14 @@
 eric7.JediInterface.JediServer.JediServer.handleNewConnection?4()
 eric7.JediInterface.JediServer.JediServer.hoverHelp?4(editor, line, index)
 eric7.JediInterface.JediServer.JediServer.isSupportedLanguage?4(language)
+eric7.JediInterface.JediServer.JediServer.refactoringExtractFunction?4()
+eric7.JediInterface.JediServer.JediServer.refactoringExtractNewVariable?4()
+eric7.JediInterface.JediServer.JediServer.refactoringInlineVariable?4()
+eric7.JediInterface.JediServer.JediServer.refactoringRenameVariable?4()
 eric7.JediInterface.JediServer.JediServer.requestCodeDocumentation?4(editor)
 eric7.JediInterface.JediServer.JediServer.requestCompletions?4(editor, context, acText)
 eric7.JediInterface.JediServer.JediServer?1(viewManager, project, ui)
+eric7.JediInterface.RefactoringPreviewDialog.RefactoringPreviewDialog?1(title, diff, parent=None)
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog.getDeviceDict?4()
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog.on_deviceTypeComboBox_currentIndexChanged?4(index)
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog.on_reportButton_clicked?4()

--- a/eric7/APIs/Python3/eric7.bas	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/APIs/Python3/eric7.bas	Tue Oct 05 19:48:08 2021 +0200
@@ -799,6 +799,7 @@
 RebaseProjectHelper HgExtensionProjectHelper
 RecursionError OverflowError ValueError
 Redirector QObject
+RefactoringPreviewDialog QDialog Ui_RefactoringPreviewDialog
 ReloadStopButton EricToolButton
 RemoveBookmarksCommand QUndoCommand
 RestructuredTextProvider MarkupBase

Binary file eric7/Documentation/Help/source.qch has changed

--- a/eric7/Documentation/Help/source.qhp	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Help/source.qhp	Tue Oct 05 19:48:08 2021 +0200
@@ -233,6 +233,7 @@
             <section title="eric7.JediInterface.AssistantJedi" ref="eric7.JediInterface.AssistantJedi.html" />
             <section title="eric7.JediInterface.JediClient" ref="eric7.JediInterface.JediClient.html" />
             <section title="eric7.JediInterface.JediServer" ref="eric7.JediInterface.JediServer.html" />
+            <section title="eric7.JediInterface.RefactoringPreviewDialog" ref="eric7.JediInterface.RefactoringPreviewDialog.html" />
           </section>
           <section title="eric7.MicroPython" ref="index-eric7.MicroPython.html">
             <section title="eric7.MicroPython.AddEditDevicesDialog" ref="eric7.MicroPython.AddEditDevicesDialog.html" />
@@ -1816,6 +1817,8 @@
       <keyword name="AssistantJedi.__editorClosed" id="AssistantJedi.__editorClosed" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__editorClosed" />
       <keyword name="AssistantJedi.__editorLanguageChanged" id="AssistantJedi.__editorLanguageChanged" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__editorLanguageChanged" />
       <keyword name="AssistantJedi.__editorOpened" id="AssistantJedi.__editorOpened" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__editorOpened" />
+      <keyword name="AssistantJedi.__editorShowMenu" id="AssistantJedi.__editorShowMenu" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__editorShowMenu" />
+      <keyword name="AssistantJedi.__initRefactoringMenu" id="AssistantJedi.__initRefactoringMenu" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__initRefactoringMenu" />
       <keyword name="AssistantJedi.__preferencesChanged" id="AssistantJedi.__preferencesChanged" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__preferencesChanged" />
       <keyword name="AssistantJedi.__setAutoCompletionHook" id="AssistantJedi.__setAutoCompletionHook" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__setAutoCompletionHook" />
       <keyword name="AssistantJedi.__setCalltipsHook" id="AssistantJedi.__setCalltipsHook" ref="eric7.JediInterface.AssistantJedi.html#AssistantJedi.__setCalltipsHook" />
@@ -4996,6 +4999,7 @@
       <keyword name="EricListSelectionDialog (Module)" id="EricListSelectionDialog (Module)" ref="eric7.EricWidgets.EricListSelectionDialog.html" />
       <keyword name="EricListSelectionDialog.getSelection" id="EricListSelectionDialog.getSelection" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.getSelection" />
       <keyword name="EricListSelectionDialog.on_selectionList_itemChanged" id="EricListSelectionDialog.on_selectionList_itemChanged" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemChanged" />
+      <keyword name="EricListSelectionDialog.on_selectionList_itemDoubleClicked" id="EricListSelectionDialog.on_selectionList_itemDoubleClicked" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemDoubleClicked" />
       <keyword name="EricListSelectionDialog.on_selectionList_itemSelectionChanged" id="EricListSelectionDialog.on_selectionList_itemSelectionChanged" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemSelectionChanged" />
       <keyword name="EricListView" id="EricListView" ref="eric7.EricWidgets.EricListView.html#EricListView" />
       <keyword name="EricListView (Module)" id="EricListView (Module)" ref="eric7.EricWidgets.EricListView.html" />
@@ -9297,10 +9301,14 @@
       <keyword name="JediClient" id="JediClient" ref="eric7.JediInterface.JediClient.html#JediClient" />
       <keyword name="JediClient (Constructor)" id="JediClient (Constructor)" ref="eric7.JediInterface.JediClient.html#JediClient.__init__" />
       <keyword name="JediClient (Module)" id="JediClient (Module)" ref="eric7.JediInterface.JediClient.html" />
+      <keyword name="JediClient.__applyRefactoring" id="JediClient.__applyRefactoring" ref="eric7.JediInterface.JediClient.html#JediClient.__applyRefactoring" />
+      <keyword name="JediClient.__cancelRefactoring" id="JediClient.__cancelRefactoring" ref="eric7.JediInterface.JediClient.html#JediClient.__cancelRefactoring" />
       <keyword name="JediClient.__closeProject" id="JediClient.__closeProject" ref="eric7.JediInterface.JediClient.html#JediClient.__closeProject" />
       <keyword name="JediClient.__completionFullName" id="JediClient.__completionFullName" ref="eric7.JediInterface.JediClient.html#JediClient.__completionFullName" />
       <keyword name="JediClient.__completionType" id="JediClient.__completionType" ref="eric7.JediInterface.JediClient.html#JediClient.__completionType" />
+      <keyword name="JediClient.__extractFunction" id="JediClient.__extractFunction" ref="eric7.JediInterface.JediClient.html#JediClient.__extractFunction" />
       <keyword name="JediClient.__extractParameters" id="JediClient.__extractParameters" ref="eric7.JediInterface.JediClient.html#JediClient.__extractParameters" />
+      <keyword name="JediClient.__extractVariable" id="JediClient.__extractVariable" ref="eric7.JediInterface.JediClient.html#JediClient.__extractVariable" />
       <keyword name="JediClient.__getAssignment" id="JediClient.__getAssignment" ref="eric7.JediInterface.JediClient.html#JediClient.__getAssignment" />
       <keyword name="JediClient.__getCallTips" id="JediClient.__getCallTips" ref="eric7.JediInterface.JediClient.html#JediClient.__getCallTips" />
       <keyword name="JediClient.__getCompletions" id="JediClient.__getCompletions" ref="eric7.JediInterface.JediClient.html#JediClient.__getCompletions" />
@@ -9308,12 +9316,17 @@
       <keyword name="JediClient.__getHoverHelp" id="JediClient.__getHoverHelp" ref="eric7.JediInterface.JediClient.html#JediClient.__getHoverHelp" />
       <keyword name="JediClient.__getReferences" id="JediClient.__getReferences" ref="eric7.JediInterface.JediClient.html#JediClient.__getReferences" />
       <keyword name="JediClient.__handleError" id="JediClient.__handleError" ref="eric7.JediInterface.JediClient.html#JediClient.__handleError" />
+      <keyword name="JediClient.__inlineVariable" id="JediClient.__inlineVariable" ref="eric7.JediInterface.JediClient.html#JediClient.__inlineVariable" />
       <keyword name="JediClient.__openProject" id="JediClient.__openProject" ref="eric7.JediInterface.JediClient.html#JediClient.__openProject" />
+      <keyword name="JediClient.__renameVariable" id="JediClient.__renameVariable" ref="eric7.JediInterface.JediClient.html#JediClient.__renameVariable" />
       <keyword name="JediClient.handleCall" id="JediClient.handleCall" ref="eric7.JediInterface.JediClient.html#JediClient.handleCall" />
       <keyword name="JediInterface (Package)" id="JediInterface (Package)" ref="index-eric7.JediInterface.html" />
       <keyword name="JediServer" id="JediServer" ref="eric7.JediInterface.JediServer.html#JediServer" />
       <keyword name="JediServer (Constructor)" id="JediServer (Constructor)" ref="eric7.JediInterface.JediServer.html#JediServer.__init__" />
       <keyword name="JediServer (Module)" id="JediServer (Module)" ref="eric7.JediInterface.JediServer.html" />
+      <keyword name="JediServer.__applyRefactoring" id="JediServer.__applyRefactoring" ref="eric7.JediInterface.JediServer.html#JediServer.__applyRefactoring" />
+      <keyword name="JediServer.__cancelRefactoring" id="JediServer.__cancelRefactoring" ref="eric7.JediInterface.JediServer.html#JediServer.__cancelRefactoring" />
+      <keyword name="JediServer.__checkRefactoringResult" id="JediServer.__checkRefactoringResult" ref="eric7.JediInterface.JediServer.html#JediServer.__checkRefactoringResult" />
       <keyword name="JediServer.__ensureActive" id="JediServer.__ensureActive" ref="eric7.JediInterface.JediServer.html#JediServer.__ensureActive" />
       <keyword name="JediServer.__idString" id="JediServer.__idString" ref="eric7.JediInterface.JediServer.html#JediServer.__idString" />
       <keyword name="JediServer.__interpreterForProject" id="JediServer.__interpreterForProject" ref="eric7.JediInterface.JediServer.html#JediServer.__interpreterForProject" />
@@ -9327,6 +9340,7 @@
       <keyword name="JediServer.__processHoverHelpResult" id="JediServer.__processHoverHelpResult" ref="eric7.JediInterface.JediServer.html#JediServer.__processHoverHelpResult" />
       <keyword name="JediServer.__projectClosed" id="JediServer.__projectClosed" ref="eric7.JediInterface.JediServer.html#JediServer.__projectClosed" />
       <keyword name="JediServer.__projectOpened" id="JediServer.__projectOpened" ref="eric7.JediInterface.JediServer.html#JediServer.__projectOpened" />
+      <keyword name="JediServer.__showRefactoringDiff" id="JediServer.__showRefactoringDiff" ref="eric7.JediInterface.JediServer.html#JediServer.__showRefactoringDiff" />
       <keyword name="JediServer.__startJediClient" id="JediServer.__startJediClient" ref="eric7.JediInterface.JediServer.html#JediServer.__startJediClient" />
       <keyword name="JediServer.__updateEditorLanguageMapping" id="JediServer.__updateEditorLanguageMapping" ref="eric7.JediInterface.JediServer.html#JediServer.__updateEditorLanguageMapping" />
       <keyword name="JediServer.activate" id="JediServer.activate" ref="eric7.JediInterface.JediServer.html#JediServer.activate" />
@@ -9337,6 +9351,10 @@
       <keyword name="JediServer.handleNewConnection" id="JediServer.handleNewConnection" ref="eric7.JediInterface.JediServer.html#JediServer.handleNewConnection" />
       <keyword name="JediServer.hoverHelp" id="JediServer.hoverHelp" ref="eric7.JediInterface.JediServer.html#JediServer.hoverHelp" />
       <keyword name="JediServer.isSupportedLanguage" id="JediServer.isSupportedLanguage" ref="eric7.JediInterface.JediServer.html#JediServer.isSupportedLanguage" />
+      <keyword name="JediServer.refactoringExtractFunction" id="JediServer.refactoringExtractFunction" ref="eric7.JediInterface.JediServer.html#JediServer.refactoringExtractFunction" />
+      <keyword name="JediServer.refactoringExtractNewVariable" id="JediServer.refactoringExtractNewVariable" ref="eric7.JediInterface.JediServer.html#JediServer.refactoringExtractNewVariable" />
+      <keyword name="JediServer.refactoringInlineVariable" id="JediServer.refactoringInlineVariable" ref="eric7.JediInterface.JediServer.html#JediServer.refactoringInlineVariable" />
+      <keyword name="JediServer.refactoringRenameVariable" id="JediServer.refactoringRenameVariable" ref="eric7.JediInterface.JediServer.html#JediServer.refactoringRenameVariable" />
       <keyword name="JediServer.requestCodeDocumentation" id="JediServer.requestCodeDocumentation" ref="eric7.JediInterface.JediServer.html#JediServer.requestCodeDocumentation" />
       <keyword name="JediServer.requestCompletions" id="JediServer.requestCompletions" ref="eric7.JediInterface.JediServer.html#JediServer.requestCompletions" />
       <keyword name="KeySequenceTranslator (Module)" id="KeySequenceTranslator (Module)" ref="eric7.QScintilla.KeySequenceTranslator.html" />
@@ -12801,6 +12819,9 @@
       <keyword name="Redirector.__nWrite" id="Redirector.__nWrite" ref="eric7.UI.UserInterface.html#Redirector.__nWrite" />
       <keyword name="Redirector.flush" id="Redirector.flush" ref="eric7.UI.UserInterface.html#Redirector.flush" />
       <keyword name="Redirector.write" id="Redirector.write" ref="eric7.UI.UserInterface.html#Redirector.write" />
+      <keyword name="RefactoringPreviewDialog" id="RefactoringPreviewDialog" ref="eric7.JediInterface.RefactoringPreviewDialog.html#RefactoringPreviewDialog" />
+      <keyword name="RefactoringPreviewDialog (Constructor)" id="RefactoringPreviewDialog (Constructor)" ref="eric7.JediInterface.RefactoringPreviewDialog.html#RefactoringPreviewDialog.__init__" />
+      <keyword name="RefactoringPreviewDialog (Module)" id="RefactoringPreviewDialog (Module)" ref="eric7.JediInterface.RefactoringPreviewDialog.html" />
       <keyword name="Reindenter" id="Reindenter" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter" />
       <keyword name="Reindenter (Constructor)" id="Reindenter (Constructor)" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter.__init__" />
       <keyword name="Reindenter.__genStats" id="Reindenter.__genStats" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter.__genStats" />
@@ -18967,6 +18988,7 @@
       <file>eric7.JediInterface.AssistantJedi.html</file>
       <file>eric7.JediInterface.JediClient.html</file>
       <file>eric7.JediInterface.JediServer.html</file>
+      <file>eric7.JediInterface.RefactoringPreviewDialog.html</file>
       <file>eric7.MicroPython.AddEditDevicesDialog.html</file>
       <file>eric7.MicroPython.CircuitPythonDevices.html</file>
       <file>eric7.MicroPython.ConnectionSelectionDialog.html</file>

--- a/eric7/Documentation/Source/eric7.EricWidgets.EricListSelectionDialog.html	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Source/eric7.EricWidgets.EricListSelectionDialog.html	Tue Oct 05 19:48:08 2021 +0200
@@ -67,6 +67,10 @@
 <td>Private slot handling a change of an item.</td>
 </tr>
 <tr>
+<td><a href="#EricListSelectionDialog.on_selectionList_itemDoubleClicked">on_selectionList_itemDoubleClicked</a></td>
+<td>Private slot handling double clicking an item.</td>
+</tr>
+<tr>
 <td><a href="#EricListSelectionDialog.on_selectionList_itemSelectionChanged">on_selectionList_itemSelectionChanged</a></td>
 <td>Private slot handling a change of the selection.</td>
 </tr>
@@ -80,7 +84,7 @@
 <a NAME="EricListSelectionDialog.__init__" ID="EricListSelectionDialog.__init__"></a>
 <h4>EricListSelectionDialog (Constructor)</h4>
 <b>EricListSelectionDialog</b>(<i>entries, selectionMode=QAbstractItemView.SelectionMode
-                 .ExtendedSelection, title="", message="", checkBoxSelection=False, parent=None</i>)
+                 .ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, parent=None</i>)
 
 <p>
         Constructor
@@ -108,6 +112,11 @@
 flag indicating to select items via their
             checkbox
 </dd>
+<dt><i>doubleClickOk</i> (bool)</dt>
+<dd>
+flag indicating to accept the dialog upon a
+            double click of an item (single selection only)
+</dd>
 <dt><i>parent</i> (QWidget)</dt>
 <dd>
 reference to the parent widget
@@ -146,6 +155,20 @@
 reference to the changed item
 </dd>
 </dl>
+<a NAME="EricListSelectionDialog.on_selectionList_itemDoubleClicked" ID="EricListSelectionDialog.on_selectionList_itemDoubleClicked"></a>
+<h4>EricListSelectionDialog.on_selectionList_itemDoubleClicked</h4>
+<b>on_selectionList_itemDoubleClicked</b>(<i>item</i>)
+
+<p>
+        Private slot handling double clicking an item.
+</p>
+<dl>
+
+<dt><i>item</i> (QListWidgetItem)</dt>
+<dd>
+double clicked item
+</dd>
+</dl>
 <a NAME="EricListSelectionDialog.on_selectionList_itemSelectionChanged" ID="EricListSelectionDialog.on_selectionList_itemSelectionChanged"></a>
 <h4>EricListSelectionDialog.on_selectionList_itemSelectionChanged</h4>
 <b>on_selectionList_itemSelectionChanged</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.JediInterface.AssistantJedi.html	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Source/eric7.JediInterface.AssistantJedi.html	Tue Oct 05 19:48:08 2021 +0200
@@ -91,6 +91,14 @@
 <td>Private slot called, when a new editor was opened.</td>
 </tr>
 <tr>
+<td><a href="#AssistantJedi.__editorShowMenu">__editorShowMenu</a></td>
+<td>Private slot called, when the the editor context menu or a submenu is about to be shown.</td>
+</tr>
+<tr>
+<td><a href="#AssistantJedi.__initRefactoringMenu">__initRefactoringMenu</a></td>
+<td>Private method to initialize the Refactoring menu.</td>
+</tr>
+<tr>
 <td><a href="#AssistantJedi.__preferencesChanged">__preferencesChanged</a></td>
 <td>Private slot handling changes of the Disassembly viewer settings.</td>
 </tr>
@@ -256,6 +264,36 @@
 reference to the new editor
 </dd>
 </dl>
+<a NAME="AssistantJedi.__editorShowMenu" ID="AssistantJedi.__editorShowMenu"></a>
+<h4>AssistantJedi.__editorShowMenu</h4>
+<b>__editorShowMenu</b>(<i>menuName, menu, editor</i>)
+
+<p>
+        Private slot called, when the the editor context menu or a submenu is
+        about to be shown.
+</p>
+<dl>
+
+<dt><i>menuName</i> (str)</dt>
+<dd>
+name of the menu to be shown
+</dd>
+<dt><i>menu</i> (QMenu)</dt>
+<dd>
+reference to the menu
+</dd>
+<dt><i>editor</i> (Editor)</dt>
+<dd>
+reference to the editor
+</dd>
+</dl>
+<a NAME="AssistantJedi.__initRefactoringMenu" ID="AssistantJedi.__initRefactoringMenu"></a>
+<h4>AssistantJedi.__initRefactoringMenu</h4>
+<b>__initRefactoringMenu</b>(<i></i>)
+
+<p>
+        Private method to initialize the Refactoring menu.
+</p>
 <a NAME="AssistantJedi.__preferencesChanged" ID="AssistantJedi.__preferencesChanged"></a>
 <h4>AssistantJedi.__preferencesChanged</h4>
 <b>__preferencesChanged</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.JediInterface.JediClient.html	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Source/eric7.JediInterface.JediClient.html	Tue Oct 05 19:48:08 2021 +0200
@@ -59,6 +59,14 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#JediClient.__applyRefactoring">__applyRefactoring</a></td>
+<td>Private method to apply a refactoring.</td>
+</tr>
+<tr>
+<td><a href="#JediClient.__cancelRefactoring">__cancelRefactoring</a></td>
+<td>Private method to cancel a refactoring.</td>
+</tr>
+<tr>
 <td><a href="#JediClient.__closeProject">__closeProject</a></td>
 <td>Private method to save a jedi project's data.</td>
 </tr>
@@ -71,10 +79,18 @@
 <td>Private method to assemble the completion type depending on the visibility indicated by the completion name.</td>
 </tr>
 <tr>
+<td><a href="#JediClient.__extractFunction">__extractFunction</a></td>
+<td>Private method to extract an expression to a new function.</td>
+</tr>
+<tr>
 <td><a href="#JediClient.__extractParameters">__extractParameters</a></td>
 <td>Private method to extract the call parameter descriptions.</td>
 </tr>
 <tr>
+<td><a href="#JediClient.__extractVariable">__extractVariable</a></td>
+<td>Private method to extract a statement to a new variable.</td>
+</tr>
+<tr>
 <td><a href="#JediClient.__getAssignment">__getAssignment</a></td>
 <td>Private method to get the place a parameter is defined.</td>
 </tr>
@@ -103,10 +119,18 @@
 <td>Private method to process an error.</td>
 </tr>
 <tr>
+<td><a href="#JediClient.__inlineVariable">__inlineVariable</a></td>
+<td>Private method to inline a variable statement.</td>
+</tr>
+<tr>
 <td><a href="#JediClient.__openProject">__openProject</a></td>
 <td>Private method to create a jedi project and load its saved data.</td>
 </tr>
 <tr>
+<td><a href="#JediClient.__renameVariable">__renameVariable</a></td>
+<td>Private method to rename the variable under the cursor.</td>
+</tr>
+<tr>
 <td><a href="#JediClient.handleCall">handleCall</a></td>
 <td>Public method to handle a method call from the server.</td>
 </tr>
@@ -140,6 +164,34 @@
             order to identify the connection
 </dd>
 </dl>
+<a NAME="JediClient.__applyRefactoring" ID="JediClient.__applyRefactoring"></a>
+<h4>JediClient.__applyRefactoring</h4>
+<b>__applyRefactoring</b>(<i>params</i>)
+
+<p>
+        Private method to apply a refactoring.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
+<a NAME="JediClient.__cancelRefactoring" ID="JediClient.__cancelRefactoring"></a>
+<h4>JediClient.__cancelRefactoring</h4>
+<b>__cancelRefactoring</b>(<i>params</i>)
+
+<p>
+        Private method to cancel a refactoring.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
 <a NAME="JediClient.__closeProject" ID="JediClient.__closeProject"></a>
 <h4>JediClient.__closeProject</h4>
 <b>__closeProject</b>(<i>params</i>)
@@ -207,6 +259,20 @@
 str
 </dd>
 </dl>
+<a NAME="JediClient.__extractFunction" ID="JediClient.__extractFunction"></a>
+<h4>JediClient.__extractFunction</h4>
+<b>__extractFunction</b>(<i>params</i>)
+
+<p>
+        Private method to extract an expression to a new function.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
 <a NAME="JediClient.__extractParameters" ID="JediClient.__extractParameters"></a>
 <h4>JediClient.__extractParameters</h4>
 <b>__extractParameters</b>(<i>signature</i>)
@@ -234,6 +300,20 @@
 str
 </dd>
 </dl>
+<a NAME="JediClient.__extractVariable" ID="JediClient.__extractVariable"></a>
+<h4>JediClient.__extractVariable</h4>
+<b>__extractVariable</b>(<i>params</i>)
+
+<p>
+        Private method to extract a statement to a new variable.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
 <a NAME="JediClient.__getAssignment" ID="JediClient.__getAssignment"></a>
 <h4>JediClient.__getAssignment</h4>
 <b>__getAssignment</b>(<i>params</i>)
@@ -344,6 +424,20 @@
 dict
 </dd>
 </dl>
+<a NAME="JediClient.__inlineVariable" ID="JediClient.__inlineVariable"></a>
+<h4>JediClient.__inlineVariable</h4>
+<b>__inlineVariable</b>(<i>params</i>)
+
+<p>
+        Private method to inline a variable statement.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
 <a NAME="JediClient.__openProject" ID="JediClient.__openProject"></a>
 <h4>JediClient.__openProject</h4>
 <b>__openProject</b>(<i>params</i>)
@@ -358,6 +452,20 @@
 dictionary containing the method parameters
 </dd>
 </dl>
+<a NAME="JediClient.__renameVariable" ID="JediClient.__renameVariable"></a>
+<h4>JediClient.__renameVariable</h4>
+<b>__renameVariable</b>(<i>params</i>)
+
+<p>
+        Private method to rename the variable under the cursor.
+</p>
+<dl>
+
+<dt><i>params</i> (dict)</dt>
+<dd>
+dictionary containing the method parameters
+</dd>
+</dl>
 <a NAME="JediClient.handleCall" ID="JediClient.handleCall"></a>
 <h4>JediClient.handleCall</h4>
 <b>handleCall</b>(<i>method, params</i>)

--- a/eric7/Documentation/Source/eric7.JediInterface.JediServer.html	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Source/eric7.JediInterface.JediServer.html	Tue Oct 05 19:48:08 2021 +0200
@@ -59,6 +59,18 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#JediServer.__applyRefactoring">__applyRefactoring</a></td>
+<td>Private method to apply a given refactoring.</td>
+</tr>
+<tr>
+<td><a href="#JediServer.__cancelRefactoring">__cancelRefactoring</a></td>
+<td>Private method to cancel a given refactoring.</td>
+</tr>
+<tr>
+<td><a href="#JediServer.__checkRefactoringResult">__checkRefactoringResult</a></td>
+<td>Private method to check the refactoring result for errors.</td>
+</tr>
+<tr>
 <td><a href="#JediServer.__ensureActive">__ensureActive</a></td>
 <td>Private method to ensure, that the requested client is active.</td>
 </tr>
@@ -111,6 +123,10 @@
 <td>Private slot to handle the projectOpened signal.</td>
 </tr>
 <tr>
+<td><a href="#JediServer.__showRefactoringDiff">__showRefactoringDiff</a></td>
+<td>Private method to show the diff of a refactoring.</td>
+</tr>
+<tr>
 <td><a href="#JediServer.__startJediClient">__startJediClient</a></td>
 <td>Private method to start the Jedi client with the given interpreter.</td>
 </tr>
@@ -151,6 +167,22 @@
 <td>Public method to check, if the given language is supported.</td>
 </tr>
 <tr>
+<td><a href="#JediServer.refactoringExtractFunction">refactoringExtractFunction</a></td>
+<td>Public slot to extract an expression to a function.</td>
+</tr>
+<tr>
+<td><a href="#JediServer.refactoringExtractNewVariable">refactoringExtractNewVariable</a></td>
+<td>Public slot to extract a statement to a new variable.</td>
+</tr>
+<tr>
+<td><a href="#JediServer.refactoringInlineVariable">refactoringInlineVariable</a></td>
+<td>Public slot to inline the selected variable.</td>
+</tr>
+<tr>
+<td><a href="#JediServer.refactoringRenameVariable">refactoringRenameVariable</a></td>
+<td>Public slot to rename the selected variable.</td>
+</tr>
+<tr>
 <td><a href="#JediServer.requestCodeDocumentation">requestCodeDocumentation</a></td>
 <td>Public method to request source code documentation for the given editor.</td>
 </tr>
@@ -187,6 +219,48 @@
 reference to the user interface
 </dd>
 </dl>
+<a NAME="JediServer.__applyRefactoring" ID="JediServer.__applyRefactoring"></a>
+<h4>JediServer.__applyRefactoring</h4>
+<b>__applyRefactoring</b>(<i>uid</i>)
+
+<p>
+        Private method to apply a given refactoring.
+</p>
+<dl>
+
+<dt><i>uid</i> (str)</dt>
+<dd>
+UID of the calculated refactoring
+</dd>
+</dl>
+<a NAME="JediServer.__cancelRefactoring" ID="JediServer.__cancelRefactoring"></a>
+<h4>JediServer.__cancelRefactoring</h4>
+<b>__cancelRefactoring</b>(<i>uid</i>)
+
+<p>
+        Private method to cancel a given refactoring.
+</p>
+<dl>
+
+<dt><i>uid</i> (str)</dt>
+<dd>
+UID of the calculated refactoring
+</dd>
+</dl>
+<a NAME="JediServer.__checkRefactoringResult" ID="JediServer.__checkRefactoringResult"></a>
+<h4>JediServer.__checkRefactoringResult</h4>
+<b>__checkRefactoringResult</b>(<i>result</i>)
+
+<p>
+        Private method to check the refactoring result for errors.
+</p>
+<dl>
+
+<dt><i>result</i> (dict)</dt>
+<dd>
+dictionary containing the result data
+</dd>
+</dl>
 <a NAME="JediServer.__ensureActive" ID="JediServer.__ensureActive"></a>
 <h4>JediServer.__ensureActive</h4>
 <b>__ensureActive</b>(<i>idString</i>)
@@ -401,6 +475,20 @@
 <p>
         Private slot to handle the projectOpened signal.
 </p>
+<a NAME="JediServer.__showRefactoringDiff" ID="JediServer.__showRefactoringDiff"></a>
+<h4>JediServer.__showRefactoringDiff</h4>
+<b>__showRefactoringDiff</b>(<i>result</i>)
+
+<p>
+        Private method to show the diff of a refactoring.
+</p>
+<dl>
+
+<dt><i>result</i> (dict)</dt>
+<dd>
+dictionary containing the result data
+</dd>
+</dl>
 <a NAME="JediServer.__startJediClient" ID="JediServer.__startJediClient"></a>
 <h4>JediServer.__startJediClient</h4>
 <b>__startJediClient</b>(<i>interpreter, idString, clientEnv</i>)
@@ -582,6 +670,37 @@
 bool
 </dd>
 </dl>
+<a NAME="JediServer.refactoringExtractFunction" ID="JediServer.refactoringExtractFunction"></a>
+<h4>JediServer.refactoringExtractFunction</h4>
+<b>refactoringExtractFunction</b>(<i></i>)
+
+<p>
+        Public slot to extract an expression to a function.
+</p>
+<a NAME="JediServer.refactoringExtractNewVariable" ID="JediServer.refactoringExtractNewVariable"></a>
+<h4>JediServer.refactoringExtractNewVariable</h4>
+<b>refactoringExtractNewVariable</b>(<i></i>)
+
+<p>
+        Public slot to extract a statement to a new variable.
+</p>
+<a NAME="JediServer.refactoringInlineVariable" ID="JediServer.refactoringInlineVariable"></a>
+<h4>JediServer.refactoringInlineVariable</h4>
+<b>refactoringInlineVariable</b>(<i></i>)
+
+<p>
+        Public slot to inline the selected variable.
+</p>
+<p>
+        Note: This is the opposite to Extract New Variable.
+</p>
+<a NAME="JediServer.refactoringRenameVariable" ID="JediServer.refactoringRenameVariable"></a>
+<h4>JediServer.refactoringRenameVariable</h4>
+<b>refactoringRenameVariable</b>(<i></i>)
+
+<p>
+        Public slot to rename the selected variable.
+</p>
 <a NAME="JediServer.requestCodeDocumentation" ID="JediServer.requestCodeDocumentation"></a>
 <h4>JediServer.requestCodeDocumentation</h4>
 <b>requestCodeDocumentation</b>(<i>editor</i>)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.JediInterface.RefactoringPreviewDialog.html	Tue Oct 05 19:48:08 2021 +0200
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.JediInterface.RefactoringPreviewDialog</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.JediInterface.RefactoringPreviewDialog</h1>
+
+<p>
+Module implementing a dialog to preview refactoring changes.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#RefactoringPreviewDialog">RefactoringPreviewDialog</a></td>
+<td>Class implementing a dialog to preview refactoring changes.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="RefactoringPreviewDialog" ID="RefactoringPreviewDialog"></a>
+<h2>RefactoringPreviewDialog</h2>
+
+<p>
+    Class implementing a dialog to preview refactoring changes.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_RefactoringPreviewDialog
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#RefactoringPreviewDialog.__init__">RefactoringPreviewDialog</a></td>
+<td>Constructor</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="RefactoringPreviewDialog.__init__" ID="RefactoringPreviewDialog.__init__"></a>
+<h4>RefactoringPreviewDialog (Constructor)</h4>
+<b>RefactoringPreviewDialog</b>(<i>title, diff, parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>title</i> (str)</dt>
+<dd>
+title string to be shown above the diff
+</dd>
+<dt><i>diff</i> (str)</dt>
+<dd>
+changes to be shown (unified diff)
+</dd>
+<dt><i>parent</i> (QWidget (optional))</dt>
+<dd>
+reference to the parent widget (defaults to None)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric7/Documentation/Source/index-eric7.JediInterface.html	Tue Oct 05 19:47:03 2021 +0200
+++ b/eric7/Documentation/Source/index-eric7.JediInterface.html	Tue Oct 05 19:48:08 2021 +0200
@@ -33,5 +33,9 @@
 <td><a href="eric7.JediInterface.JediServer.html">JediServer</a></td>
 <td>Module implementing the autocompletion interface to jedi.</td>
 </tr>
+<tr>
+<td><a href="eric7.JediInterface.RefactoringPreviewDialog.html">RefactoringPreviewDialog</a></td>
+<td>Module implementing a dialog to preview refactoring changes.</td>
+</tr>
 </table>
 </body></html>
\ No newline at end of file