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

-:d5aff4fd0ef8
+:df7025fe26a3
 positionRole = Qt.UserRole + 3
 messageRole = Qt.UserRole + 4
 fixableRole = Qt.UserRole + 5
 codeRole = Qt.UserRole + 6
 ignoredRole = Qt.UserRole + 7
+argsRole = Qt.UserRole + 8
 availableFutures = [
 'division', 'absolute_import', 'with_statement',
 'print_function', 'unicode_literals', 'generator_stop',
 'annotations']
 if not self.resultList.findItems(msg, Qt.MatchExactly):
 itm = QTreeWidgetItem(self.__errorItem, [msg])
 itm.setForeground(0, Qt.red)
 itm.setFirstColumnSpanned(True)
-def __createResultItem(self, filename, line, pos, message, fixed,
+def __createFileErrorItem(self, filename, message):
-autofixing, ignored):
+"""
-"""
+Private method to create an error entry for a given file.
-Private method to create an entry in the result list.
 @param filename file name of the file
 @type str
-@param line line number of issue
+@param message error message text
-@type int or str
-@param pos character position of issue
-@type int or str
-@param message message text
 @type str
-@param fixed flag indicating a fixed issue
+"""
-@type bool
+result = {
-@param autofixing flag indicating, that we are fixing issues
+"file": filename,
-automatically
+"line": 1,
-@type bool
+"offset": 1,
-@param ignored flag indicating an ignored issue
+"code": "",
-@type bool
+"args": [],
+"display": self.tr("Error: {0}").format(message).rstrip(),
+"fixed": False,
+"autofixing": False,
+"ignored": False,
+}
+self.__createResultItem(filename, result)
+def __createResultItem(self, filename, result):
+"""
+Private method to create an entry in the result list.
+@param filename file name of the file
+@type str
+@param result dictionary containing check result data
+@type dict
 @return reference to the created item
 @rtype QTreeWidgetItem
 """
 from .CodeStyleFixer import FixableCodeStyleIssues
 self.__lastFileItem.setFirstColumnSpanned(True)
 self.__lastFileItem.setExpanded(True)
 self.__lastFileItem.setData(0, self.filenameRole, filename)
 fixable = False
-code, message = message.split(None, 1)
 itm = QTreeWidgetItem(
 self.__lastFileItem,
-["{0:6}".format(line), code, message])
+["{0:6}".format(result["line"]), result["code"],
-if code.startswith(("W", "-", "C", "M")):
+result["display"]])
+if result["code"].startswith(("W", "-", "C", "M")):
 itm.setIcon(1, UI.PixmapCache.getIcon("warning"))
-elif code.startswith(("A", "N")):
+elif result["code"].startswith(("A", "N")):
 itm.setIcon(1, UI.PixmapCache.getIcon("namingError"))
-elif code.startswith("D"):
+elif result["code"].startswith("D"):
 itm.setIcon(1, UI.PixmapCache.getIcon("docstringError"))
 else:
 itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError"))
-if fixed:
+if result["fixed"]:
 itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
 elif (
-code in FixableCodeStyleIssues and not autofixing and
+result["code"] in FixableCodeStyleIssues and
-code not in self.__noFixCodesList
+not result["autofixing"] and
+result["code"] not in self.__noFixCodesList
 ):
 itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable"))
 fixable = True
 itm.setTextAlignment(0, Qt.AlignRight)
 itm.setTextAlignment(0, Qt.AlignVCenter)
 itm.setTextAlignment(1, Qt.AlignVCenter)
 itm.setTextAlignment(2, Qt.AlignVCenter)
 itm.setData(0, self.filenameRole, filename)
-itm.setData(0, self.lineRole, int(line))
+itm.setData(0, self.lineRole, int(result["line"]))
-itm.setData(0, self.positionRole, int(pos))
+itm.setData(0, self.positionRole, int(result["offset"]))
-itm.setData(0, self.messageRole, message)
+itm.setData(0, self.messageRole, result["display"])
 itm.setData(0, self.fixableRole, fixable)
-itm.setData(0, self.codeRole, code)
+itm.setData(0, self.codeRole, result["code"])
-itm.setData(0, self.ignoredRole, ignored)
+itm.setData(0, self.ignoredRole, result["ignored"])
+itm.setData(0, self.argsRole, result["args"])
-if ignored:
+if result["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):
+def __modifyFixedResultItem(self, itm, result):
 """
 Private method to modify a result list entry to show its
 positive fixed state.
 @param itm reference to the item to modify
 @type QTreeWidgetItem
