Rope Refactoring: comparison RefactoringRope/RefactoringServer.py

-:6fa5892b9097
+:a4cba20ad7ab
 @param plugin reference to the plugin object
 @type RefactoringRopePlugin
 @param parent parent
 @type QObject
 """
+from .FileSystemCommands import EricFileSystemCommands
 super().__init__("RefactoringServer", parent=parent)
 self.__plugin = plugin
 self.__ui = parent
 self.__vm = ericApp().getObject("ViewManager")
 self.__progressDialog = None
 self.__helpDialog = None
 self.__historyDialog = None
 self.__refactoringDialogs = {}
-from .FileSystemCommands import EricFileSystemCommands
 self.__fsCommands = EricFileSystemCommands(self.__ericProject)
 self.__methodMapping = {
 "Config": self.__setConfig,
 self.refactoringRenameAct = EricAction(
 self.tr("Rename"), self.tr("&Rename"), 0, 0, self, "refactoring_rename"
 )
 self.refactoringRenameAct.setStatusTip(self.tr("Rename the highlighted object"))
 self.refactoringRenameAct.setWhatsThis(
-self.tr(
+self.tr("""<b>Rename</b><p>Rename the highlighted Python object.</p>""")
-"""<b>Rename</b>""" """<p>Rename the highlighted Python object.</p>"""
-)
 )
 self.refactoringRenameAct.triggered.connect(self.__rename)
 self.actions.append(self.refactoringRenameAct)
 self.refactoringRenameLocalAct = EricAction(
 )
 self.refactoringClearHistoryAct.setStatusTip(
 self.tr("Clear the refactoring history")
 )
 self.refactoringClearHistoryAct.setWhatsThis(
-self.tr(
+self.tr("""<b>Clear History</b><p>Clears the refactoring history.</p>""")
-"""<b>Clear History</b>""" """<p>Clears the refactoring history.</p>"""
-)
 )
 self.refactoringClearHistoryAct.triggered.connect(self.__clearHistory)
 self.actions.append(self.refactoringClearHistoryAct)
 #####################################################
 @param result dictionary containing the error information
 @type dict
 @return flag indicating, that the error is to be ignored
 @rtype bool
 """
+from .ErrorDialog import ErrorDialog
 if "Error" not in result:
 return True
 title = result.get("Title", self.tr("Rope Error"))
 result["ErrorLine"],
 )
 elif result["Error"] == "InterruptedTaskError":
 return True
 else:
-from .ErrorDialog import ErrorDialog
 ErrorDialog(
 title,
 self.tr("Rope error: {0}").format(result["ErrorString"]),
 traceback=result["Traceback"],
 parent=self.__ui,
 the local file
 @type bool
 @param renameModule flag indicating a module rename refactoring
 @type bool
 """
+from .RenameDialog import RenameDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not renameModule and not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr(
+self.tr("Highlight the declaration you want to rename and try again."),
-"Highlight the declaration you want to rename" " and try again."
-),
 )
 return
 if isLocal:
 if not self.confirmBufferIsSaved(aw):
 if line != line1:
 # selection span more than one line
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("The selection must not extend beyond" " one line."),
+self.tr("The selection must not extend beyond one line."),
 )
 return
 index = int(index + (index1 - index) / 2)
 # keep it inside the object
 offset = self.__getOffset(aw, line, index)
 selectedText = aw.selectedText()
-from .RenameDialog import RenameDialog
 dlg = RenameDialog(
 self,
 title,
 filename,
 offset,
 def __changeOccurrences(self):
 """
 Private slot to perform the Change Occurrences refactoring.
 """
+from .ChangeOccurrencesDialog import ChangeOccurrencesDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("Highlight an occurrence to be changed" " and try again."),
+self.tr("Highlight an occurrence to be changed and try again."),
 )
 return
 if not self.confirmBufferIsSaved(aw):
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .ChangeOccurrencesDialog import ChangeOccurrencesDialog
 dlg = ChangeOccurrencesDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 @param title title of the refactoring
 @type str
 @param kind kind of extraction to be done
 @type str ("method" or "variable")
 """
+from .ExtractDialog import ExtractDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
 self.tr(
-"Highlight the region of code you want to extract" " and try again."
+"Highlight the region of code you want to extract and try again."
 ),
 )
 return
 if not self.confirmBufferIsSaved(aw):
 filename = aw.getFileName()
 startline, startcolumn, endline, endcolumn = aw.getSelection()
 startOffset = self.__getOffset(aw, startline, startcolumn)
 endOffset = self.__getOffset(aw, endline, endcolumn)
