Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Mon Feb 17 17:09:25 2025 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Wed Feb 19 15:09:52 2025 +0100
@@ -93,6 +93,7 @@
         "N": QCoreApplication.translate("CheckerCategories", "Naming"),
         "NO": QCoreApplication.translate("CheckerCategories", "Name Order"),
         "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"),
+        "PYD": QCoreApplication.translate("CheckerCategories", "'pydantic' Usage"),
         "S": QCoreApplication.translate("CheckerCategories", "Security"),
         "U": QCoreApplication.translate("CheckerCategories", "Unused"),
         "W": QCoreApplication.translate("CheckerCategories", "Warnings"),
@@ -794,8 +795,6 @@
             self.__data["UnusedChecker"]["IgnoreDunderGlobals"]
         )
 
-        self.__cleanupData()
-
     def __prepareProgress(self):
         """
         Private method to prepare the progress tab for the next run.
@@ -879,7 +878,6 @@
         self.__errorItem = None
         self.__resetStatistics()
         self.__clearErrors(self.files)
-        self.__cleanupData()
         self.__prepareProgress()
 
         # disable updates of the list for speed
@@ -893,7 +891,7 @@
 
             # extract the configuration values
             excludeMessages = self.__assembleExcludeMessages()
-            includeMessages = self.includeMessagesEdit.text()
+            includeMessages = self.__assembleIncludeMessages()
             repeatMessages = self.repeatCheckBox.isChecked()
             fixCodes = self.fixIssuesEdit.text()
             noFixCodes = self.noFixIssuesEdit.text()
@@ -1373,8 +1371,6 @@
         """
         Private slot to start a code style check run.
         """
-        self.__cleanupData()
-
         if self.__forProject:
             data = {
                 "EnabledCheckerCategories": self.__getCategories(True),
@@ -2200,8 +2196,6 @@
             )
         )
 
-        self.__cleanupData()
-
     @pyqtSlot()
     def on_storeDefaultButton_clicked(self):
         """
@@ -2916,7 +2910,7 @@
         disabledCategories = self.__getCategories(False)
 
         if excludeMessages and disabledCategories:
-            return disabledCategories + "," + excludeMessages
+            return disabledCategories + ", " + excludeMessages
         elif disabledCategories:
             return disabledCategories
         elif excludeMessages:
@@ -2924,30 +2918,24 @@
         else:
             return ""
 
-    def __cleanupData(self):
+    def __assembleIncludeMessages(self):
         """
-        Private method to clean the loaded/entered data of redundant entries.
+        Private method to assemble the list of included checks.
+
+        @return list of included checks as a comma separated string.
+        @rtype str
         """
-        # Migrate single letter exclude messages to disabled checker categories
-        # and delete them from exclude messages
-        excludedMessages = [
-            m.strip() for m in self.excludeMessagesEdit.text().split(",") if bool(m)
-        ]
-        excludedMessageCategories = [c for c in excludedMessages if len(c) == 1]
-        enabledCheckers = self.__getCategories(True, asList=True)
-        for category in excludedMessageCategories:
-            if category in enabledCheckers:
-                enabledCheckers.remove(category)
-            excludedMessages.remove(category)
+        includeMessages = self.includeMessagesEdit.text()
+        enabledCategories = self.__getCategories(True)
 
-        # Remove excluded messages of an already excluded category
-        disabledCheckers = self.__getCategories(False, asList=True)
-        for message in excludedMessages[:]:
-            if message[0] in disabledCheckers:
-                excludedMessages.remove(message)
-
-        self.excludeMessagesEdit.setText(",".join(excludedMessages))
-        self.__initCategoriesList(",".join(enabledCheckers))
+        if includeMessages and enabledCategories:
+            return enabledCategories + ", " + includeMessages
+        elif enabledCategories:
+            return enabledCategories
+        elif includeMessages:
+            return includeMessages
+        else:
+            return ""
 
     def __initCommentedCodeCheckerWhiteList(self, whitelist):
         """