-@param text text to be appended
+@param result dictionary containing check result data
-@type str
+@type dict
-@param fixed flag indicating a fixed issue
+"""
-@type bool
+if result["fixed"]:
-"""
+itm.setText(2, result["display"])
-if fixed:
-code, message = text.split(None, 1)
-itm.setText(2, message)
 itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
-itm.setData(0, self.messageRole, message)
+itm.setData(0, self.messageRole, result["display"])
 else:
 itm.setIcon(0, QIcon())
 itm.setData(0, self.fixableRole, False)
 def __updateStatistics(self, statistics, fixer, ignoredErrors):
 source, encoding = Utilities.readEncodedFile(
 self.filename)
 source = source.splitlines(True)
 except (UnicodeError, IOError) as msg:
 self.results = CodeStyleCheckerDialog.hasResults
-self.__createResultItem(
+self.__createFileErrorItem(self.filename, str(msg))
-self.filename, 1, 1,
-self.tr("Error: {0}").format(str(msg))
-.rstrip(), False, False, False)
 self.progress += 1
 # Continue with next file
 self.check()
 return
 if encoding.endswith(
 source, encoding = Utilities.readEncodedFile(
 filename)
 source = source.splitlines(True)
 except (UnicodeError, IOError) as msg:
 self.results = CodeStyleCheckerDialog.hasResults
-self.__createResultItem(
+self.__createFileErrorItem(filename, str(msg))
-filename, 1, 1,
-self.tr("Error: {0}").format(str(msg))
-.rstrip(), False, False, False)
 continue
 if encoding.endswith(
 ('-selected', '-default', '-guessed', '-ignore')):
 encoding = encoding.rsplit('-', 1)[0]
 @type str
 @param codeStyleCheckerStats stats of style and name check
 @type dict
 @param fixes number of applied fixes
 @type int
-@param results tuple for each found violation of style (tuple of
+@param results dictionary containing check result data
-lineno, position, text, ignored, fixed, autofixing)
+@type dict
-@type tuplt of tuple of (int, int, str, bool, bool, bool)
 """
 if self.__finished:
 return
 # Check if it's the requested file, otherwise ignore signal if not
 self.resultList.setSortingEnabled(False)
 fixed = None
 ignoredErrors = 0
 if self.__itms:
-for itm, (_lineno, _position, text, _ignored, fixed,
+for itm, result in zip(self.__itms, results):
-_autofixing) in zip(self.__itms, results):
+self.__modifyFixedResultItem(itm, result)
-self.__modifyFixedResultItem(itm, text, fixed)
 self.__updateFixerStatistics(fixes)
 else:
 self.__lastFileItem = None
-for lineno, position, text, ignored, fixed, autofixing in results:
+for result in results:
-if ignored:
+if result["ignored"]:
 ignoredErrors += 1
 if self.showIgnored:
-text = self.tr("{0} (ignored)").format(text)
+result["display"] = self.tr(
+"{0} (ignored)"
+).format(result["display"])
 else:
 continue
 self.results = CodeStyleCheckerDialog.hasResults
-self.__createResultItem(
+self.__createResultItem(fn, result)
-fn, lineno, position, text, fixed, autofixing, ignored)
 self.__updateStatistics(
 codeStyleCheckerStats, fixes, ignoredErrors)
 if fixed:
 for itm in fixableItems:
 filename = itm.data(0, self.filenameRole)
 if filename not in fixesDict:
 fixesDict[filename] = []
 fixesDict[filename].append((
-(filename, itm.data(0, self.lineRole),
+{
-itm.data(0, self.positionRole),
+"file": filename,
-"{0} {1}".format(itm.data(0, self.codeRole),
+"line": itm.data(0, self.lineRole),
-itm.data(0, self.messageRole))),
+"offset": itm.data(0, self.positionRole),
+"code": itm.data(0, self.codeRole),
+"display": itm.data(0, self.messageRole),
+"args": itm.data(0, self.argsRole),
+},
 itm
 ))
 # update the configuration values (3: fixCodes, 4: noFixCodes,
 # 5: fixIssues, 6: maxLineLength)

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py