Mercurial Repositories > eric / changeset
changeset
Extended the editor warning messages handling and refactored the names of warning handling methods to reflect their more general use.
Wed, 06 Nov 2013 19:23:06 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 06 Nov 2013 19:23:06 +0100
- changeset 3062
- 9de9373da5bb
- parent 3059
- 16c93928cfc5
- child 3064
- 2e7054d62218
Extended the editor warning messages handling and refactored the names of warning handling methods to reflect their more general use.
--- a/APIs/Python3/eric5.api Sat Nov 02 11:55:46 2013 +0100 +++ b/APIs/Python3/eric5.api Wed Nov 06 19:23:06 2013 +0100 @@ -6681,7 +6681,9 @@ eric5.QScintilla.Editor.Editor.clearBreakpoint?4(line) eric5.QScintilla.Editor.Editor.clearFlakesWarnings?4() eric5.QScintilla.Editor.Editor.clearSearchIndicators?4() +eric5.QScintilla.Editor.Editor.clearStyleWarnings?4() eric5.QScintilla.Editor.Editor.clearSyntaxError?4() +eric5.QScintilla.Editor.Editor.clearWarnings?4() eric5.QScintilla.Editor.Editor.close?4(alsoDelete=False) eric5.QScintilla.Editor.Editor.closeIt?4() eric5.QScintilla.Editor.Editor.codeCoverageShowAnnotations?4(silent=False) @@ -6721,7 +6723,6 @@ eric5.QScintilla.Editor.Editor.getFileName?4() eric5.QScintilla.Editor.Editor.getFileType?4() eric5.QScintilla.Editor.Editor.getFileTypeByFlag?4() -eric5.QScintilla.Editor.Editor.getFlakesWarnings?4() eric5.QScintilla.Editor.Editor.getHighlightPosition?4() eric5.QScintilla.Editor.Editor.getLanguage?4(normalized=True, forPygments=False) eric5.QScintilla.Editor.Editor.getLexer?4() @@ -6730,6 +6731,7 @@ eric5.QScintilla.Editor.Editor.getSearchText?4(selectionOnly=False) eric5.QScintilla.Editor.Editor.getSharingStatus?4() eric5.QScintilla.Editor.Editor.getSyntaxErrors?4() +eric5.QScintilla.Editor.Editor.getWarnings?4() eric5.QScintilla.Editor.Editor.getWord?4(line, index, direction=0, useWordChars=True) eric5.QScintilla.Editor.Editor.getWordBoundaries?4(line, index, useWordChars=True) eric5.QScintilla.Editor.Editor.getWordLeft?4(line, index) @@ -6744,10 +6746,10 @@ eric5.QScintilla.Editor.Editor.hasBreakpoints?4() eric5.QScintilla.Editor.Editor.hasChangeMarkers?4() eric5.QScintilla.Editor.Editor.hasCoverageMarkers?4() -eric5.QScintilla.Editor.Editor.hasFlakesWarnings?4() eric5.QScintilla.Editor.Editor.hasMiniMenu?4() eric5.QScintilla.Editor.Editor.hasSyntaxErrors?4() eric5.QScintilla.Editor.Editor.hasTaskMarkers?4() +eric5.QScintilla.Editor.Editor.hasWarnings?4() eric5.QScintilla.Editor.Editor.highlight?4(line=None, error=False, syntaxError=False) eric5.QScintilla.Editor.Editor.highlightVisible?4() eric5.QScintilla.Editor.Editor.indentLineOrSelection?4() @@ -6776,14 +6778,14 @@ eric5.QScintilla.Editor.Editor.newBreakpointWithProperties?4(line, properties) eric5.QScintilla.Editor.Editor.nextBookmark?4() eric5.QScintilla.Editor.Editor.nextChange?4() -eric5.QScintilla.Editor.Editor.nextFlakesWarning?4() eric5.QScintilla.Editor.Editor.nextTask?4() eric5.QScintilla.Editor.Editor.nextUncovered?4() +eric5.QScintilla.Editor.Editor.nextWarning?4() eric5.QScintilla.Editor.Editor.previousBookmark?4() eric5.QScintilla.Editor.Editor.previousChange?4() -eric5.QScintilla.Editor.Editor.previousFlakesWarning?4() eric5.QScintilla.Editor.Editor.previousTask?4() eric5.QScintilla.Editor.Editor.previousUncovered?4() +eric5.QScintilla.Editor.Editor.previousWarning?4() eric5.QScintilla.Editor.Editor.printFile?4() eric5.QScintilla.Editor.Editor.printPreviewFile?4() eric5.QScintilla.Editor.Editor.projectClosed?4() @@ -6830,8 +6832,8 @@ eric5.QScintilla.Editor.Editor.taskMarkersUpdated?7 eric5.QScintilla.Editor.Editor.toggleBookmark?4(line) eric5.QScintilla.Editor.Editor.toggleCommentBlock?4() -eric5.QScintilla.Editor.Editor.toggleFlakesWarning?4(line, warning, msg="", warningType=WarningCode) eric5.QScintilla.Editor.Editor.toggleSyntaxError?4(line, index, error, msg="", show=False) +eric5.QScintilla.Editor.Editor.toggleWarning?4(line, warning, msg="", warningType=WarningCode) eric5.QScintilla.Editor.Editor.uncommentLine?4() eric5.QScintilla.Editor.Editor.uncommentLineOrSelection?4() eric5.QScintilla.Editor.Editor.uncommentSelection?4()
--- a/Documentation/Help/source.qhp Sat Nov 02 11:55:46 2013 +0100 +++ b/Documentation/Help/source.qhp Wed Nov 06 19:23:06 2013 +0100 @@ -4245,6 +4245,7 @@ <keyword name="Editor.__checkSpellingSelection" id="Editor.__checkSpellingSelection" ref="eric5.QScintilla.Editor.html#Editor.__checkSpellingSelection" /> <keyword name="Editor.__checkSpellingWord" id="Editor.__checkSpellingWord" ref="eric5.QScintilla.Editor.html#Editor.__checkSpellingWord" /> <keyword name="Editor.__clearBreakpoints" id="Editor.__clearBreakpoints" ref="eric5.QScintilla.Editor.html#Editor.__clearBreakpoints" /> + <keyword name="Editor.__clearTypedWarning" id="Editor.__clearTypedWarning" ref="eric5.QScintilla.Editor.html#Editor.__clearTypedWarning" /> <keyword name="Editor.__codeCoverageHideAnnotations" id="Editor.__codeCoverageHideAnnotations" ref="eric5.QScintilla.Editor.html#Editor.__codeCoverageHideAnnotations" /> <keyword name="Editor.__completionListSelected" id="Editor.__completionListSelected" ref="eric5.QScintilla.Editor.html#Editor.__completionListSelected" /> <keyword name="Editor.__contextClose" id="Editor.__contextClose" ref="eric5.QScintilla.Editor.html#Editor.__contextClose" /> @@ -4352,11 +4353,11 @@ <keyword name="Editor.__showContextMenuResources" id="Editor.__showContextMenuResources" ref="eric5.QScintilla.Editor.html#Editor.__showContextMenuResources" /> <keyword name="Editor.__showContextMenuShow" id="Editor.__showContextMenuShow" ref="eric5.QScintilla.Editor.html#Editor.__showContextMenuShow" /> <keyword name="Editor.__showContextMenuSpelling" id="Editor.__showContextMenuSpelling" ref="eric5.QScintilla.Editor.html#Editor.__showContextMenuSpelling" /> - <keyword name="Editor.__showFlakesWarning" id="Editor.__showFlakesWarning" ref="eric5.QScintilla.Editor.html#Editor.__showFlakesWarning" /> <keyword name="Editor.__showImportsDiagram" id="Editor.__showImportsDiagram" ref="eric5.QScintilla.Editor.html#Editor.__showImportsDiagram" /> <keyword name="Editor.__showPackageDiagram" id="Editor.__showPackageDiagram" ref="eric5.QScintilla.Editor.html#Editor.__showPackageDiagram" /> <keyword name="Editor.__showProfileData" id="Editor.__showProfileData" ref="eric5.QScintilla.Editor.html#Editor.__showProfileData" /> <keyword name="Editor.__showSyntaxError" id="Editor.__showSyntaxError" ref="eric5.QScintilla.Editor.html#Editor.__showSyntaxError" /> + <keyword name="Editor.__showWarning" id="Editor.__showWarning" ref="eric5.QScintilla.Editor.html#Editor.__showWarning" /> <keyword name="Editor.__spellCharAdded" id="Editor.__spellCharAdded" ref="eric5.QScintilla.Editor.html#Editor.__spellCharAdded" /> <keyword name="Editor.__styleNeeded" id="Editor.__styleNeeded" ref="eric5.QScintilla.Editor.html#Editor.__styleNeeded" /> <keyword name="Editor.__textChanged" id="Editor.__textChanged" ref="eric5.QScintilla.Editor.html#Editor.__textChanged" /> @@ -4384,7 +4385,9 @@ <keyword name="Editor.clearBreakpoint" id="Editor.clearBreakpoint" ref="eric5.QScintilla.Editor.html#Editor.clearBreakpoint" /> <keyword name="Editor.clearFlakesWarnings" id="Editor.clearFlakesWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearFlakesWarnings" /> <keyword name="Editor.clearSearchIndicators" id="Editor.clearSearchIndicators" ref="eric5.QScintilla.Editor.html#Editor.clearSearchIndicators" /> + <keyword name="Editor.clearStyleWarnings" id="Editor.clearStyleWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearStyleWarnings" /> <keyword name="Editor.clearSyntaxError" id="Editor.clearSyntaxError" ref="eric5.QScintilla.Editor.html#Editor.clearSyntaxError" /> + <keyword name="Editor.clearWarnings" id="Editor.clearWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearWarnings" /> <keyword name="Editor.close" id="Editor.close" ref="eric5.QScintilla.Editor.html#Editor.close" /> <keyword name="Editor.closeIt" id="Editor.closeIt" ref="eric5.QScintilla.Editor.html#Editor.closeIt" /> <keyword name="Editor.codeCoverageShowAnnotations" id="Editor.codeCoverageShowAnnotations" ref="eric5.QScintilla.Editor.html#Editor.codeCoverageShowAnnotations" /> @@ -4416,7 +4419,6 @@ <keyword name="Editor.getFileName" id="Editor.getFileName" ref="eric5.QScintilla.Editor.html#Editor.getFileName" /> <keyword name="Editor.getFileType" id="Editor.getFileType" ref="eric5.QScintilla.Editor.html#Editor.getFileType" /> <keyword name="Editor.getFileTypeByFlag" id="Editor.getFileTypeByFlag" ref="eric5.QScintilla.Editor.html#Editor.getFileTypeByFlag" /> - <keyword name="Editor.getFlakesWarnings" id="Editor.getFlakesWarnings" ref="eric5.QScintilla.Editor.html#Editor.getFlakesWarnings" /> <keyword name="Editor.getHighlightPosition" id="Editor.getHighlightPosition" ref="eric5.QScintilla.Editor.html#Editor.getHighlightPosition" /> <keyword name="Editor.getLanguage" id="Editor.getLanguage" ref="eric5.QScintilla.Editor.html#Editor.getLanguage" /> <keyword name="Editor.getLexer" id="Editor.getLexer" ref="eric5.QScintilla.Editor.html#Editor.getLexer" /> @@ -4425,6 +4427,7 @@ <keyword name="Editor.getSearchText" id="Editor.getSearchText" ref="eric5.QScintilla.Editor.html#Editor.getSearchText" /> <keyword name="Editor.getSharingStatus" id="Editor.getSharingStatus" ref="eric5.QScintilla.Editor.html#Editor.getSharingStatus" /> <keyword name="Editor.getSyntaxErrors" id="Editor.getSyntaxErrors" ref="eric5.QScintilla.Editor.html#Editor.getSyntaxErrors" /> + <keyword name="Editor.getWarnings" id="Editor.getWarnings" ref="eric5.QScintilla.Editor.html#Editor.getWarnings" /> <keyword name="Editor.getWord" id="Editor.getWord" ref="eric5.QScintilla.Editor.html#Editor.getWord" /> <keyword name="Editor.getWordBoundaries" id="Editor.getWordBoundaries" ref="eric5.QScintilla.Editor.html#Editor.getWordBoundaries" /> <keyword name="Editor.getWordLeft" id="Editor.getWordLeft" ref="eric5.QScintilla.Editor.html#Editor.getWordLeft" /> @@ -4439,10 +4442,10 @@ <keyword name="Editor.hasBreakpoints" id="Editor.hasBreakpoints" ref="eric5.QScintilla.Editor.html#Editor.hasBreakpoints" /> <keyword name="Editor.hasChangeMarkers" id="Editor.hasChangeMarkers" ref="eric5.QScintilla.Editor.html#Editor.hasChangeMarkers" /> <keyword name="Editor.hasCoverageMarkers" id="Editor.hasCoverageMarkers" ref="eric5.QScintilla.Editor.html#Editor.hasCoverageMarkers" /> - <keyword name="Editor.hasFlakesWarnings" id="Editor.hasFlakesWarnings" ref="eric5.QScintilla.Editor.html#Editor.hasFlakesWarnings" /> <keyword name="Editor.hasMiniMenu" id="Editor.hasMiniMenu" ref="eric5.QScintilla.Editor.html#Editor.hasMiniMenu" /> <keyword name="Editor.hasSyntaxErrors" id="Editor.hasSyntaxErrors" ref="eric5.QScintilla.Editor.html#Editor.hasSyntaxErrors" /> <keyword name="Editor.hasTaskMarkers" id="Editor.hasTaskMarkers" ref="eric5.QScintilla.Editor.html#Editor.hasTaskMarkers" /> + <keyword name="Editor.hasWarnings" id="Editor.hasWarnings" ref="eric5.QScintilla.Editor.html#Editor.hasWarnings" /> <keyword name="Editor.highlight" id="Editor.highlight" ref="eric5.QScintilla.Editor.html#Editor.highlight" /> <keyword name="Editor.highlightVisible" id="Editor.highlightVisible" ref="eric5.QScintilla.Editor.html#Editor.highlightVisible" /> <keyword name="Editor.indentLineOrSelection" id="Editor.indentLineOrSelection" ref="eric5.QScintilla.Editor.html#Editor.indentLineOrSelection" /> @@ -4468,14 +4471,14 @@ <keyword name="Editor.newBreakpointWithProperties" id="Editor.newBreakpointWithProperties" ref="eric5.QScintilla.Editor.html#Editor.newBreakpointWithProperties" /> <keyword name="Editor.nextBookmark" id="Editor.nextBookmark" ref="eric5.QScintilla.Editor.html#Editor.nextBookmark" /> <keyword name="Editor.nextChange" id="Editor.nextChange" ref="eric5.QScintilla.Editor.html#Editor.nextChange" /> - <keyword name="Editor.nextFlakesWarning" id="Editor.nextFlakesWarning" ref="eric5.QScintilla.Editor.html#Editor.nextFlakesWarning" /> <keyword name="Editor.nextTask" id="Editor.nextTask" ref="eric5.QScintilla.Editor.html#Editor.nextTask" /> <keyword name="Editor.nextUncovered" id="Editor.nextUncovered" ref="eric5.QScintilla.Editor.html#Editor.nextUncovered" /> + <keyword name="Editor.nextWarning" id="Editor.nextWarning" ref="eric5.QScintilla.Editor.html#Editor.nextWarning" /> <keyword name="Editor.previousBookmark" id="Editor.previousBookmark" ref="eric5.QScintilla.Editor.html#Editor.previousBookmark" /> <keyword name="Editor.previousChange" id="Editor.previousChange" ref="eric5.QScintilla.Editor.html#Editor.previousChange" /> - <keyword name="Editor.previousFlakesWarning" id="Editor.previousFlakesWarning" ref="eric5.QScintilla.Editor.html#Editor.previousFlakesWarning" /> <keyword name="Editor.previousTask" id="Editor.previousTask" ref="eric5.QScintilla.Editor.html#Editor.previousTask" /> <keyword name="Editor.previousUncovered" id="Editor.previousUncovered" ref="eric5.QScintilla.Editor.html#Editor.previousUncovered" /> + <keyword name="Editor.previousWarning" id="Editor.previousWarning" ref="eric5.QScintilla.Editor.html#Editor.previousWarning" /> <keyword name="Editor.printFile" id="Editor.printFile" ref="eric5.QScintilla.Editor.html#Editor.printFile" /> <keyword name="Editor.printPreviewFile" id="Editor.printPreviewFile" ref="eric5.QScintilla.Editor.html#Editor.printPreviewFile" /> <keyword name="Editor.projectClosed" id="Editor.projectClosed" ref="eric5.QScintilla.Editor.html#Editor.projectClosed" /> @@ -4517,8 +4520,8 @@ <keyword name="Editor.streamCommentSelection" id="Editor.streamCommentSelection" ref="eric5.QScintilla.Editor.html#Editor.streamCommentSelection" /> <keyword name="Editor.toggleBookmark" id="Editor.toggleBookmark" ref="eric5.QScintilla.Editor.html#Editor.toggleBookmark" /> <keyword name="Editor.toggleCommentBlock" id="Editor.toggleCommentBlock" ref="eric5.QScintilla.Editor.html#Editor.toggleCommentBlock" /> - <keyword name="Editor.toggleFlakesWarning" id="Editor.toggleFlakesWarning" ref="eric5.QScintilla.Editor.html#Editor.toggleFlakesWarning" /> <keyword name="Editor.toggleSyntaxError" id="Editor.toggleSyntaxError" ref="eric5.QScintilla.Editor.html#Editor.toggleSyntaxError" /> + <keyword name="Editor.toggleWarning" id="Editor.toggleWarning" ref="eric5.QScintilla.Editor.html#Editor.toggleWarning" /> <keyword name="Editor.uncommentLine" id="Editor.uncommentLine" ref="eric5.QScintilla.Editor.html#Editor.uncommentLine" /> <keyword name="Editor.uncommentLineOrSelection" id="Editor.uncommentLineOrSelection" ref="eric5.QScintilla.Editor.html#Editor.uncommentLineOrSelection" /> <keyword name="Editor.uncommentSelection" id="Editor.uncommentSelection" ref="eric5.QScintilla.Editor.html#Editor.uncommentSelection" />
--- a/Documentation/Source/eric5.QScintilla.Editor.html Sat Nov 02 11:55:46 2013 +0100 +++ b/Documentation/Source/eric5.QScintilla.Editor.html Wed Nov 06 19:23:06 2013 +0100 @@ -224,6 +224,9 @@ <td><a href="#Editor.__clearBreakpoints">__clearBreakpoints</a></td> <td>Private slot to clear all breakpoints.</td> </tr><tr> +<td><a href="#Editor.__clearTypedWarning">__clearTypedWarning</a></td> +<td>Public method to clear warnings of a specific kind.</td> +</tr><tr> <td><a href="#Editor.__codeCoverageHideAnnotations">__codeCoverageHideAnnotations</a></td> <td>Private method to handle the hide code coverage annotations context menu action.</td> </tr><tr> @@ -545,9 +548,6 @@ <td><a href="#Editor.__showContextMenuSpelling">__showContextMenuSpelling</a></td> <td>Private slot to set up the spelling menu before it is shown.</td> </tr><tr> -<td><a href="#Editor.__showFlakesWarning">__showFlakesWarning</a></td> -<td>Private slot to handle the 'Show warning' context menu action.</td> -</tr><tr> <td><a href="#Editor.__showImportsDiagram">__showImportsDiagram</a></td> <td>Private method to handle the Imports Diagram context menu action.</td> </tr><tr> @@ -560,6 +560,9 @@ <td><a href="#Editor.__showSyntaxError">__showSyntaxError</a></td> <td>Private slot to handle the 'Show syntax error message' context menu action.</td> </tr><tr> +<td><a href="#Editor.__showWarning">__showWarning</a></td> +<td>Private slot to handle the 'Show warning' context menu action.</td> +</tr><tr> <td><a href="#Editor.__spellCharAdded">__spellCharAdded</a></td> <td>Public slot called to handle the user entering a character.</td> </tr><tr> @@ -636,14 +639,20 @@ <td>Public method to clear a breakpoint.</td> </tr><tr> <td><a href="#Editor.clearFlakesWarnings">clearFlakesWarnings</a></td> -<td>Public slot to handle the 'Clear all warnings' context menu action.</td> +<td>Public slot to clear all pyflakes warnings.</td> </tr><tr> <td><a href="#Editor.clearSearchIndicators">clearSearchIndicators</a></td> <td>Public method to clear all search indicators.</td> </tr><tr> +<td><a href="#Editor.clearStyleWarnings">clearStyleWarnings</a></td> +<td>Public slot to clear all style warnings.</td> +</tr><tr> <td><a href="#Editor.clearSyntaxError">clearSyntaxError</a></td> <td>Public slot to handle the 'Clear all syntax error' context menu action.</td> </tr><tr> +<td><a href="#Editor.clearWarnings">clearWarnings</a></td> +<td>Public slot to clear all warnings.</td> +</tr><tr> <td><a href="#Editor.close">close</a></td> <td>Public method called when the window gets closed.</td> </tr><tr> @@ -737,9 +746,6 @@ <td><a href="#Editor.getFileTypeByFlag">getFileTypeByFlag</a></td> <td>Public method to return the type of the file, if it was set by an eflag: marker.</td> </tr><tr> -<td><a href="#Editor.getFlakesWarnings">getFlakesWarnings</a></td> -<td>Public method to retrieve the flakes warning markers.</td> -</tr><tr> <td><a href="#Editor.getHighlightPosition">getHighlightPosition</a></td> <td>Public method to return the position of the highlight bar.</td> </tr><tr> @@ -764,6 +770,9 @@ <td><a href="#Editor.getSyntaxErrors">getSyntaxErrors</a></td> <td>Public method to retrieve the syntax error markers.</td> </tr><tr> +<td><a href="#Editor.getWarnings">getWarnings</a></td> +<td>Public method to retrieve the warning markers.</td> +</tr><tr> <td><a href="#Editor.getWord">getWord</a></td> <td>Public method to get the word at a position.</td> </tr><tr> @@ -806,9 +815,6 @@ <td><a href="#Editor.hasCoverageMarkers">hasCoverageMarkers</a></td> <td>Public method to test, if there are coverage markers.</td> </tr><tr> -<td><a href="#Editor.hasFlakesWarnings">hasFlakesWarnings</a></td> -<td>Public method to check for the presence of flakes warnings.</td> -</tr><tr> <td><a href="#Editor.hasMiniMenu">hasMiniMenu</a></td> <td>Public method to check the miniMenu flag.</td> </tr><tr> @@ -818,6 +824,9 @@ <td><a href="#Editor.hasTaskMarkers">hasTaskMarkers</a></td> <td>Public method to determine, if this editor contains any task markers.</td> </tr><tr> +<td><a href="#Editor.hasWarnings">hasWarnings</a></td> +<td>Public method to check for the presence of warnings.</td> +</tr><tr> <td><a href="#Editor.highlight">highlight</a></td> <td>Public method to highlight [or de-highlight] a particular line.</td> </tr><tr> @@ -893,30 +902,30 @@ <td><a href="#Editor.nextChange">nextChange</a></td> <td>Public slot to handle the 'Next change' context menu action.</td> </tr><tr> -<td><a href="#Editor.nextFlakesWarning">nextFlakesWarning</a></td> -<td>Public slot to handle the 'Next warning' context menu action.</td> -</tr><tr> <td><a href="#Editor.nextTask">nextTask</a></td> <td>Public slot to handle the 'Next task' context menu action.</td> </tr><tr> <td><a href="#Editor.nextUncovered">nextUncovered</a></td> <td>Public slot to handle the 'Next uncovered' context menu action.</td> </tr><tr> +<td><a href="#Editor.nextWarning">nextWarning</a></td> +<td>Public slot to handle the 'Next warning' context menu action.</td> +</tr><tr> <td><a href="#Editor.previousBookmark">previousBookmark</a></td> <td>Public slot to handle the 'Previous bookmark' context menu action.</td> </tr><tr> <td><a href="#Editor.previousChange">previousChange</a></td> <td>Public slot to handle the 'Previous task' context menu action.</td> </tr><tr> -<td><a href="#Editor.previousFlakesWarning">previousFlakesWarning</a></td> -<td>Public slot to handle the 'Previous warning' context menu action.</td> -</tr><tr> <td><a href="#Editor.previousTask">previousTask</a></td> <td>Public slot to handle the 'Previous task' context menu action.</td> </tr><tr> <td><a href="#Editor.previousUncovered">previousUncovered</a></td> <td>Public slot to handle the 'Previous uncovered' context menu action.</td> </tr><tr> +<td><a href="#Editor.previousWarning">previousWarning</a></td> +<td>Public slot to handle the 'Previous warning' context menu action.</td> +</tr><tr> <td><a href="#Editor.printFile">printFile</a></td> <td>Public slot to print the text.</td> </tr><tr> @@ -1040,12 +1049,12 @@ <td><a href="#Editor.toggleCommentBlock">toggleCommentBlock</a></td> <td>Public slot to toggle the comment of a block.</td> </tr><tr> -<td><a href="#Editor.toggleFlakesWarning">toggleFlakesWarning</a></td> -<td>Public method to toggle a flakes warning indicator.</td> -</tr><tr> <td><a href="#Editor.toggleSyntaxError">toggleSyntaxError</a></td> <td>Public method to toggle a syntax error indicator.</td> </tr><tr> +<td><a href="#Editor.toggleWarning">toggleWarning</a></td> +<td>Public method to toggle a warning indicator.</td> +</tr><tr> <td><a href="#Editor.uncommentLine">uncommentLine</a></td> <td>Public slot to uncomment the current line.</td> </tr><tr> @@ -1352,6 +1361,17 @@ <dd> name of the file (string) </dd> +</dl><a NAME="Editor.__clearTypedWarning" ID="Editor.__clearTypedWarning"></a> +<h4>Editor.__clearTypedWarning</h4> +<b>__clearTypedWarning</b>(<i>warningKind</i>) +<p> + Public method to clear warnings of a specific kind. +</p><dl> +<dt><i>warningKind</i></dt> +<dd> +kind of warning to clear (Editor.WarningCode, + Editor.WarningStyle) +</dd> </dl><a NAME="Editor.__codeCoverageHideAnnotations" ID="Editor.__codeCoverageHideAnnotations"></a> <h4>Editor.__codeCoverageHideAnnotations</h4> <b>__codeCoverageHideAnnotations</b>(<i></i>) @@ -2238,17 +2258,7 @@ <b>__showContextMenuSpelling</b>(<i></i>) <p> Private slot to set up the spelling menu before it is shown. -</p><a NAME="Editor.__showFlakesWarning" ID="Editor.__showFlakesWarning"></a> -<h4>Editor.__showFlakesWarning</h4> -<b>__showFlakesWarning</b>(<i>line=-1</i>) -<p> - Private slot to handle the 'Show warning' context menu action. -</p><dl> -<dt><i>line</i></dt> -<dd> -line number to show the flakes warning for (integer) -</dd> -</dl><a NAME="Editor.__showImportsDiagram" ID="Editor.__showImportsDiagram"></a> +</p><a NAME="Editor.__showImportsDiagram" ID="Editor.__showImportsDiagram"></a> <h4>Editor.__showImportsDiagram</h4> <b>__showImportsDiagram</b>(<i></i>) <p> @@ -2274,6 +2284,16 @@ <dd> line number to show the syntax error for (integer) </dd> +</dl><a NAME="Editor.__showWarning" ID="Editor.__showWarning"></a> +<h4>Editor.__showWarning</h4> +<b>__showWarning</b>(<i>line=-1</i>) +<p> + Private slot to handle the 'Show warning' context menu action. +</p><dl> +<dt><i>line</i></dt> +<dd> +line number to show the warning for (integer) +</dd> </dl><a NAME="Editor.__spellCharAdded" ID="Editor.__spellCharAdded"></a> <h4>Editor.__spellCharAdded</h4> <b>__spellCharAdded</b>(<i>charNumber</i>) @@ -2499,17 +2519,27 @@ <h4>Editor.clearFlakesWarnings</h4> <b>clearFlakesWarnings</b>(<i></i>) <p> - Public slot to handle the 'Clear all warnings' context menu action. + Public slot to clear all pyflakes warnings. </p><a NAME="Editor.clearSearchIndicators" ID="Editor.clearSearchIndicators"></a> <h4>Editor.clearSearchIndicators</h4> <b>clearSearchIndicators</b>(<i></i>) <p> Public method to clear all search indicators. +</p><a NAME="Editor.clearStyleWarnings" ID="Editor.clearStyleWarnings"></a> +<h4>Editor.clearStyleWarnings</h4> +<b>clearStyleWarnings</b>(<i></i>) +<p> + Public slot to clear all style warnings. </p><a NAME="Editor.clearSyntaxError" ID="Editor.clearSyntaxError"></a> <h4>Editor.clearSyntaxError</h4> <b>clearSyntaxError</b>(<i></i>) <p> Public slot to handle the 'Clear all syntax error' context menu action. +</p><a NAME="Editor.clearWarnings" ID="Editor.clearWarnings"></a> +<h4>Editor.clearWarnings</h4> +<b>clearWarnings</b>(<i></i>) +<p> + Public slot to clear all warnings. </p><a NAME="Editor.close" ID="Editor.close"></a> <h4>Editor.close</h4> <b>close</b>(<i>alsoDelete=False</i>) @@ -2821,17 +2851,6 @@ type of the displayed file, if set by an eflag: marker or an empty string (string) </dd> -</dl><a NAME="Editor.getFlakesWarnings" ID="Editor.getFlakesWarnings"></a> -<h4>Editor.getFlakesWarnings</h4> -<b>getFlakesWarnings</b>(<i></i>) -<p> - Public method to retrieve the flakes warning markers. -</p><dl> -<dt>Returns:</dt> -<dd> -sorted list of all lines containing a flakes warning - (list of integer) -</dd> </dl><a NAME="Editor.getHighlightPosition" ID="Editor.getHighlightPosition"></a> <h4>Editor.getHighlightPosition</h4> <b>getHighlightPosition</b>(<i></i>) @@ -2938,6 +2957,17 @@ sorted list of all lines containing a syntax error (list of integer) </dd> +</dl><a NAME="Editor.getWarnings" ID="Editor.getWarnings"></a> +<h4>Editor.getWarnings</h4> +<b>getWarnings</b>(<i></i>) +<p> + Public method to retrieve the warning markers. +</p><dl> +<dt>Returns:</dt> +<dd> +sorted list of all lines containing a warning + (list of integer) +</dd> </dl><a NAME="Editor.getWord" ID="Editor.getWord"></a> <h4>Editor.getWord</h4> <b>getWord</b>(<i>line, index, direction=0, useWordChars=True</i>) @@ -3115,16 +3145,6 @@ <dd> flag indicating the presence of coverage markers (boolean) </dd> -</dl><a NAME="Editor.hasFlakesWarnings" ID="Editor.hasFlakesWarnings"></a> -<h4>Editor.hasFlakesWarnings</h4> -<b>hasFlakesWarnings</b>(<i></i>) -<p> - Public method to check for the presence of flakes warnings. -</p><dl> -<dt>Returns:</dt> -<dd> -flag indicating the presence of flakes warnings (boolean) -</dd> </dl><a NAME="Editor.hasMiniMenu" ID="Editor.hasMiniMenu"></a> <h4>Editor.hasMiniMenu</h4> <b>hasMiniMenu</b>(<i></i>) @@ -3155,6 +3175,16 @@ <dd> flag indicating the presence of task markers (boolean) </dd> +</dl><a NAME="Editor.hasWarnings" ID="Editor.hasWarnings"></a> +<h4>Editor.hasWarnings</h4> +<b>hasWarnings</b>(<i></i>) +<p> + Public method to check for the presence of warnings. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the presence of warnings (boolean) +</dd> </dl><a NAME="Editor.highlight" ID="Editor.highlight"></a> <h4>Editor.highlight</h4> <b>highlight</b>(<i>line=None, error=False, syntaxError=False</i>) @@ -3347,11 +3377,6 @@ <b>nextChange</b>(<i></i>) <p> Public slot to handle the 'Next change' context menu action. -</p><a NAME="Editor.nextFlakesWarning" ID="Editor.nextFlakesWarning"></a> -<h4>Editor.nextFlakesWarning</h4> -<b>nextFlakesWarning</b>(<i></i>) -<p> - Public slot to handle the 'Next warning' context menu action. </p><a NAME="Editor.nextTask" ID="Editor.nextTask"></a> <h4>Editor.nextTask</h4> <b>nextTask</b>(<i></i>) @@ -3362,6 +3387,11 @@ <b>nextUncovered</b>(<i></i>) <p> Public slot to handle the 'Next uncovered' context menu action. +</p><a NAME="Editor.nextWarning" ID="Editor.nextWarning"></a> +<h4>Editor.nextWarning</h4> +<b>nextWarning</b>(<i></i>) +<p> + Public slot to handle the 'Next warning' context menu action. </p><a NAME="Editor.previousBookmark" ID="Editor.previousBookmark"></a> <h4>Editor.previousBookmark</h4> <b>previousBookmark</b>(<i></i>) @@ -3372,11 +3402,6 @@ <b>previousChange</b>(<i></i>) <p> Public slot to handle the 'Previous task' context menu action. -</p><a NAME="Editor.previousFlakesWarning" ID="Editor.previousFlakesWarning"></a> -<h4>Editor.previousFlakesWarning</h4> -<b>previousFlakesWarning</b>(<i></i>) -<p> - Public slot to handle the 'Previous warning' context menu action. </p><a NAME="Editor.previousTask" ID="Editor.previousTask"></a> <h4>Editor.previousTask</h4> <b>previousTask</b>(<i></i>) @@ -3387,6 +3412,11 @@ <b>previousUncovered</b>(<i></i>) <p> Public slot to handle the 'Previous uncovered' context menu action. +</p><a NAME="Editor.previousWarning" ID="Editor.previousWarning"></a> +<h4>Editor.previousWarning</h4> +<b>previousWarning</b>(<i></i>) +<p> + Public slot to handle the 'Previous warning' context menu action. </p><a NAME="Editor.printFile" ID="Editor.printFile"></a> <h4>Editor.printFile</h4> <b>printFile</b>(<i></i>) @@ -3730,29 +3760,7 @@ If the line of the cursor or the selection is not commented, it will be commented. If it is commented, the comment block will be removed. The later works independent of the current selection. -</p><a NAME="Editor.toggleFlakesWarning" ID="Editor.toggleFlakesWarning"></a> -<h4>Editor.toggleFlakesWarning</h4> -<b>toggleFlakesWarning</b>(<i>line, warning, msg="", warningType=WarningCode</i>) -<p> - Public method to toggle a flakes warning indicator. -</p><p> - Note: This method is used to set code style warnings as well. -</p><dl> -<dt><i>line</i></dt> -<dd> -line number of the flakes warning -</dd><dt><i>warning</i></dt> -<dd> -flag indicating if the warning marker should be - set or deleted (boolean) -</dd><dt><i>msg</i></dt> -<dd> -warning message (string) -</dd><dt><i>warningType=</i></dt> -<dd> -type of warning message (integer) -</dd> -</dl><a NAME="Editor.toggleSyntaxError" ID="Editor.toggleSyntaxError"></a> +</p><a NAME="Editor.toggleSyntaxError" ID="Editor.toggleSyntaxError"></a> <h4>Editor.toggleSyntaxError</h4> <b>toggleSyntaxError</b>(<i>line, index, error, msg="", show=False</i>) <p> @@ -3776,6 +3784,28 @@ flag indicating to set the cursor to the error position (boolean) </dd> +</dl><a NAME="Editor.toggleWarning" ID="Editor.toggleWarning"></a> +<h4>Editor.toggleWarning</h4> +<b>toggleWarning</b>(<i>line, warning, msg="", warningType=WarningCode</i>) +<p> + Public method to toggle a warning indicator. +</p><p> + Note: This method is used to set pyflakes and code style warnings. +</p><dl> +<dt><i>line</i></dt> +<dd> +line number of the warning +</dd><dt><i>warning</i></dt> +<dd> +flag indicating if the warning marker should be + set or deleted (boolean) +</dd><dt><i>msg</i></dt> +<dd> +warning message (string) +</dd><dt><i>warningType=</i></dt> +<dd> +type of warning message (integer) +</dd> </dl><a NAME="Editor.uncommentLine" ID="Editor.uncommentLine"></a> <h4>Editor.uncommentLine</h4> <b>uncommentLine</b>(<i></i>)
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat Nov 02 11:55:46 2013 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Wed Nov 06 19:23:06 2013 +0100 @@ -321,6 +321,7 @@ QApplication.processEvents() self.__resetStatistics() + self.__clearErrors() if save: self.__fileOrFileList = fn @@ -652,7 +653,7 @@ if code == "E901": editor.toggleSyntaxError(lineno, 0, True, message, True) else: - editor.toggleFlakesWarning( + editor.toggleWarning( lineno, True, message, warningType=editor.WarningStyle) @pyqtSlot() @@ -680,12 +681,12 @@ fn = Utilities.normabspath(itm.data(0, self.filenameRole)) vm.openSourceFile(fn, 1) editor = vm.getOpenEditor(fn) - editor.clearFlakesWarnings() + editor.clearStyleWarnings() for cindex in range(itm.childCount()): citm = itm.child(cindex) lineno = citm.data(0, self.lineRole) message = citm.data(0, self.messageRole) - editor.toggleFlakesWarning( + editor.toggleWarning( lineno, True, message, warningType=editor.WarningStyle) # go through the list again to clear warning markers for files, @@ -699,7 +700,7 @@ for file in openFiles: if not file in errorFiles: editor = vm.getOpenEditor(file) - editor.clearFlakesWarnings() + editor.clearStyleWarnings() @pyqtSlot() def on_statisticsButton_clicked(self): @@ -806,7 +807,7 @@ openFiles = vm.getOpenFilenames() for file in openFiles: editor = vm.getOpenEditor(file) - editor.clearFlakesWarnings() + editor.clearStyleWarnings() @pyqtSlot() def on_fixButton_clicked(self):
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sat Nov 02 11:55:46 2013 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Wed Nov 06 19:23:06 2013 +0100 @@ -140,6 +140,8 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) QApplication.processEvents() + self.__clearErrors() + if isinstance(fn, list): files = fn elif os.path.isdir(fn): @@ -344,7 +346,7 @@ editor = vm.getOpenEditor(fn) if itm.data(0, self.warningRole): - editor.toggleFlakesWarning(lineno, True, error) + editor.toggleWarning(lineno, True, error) else: editor.toggleSyntaxError(lineno, index, True, error, show=True) else: @@ -358,7 +360,7 @@ index = citm.data(0, self.indexRole) error = citm.data(0, self.errorRole) if citm.data(0, self.warningRole): - editor.toggleFlakesWarning(lineno, True, error) + editor.toggleWarning(lineno, True, error) else: editor.toggleSyntaxError( lineno, index, True, error, show=True)
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sat Nov 02 11:55:46 2013 +0100 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Wed Nov 06 19:23:06 2013 +0100 @@ -527,7 +527,7 @@ elif editor.hasSyntaxErrors(): self.viewlist.item(index).setIcon( UI.PixmapCache.getIcon("syntaxError.png")) - elif editor.hasFlakesWarnings(): + elif editor.hasWarnings(): self.viewlist.item(index).setIcon( UI.PixmapCache.getIcon("warning.png")) else: @@ -547,7 +547,7 @@ if editor.hasSyntaxErrors(): self.viewlist.item(index).setIcon( UI.PixmapCache.getIcon("syntaxError.png")) - elif editor.hasFlakesWarnings(): + elif editor.hasWarnings(): self.viewlist.item(index).setIcon( UI.PixmapCache.getIcon("warning.png")) elif editor.isModified():
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sat Nov 02 11:55:46 2013 +0100 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Wed Nov 06 19:23:06 2013 +0100 @@ -1002,7 +1002,7 @@ tw.setTabIcon(index, UI.PixmapCache.getIcon("fileModified.png")) elif editor.hasSyntaxErrors(): tw.setTabIcon(index, UI.PixmapCache.getIcon("syntaxError.png")) - elif editor.hasFlakesWarnings(): + elif editor.hasWarnings(): tw.setTabIcon(index, UI.PixmapCache.getIcon("warning.png")) else: tw.setTabIcon(index, UI.PixmapCache.getIcon("empty.png")) @@ -1020,7 +1020,7 @@ index = tw.indexOf(editor) if editor.hasSyntaxErrors(): tw.setTabIcon(index, UI.PixmapCache.getIcon("syntaxError.png")) - elif editor.hasFlakesWarnings(): + elif editor.hasWarnings(): tw.setTabIcon(index, UI.PixmapCache.getIcon("warning.png")) elif editor.isModified(): tw.setTabIcon(index, UI.PixmapCache.getIcon("fileModified.png"))
--- a/QScintilla/Editor.py Sat Nov 02 11:55:46 2013 +0100 +++ b/QScintilla/Editor.py Wed Nov 06 19:23:06 2013 +0100 @@ -1034,16 +1034,16 @@ self.indicMarginMenu.addSeparator() self.marginMenuActs["NextWarningMarker"] = \ self.indicMarginMenu.addAction( - self.trUtf8("Next warning"), self.nextFlakesWarning) + self.trUtf8("Next warning"), self.nextWarning) self.marginMenuActs["PreviousWarningMarker"] = \ self.indicMarginMenu.addAction( - self.trUtf8("Previous warning"), self.previousFlakesWarning) + self.trUtf8("Previous warning"), self.previousWarning) self.marginMenuActs["ShowWarning"] = \ self.indicMarginMenu.addAction( - self.trUtf8('Show warning message'), self.__showFlakesWarning) + self.trUtf8('Show warning message'), self.__showWarning) self.marginMenuActs["ClearWarnings"] = \ self.indicMarginMenu.addAction( - self.trUtf8('Clear warnings'), self.clearFlakesWarnings) + self.trUtf8('Clear warnings'), self.clearWarnings) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextCoverageMarker"] = \ self.indicMarginMenu.addAction( @@ -1091,14 +1091,14 @@ self.trUtf8('Clear syntax error'), self.clearSyntaxError) self.marginMenu.addSeparator() self.marginMenuActs["NextWarningMarker"] = self.marginMenu.addAction( - self.trUtf8("Next warning"), self.nextFlakesWarning) + self.trUtf8("Next warning"), self.nextWarning) self.marginMenuActs["PreviousWarningMarker"] = \ self.marginMenu.addAction( - self.trUtf8("Previous warning"), self.previousFlakesWarning) + self.trUtf8("Previous warning"), self.previousWarning) self.marginMenuActs["ShowWarning"] = self.marginMenu.addAction( - self.trUtf8('Show warning message'), self.__showFlakesWarning) + self.trUtf8('Show warning message'), self.__showWarning) self.marginMenuActs["ClearWarnings"] = self.marginMenu.addAction( - self.trUtf8('Clear warnings'), self.clearFlakesWarnings) + self.trUtf8('Clear warnings'), self.clearWarnings) self.marginMenu.addSeparator() self.marginMenuActs["Breakpoint"] = self.marginMenu.addAction( self.trUtf8('Toggle breakpoint'), self.menuToggleBreakpoint) @@ -3040,7 +3040,7 @@ if self.markersAtLine(line) & (1 << self.syntaxerror): self.__showSyntaxError(line) elif self.markersAtLine(line) & (1 << self.warning): - self.__showFlakesWarning(line) + self.__showWarning(line) else: if self.marginMenuActs["LMBbreakpoints"].isChecked(): self.__toggleBreakpoint(line + 1) @@ -3055,7 +3055,7 @@ if self.markersAtLine(line) & (1 << self.syntaxerror): self.__showSyntaxError(line) elif self.markersAtLine(line) & (1 << self.warning): - self.__showFlakesWarning(line) + self.__showWarning(line) def handleMonospacedEnable(self): """ @@ -4972,7 +4972,7 @@ if "__IGNORE_WARNING__" not in \ Utilities.extractLineFlags( self.text(lineno - 1).strip()): - self.toggleFlakesWarning( + self.toggleWarning( lineno, True, message) except SyntaxError as err: if err.text.strip(): @@ -4991,7 +4991,7 @@ int(errorline), int(errorindex), True, _error) else: for warning in warnings: - self.toggleFlakesWarning( + self.toggleWarning( int(warning[1]), True, warning[2]) def __initOnlineSyntaxCheck(self): @@ -5374,17 +5374,16 @@ self.trUtf8("No syntax error message available.")) ########################################################################### - ## Flakes warning handling methods below + ## Warning handling methods below ########################################################################### - def toggleFlakesWarning(self, line, warning, msg="", - warningType=WarningCode): - """ - Public method to toggle a flakes warning indicator. - - Note: This method is used to set code style warnings as well. - - @param line line number of the flakes warning + def toggleWarning(self, line, warning, msg="", warningType=WarningCode): + """ + Public method to toggle a warning indicator. + + Note: This method is used to set pyflakes and code style warnings. + + @param line line number of the warning @param warning flag indicating if the warning marker should be set or deleted (boolean) @param msg warning message (string) @@ -5394,7 +5393,7 @@ line = 1 # hack to show a warning marker, if line is reported to be 0 if warning: - # set/ammend a new warning marker + # set/amend a new warning marker warn = (msg, warningType) markers = self.markersAtLine(line - 1) if not (markers & (1 << self.warning)): @@ -5415,11 +5414,11 @@ self.__setAnnotation(line - 1) - def getFlakesWarnings(self): - """ - Public method to retrieve the flakes warning markers. - - @return sorted list of all lines containing a flakes warning + def getWarnings(self): + """ + Public method to retrieve the warning markers. + + @return sorted list of all lines containing a warning (list of integer) """ fwlist = [] @@ -5429,15 +5428,15 @@ fwlist.sort() return fwlist - def hasFlakesWarnings(self): - """ - Public method to check for the presence of flakes warnings. - - @return flag indicating the presence of flakes warnings (boolean) + def hasWarnings(self): + """ + Public method to check for the presence of warnings. + + @return flag indicating the presence of warnings (boolean) """ return len(self.warnings) > 0 - def nextFlakesWarning(self): + def nextWarning(self): """ Public slot to handle the 'Next warning' context menu action. """ @@ -5454,7 +5453,7 @@ self.setCursorPosition(fwline, 0) self.ensureLineVisible(fwline) - def previousFlakesWarning(self): + def previousWarning(self): """ Public slot to handle the 'Previous warning' context menu action. """ @@ -5474,7 +5473,45 @@ def clearFlakesWarnings(self): """ - Public slot to handle the 'Clear all warnings' context menu action. + Public slot to clear all pyflakes warnings. + """ + self.__clearTypedWarning(Editor.WarningCode) + + def clearStyleWarnings(self): + """ + Public slot to clear all style warnings. + """ + self.__clearTypedWarning(Editor.WarningStyle) + + def __clearTypedWarning(self, warningKind): + """ + Public method to clear warnings of a specific kind. + + @param warningKind kind of warning to clear (Editor.WarningCode, + Editor.WarningStyle) + """ + assert warningKind in [Editor.WarningCode, Editor.WarningStyle] + + for handle in list(self.warnings.keys()): + warnings = [] + for msg, warningType in self.warnings[handle]: + if warningType == warningKind: + continue + + warnings.append((msg, warningType)) + + if warnings: + self.warnings[handle] = warnings + self.__setAnnotation(self.markerLine(handle)) + else: + del self.warnings[handle] + self.__setAnnotation(self.markerLine(handle)) + self.markerDeleteHandle(handle) + self.syntaxerrorToggled.emit(self) + + def clearWarnings(self): + """ + Public slot to clear all warnings. """ for handle in self.warnings: self.warnings[handle] = [] @@ -5483,11 +5520,11 @@ self.warnings = {} self.syntaxerrorToggled.emit(self) - def __showFlakesWarning(self, line=-1): + def __showWarning(self, line=-1): """ Private slot to handle the 'Show warning' context menu action. - @param line line number to show the flakes warning for (integer) + @param line line number to show the warning for (integer) """ if line == -1: line = self.line @@ -5557,7 +5594,7 @@ styleAnnotations = [] # step 1: do warnings - for handle in list(self.warnings.keys()): + for handle in self.warnings.keys(): if self.markerLine(handle) == line: for msg, warningType in self.warnings[handle]: if warningType == self.WarningStyle: @@ -5568,7 +5605,7 @@ self.trUtf8("Warning: {0}").format(msg)) # step 2: do syntax errors - for handle in list(self.syntaxerrors.keys()): + for handle in self.syntaxerrors.keys(): if self.markerLine(handle) == line: for msg, _ in self.syntaxerrors[handle]: errorAnnotations.append( @@ -6059,7 +6096,7 @@ self.clearSyntaxError() # clear flakes warning markers - self.clearFlakesWarnings() + self.clearWarnings() # clear breakpoint markers for handle in list(self.breaks.keys()):
--- a/ViewManager/ViewManager.py Sat Nov 02 11:55:46 2013 +0100 +++ b/ViewManager/ViewManager.py Wed Nov 06 19:23:06 2013 +0100 @@ -5731,7 +5731,7 @@ else: self.syntaxErrorGotoAct.setEnabled(False) self.syntaxErrorClearAct.setEnabled(False) - if editor.hasFlakesWarnings(): + if editor.hasWarnings(): self.warningsNextAct.setEnabled(True) self.warningsPreviousAct.setEnabled(True) self.warningsClearAct.setEnabled(True) @@ -5745,20 +5745,20 @@ """ Private method to handle the next warning action. """ - self.activeWindow().nextFlakesWarning() + self.activeWindow().nextWarning() def __previousWarning(self): """ Private method to handle the previous warning action. """ - self.activeWindow().previousFlakesWarning() + self.activeWindow().previousWarning() def __clearAllWarnings(self): """ Private method to handle the clear all warnings action. """ for editor in self.editors: - editor.clearFlakesWarnings() + editor.clearWarnings() def __nextUncovered(self): """ @@ -6139,7 +6139,7 @@ self.syntaxErrorGotoAct.setEnabled(False) self.syntaxErrorClearAct.setEnabled(False) - if editor.hasFlakesWarnings(): + if editor.hasWarnings(): self.warningsNextAct.setEnabled(True) self.warningsPreviousAct.setEnabled(True) self.warningsClearAct.setEnabled(True)
