Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Wed Sep 18 20:25:52 2019 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Thu Sep 19 19:14:34 2019 +0200
@@ -351,6 +351,11 @@
             self.__data["CommentedCodeChecker"] = {
                 "Aggressive": False,
             }
+        if "AnnotationsChecker" not in self.__data:
+            self.__data["AnnotationsChecker"] = {
+                "MinimumCoverage": 75,
+                "MaximumComplexity": 3,
+            }
         
         self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
         self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"])
@@ -379,6 +384,10 @@
         self.__initBuiltinsIgnoreList(self.__data["BuiltinsChecker"])
         self.aggressiveCheckBox.setChecked(
             self.__data["CommentedCodeChecker"]["Aggressive"])
+        self.minAnnotationsCoverageSpinBox.setValue(
+            self.__data["AnnotationsChecker"]["MinimumCoverage"])
+        self.maxAnnotationsComplexitySpinBox.setValue(
+            self.__data["AnnotationsChecker"]["MaximumComplexity"])
     
     def start(self, fn, save=False, repeat=None):
         """
@@ -479,11 +488,18 @@
                     "Aggressive": self.aggressiveCheckBox.isChecked(),
                 }
             }
+            annotationArgs = {
+                "MinimumCoverage":
+                    self.minAnnotationsCoverageSpinBox.value(),
+                "MaximumComplexity":
+                    self.maxAnnotationsComplexitySpinBox.value(),
+            }
             
             self.__options = [excludeMessages, includeMessages, repeatMessages,
                               fixCodes, noFixCodes, fixIssues, maxLineLength,
                               maxDocLineLength, blankLines, hangClosing,
-                              docType, codeComplexityArgs, miscellaneousArgs]
+                              docType, codeComplexityArgs, miscellaneousArgs,
+                              annotationArgs]
             
             # now go through all the files
             self.progress = 0
@@ -813,6 +829,12 @@
                 "BuiltinsChecker": self.__getBuiltinsIgnoreList(),
                 "CommentedCodeChecker": {
                     "Aggressive": self.aggressiveCheckBox.isChecked(),
+                },
+                "AnnotationsChecker": {
+                    "MinimumCoverage":
+                        self.minAnnotationsCoverageSpinBox.value(),
+                    "MaximumComplexity":
+                        self.maxAnnotationsComplexitySpinBox.value(),
                 }
             }
             if data != self.__data:
@@ -1018,6 +1040,12 @@
             })))
         self.aggressiveCheckBox.setChecked(Preferences.toBool(
             Preferences.Prefs.settings.value("PEP8/AggressiveSearch", False)))
+        self.minAnnotationsCoverageSpinBox.setValue(int(
+            Preferences.Prefs.settings.value(
+                "PEP8/MinimumAnnotationsCoverage", 75)))
+        self.maxAnnotationsComplexitySpinBox.setValue(int(
+            Preferences.Prefs.settings.value(
+                "PEP8/MaximumAnnotationComplexity", 3)))
     
     @pyqtSlot()
     def on_storeDefaultButton_clicked(self):
@@ -1075,6 +1103,12 @@
             "PEP8/BuiltinsChecker", self.__getBuiltinsIgnoreList())
         Preferences.Prefs.settings.setValue(
             "PEP8/AggressiveSearch", self.aggressiveCheckBox.isChecked())
+        Preferences.Prefs.settings.setValue(
+            "PEP8/MinimumAnnotationsCoverage",
+            self.minAnnotationsCoverageSpinBox.value())
+        Preferences.Prefs.settings.setValue(
+            "PEP8/MaximumAnnotationComplexity",
+            self.maxAnnotationsComplexitySpinBox.value())
     
     @pyqtSlot()
     def on_resetDefaultButton_clicked(self):
@@ -1114,6 +1148,10 @@
             "chr": ["unichr", ],
         })
         Preferences.Prefs.settings.setValue("PEP8/AggressiveSearch", False)
+        Preferences.Prefs.settings.setValue(
+            "PEP8/MinimumAnnotationsCoverage", 75)
+        Preferences.Prefs.settings.setValue(
+            "PEP8/MaximumAnnotationComplexity", 3)
         
         # Update UI with default values
         self.on_loadDefaultButton_clicked()