eric: comparison Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py

-:d85fadb263a0
+:1b8381afe38f
 lineRole = Qt.UserRole + 2
 positionRole = Qt.UserRole + 3
 messageRole = Qt.UserRole + 4
 fixableRole = Qt.UserRole + 5
 codeRole = Qt.UserRole + 6
+ignoredRole = Qt.UserRole + 7
 def __init__(self, styleCheckService, parent=None):
 """
 Constructor
 """
 self.resultList.sortItems(self.resultList.sortColumn(),
 self.resultList.header().sortIndicatorOrder()
 )
-def __createResultItem(self, file, line, pos, message, fixed, autofixing):
+def __createResultItem(self, file, line, pos, message, fixed, autofixing,
+ignored):
 """
 Private method to create an entry in the result list.
 @param file file name of the file (string)
 @param line line number of issue (integer or string)
 @param pos character position of issue (integer or string)
 @param message message text (string)
 @param fixed flag indicating a fixed issue (boolean)
 @param autofixing flag indicating, that we are fixing issues
 automatically (boolean)
+@param ignored flag indicating an ignored issue (boolean)
 @return reference to the created item (QTreeWidgetItem)
 """
 from .CodeStyleFixer import FixableCodeStyleIssues
 if self.__lastFileItem is None:
 itm.setData(0, self.lineRole, int(line))
 itm.setData(0, self.positionRole, int(pos))
 itm.setData(0, self.messageRole, message)
 itm.setData(0, self.fixableRole, fixable)
 itm.setData(0, self.codeRole, code)
+itm.setData(0, self.ignoredRole, ignored)
+if ignored:
+font = itm.font(0)
+font.setItalic(True)
+for col in range(itm.columnCount()):
+itm.setFont(col, font)
 return itm
 def __modifyFixedResultItem(self, itm, text, fixed):
 """
 itm.setData(0, self.messageRole, message)
 else:
 itm.setIcon(0, QIcon())
 itm.setData(0, self.fixableRole, False)
-def __updateStatistics(self, statistics, fixer):
+def __updateStatistics(self, statistics, fixer, ignoredErrors):
 """
 Private method to update the collected statistics.
 @param statistics dictionary of statistical data with
 message code as key and message count as value
 @param fixer reference to the code style fixer (CodeStyleFixer)
+@param ignoredErrors number of ignored errors (integer)
 """
 self.__statistics["_FilesCount"] += 1
 stats = [k for k in statistics.keys() if k[0].isupper()]
 if stats:
 self.__statistics["_FilesIssues"] += 1
 if key in self.__statistics:
 self.__statistics[key] += statistics[key]
 else:
 self.__statistics[key] = statistics[key]
 self.__statistics["_IssuesFixed"] += fixer
+self.__statistics["_IgnoredErrors"] += ignoredErrors
 def __updateFixerStatistics(self, fixer):
 """
 Private method to update the collected fixer related statistics.
 """
 self.__statistics = {}
 self.__statistics["_FilesCount"] = 0
 self.__statistics["_FilesIssues"] = 0
 self.__statistics["_IssuesFixed"] = 0
+self.__statistics["_IgnoredErrors"] = 0
 def prepare(self, fileList, project):
 """
 Public method to prepare the dialog with a list of filenames.
 self.__data["HangClosing"] = False
 if "NoFixCodes" not in self.__data:
 self.__data["NoFixCodes"] = "E501"
 if "DocstringType" not in self.__data:
 self.__data["DocstringType"] = "pep257"
+if "ShowIgnored" not in self.__data:
+self.__data["ShowIgnored"] = False
 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
 self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"])
 self.includeMessagesEdit.setText(self.__data["IncludeMessages"])
 self.repeatCheckBox.setChecked(self.__data["RepeatMessages"])
 self.fixIssuesEdit.setText(self.__data["FixCodes"])
 self.noFixIssuesEdit.setText(self.__data["NoFixCodes"])
 self.fixIssuesCheckBox.setChecked(self.__data["FixIssues"])
+self.ignoredCheckBox.setChecked(self.__data["ShowIgnored"])
 self.lineLengthSpinBox.setValue(self.__data["MaxLineLength"])
 self.hangClosingCheckBox.setChecked(self.__data["HangClosing"])
 self.docTypeComboBox.setCurrentIndex(
 self.docTypeComboBox.findData(self.__data["DocstringType"]))
 includeMessages = self.includeMessagesEdit.text()
 repeatMessages = self.repeatCheckBox.isChecked()
 fixCodes = self.fixIssuesEdit.text()
 noFixCodes = self.noFixIssuesEdit.text()
 fixIssues = self.fixIssuesCheckBox.isChecked() and repeatMessages
