src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py

Fri, 08 Mar 2024 15:30:23 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 08 Mar 2024 15:30:23 +0100
branch
server
changeset 10630
552a790fd9bc
parent 10596
ea35c92a3c7c
child 10704
27d21e5163b8
permissions
-rw-r--r--

Corrected some issues and improved some existing code with respect to eric-ide server use.

0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2
10439
21c28b0f9e41 Updated copyright for 2024.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10341
diff changeset
3 # Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
4 #
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
5
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 Module implementing a simple Python syntax checker.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
10 import fnmatch
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
11 import os
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
12 import time
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
13
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
14 from PyQt6.QtCore import Qt, QTimer, pyqtSlot
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
15 from PyQt6.QtWidgets import (
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
16 QApplication,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
17 QDialog,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
18 QDialogButtonBox,
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
19 QHeaderView,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
20 QTreeWidgetItem,
7256
4ef3b78ebb4e Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
21 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
22
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
23 from eric7 import Utilities
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
24 from eric7.EricGui import EricPixmapCache
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9336
diff changeset
25 from eric7.EricWidgets.EricApplication import ericApp
9624
b47dfa7a137d Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9508
diff changeset
26 from eric7.SystemUtilities import FileSystemUtilities
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
27
12
1d8dd9706f46 First commit after changing to Python 3.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
28 from .Ui_SyntaxCheckerDialog import Ui_SyntaxCheckerDialog
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
29
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 915
diff changeset
30
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
31 class SyntaxCheckerDialog(QDialog, Ui_SyntaxCheckerDialog):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
32 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
33 Class implementing a dialog to display the results of a syntax check run.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
34 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
35
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
36 filenameRole = Qt.ItemDataRole.UserRole + 1
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
37 lineRole = Qt.ItemDataRole.UserRole + 2
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
38 indexRole = Qt.ItemDataRole.UserRole + 3
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
39 errorRole = Qt.ItemDataRole.UserRole + 4
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
40 warningRole = Qt.ItemDataRole.UserRole + 5
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
41
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 915
diff changeset
42 def __init__(self, parent=None):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
43 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
44 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
45
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
46 @param parent reference to the parent widget
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
47 @type QWidget
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
48 """
8218
7c09585bd960 Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8143
diff changeset
49 super().__init__(parent)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
50 self.setupUi(self)
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
51 self.setWindowFlags(Qt.WindowType.Window)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
52
564
b3d966393ba9 Did some code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 500
diff changeset
53 self.showButton = self.buttonBox.addButton(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
54 self.tr("Show"), QDialogButtonBox.ButtonRole.ActionRole
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
55 )
564
b3d966393ba9 Did some code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 500
diff changeset
56 self.showButton.setToolTip(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
57 self.tr("Press to show all files containing an issue")
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
58 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
59 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
60 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
61
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
62 self.resultList.headerItem().setText(self.resultList.columnCount(), "")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
63 self.resultList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
64
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
65 self.noResults = True
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
66 self.cancelled = False
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
67 self.__lastFileItem = None
5609
5bf0aaa818e9 Added code to safe-guard against self.__batch not being defined in the sytax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5597
diff changeset
68 self.__batch = False
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
69 self.__finished = True
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
70 self.__errorItem = None
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
71 self.__timenow = time.monotonic()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
72
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
73 self.__fileList = []
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
74 self.__project = None
9926
6222ddc7e1bd Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9925
diff changeset
75 self.__arguments = ()
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
76 self.__statistics = self.__defaultStatistics()
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
77 self.filterFrame.setVisible(False)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
78
3091
8239cae3f947 Made the progress bar of the syntax and indentation checker dialogs only visible, while it is checking and only if more than 1 file are being checked.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3064
diff changeset
79 self.checkProgress.setVisible(False)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
80
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
81 try:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
82 self.syntaxCheckService = ericApp().getObject("SyntaxCheckService")
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
83 self.syntaxCheckService.syntaxChecked.connect(self.__processResult)
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
84 self.syntaxCheckService.batchFinished.connect(self.__batchFinished)
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
85 self.syntaxCheckService.error.connect(self.__processError)
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
86 except KeyError:
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
87 self.syntaxCheckService = None
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
88 self.filename = None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
89
10582
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
90 self.__remotefsInterface = (
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
91 ericApp().getObject("EricServer").getServiceInterface("FileSystem")
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
92 )
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
93
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
94 def __resort(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
95 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
96 Private method to resort the tree.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
97 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
98 self.resultList.sortItems(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
99 self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder()
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
100 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
101
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
102 def __defaultStatistics(self):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
103 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
104 Private method to return the default statistics entry.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
105
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
106 @return dictionary with default statistics entry
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
107 @rtype dict
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
108 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
109 return {
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
110 "files_checked": 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
111 "files_issues": 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
112 "errors": 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
113 "py_warnings": 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
114 "warnings": 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
115 }
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
116
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
117 def __updateStatistics(self, fileStatistics):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
118 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
119 Private method to update the statistics.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
120
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
121 @param fileStatistics dictionary containing the file statistics
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
122 @type dict
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
123 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
124 self.__statistics["files_checked"] += 1
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
125 if any(fileStatistics.values()):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
126 self.__statistics["files_issues"] += 1
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
127 self.__statistics["errors"] += fileStatistics["errors"]
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
128 self.__statistics["py_warnings"] += fileStatistics["py_warnings"]
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
129 self.__statistics["warnings"] += fileStatistics["warnings"]
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
130
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
131 def __resetStatistics(self, skipped):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
132 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
133 Private method to reset the statistics data.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
134
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
135 @param skipped number of files not being checked
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
136 @type int
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
137 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
138 self.__statistics["files_checked"] = 0
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
139 self.__statistics["files_skipped"] = skipped
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
140 self.__statistics["files_issues"] = 0
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
141 self.__statistics["errors"] = 0
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
142 self.__statistics["py_warnings"] = 0
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
143 self.__statistics["warnings"] = 0
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
144
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
145 def __createFileStatistics(self, problems):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
146 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
147 Private method to return the file statistics entry.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
148
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
149 @param problems dictionary with the keys 'error', 'py_warnings' and
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
150 'warnings' which hold a list of issues each
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
151 @type dict
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
152 @return dictionary with the file statistics
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
153 @rtype dict
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
154 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
155 return {
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
156 "errors": 1 if problems.get("error") else 0,
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
157 "py_warnings": len(problems.get("py_warnings", [])),
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
158 "warnings": len(problems.get("warnings", [])),
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
159 }
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
160
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
161 def __createErrorItem(self, filename, message):
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
162 """
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
163 Private slot to create a new error item in the result list.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
164
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
165 @param filename name of the file
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
166 @type str
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
167 @param message error message
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
168 @type str
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
169 """
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
170 if self.__errorItem is None:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
171 self.__errorItem = QTreeWidgetItem(self.resultList, [self.tr("Errors")])
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
172 self.__errorItem.setExpanded(True)
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
173 self.__errorItem.setForeground(0, Qt.GlobalColor.red)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
174
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
175 msg = "{0} ({1})".format(self.__project.getRelativePath(filename), message)
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
176 if not self.resultList.findItems(msg, Qt.MatchFlag.MatchExactly):
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
177 itm = QTreeWidgetItem(self.__errorItem, [msg])
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
178 itm.setForeground(0, Qt.GlobalColor.red)
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
179 itm.setFirstColumnSpanned(True)
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
180 itm.setData(0, self.filenameRole, filename)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
181
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
182 def __createHeaderItem(self, filename, fileStatistics=None):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
183 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
184 Private method to create a header item in the result list.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
185
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
186 @param filename file name of file
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
187 @type str
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
188 @param fileStatistics dictionary containing statistical data of the check
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
189 result (defaults to None)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
190 @type dict (optional)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
191 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
192 itemText = self.__project.getRelativePath(filename)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
193
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
194 if fileStatistics:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
195 statisticsTextList = []
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
196 if fileStatistics["errors"]:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
197 statisticsTextList.append(
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
198 self.tr("Errors: {0}").format(fileStatistics["errors"])
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
199 )
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
200 if fileStatistics["py_warnings"]:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
201 statisticsTextList.append(
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
202 self.tr("Python Warnings: {0}").format(
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
203 fileStatistics["py_warnings"]
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
204 )
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
205 )
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
206 if fileStatistics["warnings"]:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
207 statisticsTextList.append(
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
208 self.tr("Warnings: {0}").format(fileStatistics["warnings"])
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
209 )
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
210 if statisticsTextList:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
211 itemText += "{0}\n{1}".format(itemText, ", ".join(statisticsTextList))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
212
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
213 self.__lastFileItem = QTreeWidgetItem(self.resultList, [itemText])
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
214 self.__lastFileItem.setFirstColumnSpanned(True)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
215 self.__lastFileItem.setExpanded(True)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
216 self.__lastFileItem.setData(0, self.filenameRole, filename)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
217
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
218 def __createResultItem(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
219 self, filename, line, index, error, sourcecode, isWarning=False
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
220 ):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
221 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
222 Private method to create an entry in the result list.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
223
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
224 @param filename file name of file
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
225 @type str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
226 @param line line number of faulty source
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
227 @type int or str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
228 @param index index number of fault
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
229 @type int
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
230 @param error error text
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
231 @type str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
232 @param sourcecode faulty line of code
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
233 @type str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
234 @param isWarning flag indicating a warning message
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
235 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
236 """
7256
4ef3b78ebb4e Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
237 if (
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
238 self.__lastFileItem is None
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
239 or self.__lastFileItem.data(0, self.filenameRole) != filename
7256
4ef3b78ebb4e Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
240 ):
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
241 # It's a new file
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
242 self.__createHeaderItem(filename)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
243
1640
1699d46026cd Fixed a compatibility issue with Qt 4.8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1509
diff changeset
244 itm = QTreeWidgetItem(self.__lastFileItem)
88
3701923bccf2 Added my own Python3 port of pyflakes and integrated py3flakes into syntax checker dialog and editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 55
diff changeset
245 if isWarning:
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9336
diff changeset
246 itm.setIcon(0, EricPixmapCache.getIcon("warning"))
88
3701923bccf2 Added my own Python3 port of pyflakes and integrated py3flakes into syntax checker dialog and editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 55
diff changeset
247 else:
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9336
diff changeset
248 itm.setIcon(0, EricPixmapCache.getIcon("syntaxError"))
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
249 itm.setData(0, Qt.ItemDataRole.DisplayRole, line)
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
250 itm.setData(1, Qt.ItemDataRole.DisplayRole, error)
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
251 itm.setData(2, Qt.ItemDataRole.DisplayRole, sourcecode)
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
252 itm.setData(0, self.filenameRole, filename)
500
c3abc7895a01 Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 466
diff changeset
253 itm.setData(0, self.lineRole, int(line))
915
c1e052773c08 Changed syntax check to report error position within the line.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 831
diff changeset
254 itm.setData(0, self.indexRole, index)
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
255 itm.setData(0, self.errorRole, error)
88
3701923bccf2 Added my own Python3 port of pyflakes and integrated py3flakes into syntax checker dialog and editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 55
diff changeset
256 itm.setData(0, self.warningRole, isWarning)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
257
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
258 def setArguments(self, args):
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
259 """
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
260 Public method to set additional arguments to be used by the syntax check.
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
261
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
262 @param args tuple containing the additional arguments
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
263 @type tuple of Any
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
264 """
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
265 self.__arguments = args
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
266
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
267 def prepare(self, fileList, project):
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
268 """
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
269 Public method to prepare the dialog with a list of filenames.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
270
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
271 @param fileList list of filenames
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
272 @type list of str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
273 @param project reference to the project object
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
274 @type Project
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
275 """
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
276 self.__fileList = fileList[:]
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
277 self.__project = project
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
278
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
279 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
280 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
281 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
282
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
283 self.filterFrame.setVisible(True)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
284
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
285 self.__data = self.__project.getData("CHECKERSPARMS", "SyntaxChecker")
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
286 if self.__data is None or "ExcludeFiles" not in self.__data:
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 915
diff changeset
287 self.__data = {"ExcludeFiles": ""}
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
288 if "AdditionalBuiltins" not in self.__data:
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
289 self.__data["AdditionalBuiltins"] = ""
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
290
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
291 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
292 self.builtinsEdit.setText(self.__data["AdditionalBuiltins"])
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
293
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
294 def startForBrowser(self, fn):
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
295 """
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
296 Public slot to start the syntax check for the project sources browser.
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
297
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
298 @param fn file or list of files or directory to be checked
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
299 @type str or list of str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
300 """
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
301 isdir = isinstance(fn, str) and (
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
302 self.__remotefsInterface.isdir(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
303 if FileSystemUtilities.isRemoteFileName(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
304 else os.path.isdir(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
305 )
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
306
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
307 if isinstance(fn, list):
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
308 files = fn
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
309 elif isdir:
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
310 if FileSystemUtilities.isRemoteFileName(fn):
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
311 files = self.__remotefsInterface.direntries(
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
312 fn,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
313 filesonly=True,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
314 pattern=[
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
315 "*{0}".format(ext)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
316 for ext in self.syntaxCheckService.getExtensions()
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
317 ],
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
318 followsymlinks=False,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
319 )
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
320 else:
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
321 files = FileSystemUtilities.direntries(
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
322 fn,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
323 filesonly=True,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
324 pattern=[
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
325 "*{0}".format(ext)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
326 for ext in self.syntaxCheckService.getExtensions()
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
327 ],
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
328 followsymlinks=False,
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
329 )
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
330 else:
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
331 files = [fn]
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
332
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
333 if files:
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
334 if self.__project is None:
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
335 self.__project = ericApp().getObject("Project")
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
336
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
337 self.__fileList = files[:]
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
338
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
339 self.filterFrame.setVisible(True)
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
340
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
341 self.__data = self.__project.getData("CHECKERSPARMS", "SyntaxChecker")
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
342 if self.__data is None or "ExcludeFiles" not in self.__data:
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
343 self.__data = {"ExcludeFiles": ""}
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
344 if "AdditionalBuiltins" not in self.__data:
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
345 self.__data["AdditionalBuiltins"] = ""
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
346
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
347 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
348 self.builtinsEdit.setText(self.__data["AdditionalBuiltins"])
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
349
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
350 self.on_startButton_clicked() # press the start button
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
351
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
352 def start(self, fn, codestring="", skipped=0):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
353 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
354 Public slot to start the syntax check.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
355
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
356 @param fn file or list of files or directory to be checked
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
357 @type str or list of str
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
358 @param codestring string containing the code to be checked. If this is given,
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
359 fn must be a single file name.
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
360 @type str
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
361 @param skipped number of files not being checked
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
362 @type int
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
363 """
5609
5bf0aaa818e9 Added code to safe-guard against self.__batch not being defined in the sytax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5597
diff changeset
364 self.__batch = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
365
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
366 if self.syntaxCheckService is not None:
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
367 if self.__project is None:
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
368 self.__project = ericApp().getObject("Project")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
369
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
370 self.cancelled = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
371 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
372 False
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
373 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
374 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
375 True
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
376 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
377 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
378 True
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
379 )
5828
c8deff89c20c Fixed a little issue in the syntax checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5609
diff changeset
380 self.showButton.setEnabled(False)
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
381 self.checkProgress.setVisible(True)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
382 QApplication.processEvents()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
383
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
384 isdir = isinstance(fn, str) and (
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
385 self.__remotefsInterface.isdir(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
386 if FileSystemUtilities.isRemoteFileName(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
387 else os.path.isdir(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
388 )
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
389
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
390 if isinstance(fn, list):
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
391 self.files = fn
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
392 elif isdir:
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
393 self.files = []
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
394 for ext in self.syntaxCheckService.getExtensions():
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
395 self.files.extend(
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
396 self.__remotefsInterface.direntries(
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
397 fn, True, "*{0}".format(ext), False
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
398 )
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
399 if FileSystemUtilities.isRemoteFileName(fn)
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
400 else FileSystemUtilities.direntries(
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
401 fn, True, "*{0}".format(ext), False
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
402 )
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
403 )
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
404 else:
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
405 self.files = [fn]
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
406
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
407 self.__errorItem = None
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
408 self.__clearErrors(self.files)
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
409 self.__resetStatistics(skipped)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
410
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
411 if codestring or len(self.files) > 0:
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
412 self.checkProgress.setMaximum(max(1, len(self.files)))
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
413 self.checkProgress.setVisible(len(self.files) > 1)
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
414 QApplication.processEvents()
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
415
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
416 # now go through all the files
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
417 self.progress = 0
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
418 self.files.sort()
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
419 self.__timenow = time.monotonic()
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
420 if codestring or len(self.files) == 1:
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
421 self.__batch = False
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
422 self.check(codestring)
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
423 else:
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
424 self.__batch = True
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
425 self.checkBatch()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
426
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
427 def check(self, codestring=""):
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
428 """
3591
2f2a4a76dd22 Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3515
diff changeset
429 Public method to start a check for one file.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
430
3209
c5432abceb25 CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3177
diff changeset
431 The results are reported to the __processResult slot.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
432
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
433 @param codestring optional sourcestring
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
434 @type str
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
435 """
3972
efc9c803ebdc Fixed an issue related to handling an inactive syntax checker in the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3971
diff changeset
436 if self.syntaxCheckService is None or not self.files:
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
437 self.checkProgress.setMaximum(1)
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
438 self.checkProgress.setValue(1)
3618
49e7fbd66ef9 Fixed behavior and output if a file is deleted outside eric.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3591
diff changeset
439 self.__finish()
49e7fbd66ef9 Fixed behavior and output if a file is deleted outside eric.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3591
diff changeset
440 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
441
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
442 self.filename = self.files.pop(0)
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
443 self.checkProgress.setValue(self.progress)
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
444 QApplication.processEvents()
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
445 self.__resort()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
446
3173
1fb284abe46e Interface to add user-defined services, e.g. in plugins. Auto syntax check working. Little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3159
diff changeset
447 if self.cancelled:
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
448 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
449
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
450 self.__lastFileItem = None
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
451 self.__finished = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
452
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
453 if codestring:
9507
1f39839655ea Refactored the syntax checker code to get rid of redundancies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9473
diff changeset
454 self.source = Utilities.normalizeCode(codestring)
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
455 else:
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
456 try:
10582
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
457 if FileSystemUtilities.isRemoteFileName(self.filename):
10589
75b656c80a40 Added methods to read and write files with a given encoding to the eric-ide server file system interface and adapted the code accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10582
diff changeset
458 self.source = self.__remotefsInterface.readEncodedFile(
75b656c80a40 Added methods to read and write files with a given encoding to the eric-ide server file system interface and adapted the code accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10582
diff changeset
459 self.filename
75b656c80a40 Added methods to read and write files with a given encoding to the eric-ide server file system interface and adapted the code accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10582
diff changeset
460 )[0]
10582
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
461 else:
8264ea1f42e5 Enabled the syntax checker to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10520
diff changeset
462 self.source = Utilities.readEncodedFile(self.filename)[0]
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
463 self.source = Utilities.normalizeCode(self.source)
10050
3750abc45d5e Corrected some code style issues detected by the extended checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9926
diff changeset
464 except (OSError, UnicodeError) as msg:
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
465 self.noResults = False
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
466 self.__createResultItem(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
467 self.filename,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
468 1,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
469 0,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
470 self.tr("Error: {0}").format(str(msg)).rstrip(),
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
471 "",
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
472 )
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
473 self.progress += 1
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
474 # Continue with next file
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
475 self.check()
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
476 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
477
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
478 self.syntaxCheckService.syntaxCheck(
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
479 None, self.filename, self.source, *self.__arguments
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
480 )
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
481
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
482 def checkBatch(self):
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
483 """
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
484 Public method to start a style check batch job.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
485
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
486 The results are reported to the __processResult slot.
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
487 """
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
488 self.__lastFileItem = None
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
489 self.__finished = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
490
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
491 argumentsList = []
8220
006ee31b4835 Applied some more code simplifications suggested by the new Simplify checker (Y113: use enumerate()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
492 for progress, filename in enumerate(self.files, start=1):
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
493 self.checkProgress.setValue(progress)
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
494 if time.monotonic() - self.__timenow > 0.01:
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
495 QApplication.processEvents()
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
496 self.__timenow = time.monotonic()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
497
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
498 try:
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10589
diff changeset
499 source = (
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
500 self.__remotefsInterface.readEncodedFile(filename)[0]
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
501 if FileSystemUtilities.isRemoteFileName(filename)
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10589
diff changeset
502 else Utilities.readEncodedFile(filename)[0]
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10589
diff changeset
503 )
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
504 source = Utilities.normalizeCode(source)
10050
3750abc45d5e Corrected some code style issues detected by the extended checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9926
diff changeset
505 except (OSError, UnicodeError) as msg:
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
506 self.noResults = False
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
507 self.__createResultItem(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
508 self.filename,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
509 1,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
510 0,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
511 self.tr("Error: {0}").format(str(msg)).rstrip(),
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
512 "",
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
513 )
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
514 continue
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
515
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
516 argumentsList.append((filename, source, *self.__arguments))
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
517
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
518 # reset the progress bar to the checked files
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
519 self.checkProgress.setValue(self.progress)
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
520 QApplication.processEvents()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
521
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
522 self.syntaxCheckService.syntaxBatchCheck(argumentsList)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
523
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
524 def __batchFinished(self):
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
525 """
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
526 Private slot handling the completion of a batch job.
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
527 """
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
528 self.checkProgress.setMaximum(1)
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
529 self.checkProgress.setValue(1)
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
530 self.__finish()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
531
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
532 def __processError(self, fn, msg):
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
533 """
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
534 Private slot to process an error indication from the service.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
535
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
536 @param fn filename of the file
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
537 @type str
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
538 @param msg error message
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
539 @type str
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
540 """
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
541 self.__createErrorItem(fn, msg)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
542
4503
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
543 if not self.__batch:
d68dcbe1deb3 Improved the syntax checker, code style checker and indentation checker interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4501
diff changeset
544 self.check()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
545
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
546 def __processResult(self, fn, problems):
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
547 """
3591
2f2a4a76dd22 Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3515
diff changeset
548 Private slot to display the reported messages.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
549
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
550 @param fn filename of the checked file
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
551 @type str
10341
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
552 @param problems list of dictionaries with the keys 'error', 'py_warnings' and
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
553 'warnings' which contain a tuple with details about the syntax error or a
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
554 list of tuples with details about Python warnings and PyFlakes warnings.
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
555 Each tuple contains the file name, line number, column, code string (only
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
556 for syntax errors), the message and an optional list with arguments for
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
557 the message.
3fdffd9cc21d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10304
diff changeset
558 @type list of dict
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
559 """
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
560 if self.__finished:
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
561 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
562
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
563 # Check if it's the requested file, otherwise ignore signal if not
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
564 # in batch mode
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
565 if not self.__batch and fn != self.filename:
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
566 return
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
567
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
568 fileStatistics = self.__createFileStatistics(problems)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
569 self.__updateStatistics(fileStatistics)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
570 if any(fileStatistics.values()):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
571 self.__createHeaderItem(fn, fileStatistics)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
572
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
573 error = problems.get("error")
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
574 if error:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
575 self.noResults = False
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
576 filename, lineno, col, code, msg = error
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
577 self.__createResultItem(filename, lineno, col, msg, code, False)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
578
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
579 warnings = problems.get("py_warnings", []) + problems.get("warnings", [])
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
580 if warnings:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
581 if self.__batch:
4524
5543f4dec8f7 Fixed an issue in the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4522
diff changeset
582 try:
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
583 source = Utilities.readEncodedFile(fn)[0]
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
584 source = Utilities.normalizeCode(source)
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
585 source = source.splitlines()
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
586 except (OSError, UnicodeError):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
587 source = ""
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
588 else:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
589 source = self.source.splitlines()
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
590 for filename, lineno, col, _code, msg in warnings:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
591 self.noResults = False
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
592 if source:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
593 try:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
594 src_line = source[lineno - 1].strip()
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
595 except IndexError:
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
596 src_line = ""
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
597 else:
10188
0f873791d67e Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
598 src_line = ""
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
599 self.__createResultItem(filename, lineno, col, msg, src_line, True)
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
600
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
601 self.progress += 1
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
602 self.checkProgress.setValue(self.progress)
8943
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
603 if time.monotonic() - self.__timenow > 0.01:
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
604 QApplication.processEvents()
23f9c7b9e18e Implemented some performance improvements.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
605 self.__timenow = time.monotonic()
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
606 self.__resort()
2574
9d6b6cf31ec6 Fix for SyntaxCheckDialog and eflags evaluation.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 2525
diff changeset
607
4231
0b38613388c9 Implemented the batch check mode for the syntax checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4021
diff changeset
608 if not self.__batch:
3159
02cb2adb4868 First implementation for the BackgroundService.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3145
diff changeset
609 self.check()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
610
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
611 def __updateStatisticsArea(self):
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
612 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
613 Private method to update the statistics area of the dialog.
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
614 """
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
615 self.totalLabel.setText(
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
616 str(self.__statistics["files_skipped"] + self.__statistics["files_checked"])
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
617 )
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
618 self.skippedLabel.setText(str(self.__statistics["files_skipped"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
619 self.checkedLabel.setText(str(self.__statistics["files_checked"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
620 self.issuesLabel.setText(str(self.__statistics["files_issues"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
621 self.errorsLabel.setText(str(self.__statistics["errors"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
622 self.warningsLabel.setText(str(self.__statistics["warnings"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
623 self.pyWarningsLabel.setText(str(self.__statistics["py_warnings"]))
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
624
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
625 def __finish(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
626 """
830
6caa4436dee2 Fixed a few smaller issues and some source code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 804
diff changeset
627 Private slot called when the syntax check finished or the user
6caa4436dee2 Fixed a few smaller issues and some source code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 804
diff changeset
628 pressed the button.
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
629 """
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
630 if not self.__finished:
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
631 self.__finished = True
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
632
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
633 self.cancelled = True
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
634 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
635 True
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
636 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
637 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
638 False
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
639 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
640 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
641 True
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
642 )
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
643
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
644 if self.noResults:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
645 QTreeWidgetItem(self.resultList, [self.tr("No issues found.")])
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
646 QApplication.processEvents()
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
647 self.showButton.setEnabled(False)
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
648 else:
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
649 self.showButton.setEnabled(True)
4236
8d4e498a7af8 Fixed a few coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4235
diff changeset
650 self.resultList.header().resizeSections(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
651 QHeaderView.ResizeMode.ResizeToContents
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
652 )
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
653 self.resultList.header().setStretchLastSection(True)
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
654 self.__updateStatisticsArea()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
655
4235
81278aff6af9 Fixed an issue in the batch checker cancel function leading to the function not working if the background jobs had finished already.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4234
diff changeset
656 self.checkProgress.setVisible(False)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
657
10068
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
658 def __cancel(self):
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
659 """
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
660 Private method to cancel the current check run.
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
661 """
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
662 if self.__batch:
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
663 self.syntaxCheckService.cancelSyntaxBatchCheck()
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
664 QTimer.singleShot(1000, self.__finish)
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
665 else:
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
666 self.__finish()
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
667
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
668 def closeEvent(self, evt):
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
669 """
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
670 Protected method to handle a close event.
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
671
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
672 @param evt reference to the close event
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
673 @type QCloseEvent
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
674 """
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
675 self.__cancel()
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
676
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
677 def on_buttonBox_clicked(self, button):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
678 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
679 Private slot called by a button of the button box clicked.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
680
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
681 @param button button that was clicked
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
682 @type QAbstractButton
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
683 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
684 if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
685 self.close()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
686 elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel):
10068
7febcdccb2a1 Syntax Checker Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10050
diff changeset
687 self.__cancel()
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
688 elif button == self.showButton:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
689 self.on_showButton_clicked()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
690
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
691 @pyqtSlot()
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
692 def on_startButton_clicked(self):
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
693 """
830
6caa4436dee2 Fixed a few smaller issues and some source code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 804
diff changeset
694 Private slot to start a syntax check run.
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
695 """
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
696 fileList = self.__fileList[:]
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
697 totalLen = len(fileList)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
698
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
699 filterString = self.excludeFilesEdit.text()
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
700 self.__data["ExcludeFiles"] = filterString
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
701 self.__data["AdditionalBuiltins"] = self.builtinsEdit.text().strip()
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
702 if self.__data != self.__project.getData("CHECKERSPARMS", "SyntaxChecker"):
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
703 self.__project.setData("CHECKERSPARMS", "SyntaxChecker", self.__data)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
704 filterList = [f.strip() for f in filterString.split(",") if f.strip()]
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
705 if filterList:
5597
3d88d53f8c2b Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5389
diff changeset
706 for fileFilter in filterList:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
707 fileList = [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)]
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
708
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
709 self.resultList.clear()
793
cd183f89874b Changed the syntac checker dialog and the tabnanny dialog to use the new eflag: marker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
710 self.noResults = True
cd183f89874b Changed the syntac checker dialog and the tabnanny dialog to use the new eflag: marker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
711 self.cancelled = False
9925
a267ac36dd69 Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9653
diff changeset
712 self.setArguments((self.__data["AdditionalBuiltins"].split(),))
10304
ff7d3d6b952d Syntax Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10302
diff changeset
713 self.start(fileList, skipped=totalLen - len(fileList))
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
714
10069
435cc5875135 Corrected and checked some code style issues (unused function arguments).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10068
diff changeset
715 @pyqtSlot(QTreeWidgetItem, int)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
716 def on_resultList_itemActivated(self, itm, col):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
717 """
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 915
diff changeset
718 Private slot to handle the activation of an item.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
719
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
720 @param itm reference to the activated item
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
721 @type QTreeWidgetItem
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
722 @param col column the item was activated in
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
723 @type int
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
724 """
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
725 if self.noResults or itm.data(0, self.filenameRole) is None:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
726 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
727
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
728 vm = ericApp().getObject("ViewManager")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
729
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
730 if itm.parent():
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
731 fn = itm.data(0, self.filenameRole)
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
732 lineno = itm.data(0, self.lineRole)
915
c1e052773c08 Changed syntax check to report error position within the line.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 831
diff changeset
733 index = itm.data(0, self.indexRole)
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
734 error = itm.data(0, self.errorRole)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
735
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
736 vm.openSourceFile(fn, lineno)
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
737 editor = vm.getOpenEditor(fn)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
738
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
739 if itm.data(0, self.warningRole):
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
740 editor.toggleWarning(lineno, 0, True, error)
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
741 else:
915
c1e052773c08 Changed syntax check to report error position within the line.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 831
diff changeset
742 editor.toggleSyntaxError(lineno, index, True, error, show=True)
2195
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
743 else:
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
744 fn = itm.data(0, self.filenameRole)
2195
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
745 vm.openSourceFile(fn)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
746 editor = vm.getOpenEditor(fn)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
747 for index in range(itm.childCount()):
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
748 citm = itm.child(index)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
749 lineno = citm.data(0, self.lineRole)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
750 index = citm.data(0, self.indexRole)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
751 error = citm.data(0, self.errorRole)
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
752 if citm.data(0, self.warningRole):
3412
9364dab2d472 Plug-in docu updated, now the return values of the syntax checker is a dictionary
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 3241
diff changeset
753 editor.toggleWarning(lineno, 0, True, error)
2195
d6cbd81fb692 Added capability to the syntax checker dialog to show all errors/warnings in an editor when the file entry is double activated.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1640
diff changeset
754 else:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
755 editor.toggleSyntaxError(lineno, index, True, error, show=True)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
756
4433
7ab862396a8a Workaround for missing lines at vertical scroll bar caused by annotations.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 4278
diff changeset
757 editor = vm.activeWindow()
7ab862396a8a Workaround for missing lines at vertical scroll bar caused by annotations.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 4278
diff changeset
758 editor.updateVerticalScrollBar()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
759
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
760 @pyqtSlot()
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
761 def on_showButton_clicked(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
762 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
763 Private slot to handle the "Show" button press.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
764 """
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
765 vm = ericApp().getObject("ViewManager")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
766
3064
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
767 selectedIndexes = []
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
768 for index in range(self.resultList.topLevelItemCount()):
3064
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
769 if self.resultList.topLevelItem(index).isSelected():
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
770 selectedIndexes.append(index)
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
771 if len(selectedIndexes) == 0:
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
772 selectedIndexes = list(range(self.resultList.topLevelItemCount()))
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
773 for index in selectedIndexes:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
774 itm = self.resultList.topLevelItem(index)
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
775 if itm.data(0, self.filenameRole) is not None:
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
776 fn = itm.data(0, self.filenameRole)
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
777 vm.openSourceFile(fn, 1)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
778 editor = vm.getOpenEditor(fn)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
779 editor.clearSyntaxError()
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
780 editor.clearFlakesWarnings()
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
781 for cindex in range(itm.childCount()):
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
782 citm = itm.child(cindex)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
783 lineno = citm.data(0, self.lineRole)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
784 index = citm.data(0, self.indexRole)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
785 error = citm.data(0, self.errorRole)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
786 if citm.data(0, self.warningRole):
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
787 editor.toggleWarning(lineno, 0, True, error)
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
788 else:
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
789 editor.toggleSyntaxError(lineno, index, True, error, show=True)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
790
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 915
diff changeset
791 # go through the list again to clear syntax error and
3064
2e7054d62218 Fixed an issue with the syntax check dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3062
diff changeset
792 # flakes warning markers for files, that are ok
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
793 errorFiles = []
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
794 for index in range(self.resultList.topLevelItemCount()):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
795 itm = self.resultList.topLevelItem(index)
10630
552a790fd9bc Corrected some issues and improved some existing code with respect to eric-ide server use.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
796 errorFiles.append(itm.data(0, self.filenameRole))
10520
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
797 for fn in vm.getOpenFilenames():
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
798 if fn not in errorFiles:
dd95c3cbb35e Fixed a few issues in the 'Syntax Checker' and 'Code Style Checker' dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
799 editor = vm.getOpenEditor(fn)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
800 editor.clearSyntaxError()
90
6de42151f9e6 Refined the flakes integration code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 89
diff changeset
801 editor.clearFlakesWarnings()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
802
4433
7ab862396a8a Workaround for missing lines at vertical scroll bar caused by annotations.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 4278
diff changeset
803 editor = vm.activeWindow()
7ab862396a8a Workaround for missing lines at vertical scroll bar caused by annotations.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 4278
diff changeset
804 editor.updateVerticalScrollBar()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
805
3175
1a6638ccce9d Fixed an issue in the syntax and code style checker dialogs causing markers of open files not to be checked being cleared.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
806 def __clearErrors(self, files):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
807 """
3175
1a6638ccce9d Fixed an issue in the syntax and code style checker dialogs causing markers of open files not to be checked being cleared.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
808 Private method to clear all error and warning markers of
1a6638ccce9d Fixed an issue in the syntax and code style checker dialogs causing markers of open files not to be checked being cleared.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
809 open editors to be checked.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
810
9508
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
811 @param files list of files to be checked
5a02bdb1dcba Harmonized the naming of some code in the syntax checker plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9507
diff changeset
812 @type list of str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
813 """
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
814 vm = ericApp().getObject("ViewManager")
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
815 openFiles = vm.getOpenFilenames()
3175
1a6638ccce9d Fixed an issue in the syntax and code style checker dialogs causing markers of open files not to be checked being cleared.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
816 for file in [f for f in openFiles if f in files]:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
817 editor = vm.getOpenEditor(file)
88
3701923bccf2 Added my own Python3 port of pyflakes and integrated py3flakes into syntax checker dialog and editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 55
diff changeset
818 editor.clearSyntaxError()
571
1a4101cb87eb Added filename filters to the syntax checker and tabnanny dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 564
diff changeset
819 editor.clearFlakesWarnings()

eric ide

mercurial