eric: comparison Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py

-:5328bc217a3c
+:6de42151f9e6
 class SyntaxCheckerDialog(QDialog, Ui_SyntaxCheckerDialog):
 """
 Class implementing a dialog to display the results of a syntax check run.
 """
 filenameRole = Qt.UserRole + 1
-warningRole = Qt.UserRole + 2
+lineRole     = Qt.UserRole + 2
+errorRole    = Qt.UserRole + 3
+warningRole  = Qt.UserRole + 4
 def __init__(self, parent = None):
 """
 Constructor
 self.setupUi(self)
 self.showButton = self.buttonBox.addButton(\
 self.trUtf8("Show"), QDialogButtonBox.ActionRole)
 self.showButton.setToolTip(\
-self.trUtf8("Press to show all files containing a syntax error"))
+self.trUtf8("Press to show all files containing an issue"))
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
 self.resultList.headerItem().setText(self.resultList.columnCount(), "")
 self.resultList.header().setSortIndicator(0, Qt.AscendingOrder)
 self.noResults = True
 self.cancelled = False
+self.__lastFileItem = None
 def __resort(self):
 """
 Private method to resort the tree.
 """
 @param line linenumber of faulty source (integer or string)
 @param error error text (string)
 @param sourcecode faulty line of code (string)
 @param isWarning flag indicating a warning message (boolean)
 """
-itm = QTreeWidgetItem(self.resultList,
+if self.__lastFileItem is None:
-[os.path.basename(file), str(line), error, sourcecode])
+# It's a new file
-itm.setTextAlignment(1, Qt.AlignRight)
+self.__lastFileItem = QTreeWidgetItem(self.resultList, [file])
+self.__lastFileItem.setFirstColumnSpanned(True)
+self.__lastFileItem.setExpanded(True)
+self.__lastFileItem.setData(0, self.filenameRole, file)
+itm = QTreeWidgetItem(self.__lastFileItem,
+[str(line), error, sourcecode])
 if isWarning:
 itm.setIcon(0, UI.PixmapCache.getIcon("warning.png"))
 else:
 itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png"))
-itm.setToolTip(0, file)
+##        itm.setToolTip(0, file)
 itm.setData(0, self.filenameRole, file)
+itm.setData(0, self.lineRole, line)
+itm.setData(0, self.errorRole, error)
 itm.setData(0, self.warningRole, isWarning)
 def start(self, fn, codestring = ""):
 """
 Public slot to start the syntax check.
 # now go through all the files
 progress = 0
 for file in files:
 if self.cancelled:
 return
+self.__lastFileItem = None
 if codestring:
 source = codestring
 else:
 try:
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 if self.noResults:
-self.__createResultItem(self.trUtf8('No syntax errors found.'), "", "", "")
+QTreeWidgetItem(self.resultList, [self.trUtf8('No issues found.')])
 QApplication.processEvents()
 self.showButton.setEnabled(False)
 self.__clearErrors()
 else:
 self.showButton.setEnabled(True)
 @param itm reference to the activated item (QTreeWidgetItem)
 @param col column the item was activated in (integer)
 """
 if self.noResults:
 return
+if itm.parent():
+fn = Utilities.normabspath(itm.data(0, self.filenameRole))
+lineno = itm.data(0, self.lineRole)
+error = itm.data(0, self.errorRole)
-fn = Utilities.normabspath(itm.data(0, self.filenameRole))
+vm = e5App().getObject("ViewManager")
-lineno = int(itm.text(1))
+vm.openSourceFile(fn, lineno)
-error = itm.text(2)
+editor = vm.getOpenEditor(fn)
-vm = e5App().getObject("ViewManager")
+if itm.data(0, self.warningRole):
-vm.openSourceFile(fn, lineno)
+editor.toggleFlakesWarning(lineno, True, error)
-editor = vm.getOpenEditor(fn)
+else:
-if itm.data(0, self.warningRole):
+editor.toggleSyntaxError(lineno, True, error)
-editor.toggleFlakesWarning(lineno, True, error)
-else:
-editor.toggleSyntaxError(lineno, True, error)
 @pyqtSlot()
 def on_showButton_clicked(self):
 """
 Private slot to handle the "Show" button press.
 """
+vm = e5App().getObject("ViewManager")
 for index in range(self.resultList.topLevelItemCount()):
 itm = self.resultList.topLevelItem(index)
-self.on_resultList_itemActivated(itm, 0)
+fn = Utilities.normabspath(itm.data(0, self.filenameRole))
+vm.openSourceFile(fn, 1)
-# go through the list again to clear syntax error markers
-# for files, that are ok
+# go through the list again to clear syntax error and
-vm = e5App().getObject("ViewManager")
+# py3flakes warning markers for files, that are ok
 openFiles = vm.getOpenFilenames()
 errorFiles = []
 for index in range(self.resultList.topLevelItemCount()):
 itm = self.resultList.topLevelItem(index)
-errorFiles.append(Utilities.normabspath(itm.text(0)))
+errorFiles.append(Utilities.normabspath(itm.data(0, self.filenameRole)))
 for file in openFiles:
 if not file in errorFiles:
 editor = vm.getOpenEditor(file)
 editor.clearSyntaxError()
+editor.clearFlakesWarnings()
 def __clearErrors(self):
 """
 Private method to clear all error markers of open editors.
 """
 vm = e5App().getObject("ViewManager")
 openFiles = vm.getOpenFilenames()
 for file in openFiles:
 editor = vm.getOpenEditor(file)
 editor.clearSyntaxError()
+editor.clearFlakesWarnings()

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py

Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py