-from .ExtractDialog import ExtractDialog
 dlg = ExtractDialog(
 self, title, filename, startOffset, endOffset, kind, parent=self.__ui
 )
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 def __inline(self):
 """
 Private slot to handle the Inline Local Variable action.
 """
+from .InlineDialog import InlineDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .InlineDialog import InlineDialog
 dlg = InlineDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 dlg.show()
 Private slot to handle the Move Method action.
 @param moveKind kind of move to be performed
 @type str (one of 'move_method' or 'move_module')
 """
+from .MoveDialog import MoveDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("Highlight the method to move" " and try again."),
+self.tr("Highlight the method to move and try again."),
 )
 return
 else:
 title = self.tr("Move Current Module")
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
 else:
 offset = None
-from .MoveDialog import MoveDialog
 dlg = MoveDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 dlg.show()
 def __useFunction(self):
 """
 Private slot to use a function wherever possible.
 """
+from .UseFunctionDialog import UseFunctionDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .UseFunctionDialog import UseFunctionDialog
 dlg = UseFunctionDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 dlg.show()
 def __introduceFactoryMethod(self):
 """
 Private slot to introduce a factory method or global function.
 """
+from .IntroduceFactoryDialog import IntroduceFactoryDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .IntroduceFactoryDialog import IntroduceFactoryDialog
 dlg = IntroduceFactoryDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 dlg.show()
 def __introduceParameter(self):
 """
 Private slot to introduce a parameter in a function.
 """
+from .IntroduceParameterDialog import IntroduceParameterDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("Highlight the code for the new parameter" " and try again."),
+self.tr("Highlight the code for the new parameter and try again."),
 )
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .IntroduceParameterDialog import IntroduceParameterDialog
 dlg = IntroduceParameterDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 @param title title to be used for the import refactoring
 @type str
 @param methodName name of the method performing the import refactoring
 @type str
 """
+from .ConfirmationDialog import ConfirmationDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if aw.hasSelectedText():
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
 else:
 offset = None
-from .ConfirmationDialog import ConfirmationDialog
 dlg = ConfirmationDialog(
 self,
 title,
 "Imports",
 def __changeSignature(self):
 """
 Private slot to change the signature of a method or function.
 """
+from .ChangeSignatureDialog import ChangeSignatureDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("Highlight the method or function to change" " and try again."),
+self.tr("Highlight the method or function to change and try again."),
 )
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .ChangeSignatureDialog import ChangeSignatureDialog
 dlg = ChangeSignatureDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 def __inlineArgumentDefault(self):
 """
 Private slot to inline the default value of a parameter of a
 method or function.
 """
+from .InlineArgumentDefaultDialog import InlineArgumentDefaultDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .InlineArgumentDefaultDialog import InlineArgumentDefaultDialog
 dlg = InlineArgumentDefaultDialog(
 self, title, filename, offset, parent=self.__ui
 )
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 def __transformModuleToPackage(self):
 """
 Private slot to transform a module to a package.
 """
+from .ConfirmationDialog import ConfirmationDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
-from .ConfirmationDialog import ConfirmationDialog
 dlg = ConfirmationDialog(
 self,
 title,
 "ModuleToPackage",
 def __encapsulateAttribute(self):
 """
 Private slot to encapsulate an attribute.
 """
+from .GetterSetterDialog import GetterSetterDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr("Highlight the attribute to encapsulate" " and try again."),
+self.tr("Highlight the attribute to encapsulate and try again."),
 )
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .GetterSetterDialog import GetterSetterDialog
 dlg = GetterSetterDialog(self, title, filename, offset, parent=self.__ui)
 changeGroup = dlg.getChangeGroupName()
 self.__refactoringDialogs[changeGroup] = dlg
 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
 def __convertLocalToAttribute(self):
 """
 Private slot to convert a local variable to an attribute.
 """
