Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
- branch
- eric7
- changeset 10052
- 041d0785dd42
- parent 10050
- 3750abc45d5e
- child 10053
- 9914b7b4b11c
equal
deleted
inserted
replaced
| 10051:1128cb7bbb42 | 10052:041d0785dd42 |
|---|---|
| 89 "M": QCoreApplication.translate("CheckerCategories", "Miscellaneous"), | 89 "M": QCoreApplication.translate("CheckerCategories", "Miscellaneous"), |
| 90 "N": QCoreApplication.translate("CheckerCategories", "Naming"), | 90 "N": QCoreApplication.translate("CheckerCategories", "Naming"), |
| 91 "NO": QCoreApplication.translate("CheckerCategories", "Name Order"), | 91 "NO": QCoreApplication.translate("CheckerCategories", "Name Order"), |
| 92 "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"), | 92 "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"), |
| 93 "S": QCoreApplication.translate("CheckerCategories", "Security"), | 93 "S": QCoreApplication.translate("CheckerCategories", "Security"), |
| 94 "U": QCoreApplication.translate("CheckerCategories", "Unused"), | |
| 94 "W": QCoreApplication.translate("CheckerCategories", "Warnings"), | 95 "W": QCoreApplication.translate("CheckerCategories", "Warnings"), |
| 95 "Y": QCoreApplication.translate("CheckerCategories", "Simplify Code"), | 96 "Y": QCoreApplication.translate("CheckerCategories", "Simplify Code"), |
| 96 } | 97 } |
| 97 | 98 |
| 98 noResults = 0 | 99 noResults = 0 |
| 501 "SortCaseSensitive": False, | 502 "SortCaseSensitive": False, |
| 502 "CombinedAsImports": False, | 503 "CombinedAsImports": False, |
| 503 "SortIgnoringStyle": False, | 504 "SortIgnoringStyle": False, |
| 504 "SortFromFirst": False, | 505 "SortFromFirst": False, |
| 505 }, | 506 }, |
| 507 # Unused | |
| 508 # TODO: add 'IgnoreSlotMethods' (pyqtSlot, Slot) | |
| 509 "UnusedChecker": { | |
| 510 "IgnoreAbstract": False, | |
| 511 "IgnoreOverload": False, | |
| 512 "IgnoreOverride": False, | |
| 513 "IgnoreSlotMethods": False, | |
| 514 "IgnoreStubs": False, | |
| 515 "IgnoreVariadicNames": False, | |
| 516 "IgnoreLambdas": False, | |
| 517 "IgnoreNestedFunctions": False, | |
| 518 "IgnoreDunderMethods": False, | |
| 519 }, | |
| 506 } | 520 } |
| 507 | 521 |
| 508 return defaults | 522 return defaults |
| 509 | 523 |
| 510 def prepare(self, fileList, project): | 524 def prepare(self, fileList, project): |
| 721 ) | 735 ) |
| 722 self.sortFromFirstCheckBox.setChecked( | 736 self.sortFromFirstCheckBox.setChecked( |
| 723 self.__data["NameOrderChecker"]["SortFromFirst"] | 737 self.__data["NameOrderChecker"]["SortFromFirst"] |
| 724 ) | 738 ) |
| 725 | 739 |
| 740 # UnusedChecker | |
| 741 self.ignoreAbstractCheckBox.setChecked( | |
| 742 self.__data["UnusedChecker"]["IgnoreAbstract"] | |
| 743 ) | |
| 744 self.ignoreOverloadCheckBox.setChecked( | |
| 745 self.__data["UnusedChecker"]["IgnoreOverload"] | |
| 746 ) | |
| 747 self.ignoreOverrideCheckBox.setChecked( | |
| 748 self.__data["UnusedChecker"]["IgnoreOverride"] | |
| 749 ) | |
| 750 self.ignoreStubsCheckBox.setChecked(self.__data["UnusedChecker"]["IgnoreStubs"]) | |
| 751 self.ignoreVariadicNamesCheckBox.setChecked( | |
| 752 self.__data["UnusedChecker"]["IgnoreVariadicNames"] | |
| 753 ) | |
| 754 self.ignoreLambdasCheckBox.setChecked( | |
| 755 self.__data["UnusedChecker"]["IgnoreLambdas"] | |
| 756 ) | |
| 757 self.ignoreNestedFunctionsCheckBox.setChecked( | |
| 758 self.__data["UnusedChecker"]["IgnoreNestedFunctions"] | |
| 759 ) | |
| 760 self.ignoreDunderMethodsCheckBox.setChecked( | |
| 761 self.__data["UnusedChecker"]["IgnoreDunderMethods"] | |
| 762 ) | |
| 763 self.ignoreSlotsCheckBox.setChecked( | |
| 764 self.__data["UnusedChecker"]["IgnoreSlotMethods"] | |
| 765 ) | |
| 766 | |
| 726 self.__cleanupData() | 767 self.__cleanupData() |
| 727 | 768 |
| 728 def __prepareProgress(self): | 769 def __prepareProgress(self): |
| 729 """ | 770 """ |
| 730 Private method to prepare the progress tab for the next run. | 771 Private method to prepare the progress tab for the next run. |
| 913 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | 954 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), |
| 914 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | 955 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), |
| 915 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | 956 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), |
| 916 } | 957 } |
| 917 | 958 |
| 959 unusedArgs = { | |
| 960 "IgnoreAbstract": self.ignoreAbstractCheckBox.isChecked(), | |
| 961 "IgnoreOverload": self.ignoreOverloadCheckBox.isChecked(), | |
| 962 "IgnoreOverride": self.ignoreOverrideCheckBox.isChecked(), | |
| 963 "IgnoreStubs": self.ignoreStubsCheckBox.isChecked(), | |
| 964 "IgnoreVariadicNames": self.ignoreVariadicNamesCheckBox.isChecked(), | |
| 965 "IgnoreLambdas": self.ignoreLambdasCheckBox.isChecked(), | |
| 966 "IgnoreNestedFunctions": self.ignoreNestedFunctionsCheckBox.isChecked(), | |
| 967 "IgnoreDunderMethods": self.ignoreDunderMethodsCheckBox.isChecked(), | |
| 968 "IgnoreSlotMethods": self.ignoreSlotsCheckBox.isChecked(), | |
| 969 } | |
| 970 | |
| 918 self.__options = [ | 971 self.__options = [ |
| 919 excludeMessages, | 972 excludeMessages, |
| 920 includeMessages, | 973 includeMessages, |
| 921 repeatMessages, | 974 repeatMessages, |
| 922 fixCodes, | 975 fixCodes, |
| 931 miscellaneousArgs, | 984 miscellaneousArgs, |
| 932 annotationArgs, | 985 annotationArgs, |
| 933 securityArgs, | 986 securityArgs, |
| 934 importsArgs, | 987 importsArgs, |
| 935 nameOrderArgs, | 988 nameOrderArgs, |
| 989 unusedArgs, | |
| 936 ] | 990 ] |
| 937 | 991 |
| 938 # now go through all the files | 992 # now go through all the files |
| 939 self.progress = 0 | 993 self.progress = 0 |
| 940 self.files.sort() | 994 self.files.sort() |
| 1363 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), | 1417 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), |
| 1364 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | 1418 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), |
| 1365 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | 1419 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), |
| 1366 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | 1420 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), |
| 1367 }, | 1421 }, |
| 1422 "UnusedChecker": { | |
| 1423 "IgnoreAbstract": self.ignoreAbstractCheckBox.isChecked(), | |
| 1424 "IgnoreOverload": self.ignoreOverloadCheckBox.isChecked(), | |
| 1425 "IgnoreOverride": self.ignoreOverrideCheckBox.isChecked(), | |
| 1426 "IgnoreStubs": self.ignoreStubsCheckBox.isChecked(), | |
| 1427 "IgnoreVariadicNames": self.ignoreVariadicNamesCheckBox.isChecked(), | |
| 1428 "IgnoreLambdas": self.ignoreLambdasCheckBox.isChecked(), | |
| 1429 "IgnoreNestedFunctions": ( | |
| 1430 self.ignoreNestedFunctionsCheckBox.isChecked() | |
| 1431 ), | |
| 1432 "IgnoreDunderMethods": self.ignoreDunderMethodsCheckBox.isChecked(), | |
| 1433 "IgnoreSlotMethods": self.ignoreSlotsCheckBox.isChecked(), | |
| 1434 }, | |
| 1368 } | 1435 } |
| 1369 if json.dumps(data, sort_keys=True) != json.dumps( | 1436 if json.dumps(data, sort_keys=True) != json.dumps( |
| 1370 self.__data, sort_keys=True | 1437 self.__data, sort_keys=True |
| 1371 ): | 1438 ): |
| 1372 self.__data = data | 1439 self.__data = data |
| 1942 defaultParameters["NameOrderChecker"]["SortFromFirst"], | 2009 defaultParameters["NameOrderChecker"]["SortFromFirst"], |
| 1943 ) | 2010 ) |
| 1944 ) | 2011 ) |
| 1945 ) | 2012 ) |
| 1946 | 2013 |
| 2014 # Unused Checker | |
| 2015 self.ignoreAbstractCheckBox.setChecked( | |
| 2016 Preferences.toBool( | |
| 2017 settings.value( | |
| 2018 "PEP8/UnusedIgnoreAbstract", | |
| 2019 defaultParameters["UnusedChecker"]["IgnoreAbstract"], | |
| 2020 ) | |
| 2021 ) | |
| 2022 ) | |
| 2023 self.ignoreOverloadCheckBox.setChecked( | |
| 2024 Preferences.toBool( | |
| 2025 settings.value( | |
| 2026 "PEP8/UnusedIgnoreOverload", | |
| 2027 defaultParameters["UnusedChecker"]["IgnoreOverload"], | |
| 2028 ) | |
| 2029 ) | |
| 2030 ) | |
| 2031 self.ignoreOverrideCheckBox.setChecked( | |
| 2032 Preferences.toBool( | |
| 2033 settings.value( | |
| 2034 "PEP8/UnusedIgnoreOverride", | |
| 2035 defaultParameters["UnusedChecker"]["IgnoreOverride"], | |
| 2036 ) | |
| 2037 ) | |
| 2038 ) | |
| 2039 self.ignoreStubsCheckBox.setChecked( | |
| 2040 Preferences.toBool( | |
| 2041 settings.value( | |
| 2042 "PEP8/UnusedIgnoreStubs", | |
| 2043 defaultParameters["UnusedChecker"]["IgnoreStubs"], | |
| 2044 ) | |
| 2045 ) | |
| 2046 ) | |
| 2047 self.ignoreVariadicNamesCheckBox.setChecked( | |
| 2048 Preferences.toBool( | |
| 2049 settings.value( | |
| 2050 "PEP8/UnusedIgnoreVariadicNames", | |
| 2051 defaultParameters["UnusedChecker"]["IgnoreVariadicNames"], | |
| 2052 ) | |
| 2053 ) | |
| 2054 ) | |
| 2055 self.ignoreLambdasCheckBox.setChecked( | |
| 2056 Preferences.toBool( | |
| 2057 settings.value( | |
| 2058 "PEP8/UnusedIgnoreLambdas", | |
| 2059 defaultParameters["UnusedChecker"]["IgnoreLambdas"], | |
| 2060 ) | |
| 2061 ) | |
| 2062 ) | |
| 2063 self.ignoreNestedFunctionsCheckBox.setChecked( | |
| 2064 Preferences.toBool( | |
| 2065 settings.value( | |
| 2066 "PEP8/UnusedIgnoreNestedFunctions", | |
| 2067 defaultParameters["UnusedChecker"]["IgnoreNestedFunctions"], | |
| 2068 ) | |
| 2069 ) | |
| 2070 ) | |
| 2071 self.ignoreDunderMethodsCheckBox.setChecked( | |
| 2072 Preferences.toBool( | |
| 2073 settings.value( | |
| 2074 "PEP8/UnusedIgnoreDunderMethods", | |
| 2075 defaultParameters["UnusedChecker"]["IgnoreDunderMethods"], | |
| 2076 ) | |
| 2077 ) | |
| 2078 ) | |
| 2079 self.ignoreSlotsCheckBox.setChecked( | |
| 2080 Preferences.toBool( | |
| 2081 settings.value( | |
| 2082 "PEP8/UnusedIgnoreSlotMethods", | |
| 2083 defaultParameters["UnusedChecker"]["IgnoreSlotMethods"], | |
| 2084 ) | |
| 2085 ) | |
| 2086 ) | |
| 2087 | |
| 1947 self.__cleanupData() | 2088 self.__cleanupData() |
| 1948 | 2089 |
| 1949 @pyqtSlot() | 2090 @pyqtSlot() |
| 1950 def on_storeDefaultButton_clicked(self): | 2091 def on_storeDefaultButton_clicked(self): |
| 1951 """ | 2092 """ |
| 2084 "PEP8/BannedModules", sorted(self.bannedModulesEdit.toPlainText().split()) | 2225 "PEP8/BannedModules", sorted(self.bannedModulesEdit.toPlainText().split()) |
| 2085 ) | 2226 ) |
| 2086 settings.setValue( | 2227 settings.setValue( |
| 2087 "PEP8/BanRelativeImports", self.__getBanRelativeImportsValue() | 2228 "PEP8/BanRelativeImports", self.__getBanRelativeImportsValue() |
| 2088 ) | 2229 ) |
| 2230 | |
| 2231 # Name Order Checker | |
| 2089 settings.setValue("PEP8/SortOrder", self.sortOrderComboBox.currentData()) | 2232 settings.setValue("PEP8/SortOrder", self.sortOrderComboBox.currentData()) |
| 2090 settings.setValue( | 2233 settings.setValue( |
| 2091 "PEP8/SortCaseSensitive", self.sortCaseSensitiveCheckBox.isChecked() | 2234 "PEP8/SortCaseSensitive", self.sortCaseSensitiveCheckBox.isChecked() |
| 2092 ) | 2235 ) |
| 2093 settings.setValue( | 2236 settings.setValue( |
| 2095 ) | 2238 ) |
| 2096 settings.setValue( | 2239 settings.setValue( |
| 2097 "PEP8/SortIgnoringStyle", self.sortIgnoreStyleCheckBox.isChecked() | 2240 "PEP8/SortIgnoringStyle", self.sortIgnoreStyleCheckBox.isChecked() |
| 2098 ) | 2241 ) |
| 2099 settings.setValue("PEP8/SortFromFirst", self.sortFromFirstCheckBox.isChecked()) | 2242 settings.setValue("PEP8/SortFromFirst", self.sortFromFirstCheckBox.isChecked()) |
| 2243 | |
| 2244 # Unused Checker | |
| 2245 settings.setValue( | |
| 2246 "PEP8/UnusedIgnoreAbstract", self.ignoreAbstractCheckBox.isChecked() | |
| 2247 ) | |
| 2248 settings.setValue( | |
| 2249 "PEP8/UnusedIgnoreOverload", self.ignoreOverloadCheckBox.isChecked() | |
| 2250 ) | |
| 2251 settings.setValue( | |
| 2252 "PEP8/UnusedIgnoreOverride", self.ignoreOverrideCheckBox.isChecked() | |
| 2253 ) | |
| 2254 settings.setValue( | |
| 2255 "PEP8/UnusedIgnoreStubs", self.ignoreStubsCheckBox.isChecked() | |
| 2256 ) | |
| 2257 settings.setValue( | |
| 2258 "PEP8/UnusedIgnoreVariadicNames", | |
| 2259 self.ignoreVariadicNamesCheckBox.isChecked(), | |
| 2260 ) | |
| 2261 settings.setValue( | |
| 2262 "PEP8/UnusedIgnoreLambdas", self.ignoreLambdasCheckBox.isChecked() | |
| 2263 ) | |
| 2264 settings.setValue( | |
| 2265 "PEP8/UnusedIgnoreNestedFunctions", | |
| 2266 self.ignoreNestedFunctionsCheckBox.isChecked(), | |
| 2267 ) | |
| 2268 settings.setValue( | |
| 2269 "PEP8/UnusedIgnoreDunderMethods", | |
| 2270 self.ignoreDunderMethodsCheckBox.isChecked(), | |
| 2271 ) | |
| 2272 settings.setValue( | |
| 2273 "PEP8/UnusedIgnoreSlotMethods", self.ignoreSlotsCheckBox.isChecked() | |
| 2274 ) | |
| 2100 | 2275 |
| 2101 @pyqtSlot() | 2276 @pyqtSlot() |
| 2102 def on_resetDefaultButton_clicked(self): | 2277 def on_resetDefaultButton_clicked(self): |
| 2103 """ | 2278 """ |
| 2104 Private slot to reset the configuration values to their default values. | 2279 Private slot to reset the configuration values to their default values. |
| 2281 defaultParameters["NameOrderChecker"]["SortIgnoringStyle"], | 2456 defaultParameters["NameOrderChecker"]["SortIgnoringStyle"], |
| 2282 ) | 2457 ) |
| 2283 settings.setValue( | 2458 settings.setValue( |
| 2284 "PEP8/SortFromFirst", | 2459 "PEP8/SortFromFirst", |
| 2285 defaultParameters["NameOrderChecker"]["SortFromFirst"], | 2460 defaultParameters["NameOrderChecker"]["SortFromFirst"], |
| 2461 ) | |
| 2462 | |
| 2463 # Unused Checker | |
| 2464 settings.setValue( | |
| 2465 "PEP8/UnusedIgnoreAbstract", | |
| 2466 defaultParameters["UnusedChecker"]["IgnoreAbstract"], | |
| 2467 ) | |
| 2468 settings.setValue( | |
| 2469 "PEP8/UnusedIgnoreOverload", | |
| 2470 defaultParameters["UnusedChecker"]["IgnoreOverload"], | |
| 2471 ) | |
| 2472 settings.setValue( | |
| 2473 "PEP8/UnusedIgnoreOverride", | |
| 2474 defaultParameters["UnusedChecker"]["IgnoreOverride"], | |
| 2475 ) | |
| 2476 settings.setValue( | |
| 2477 "PEP8/UnusedIgnoreStubs", | |
| 2478 defaultParameters["UnusedChecker"]["IgnoreStubs"], | |
| 2479 ) | |
| 2480 settings.setValue( | |
| 2481 "PEP8/UnusedIgnoreVariadicNames", | |
| 2482 defaultParameters["UnusedChecker"]["IgnoreVariadicNames"], | |
| 2483 ) | |
| 2484 settings.setValue( | |
| 2485 "PEP8/UnusedIgnoreLambdas", | |
| 2486 defaultParameters["UnusedChecker"]["IgnoreLambdas"], | |
| 2487 ) | |
| 2488 settings.setValue( | |
| 2489 "PEP8/UnusedIgnoreNestedFunctions", | |
| 2490 defaultParameters["UnusedChecker"]["IgnoreNestedFunctions"], | |
| 2491 ) | |
| 2492 settings.setValue( | |
| 2493 "PEP8/UnusedIgnoreDunderMethods", | |
| 2494 defaultParameters["UnusedChecker"]["IgnoreDunderMethods"], | |
| 2495 ) | |
| 2496 settings.setValue( | |
| 2497 "PEP8/UnusedIgnoreSlotMethods", | |
| 2498 defaultParameters["UnusedChecker"]["IgnoreSlotMethods"], | |
| 2286 ) | 2499 ) |
| 2287 | 2500 |
| 2288 # Update UI with default values | 2501 # Update UI with default values |
| 2289 self.on_loadDefaultButton_clicked() | 2502 self.on_loadDefaultButton_clicked() |
| 2290 | 2503 |
