diff -r 2cdb7c48b719 -r 04583cac110f RefactoringRope/Refactoring.py
--- a/RefactoringRope/Refactoring.py Tue Sep 19 18:59:14 2017 +0200
+++ b/RefactoringRope/Refactoring.py Tue Sep 19 19:40:18 2017 +0200
@@ -947,16 +947,14 @@
selectedText = aw.selectedText()
from RenameDialog import RenameDialog
- dlg = RenameDialog(
- self, title, filename, offset, isLocal,
- selectedText=selectedText, parent=self.__ui)
+ dlg = RenameDialog(self, title, filename, offset, isLocal,
+ selectedText=selectedText, parent=self.__ui)
changeGroup = dlg.getChangeGroupName()
self.__refactoringDialogs[changeGroup] = dlg
dlg.finished.connect(
lambda: self.__refactoringDialogClosed(changeGroup))
dlg.show()
- # TODO: continue from here
def __changeOccurrences(self):
"""
Private slot to perform the Change Occurrences refactoring.
@@ -982,20 +980,14 @@
line, index, line1, index1 = aw.getSelection()
offset = self.__getOffset(aw, line, index)
- import rope.refactor.rename
- resource = rope.base.libutils.path_to_resource(
- self.__project, filename)
- try:
- renamer = rope.refactor.rename.ChangeOccurrences(
- self.__project, resource, offset)
- except Exception as err:
- self.handleRopeError(err, title)
- return
-
from ChangeOccurrencesDialog import ChangeOccurrencesDialog
- self.dlg = ChangeOccurrencesDialog(self, title, renamer,
- parent=self.__ui)
- self.dlg.show()
+ dlg = ChangeOccurrencesDialog(self, title, filename, offset,
+ parent=self.__ui)
+ changeGroup = dlg.getChangeGroupName()
+ self.__refactoringDialogs[changeGroup] = dlg
+ dlg.finished.connect(
+ lambda: self.__refactoringDialogClosed(changeGroup))
+ dlg.show()
#####################################################
## Extract refactorings
@@ -1013,6 +1005,7 @@
"""
self.__doExtract(self.tr("Extract Local Variable"), "variable")
+ # TODO: continue from here
def __doExtract(self, title, kind):
"""
Private method to perform the extract refactoring.
