Rope Refactoring: comparison RefactoringRope/RefactoringServer.py

-:891b660bcbda
+:f05681349336
 super(RefactoringServer, self).__init__(
 "RefactoringServer", parent=parent)
 self.__plugin = plugin
 self.__ui = parent
+self.__vm = e5App().getObject("ViewManager")
 self.__e5project = e5App().getObject("Project")
 self.__projectpath = ''
 self.__projectLanguage = ""
 self.__projectopen = False
 self.__ropeConfig = {}
 def __showRefactoringHistoryMenu(self):
 """
 Private slot called before the refactoring history menu is shown.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 enable = aw is not None and bool(aw.getFileName())
 self.refactoringFileHistoryAct.setEnabled(enable)
 def handleRopeError(self, result):
 self.__ui, title,
 self.tr("Rope error: {0}").format(
 result["ErrorString"]),
 E5MessageBox.Ok | E5MessageBox.Open)
 if res == E5MessageBox.Open:
-e5App().getObject("ViewManager").openSourceFile(
+self.__vm.openSourceFile(
 os.path.join(self.__e5project.getProjectPath(),
 result["ErrorFile"]),
 result["ErrorLine"])
 elif result["Error"] == "InterruptedTaskError":
 return True
 the local file
 @type bool
 @param renameModule flag indicating a module rename refactoring
 @type bool
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not renameModule and not aw.hasSelectedText():
 def __changeOccurrences(self):
 """
 Private slot to perform the Change Occurrences refactoring.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Change Occurrences")
 @param kind kind of extraction to be done
 @type str ("method" or "variable")
 """
 assert kind in ["variable", "method"]
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not aw.hasSelectedText():
 def __inline(self):
 """
 Private slot to handle the Inline Local Variable action.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Inline")
 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')
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 if moveKind == "move_method":
 def __useFunction(self):
 """
 Private slot to use a function wherever possible.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Use Function")
 def __introduceFactoryMethod(self):
 """
 Private slot to introduce a factory method or global function.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Introduce Factory Method")
 def __introduceParameter(self):
 """
 Private slot to introduce a parameter in a function.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Introduce Parameter")
 @param title title to be used for the import refactoring
 @type str
 @param methodName name of the method performing the import refactoring
 @type str
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 if not self.confirmBufferIsSaved(aw):
 def __changeSignature(self):
 """
 Private slot to change the signature of a method or function.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Change Method Signature")
 def __inlineArgumentDefault(self):
 """
 Private slot to inline the default value of a parameter of a
 method or function.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Inline Argument Default")
 def __transformModuleToPackage(self):
 """
 Private slot to transform a module to a package.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Transform Module to Package")
 def __encapsulateAttribute(self):
 """
 Private slot to encapsulate an attribute.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Encapsulate Attribute")
 def __convertLocalToAttribute(self):
 """
 Private slot to convert a local variable to an attribute.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Local Variable to Attribute")
 def __methodToMethodObject(self):
 """
 Private slot to change the signature of a method or function.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Replace Method With Method Object")
 def __showFileHistory(self):
 """
 Private method to show the refactoring history of the current file.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 if self.__historyDialog is not None:
 def __queryReferences(self):
 """
 Private slot to handle the Find References action.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Find Occurrences")
 def __queryDefinition(self):
 """
 Private slot to handle the Find Definition action.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Find Definition")
 Note: This is executed upon a mouse click sequence.
 @param editor reference to the calling editor
 @type QScintilla.Editor
 """
-filename = editor.getFileName()
+if self.__projectopen:
-line, index = editor.getCursorPosition()
+filename = editor.getFileName()
-offset = self.__getOffset(editor, line, index)
+line, index = editor.getCursorPosition()
+offset = self.__getOffset(editor, line, index)
-self.sendJson("QueryDefinition", {
-"Title": "",
+self.sendJson("QueryDefinition", {
-"FileName": filename,
+"Title": "",
-"Offset": offset,
+"FileName": filename,
-"Source": editor.text(),
+"Offset": offset,
-"Subcommand": "Goto",
+"Source": editor.text(),
-})
+"Subcommand": "Goto",
+})
 def __queryDefinitionResult(self, result):
 """
 Private method to handle the "Query Definition" result sent by
 the client.
 if "Error" not in result:
 # ignore errors silently
 if "Location" in result:
 location = result["Location"]
 try:
