Rope Refactoring: comparison RefactoringRope/ChangeSignatureDialog.py

-:cb044ec27c24
+:4f53795beff0
 """
 import copy
 from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import (
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, QAbstractButton
-QDialog, QDialogButtonBox, QListWidgetItem, QAbstractButton
-)
 from .Ui_ChangeSignatureDialog import Ui_ChangeSignatureDialog
 from .RefactoringDialogBase import RefactoringDialogBase
 class ChangeSignatureDialog(RefactoringDialogBase, Ui_ChangeSignatureDialog):
 """
 Class implementing the Change Signature dialog.
 """
 NameRole = Qt.ItemDataRole.UserRole
 IsAddedRole = Qt.ItemDataRole.UserRole + 1
 DefaultRole = Qt.ItemDataRole.UserRole + 2
 ValueRole = Qt.ItemDataRole.UserRole + 3
 def __init__(self, refactoring, title, filename, offset, parent=None):
 """
 Constructor
 @param refactoring reference to the main refactoring object
 @type RefactoringServer
 @param title title of the dialog
 @type str
 @param filename file name to be worked on
 @param parent reference to the parent widget
 @type QWidget
 """
 RefactoringDialogBase.__init__(self, refactoring, title, parent)
 self.setupUi(self)
 self._changeGroupName = "ChangeSignature"
 self.__filename = filename
 self.__offset = offset
 self.__definition_info = []
 self.__to_be_removed = []
-self.__okButton = self.buttonBox.button(
+self.__okButton = self.buttonBox.button(QDialogButtonBox.StandardButton.Ok)
-QDialogButtonBox.StandardButton.Ok)
 self.__previewButton = self.buttonBox.addButton(
-self.tr("Preview"), QDialogButtonBox.ButtonRole.ActionRole)
+self.tr("Preview"), QDialogButtonBox.ButtonRole.ActionRole
+)
 self.__previewButton.setDefault(True)
-self._refactoring.sendJson("RequestSignature", {
+self._refactoring.sendJson(
-"ChangeGroup": self._changeGroupName,
+"RequestSignature",
-"Title": self._title,
+{
-"FileName": self.__filename,
+"ChangeGroup": self._changeGroupName,
-"Offset": self.__offset,
+"Title": self._title,
-})
+"FileName": self.__filename,
+"Offset": self.__offset,
+},
+)
 def __processSignature(self, data):
 """
 Private method to process the inline type data sent by the refactoring
 client in order to polish the dialog.
 @param data dictionary containing the inline type data
 @type dict
 """
 self.__definition_info = data["DefinitionInfo"]
 # populate the parameters list
 for arg, default in self.__definition_info:
 itm = (
 QListWidgetItem(arg, self.parameterList)
-if default is None else
+if default is None
-QListWidgetItem("{0}={1}".format(arg, default),
+else QListWidgetItem("{0}={1}".format(arg, default), self.parameterList)
-self.parameterList)
 )
 itm.setData(ChangeSignatureDialog.NameRole, arg)
 itm.setData(ChangeSignatureDialog.IsAddedRole, False)
 itm.setData(ChangeSignatureDialog.DefaultRole, None)
 itm.setData(ChangeSignatureDialog.ValueRole, None)
 if self.parameterList.count():
 self.parameterList.setCurrentRow(0)
 else:
 self.on_parameterList_currentRowChanged(-1)
 @pyqtSlot(int)
 def on_parameterList_currentRowChanged(self, currentRow):
 """
 Private slot called, when the current row is changed.
 @param currentRow index of the current row
 @type int
 """
 if currentRow == -1:
 self.upButton.setEnabled(False)
 self.removeButton.setEnabled(False)
 else:
 maxIndex = self.parameterList.count() - 1
 self.upButton.setEnabled(currentRow != 0)
 self.downButton.setEnabled(currentRow != maxIndex)
 @pyqtSlot()
 def on_upButton_clicked(self):
 """
 Private slot called to move the selected item up in the list.
 """
 row = self.parameterList.currentRow()
 if row == 0:
 # we're already at the top
 return
 itm = self.parameterList.takeItem(row)
 self.parameterList.insertItem(row - 1, itm)
 self.parameterList.setCurrentItem(itm)
 if row == 1:
 self.upButton.setEnabled(False)
 else:
 self.upButton.setEnabled(True)
 self.downButton.setEnabled(True)
 @pyqtSlot()
 def on_downButton_clicked(self):
 """
 Private slot called to move the selected item down in the list.
 """
 rows = self.parameterList.count()
 row = self.parameterList.currentRow()
 if row == rows - 1:
 # we're already at the end
 return
 itm = self.parameterList.takeItem(row)
 self.parameterList.insertItem(row + 1, itm)
 self.parameterList.setCurrentItem(itm)
 self.upButton.setEnabled(True)
 if row == rows - 2:
 self.downButton.setEnabled(False)
 else:
 self.downButton.setEnabled(True)
 @pyqtSlot()
 def on_removeButton_clicked(self):
 """
 Private slot to remove a parameter.
 """
 itm = self.parameterList.takeItem(self.parameterList.currentRow())
 self.__to_be_removed.append(itm)
 @pyqtSlot()
 def on_addButton_clicked(self):
 """
 Private slot to add a new parameter.
 """
 from .AddParameterDialog import AddParameterDialog
 dlg = AddParameterDialog(self)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 name, default, value = dlg.getData()
 if default:
 s = "{0}={1}".format(name, default)
 if value:
 itm.setData(ChangeSignatureDialog.ValueRole, value)
 else:
 itm.setData(ChangeSignatureDialog.ValueRole, None)
 if self.parameterList.count():
-self.parameterList.insertItem(
+self.parameterList.insertItem(self.parameterList.currentRow() + 1, itm)
-self.parameterList.currentRow() + 1, itm)
 else:
 self.parameterList.addItem(itm)
 self.parameterList.setCurrentItem(itm)
 @pyqtSlot(QAbstractButton)
 def on_buttonBox_clicked(self, button):
 """
 Private slot to act on the button pressed.
 @param button reference to the button pressed
 @type QAbstractButton
 """
 if button == self.__previewButton:
 self.requestPreview()
 elif button == self.__okButton:
 self.applyChanges()
 def __getParameterIndex(self, definition_info, name):
 """
 Private method to calculate the index of the given paramter.
 @param definition_info list of lists containing the method signature
 definition
 @type list of lists of two str
 @param name parameter name
 @type str
 @rtype int
 """
 for index, pair in enumerate(definition_info):
 if pair[0] == name:
 return index
 return -1
 def _calculateChanges(self):
 """
 Protected method to initiate the calculation of the changes.
 definition_info = copy.deepcopy(self.__definition_info)
 for itm in self.__to_be_removed:
 if itm.data(ChangeSignatureDialog.IsAddedRole):
 continue
 index = self.__getParameterIndex(
-definition_info,
+definition_info, itm.data(ChangeSignatureDialog.NameRole)
-itm.data(ChangeSignatureDialog.NameRole))
+)
 if index >= 0:
 removals.append(index)
 del definition_info[index]
 additions = []
 for index in range(self.parameterList.count()):
 itm = self.parameterList.item(index)
 if itm.data(ChangeSignatureDialog.IsAddedRole):
 name = itm.data(ChangeSignatureDialog.NameRole)
 additions.append([index, name, default, value])
 try:
 definition_info.insert(index, [name, default])
 except Exception as err:
 self._refactoring.handleRopeError(err, self._title)
 newOrdering = []
 for row in range(self.parameterList.count()):
 itm = self.parameterList.item(row)
 name = itm.data(ChangeSignatureDialog.NameRole)
 index = self.__getParameterIndex(definition_info, name)
 if index >= 0:
 newOrdering.append(index)
 autodef = self.autodefEdit.text()
 if not autodef:
 autodef = None
-self._refactoring.sendJson("CalculateSignatureChanges", {
+self._refactoring.sendJson(
-"ChangeGroup": self._changeGroupName,
+"CalculateSignatureChanges",
-"Title": self._title,
+{
-"FileName": self.__filename,
+"ChangeGroup": self._changeGroupName,
-"Offset": self.__offset,
+"Title": self._title,
-"Removals": removals,
+"FileName": self.__filename,
-"Additions": additions,
+"Offset": self.__offset,
-"Ordering": newOrdering,
+"Removals": removals,
-"AutoDef": autodef,
+"Additions": additions,
-"Hierarchy": self.hierarchyCheckBox.isChecked(),
+"Ordering": newOrdering,
-})
+"AutoDef": autodef,
+"Hierarchy": self.hierarchyCheckBox.isChecked(),
+},
+)
 def processChangeData(self, data):
 """
 Public method to process the change data sent by the refactoring
 client.
 @param data dictionary containing the change data
 @type dict
 """
 subcommand = data["Subcommand"]
 if subcommand == "Signature":

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/ChangeSignatureDialog.py

RefactoringRope/ChangeSignatureDialog.py