Mercurial Repositories > eric / changeset
changeset
Fixed issues in the various checkers.
Wed, 07 May 2014 19:51:24 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 07 May 2014 19:51:24 +0200
- changeset 3558
- 7f2bc8910d28
- parent 3557
- 3ea8ba471d96
- child 3559
- 8938a2a66dee
Fixed issues in the various checkers.
--- a/APIs/Python3/eric5.api Mon May 05 19:27:30 2014 +0200 +++ b/APIs/Python3/eric5.api Wed May 07 19:51:24 2014 +0200 @@ -4055,6 +4055,8 @@ eric5.Plugins.PluginAbout.version?7 eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.activate?4() eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.deactivate?4() +eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.serviceErrorPy2?4(fx, lang, fn, msg) +eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.serviceErrorPy3?4(fx, lang, fn, msg) eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.styleCheck?4(lang, filename, source, args) eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin.styleChecked?7 eric5.Plugins.PluginCodeStyleChecker.CodeStyleCheckerPlugin?1(ui) @@ -4104,6 +4106,9 @@ eric5.Plugins.PluginEricdoc.version?7 eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin.activate?4() eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin.deactivate?4() +eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin.serviceErrorJavaScript?4(fx, lang, fn, msg) +eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin.serviceErrorPy2?4(fx, lang, fn, msg) +eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin.serviceErrorPy3?4(fx, lang, fn, msg) eric5.Plugins.PluginSyntaxChecker.SyntaxCheckerPlugin?1(ui) eric5.Plugins.PluginSyntaxChecker.author?7 eric5.Plugins.PluginSyntaxChecker.autoactivate?7 @@ -4121,6 +4126,8 @@ eric5.Plugins.PluginTabnanny.TabnannyPlugin.deactivate?4() eric5.Plugins.PluginTabnanny.TabnannyPlugin.indentCheck?4(lang, filename, source) eric5.Plugins.PluginTabnanny.TabnannyPlugin.indentChecked?7 +eric5.Plugins.PluginTabnanny.TabnannyPlugin.serviceErrorPy2?4(fx, lang, fn, msg) +eric5.Plugins.PluginTabnanny.TabnannyPlugin.serviceErrorPy3?4(fx, lang, fn, msg) eric5.Plugins.PluginTabnanny.TabnannyPlugin?1(ui) eric5.Plugins.PluginTabnanny.author?7 eric5.Plugins.PluginTabnanny.autoactivate?7
--- a/Documentation/Help/source.qhp Mon May 05 19:27:30 2014 +0200 +++ b/Documentation/Help/source.qhp Wed May 07 19:51:24 2014 +0200 @@ -2183,9 +2183,12 @@ <keyword name="CodeStyleCheckerPlugin.__projectBrowserShowMenu" id="CodeStyleCheckerPlugin.__projectBrowserShowMenu" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.__projectBrowserShowMenu" /> <keyword name="CodeStyleCheckerPlugin.__projectCodeStyleCheck" id="CodeStyleCheckerPlugin.__projectCodeStyleCheck" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.__projectCodeStyleCheck" /> <keyword name="CodeStyleCheckerPlugin.__projectShowMenu" id="CodeStyleCheckerPlugin.__projectShowMenu" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.__projectShowMenu" /> + <keyword name="CodeStyleCheckerPlugin.__serviceError" id="CodeStyleCheckerPlugin.__serviceError" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.__serviceError" /> <keyword name="CodeStyleCheckerPlugin.__translateStyleCheck" id="CodeStyleCheckerPlugin.__translateStyleCheck" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.__translateStyleCheck" /> <keyword name="CodeStyleCheckerPlugin.activate" id="CodeStyleCheckerPlugin.activate" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.activate" /> <keyword name="CodeStyleCheckerPlugin.deactivate" id="CodeStyleCheckerPlugin.deactivate" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.deactivate" /> + <keyword name="CodeStyleCheckerPlugin.serviceErrorPy2" id="CodeStyleCheckerPlugin.serviceErrorPy2" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.serviceErrorPy2" /> + <keyword name="CodeStyleCheckerPlugin.serviceErrorPy3" id="CodeStyleCheckerPlugin.serviceErrorPy3" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.serviceErrorPy3" /> <keyword name="CodeStyleCheckerPlugin.styleCheck" id="CodeStyleCheckerPlugin.styleCheck" ref="eric5.Plugins.PluginCodeStyleChecker.html#CodeStyleCheckerPlugin.styleCheck" /> <keyword name="CodeStyleCheckerReport" id="CodeStyleCheckerReport" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#CodeStyleCheckerReport" /> <keyword name="CodeStyleCheckerReport (Constructor)" id="CodeStyleCheckerReport (Constructor)" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#CodeStyleCheckerReport.__init__" /> @@ -11252,9 +11255,13 @@ <keyword name="SyntaxCheckerPlugin.__projectBrowserSyntaxCheck" id="SyntaxCheckerPlugin.__projectBrowserSyntaxCheck" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.__projectBrowserSyntaxCheck" /> <keyword name="SyntaxCheckerPlugin.__projectShowMenu" id="SyntaxCheckerPlugin.__projectShowMenu" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.__projectShowMenu" /> <keyword name="SyntaxCheckerPlugin.__projectSyntaxCheck" id="SyntaxCheckerPlugin.__projectSyntaxCheck" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.__projectSyntaxCheck" /> + <keyword name="SyntaxCheckerPlugin.__serviceError" id="SyntaxCheckerPlugin.__serviceError" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.__serviceError" /> <keyword name="SyntaxCheckerPlugin.__translateSyntaxCheck" id="SyntaxCheckerPlugin.__translateSyntaxCheck" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.__translateSyntaxCheck" /> <keyword name="SyntaxCheckerPlugin.activate" id="SyntaxCheckerPlugin.activate" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.activate" /> <keyword name="SyntaxCheckerPlugin.deactivate" id="SyntaxCheckerPlugin.deactivate" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.deactivate" /> + <keyword name="SyntaxCheckerPlugin.serviceErrorJavaScript" id="SyntaxCheckerPlugin.serviceErrorJavaScript" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.serviceErrorJavaScript" /> + <keyword name="SyntaxCheckerPlugin.serviceErrorPy2" id="SyntaxCheckerPlugin.serviceErrorPy2" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.serviceErrorPy2" /> + <keyword name="SyntaxCheckerPlugin.serviceErrorPy3" id="SyntaxCheckerPlugin.serviceErrorPy3" ref="eric5.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.serviceErrorPy3" /> <keyword name="TRPreviewer" id="TRPreviewer" ref="eric5.Tools.TRPreviewer.html#TRPreviewer" /> <keyword name="TRPreviewer (Constructor)" id="TRPreviewer (Constructor)" ref="eric5.Tools.TRPreviewer.html#TRPreviewer.__init__" /> <keyword name="TRPreviewer (Module)" id="TRPreviewer (Module)" ref="eric5.Tools.TRPreviewer.html" /> @@ -11349,9 +11356,12 @@ <keyword name="TabnannyPlugin.__projectBrowserTabnanny" id="TabnannyPlugin.__projectBrowserTabnanny" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.__projectBrowserTabnanny" /> <keyword name="TabnannyPlugin.__projectShowMenu" id="TabnannyPlugin.__projectShowMenu" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.__projectShowMenu" /> <keyword name="TabnannyPlugin.__projectTabnanny" id="TabnannyPlugin.__projectTabnanny" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.__projectTabnanny" /> + <keyword name="TabnannyPlugin.__serviceError" id="TabnannyPlugin.__serviceError" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.__serviceError" /> <keyword name="TabnannyPlugin.activate" id="TabnannyPlugin.activate" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.activate" /> <keyword name="TabnannyPlugin.deactivate" id="TabnannyPlugin.deactivate" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.deactivate" /> <keyword name="TabnannyPlugin.indentCheck" id="TabnannyPlugin.indentCheck" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.indentCheck" /> + <keyword name="TabnannyPlugin.serviceErrorPy2" id="TabnannyPlugin.serviceErrorPy2" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.serviceErrorPy2" /> + <keyword name="TabnannyPlugin.serviceErrorPy3" id="TabnannyPlugin.serviceErrorPy3" ref="eric5.Plugins.PluginTabnanny.html#TabnannyPlugin.serviceErrorPy3" /> <keyword name="Tabview" id="Tabview" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview" /> <keyword name="Tabview (Constructor)" id="Tabview (Constructor)" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.__init__" /> <keyword name="Tabview (Module)" id="Tabview (Module)" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html" />
--- a/Documentation/Source/eric5.Plugins.PluginCodeStyleChecker.html Mon May 05 19:27:30 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.PluginCodeStyleChecker.html Wed May 07 19:51:24 2014 +0200 @@ -94,6 +94,9 @@ <td><a href="#CodeStyleCheckerPlugin.__projectShowMenu">__projectShowMenu</a></td> <td>Private slot called, when the the project menu or a submenu is about to be shown.</td> </tr><tr> +<td><a href="#CodeStyleCheckerPlugin.__serviceError">__serviceError</a></td> +<td>Private slot handling service errors.</td> +</tr><tr> <td><a href="#CodeStyleCheckerPlugin.__translateStyleCheck">__translateStyleCheck</a></td> <td>Privat slot called after perfoming a style check on one file.</td> </tr><tr> @@ -103,6 +106,12 @@ <td><a href="#CodeStyleCheckerPlugin.deactivate">deactivate</a></td> <td>Public method to deactivate this plugin.</td> </tr><tr> +<td><a href="#CodeStyleCheckerPlugin.serviceErrorPy2">serviceErrorPy2</a></td> +<td>Public method handling service errors for Python 2.</td> +</tr><tr> +<td><a href="#CodeStyleCheckerPlugin.serviceErrorPy3">serviceErrorPy3</a></td> +<td>Public method handling service errors for Python 2.</td> +</tr><tr> <td><a href="#CodeStyleCheckerPlugin.styleCheck">styleCheck</a></td> <td>Method to prepare a style check on one Python source file in another task.</td> </tr> @@ -208,6 +217,19 @@ <dd> reference to the menu (QMenu) </dd> +</dl><a NAME="CodeStyleCheckerPlugin.__serviceError" ID="CodeStyleCheckerPlugin.__serviceError"></a> +<h4>CodeStyleCheckerPlugin.__serviceError</h4> +<b>__serviceError</b>(<i>fn, msg</i>) +<p> + Private slot handling service errors. +</p><dl> +<dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> </dl><a NAME="CodeStyleCheckerPlugin.__translateStyleCheck" ID="CodeStyleCheckerPlugin.__translateStyleCheck"></a> <h4>CodeStyleCheckerPlugin.__translateStyleCheck</h4> <b>__translateStyleCheck</b>(<i>fn, codeStyleCheckerStats, results</i>) @@ -241,7 +263,45 @@ <b>deactivate</b>(<i></i>) <p> Public method to deactivate this plugin. -</p><a NAME="CodeStyleCheckerPlugin.styleCheck" ID="CodeStyleCheckerPlugin.styleCheck"></a> +</p><a NAME="CodeStyleCheckerPlugin.serviceErrorPy2" ID="CodeStyleCheckerPlugin.serviceErrorPy2"></a> +<h4>CodeStyleCheckerPlugin.serviceErrorPy2</h4> +<b>serviceErrorPy2</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="CodeStyleCheckerPlugin.serviceErrorPy3" ID="CodeStyleCheckerPlugin.serviceErrorPy3"></a> +<h4>CodeStyleCheckerPlugin.serviceErrorPy3</h4> +<b>serviceErrorPy3</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="CodeStyleCheckerPlugin.styleCheck" ID="CodeStyleCheckerPlugin.styleCheck"></a> <h4>CodeStyleCheckerPlugin.styleCheck</h4> <b>styleCheck</b>(<i>lang, filename, source, args</i>) <p>
--- a/Documentation/Source/eric5.Plugins.PluginSyntaxChecker.html Mon May 05 19:27:30 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.PluginSyntaxChecker.html Wed May 07 19:51:24 2014 +0200 @@ -90,6 +90,9 @@ <td><a href="#SyntaxCheckerPlugin.__projectSyntaxCheck">__projectSyntaxCheck</a></td> <td>Public slot used to check the project files for syntax errors.</td> </tr><tr> +<td><a href="#SyntaxCheckerPlugin.__serviceError">__serviceError</a></td> +<td>Private slot handling service errors.</td> +</tr><tr> <td><a href="#SyntaxCheckerPlugin.__translateSyntaxCheck">__translateSyntaxCheck</a></td> <td>Slot to translate the resulting messages.</td> </tr><tr> @@ -98,6 +101,15 @@ </tr><tr> <td><a href="#SyntaxCheckerPlugin.deactivate">deactivate</a></td> <td>Public method to deactivate this plugin.</td> +</tr><tr> +<td><a href="#SyntaxCheckerPlugin.serviceErrorJavaScript">serviceErrorJavaScript</a></td> +<td>Public method handling service errors for JavaScript.</td> +</tr><tr> +<td><a href="#SyntaxCheckerPlugin.serviceErrorPy2">serviceErrorPy2</a></td> +<td>Public method handling service errors for Python 2.</td> +</tr><tr> +<td><a href="#SyntaxCheckerPlugin.serviceErrorPy3">serviceErrorPy3</a></td> +<td>Public method handling service errors for Python 2.</td> </tr> </table> <h3>Static Methods</h3> @@ -211,7 +223,20 @@ <b>__projectSyntaxCheck</b>(<i></i>) <p> Public slot used to check the project files for syntax errors. -</p><a NAME="SyntaxCheckerPlugin.__translateSyntaxCheck" ID="SyntaxCheckerPlugin.__translateSyntaxCheck"></a> +</p><a NAME="SyntaxCheckerPlugin.__serviceError" ID="SyntaxCheckerPlugin.__serviceError"></a> +<h4>SyntaxCheckerPlugin.__serviceError</h4> +<b>__serviceError</b>(<i>fn, msg</i>) +<p> + Private slot handling service errors. +</p><dl> +<dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="SyntaxCheckerPlugin.__translateSyntaxCheck" ID="SyntaxCheckerPlugin.__translateSyntaxCheck"></a> <h4>SyntaxCheckerPlugin.__translateSyntaxCheck</h4> <b>__translateSyntaxCheck</b>(<i>fn, problems</i>) <p> @@ -246,7 +271,64 @@ <b>deactivate</b>(<i></i>) <p> Public method to deactivate this plugin. -</p> +</p><a NAME="SyntaxCheckerPlugin.serviceErrorJavaScript" ID="SyntaxCheckerPlugin.serviceErrorJavaScript"></a> +<h4>SyntaxCheckerPlugin.serviceErrorJavaScript</h4> +<b>serviceErrorJavaScript</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for JavaScript. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="SyntaxCheckerPlugin.serviceErrorPy2" ID="SyntaxCheckerPlugin.serviceErrorPy2"></a> +<h4>SyntaxCheckerPlugin.serviceErrorPy2</h4> +<b>serviceErrorPy2</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="SyntaxCheckerPlugin.serviceErrorPy3" ID="SyntaxCheckerPlugin.serviceErrorPy3"></a> +<h4>SyntaxCheckerPlugin.serviceErrorPy3</h4> +<b>serviceErrorPy3</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.PluginTabnanny.html Mon May 05 19:27:30 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.PluginTabnanny.html Wed May 07 19:51:24 2014 +0200 @@ -94,6 +94,9 @@ <td><a href="#TabnannyPlugin.__projectTabnanny">__projectTabnanny</a></td> <td>Public slot used to check the project files for bad indentations.</td> </tr><tr> +<td><a href="#TabnannyPlugin.__serviceError">__serviceError</a></td> +<td>Private slot handling service errors.</td> +</tr><tr> <td><a href="#TabnannyPlugin.activate">activate</a></td> <td>Public method to activate this plugin.</td> </tr><tr> @@ -102,6 +105,12 @@ </tr><tr> <td><a href="#TabnannyPlugin.indentCheck">indentCheck</a></td> <td>Method to prepare a style check on one Python source file in another task.</td> +</tr><tr> +<td><a href="#TabnannyPlugin.serviceErrorPy2">serviceErrorPy2</a></td> +<td>Public method handling service errors for Python 2.</td> +</tr><tr> +<td><a href="#TabnannyPlugin.serviceErrorPy3">serviceErrorPy3</a></td> +<td>Public method handling service errors for Python 2.</td> </tr> </table> <h3>Static Methods</h3> @@ -204,7 +213,20 @@ <b>__projectTabnanny</b>(<i></i>) <p> Public slot used to check the project files for bad indentations. -</p><a NAME="TabnannyPlugin.activate" ID="TabnannyPlugin.activate"></a> +</p><a NAME="TabnannyPlugin.__serviceError" ID="TabnannyPlugin.__serviceError"></a> +<h4>TabnannyPlugin.__serviceError</h4> +<b>__serviceError</b>(<i>fn, msg</i>) +<p> + Private slot handling service errors. +</p><dl> +<dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="TabnannyPlugin.activate" ID="TabnannyPlugin.activate"></a> <h4>TabnannyPlugin.activate</h4> <b>activate</b>(<i></i>) <p> @@ -237,6 +259,44 @@ <dd> string containing the code to check (string) </dd> +</dl><a NAME="TabnannyPlugin.serviceErrorPy2" ID="TabnannyPlugin.serviceErrorPy2"></a> +<h4>TabnannyPlugin.serviceErrorPy2</h4> +<b>serviceErrorPy2</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> +</dl><a NAME="TabnannyPlugin.serviceErrorPy3" ID="TabnannyPlugin.serviceErrorPy3"></a> +<h4>TabnannyPlugin.serviceErrorPy3</h4> +<b>serviceErrorPy3</b>(<i>fx, lang, fn, msg</i>) +<p> + Public method handling service errors for Python 2. +</p><dl> +<dt><i>fx</i></dt> +<dd> +service name (string) +</dd><dt><i>lang</i></dt> +<dd> +language (string) +</dd><dt><i>fn</i></dt> +<dd> +file name (string) +</dd><dt><i>msg</i></dt> +<dd> +message text (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Mon May 05 19:27:30 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Wed May 07 19:51:24 2014 +0200 @@ -135,7 +135,7 @@ itm = QTreeWidgetItem( self.__lastFileItem, ["{0:6}".format(line), code, message]) - if code.startswith("W"): + if code.startswith(("W", "-")): itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) elif code.startswith("N"): itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) @@ -370,6 +370,7 @@ Start a style check for one file. The results are reported to the __processResult slot. + @keyparam codestring optional sourcestring (str) @keyparam onlyFixes dict which violations should be fixed (dict) """
--- a/Plugins/PluginCodeStyleChecker.py Mon May 05 19:27:30 2014 +0200 +++ b/Plugins/PluginCodeStyleChecker.py Wed May 07 19:51:24 2014 +0200 @@ -67,12 +67,48 @@ path = os.path.join( os.path.dirname(__file__), 'CheckerPlugins', 'CodeStyleChecker') - for lang in ['Python2', 'Python3']: - self.backgroundService.serviceConnect( - 'style', lang, path, 'CodeStyleChecker', - self.__translateStyleCheck, - lambda fx, fn, ver, msg: self.styleChecked.emit( - fn, {}, 0, [[1, 1, '---- ' + msg, False, False]])) + self.backgroundService.serviceConnect( + 'style', 'Python2', path, 'CodeStyleChecker', + self.__translateStyleCheck, + onErrorCallback=self.serviceErrorPy2) + self.backgroundService.serviceConnect( + 'style', 'Python3', path, 'CodeStyleChecker', + self.__translateStyleCheck, + onErrorCallback=self.serviceErrorPy3) + + def __serviceError(self, fn, msg): + """ + Private slot handling service errors. + + @param fn file name (string) + @param msg message text (string) + """ + self.styleChecked.emit( + fn, {}, 0, [[1, 1, '---- ' + msg, False, False, False]]) + + def serviceErrorPy2(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'style' and lang == 'Python2': + self.__serviceError(fn, msg) + + def serviceErrorPy3(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'style' and lang == 'Python3': + self.__serviceError(fn, msg) def __initialize(self): """
--- a/Plugins/PluginSyntaxChecker.py Mon May 05 19:27:30 2014 +0200 +++ b/Plugins/PluginSyntaxChecker.py Wed May 07 19:51:24 2014 +0200 @@ -68,18 +68,14 @@ self.__getPythonOptions, lambda: Preferences.getPython("PythonExtensions"), self.__translateSyntaxCheck, - lambda fx, lng, fn, msg: - self.syntaxCheckService.syntaxChecked.emit( # __IGNORE_WARNING__ - fn, {'error': (fn, 0, 0, '', msg)})) + self.serviceErrorPy2) self.syntaxCheckService.addLanguage( 'Python3', 'Python3', path, 'SyntaxCheck', self.__getPythonOptions, lambda: Preferences.getPython("Python3Extensions"), self.__translateSyntaxCheck, - lambda fx, lng, fn, msg: - self.syntaxCheckService.syntaxChecked.emit( # __IGNORE_WARNING__ - fn, {'error': (fn, 0, 0, '', msg)})) + self.serviceErrorPy3) # Jasy isn't yet compatible to Python2 self.syntaxCheckService.addLanguage( @@ -89,9 +85,53 @@ lambda: ['.js'], lambda fn, problems: self.syntaxCheckService.syntaxChecked.emit(fn, problems), # __IGNORE_WARNING__ - lambda fx, lng, fn, msg: - self.syntaxCheckService.syntaxChecked.emit( # __IGNORE_WARNING__ - fn, {'error': (fn, 0, 0, '', msg)})) + self.serviceErrorJavaScript) + + def __serviceError(self, fn, msg): + """ + Private slot handling service errors. + + @param fn file name (string) + @param msg message text (string) + """ + self.syntaxCheckService.syntaxChecked.emit( + fn, {'warnings': [(fn, 1, 0, '', msg)]}) + + def serviceErrorPy2(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'Python2Syntax': + self.__serviceError(fn, msg) + + def serviceErrorPy3(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'Python3Syntax': + self.__serviceError(fn, msg) + + def serviceErrorJavaScript(self, fx, lang, fn, msg): + """ + Public method handling service errors for JavaScript. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'JavaScriptSyntax': + self.__serviceError(fn, msg) def __initialize(self): """
--- a/Plugins/PluginTabnanny.py Mon May 05 19:27:30 2014 +0200 +++ b/Plugins/PluginTabnanny.py Wed May 07 19:51:24 2014 +0200 @@ -62,13 +62,48 @@ path = os.path.join( os.path.dirname(__file__), 'CheckerPlugins', 'Tabnanny') - for lang in ['Python2', 'Python3']: - self.backgroundService.serviceConnect( - 'indent', lang, path, 'Tabnanny', - lambda *args: self.indentChecked.emit(*args), - lambda fx, fn, ver, msg: self.indentChecked.emit( - fn, True, "1", msg)) + self.backgroundService.serviceConnect( + 'indent', 'Python2', path, 'Tabnanny', + lambda *args: self.indentChecked.emit(*args), + onErrorCallback=self.serviceErrorPy2) + self.backgroundService.serviceConnect( + 'indent', 'Python3', path, 'Tabnanny', + lambda *args: self.indentChecked.emit(*args), + onErrorCallback=self.serviceErrorPy3) + + def __serviceError(self, fn, msg): + """ + Private slot handling service errors. + @param fn file name (string) + @param msg message text (string) + """ + self.indentChecked.emit(fn, True, "1", msg) + + def serviceErrorPy2(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'indent' and lang == 'Python2': + self.__serviceError(fn, msg) + + def serviceErrorPy3(self, fx, lang, fn, msg): + """ + Public method handling service errors for Python 2. + + @param fx service name (string) + @param lang language (string) + @param fn file name (string) + @param msg message text (string) + """ + if fx == 'indent' and lang == 'Python3': + self.__serviceError(fn, msg) + def __initialize(self): """ Private slot to (re)initialize the plugin.
