Mercurial Repositories > Rope Refactoring / file diff

diff -r c8890f852917 -r 2cdb7c48b719 RefactoringRope/RenameDialog.py
--- a/RefactoringRope/RenameDialog.py	Mon Sep 18 20:05:28 2017 +0200
+++ b/RefactoringRope/RenameDialog.py	Tue Sep 19 18:59:14 2017 +0200
@@ -52,12 +52,7 @@
         self.__filename = filename
         self.__offset = offset
         self.__local = isLocal
-##        self.__renamer = renamer
-##        if resource is not None:
-##            self.__resources = [resource]
-##        else:
-##            self.__resources = None
-##        
+        
         self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         self.__okButton.setEnabled(False)
         self.__previewButton = self.buttonBox.addButton(
@@ -98,14 +93,14 @@
         @param data dictionary containing the change data
         @type dict
         """
-        # TODO: change this to the distributed version
         if self.ignoreButton.isChecked():
             answer = False
         elif self.matchButton.isChecked():
             answer = True
         else:
-            filename = occurrence.resource.real_path
-            start, end = occurrence.get_primary_range()
+            filename = data["FileName"]
+            start = data["StartOffset"]
+            end = data["EndOffset"]
             
             vm = e5App().getObject("ViewManager")
             
@@ -118,21 +113,29 @@
             aw.ensureLineVisible(sline)
             aw.gotoLine(sline)
             aw.setSelection(sline, sindex, eline, eindex)
+            
             answer = E5MessageBox.yesNo(
-                self,
+                self._ui,
                 self.tr("Rename"),
                 self.tr("""<p>Is the highlighted code a match?</p>"""),
                 yesDefault=True)
+            
             aw.setCursorPosition(cline, cindex)
             aw.ensureCursorVisible()
         
-        return answer
+        self._refactoring.sendJson("ConfirmUnsure", {
+            "Answer": answer,
+        })
     
     def _calculateChanges(self):
         """
         Protected method to initiate the calculation of the changes.
         """
+        if self.askButton.isChecked():
+            self.hide()
+        
         self._refactoring.sendJson("CalculateRenameChanges", {
+            "ChangeGroup": self._changeGroupName,
             "Title": self._title,
             "FileName": self.__filename,
             "Offset": self.__offset,
@@ -141,18 +144,6 @@
             "RenameHierarchy": self.allCheckBox.isChecked(),
             "RenameInStrings": self.stringsCheckBox.isChecked(),
         })
-##        try:
-##            changes = self.__renamer.get_changes(
-##                self.newNameEdit.text(),
-##                resources=self.__resources,
-##                in_hierarchy=self.allCheckBox.isChecked(),
-##                unsure=self.__confirmUnsure,
-##                docs=self.stringsCheckBox.isChecked(),
-##                task_handle=handle)
-##            return changes
-##        except Exception as err:
-##            self._refactoring.handleRopeError(err, self._title, handle)
-##            return None
     
     def processChangeData(self, data):
         """