+self.showIgnored = self.ignoredCheckBox.isChecked() and \
+repeatMessages
 maxLineLength = self.lineLengthSpinBox.value()
 hangClosing = self.hangClosingCheckBox.isChecked()
 docType = self.docTypeComboBox.itemData(
 self.docTypeComboBox.currentIndex())
 except (UnicodeError, IOError) as msg:
 self.noResults = False
 self.__createResultItem(
 self.filename, 1, 1,
 self.tr("Error: {0}").format(str(msg))
-.rstrip()[1:-1], False, False)
+.rstrip()[1:-1], False, False, False)
 self.progress += 1
 # Continue with next file
 self.check()
 return
 @param fn filename of the just checked file (str)
 @param codeStyleCheckerStats stats of style and name check (dict)
 @param fixes number of applied fixes (int)
 @param results tuple for each found violation of style (tuple of
-lineno (int), position (int), text (str), fixed (bool),
+lineno (int), position (int), text (str), ignored (bool),
-autofixing (bool))
+fixed (bool), autofixing (bool))
 """
 # Check if it's the requested file, otherwise ignore signal
 if fn != self.filename:
 return
 # disable updates of the list for speed
 self.resultList.setUpdatesEnabled(False)
 self.resultList.setSortingEnabled(False)
 fixed = None
+ignoredErrors = 0
 if self.__itms:
-for itm, (lineno, position, text, fixed, autofixing) in zip(
+for itm, (lineno, position, text, ignored, fixed, autofixing) in \
-self.__itms, results):
+zip(self.__itms, results):
 self.__modifyFixedResultItem(itm, text, fixed)
 self.__updateFixerStatistics(fixes)
 else:
-for lineno, position, text, fixed, autofixing in results:
+for lineno, position, text, ignored, fixed, autofixing in results:
+if ignored:
+ignoredErrors += 1
+if self.showIgnored:
+text = self.tr("{0} (ignored)").format(text)
+else:
+continue
 self.noResults = False
 self.__createResultItem(
-fn, lineno, position, text, fixed, autofixing)
+fn, lineno, position, text, fixed, autofixing, ignored)
-self.__updateStatistics(codeStyleCheckerStats, fixes)
+self.__updateStatistics(
+codeStyleCheckerStats, fixes, ignoredErrors)
 if fixed:
 vm = e5App().getObject("ViewManager")
 editor = vm.getOpenEditor(fn)
 if editor:
 "IncludeMessages": self.includeMessagesEdit.text(),
 "RepeatMessages": self.repeatCheckBox.isChecked(),
 "FixCodes": self.fixIssuesEdit.text(),
 "NoFixCodes": self.noFixIssuesEdit.text(),
 "FixIssues": self.fixIssuesCheckBox.isChecked(),
+"ShowIgnored": self.ignoredCheckBox.isChecked(),
 "MaxLineLength": self.lineLengthSpinBox.value(),
 "HangClosing": self.hangClosingCheckBox.isChecked(),
 "DocstringType": self.docTypeComboBox.itemData(
 self.docTypeComboBox.currentIndex()),
 }
 "PEP8/FixCodes"))
 self.noFixIssuesEdit.setText(Preferences.Prefs.settings.value(
 "PEP8/NoFixCodes", "E501"))
 self.fixIssuesCheckBox.setChecked(Preferences.toBool(
 Preferences.Prefs.settings.value("PEP8/FixIssues")))
+self.ignoredCheckBox.setChecked(Preferences.toBool(
+Preferences.Prefs.settings.value("PEP8/ShowIgnored")))
 self.lineLengthSpinBox.setValue(int(Preferences.Prefs.settings.value(
 "PEP8/MaxLineLength", pep8.MAX_LINE_LENGTH)))
 self.hangClosingCheckBox.setChecked(Preferences.toBool(
 Preferences.Prefs.settings.value("PEP8/HangClosing")))
 self.docTypeComboBox.setCurrentIndex(self.docTypeComboBox.findData(
 Preferences.Prefs.settings.setValue(
 "PEP8/NoFixCodes", self.noFixIssuesEdit.text())
 Preferences.Prefs.settings.setValue(
 "PEP8/FixIssues", self.fixIssuesCheckBox.isChecked())
 Preferences.Prefs.settings.setValue(
+"PEP8/ShowIgnored", self.ignoredCheckBox.isChecked())
+Preferences.Prefs.settings.setValue(
 "PEP8/MaxLineLength", self.lineLengthSpinBox.value())
 Preferences.Prefs.settings.setValue(
 "PEP8/HangClosing", self.hangClosingCheckBox.isChecked())
 Preferences.Prefs.settings.setValue(
 "PEP8/DocstringType", self.docTypeComboBox.itemData(
 Preferences.Prefs.settings.setValue("PEP8/IncludeMessages", "")
 Preferences.Prefs.settings.setValue("PEP8/RepeatMessages", False)
 Preferences.Prefs.settings.setValue("PEP8/FixCodes", "")
 Preferences.Prefs.settings.setValue("PEP8/NoFixCodes", "E501")
 Preferences.Prefs.settings.setValue("PEP8/FixIssues", False)
+Preferences.Prefs.settings.setValue("PEP8/ShowIgnored", False)
 Preferences.Prefs.settings.setValue(
 "PEP8/MaxLineLength", pep8.MAX_LINE_LENGTH)
 Preferences.Prefs.settings.setValue("PEP8/HangClosing", False)
 Preferences.Prefs.settings.setValue("PEP8/DocstringType", "pep257")
 itm.data(0, self.positionRole),
 "{0} {1}".format(itm.data(0, self.codeRole),
 itm.data(0, self.messageRole))),
 itm
 ))
+##!
 # update the configuration values (3: fixCodes, 4: noFixCodes,
 # 5: fixIssues, 6: maxLineLength)
 self.__options[3] = self.fixIssuesEdit.text()
 self.__options[4] = self.noFixIssuesEdit.text()
 self.__options[5] = True
 Private method to check, if an item has a fixable issue.
 @param itm item to be checked (QTreeWidgetItem)
 @return flag indicating a fixable issue (boolean)
 """
-return itm.data(0, self.fixableRole)
+return (itm.data(0, self.fixableRole) and
+not itm.data(0, self.ignoredRole))

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py

Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py