+from .ConfirmationDialog import ConfirmationDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .ConfirmationDialog import ConfirmationDialog
 dlg = ConfirmationDialog(
 self,
 title,
 "LocalToAttribute",
 "CalculateLocalToAttributeChanges",
 def __methodToMethodObject(self):
 """
 Private slot to change the signature of a method or function.
 """
+from .MethodToMethodObjectDialog import MethodToMethodObjectDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 # no selection available
 EricMessageBox.warning(
 self.__ui,
 title,
-self.tr(
+self.tr("Highlight the method or function to convert and try again."),
-"Highlight the method or function to convert" " and try again."
-),
 )
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = self.__getOffset(aw, line, index)
-from .MethodToMethodObjectDialog import MethodToMethodObjectDialog
 dlg = MethodToMethodObjectDialog(
 self, title, filename, offset, parent=self.__ui
 )
 changeGroup = dlg.getChangeGroupName()
 def __showProjectHistory(self):
 """
 Private method to show the project refactoring history.
 """
+from .HistoryDialog import HistoryDialog
 if self.__historyDialog is not None:
 self.__historyDialog.close()
-from .HistoryDialog import HistoryDialog
 self.__historyDialog = HistoryDialog(self, parent=self.__ui)
 self.__historyDialog.finished.connect(self.__historyDialogClosed)
 self.__historyDialog.show()
 def __showFileHistory(self):
 """
 Private method to show the refactoring history of the current file.
 """
+from .HistoryDialog import HistoryDialog
 aw = self.__vm.activeWindow()
 if aw is None:
 return
 if self.__historyDialog is not None:
 self.__historyDialog.close()
-from .HistoryDialog import HistoryDialog
 filename = aw.getFileName()
 if filename:
 self.__historyDialog = HistoryDialog(
 self, filename=filename, parent=self.__ui
 the client.
 @param result dictionary containing the result data
 @type dict
 """
+from .MatchesDialog import MatchesDialog
 if self.handleRopeError(result):
 title = result["Title"]
 if result["EntriesCount"] > 0:
-from .MatchesDialog import MatchesDialog
 self.dlg = MatchesDialog(self.__ui, True)
 self.dlg.show()
 for occurrence in result["Entries"]:
 self.dlg.addEntry(
 # file name, lineno, unsure
 the client.
 @param result dictionary containing the result data
 @type dict
 """
+from .MatchesDialog import MatchesDialog
 if self.handleRopeError(result):
 title = result["Title"]
 if "Location" in result:
 location = result["Location"]
-from .MatchesDialog import MatchesDialog
 self.dlg = MatchesDialog(self.__ui, False)
 self.dlg.show()
 self.dlg.addEntry(location[0], location[1])
 # file name, lineno
 the client.
 @param result dictionary containing the result data
 @type dict
 """
+from .MatchesDialog import MatchesDialog
 if self.handleRopeError(result):
 title = result["Title"]
 if result["EntriesCount"] > 0:
-from .MatchesDialog import MatchesDialog
 self.dlg = MatchesDialog(self.__ui, True)
 self.dlg.show()
 for occurrence in result["Entries"]:
 self.dlg.addEntry(
 # file name, lineno, unsure
 def __editConfig(self):
 """
 Private slot to open the rope configuration file in an editor.
 """
+from eric7.QScintilla.MiniEditor import MiniEditor
 ropedir = self.__ropeConfig["RopeFolderName"]
 configfile = ""
 if ropedir and os.path.exists(ropedir):
 configfile = os.path.join(ropedir, "config.py")
 if os.path.exists(configfile):
-from eric7.QScintilla.MiniEditor import MiniEditor
 self.__editor = MiniEditor(configfile)
 self.__editor.show()
 self.__editor.editorSaved.connect(self.__configChanged)
 else:
 EricMessageBox.critical(
 self.__ui,
 self.tr("Configure Rope"),
 self.tr(
-"""The Rope configuration file '{0}' does""" """ not exist."""
+"""The Rope configuration file '{0}' does not exist."""
 ).format(configfile),
 )
 else:
 EricMessageBox.critical(
 self.__ui,
 def __showRopeHelp(self):
 """
 Private slot to show help about the refactorings offered by Rope.
 """
+from .HelpDialog import HelpDialog
 if self.__helpDialog is None:
-from .HelpDialog import HelpDialog
 self.__helpDialog = HelpDialog(
 self.tr("Help about rope refactorings"),
 self.__ropeConfig["RopeHelpFile"],
 )
 self.__helpDialog.show()
 """This action might take some time. """
 """Do you really want to perform SOA?"""
 ),
 )
 if res:
 self.sendJson(
 "PerformSoa",
 {
 "Title": title,
 },

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/RefactoringServer.py

RefactoringRope/RefactoringServer.py