-e5App().getObject("ViewManager").openSourceFile(
+self.__vm.openSourceFile(
 location[0], location[1], addNext=True)
 except TypeError:
 # backward compatibility; <= 17.03
-e5App().getObject("ViewManager").openSourceFile(
+self.__vm.openSourceFile(
 location[0], location[1], next=True)
 else:
 e5App().getObject("UserInterface").statusBar().showMessage(
 self.tr('No definition found'), 5000)
 def __queryImplementations(self):
 """
 Private slot to handle the Find Implementations action.
 """
-aw = e5App().getObject("ViewManager").activeWindow()
+aw = self.__vm.activeWindow()
 if aw is None:
 return
 title = self.tr("Find Implementations")
 Public method to check, if any editor has unsaved changes.
 @return flag indicating, that no editor contains unsaved edits
 @rtype bool
 """
-res = e5App().getObject("ViewManager").checkAllDirty()
+res = self.__vm.checkAllDirty()
 self.sendJson("Validate", {})
 return res
 def refreshEditors(self, changedFiles):
 """
 Public method to refresh modified editors.
 @param changedFiles list of changed files
 @type list of str
 """
-vm = e5App().getObject("ViewManager")
+openFiles = [Utilities.normcasepath(f)
-openFiles = [Utilities.normcasepath(f) for f in vm.getOpenFilenames()]
+for f in self.__vm.getOpenFilenames()]
 for fileName in changedFiles:
 normfile = Utilities.normcasepath(fileName)
 if normfile in openFiles:
-editor = vm.getEditor(normfile)[1]
+editor = self.__vm.getEditor(normfile)[1]
 editor.refresh()
-aw = vm.activeWindow()
+aw = self.__vm.activeWindow()
 if aw is not None:
 filename = aw.getFileName()
 if filename is not None:
-vm.openSourceFile(filename, aw.getCursorPosition()[0] + 1)
+self.__vm.openSourceFile(filename,
+aw.getCursorPosition()[0] + 1)
 def reportChanged(self, filename, oldSource):
 """
 Public slot to report some changed sources.
 @param oldSource source code before the change
 @type str
 """
 if self.__e5project.isOpen() and \
 self.__e5project.isProjectFile(filename):
-self.sendJson("ReportChanged", {
+editor = self.__vm.getOpenEditor(filename)
-"FileName": filename,
+if editor is not None and \
-"OldSource": oldSource,
+editor.getLanguage() == self.__ropeConfig["PythonVersion"]:
-})
+self.sendJson("ReportChanged", {
+"FileName": filename,
+"OldSource": oldSource,
+})
 #######################################################################
 ## Methods below handle the network connection
 #######################################################################
 """
 client = os.path.join(os.path.dirname(__file__),
 "RefactoringClient.py")
 ok = self.startClient(interpreter, client, [self.__projectpath])
 return ok
+#########################################################################
+## Methods below handle setting/unsetting the mouse click handler methods
+#########################################################################
+def connectEditor(self, editor):
+"""
+Public method to connect an editor.
+@param editor reference to the editor
+@type QScintilla.Editor
+"""
+if self.__plugin.getPreferences("MouseClickEnabled"):
+self.__disconnectMouseClickHandler(editor)
+self.__connectMouseClickHandler(editor)
+def disconnectEditor(self, editor):
+"""
+Public method to disconnect an editor.
+@param editor reference to the editor
+@type QScintilla.Editor
+"""
+self.__disconnectMouseClickHandler(editor)
+def __connectMouseClickHandler(self, editor):
+"""
+Private method to connect the mouse click handler to an editor.
+@param editor reference to the editor
+@type QScintilla.Editor
+"""
+if self.__plugin.getPreferences("MouseClickGotoButton"):
+editor.setMouseClickHandler(
+"rope",
+self.__plugin.getPreferences("MouseClickGotoModifiers"),
+self.__plugin.getPreferences("MouseClickGotoButton"),
+self.gotoDefinition
+)
+def __disconnectMouseClickHandler(self, editor):
+"""
+Private method to disconnect the mouse click handler from an editor.
+@param editor reference to the editor
+@type QScintilla.Editor
+"""
+editor.removeMouseClickHandlers("rope")

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/RefactoringServer.py

RefactoringRope/RefactoringServer.py