Mercurial Repositories > eric / file diff

--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py	Mon Oct 31 14:09:07 2022 +0100
+++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py	Mon Oct 31 15:29:18 2022 +0100
@@ -4,7 +4,7 @@
 #
 
 """
-Module implementing a dialog showing the code formatting progress and the result.
+Module implementing a dialog showing the Black code formatting progress and the results.
 """
 
 import copy
@@ -30,7 +30,7 @@
 from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog
 
 from . import BlackUtilities
-from .BlackDiffWidget import BlackDiffWidget
+from .FormattingDiffWidget import FormattingDiffWidget
 from .BlackFormattingAction import BlackFormattingAction
 
 from eric7 import Preferences, Utilities
@@ -38,7 +38,8 @@
 
 class BlackFormattingDialog(QDialog, Ui_BlackFormattingDialog):
     """
-    Class implementing a dialog showing the code formatting progress and the result.
+    Class implementing a dialog showing the Black code formatting progress and the
+    results.
     """
 
     DataTypeRole = Qt.ItemDataRole.UserRole
@@ -98,7 +99,7 @@
 
     def __performAction(self):
         """
-        Private method to exceute the requested formatting action.
+        Private method to execute the requested formatting action.
         """
         self.progressBar.setValue(0)
         self.progressBar.setVisible(True)
@@ -277,7 +278,7 @@
             )
         elif dataType == "diff":
             if self.__diffDialog is None:
-                self.__diffDialog = BlackDiffWidget()
+                self.__diffDialog = FormattingDiffWidget()
             self.__diffDialog.showDiff(item.data(0, BlackFormattingDialog.DataRole))
 
     def __formatManyFiles(self, files):
@@ -520,8 +521,8 @@
         """
         Private slot to handle the result of a black reformatting action.
 
-        @param status status of the performed action (one of 'changed', 'unchanged',
-            'unmodified', 'failed' or 'ignored')
+        @param status status of the performed action (one of 'changed', 'failed',
+            'ignored', 'unchanged' or 'unmodified')
         @type str
         @param filename name of the processed file
         @type str