eric: comparison QScintilla/Editor.py

-:16c93928cfc5
+:9de9373da5bb
 self.indicMarginMenu.addAction(
 self.trUtf8('Clear syntax error'), self.clearSyntaxError)
 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(
 self.trUtf8('Next uncovered line'), self.nextUncovered)
 self.marginMenuActs["PreviousCoverageMarker"] = \
 self.trUtf8('Show syntax error message'), self.__showSyntaxError)
 self.marginMenuActs["ClearSyntaxError"] = self.marginMenu.addAction(
 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)
 self.marginMenuActs["TempBreakpoint"] = self.marginMenu.addAction(
 self.trUtf8('Toggle temporary breakpoint'),
 self.__toggleBreakpoint(line + 1)
 elif modifiers & Qt.KeyboardModifiers(Qt.ControlModifier):
 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)
 else:
 self.toggleBookmark(line + 1)
 self.__toggleBreakpoint(line + 1)
 elif margin == self.__indicMargin:
 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):
 """
 Private slot to handle the Use Monospaced Font context menu entry.
 """
 _fn, lineno, message = warning.getMessageData()
 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():
 msg = err.text.strip()
 else:
 if syntaxError:
 self.toggleSyntaxError(
 int(errorline), int(errorindex), True, _error)
 else:
 for warning in warnings:
-self.toggleFlakesWarning(
+self.toggleWarning(
 int(warning[1]), True, warning[2])
 def __initOnlineSyntaxCheck(self):
 """
 Private slot to initialize the online syntax check.
 self,
 self.trUtf8("Syntax Error"),
 self.trUtf8("No syntax error message available."))
 ###########################################################################
-## Flakes warning handling methods below
+## Warning handling methods below
 ###########################################################################
-def toggleFlakesWarning(self, line, warning, msg="",
+def toggleWarning(self, line, warning, msg="", warningType=WarningCode):
-warningType=WarningCode):
+"""
-"""
+Public method to toggle a warning indicator.
-Public method to toggle a flakes warning indicator.
+Note: This method is used to set pyflakes and code style warnings.
-Note: This method is used to set code style warnings as well.
+@param line line number of the warning
-@param line line number of the flakes warning
 @param warning flag indicating if the warning marker should be
 set or deleted (boolean)
 @param msg warning message (string)
 @keyparam warningType type of warning message (integer)
 """
 if line == 0:
 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)):
 handle = self.markerAdd(line - 1, self.warning)
 self.warnings[handle] = [warn]
 self.markerDeleteHandle(handle)
 self.syntaxerrorToggled.emit(self)
 self.__setAnnotation(line - 1)
-def getFlakesWarnings(self):
+def getWarnings(self):
 """
-Public method to retrieve the flakes warning markers.
+Public method to retrieve the warning markers.
-@return sorted list of all lines containing a flakes warning
+@return sorted list of all lines containing a warning
 (list of integer)
 """
 fwlist = []
 for handle in list(self.warnings.keys()):
 fwlist.append(self.markerLine(handle) + 1)
 fwlist.sort()
 return fwlist
-def hasFlakesWarnings(self):
+def hasWarnings(self):
 """
-Public method to check for the presence of flakes warnings.
+Public method to check for the presence of warnings.
-@return flag indicating the presence of flakes warnings (boolean)
+@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.
 """
 line, index = self.getCursorPosition()
 if line == self.lines() - 1:
 fwline = self.markerFindNext(0, 1 << self.warning)
 if fwline >= 0:
 self.setCursorPosition(fwline, 0)
 self.ensureLineVisible(fwline)
-def previousFlakesWarning(self):
+def previousWarning(self):
 """
 Public slot to handle the 'Previous warning' context menu action.
 """
 line, index = self.getCursorPosition()
 if line == 0:
 self.setCursorPosition(fwline, 0)
 self.ensureLineVisible(fwline)
 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] = []
 self.__setAnnotation(self.markerLine(handle))
 self.markerDeleteHandle(handle)
 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
 for handle in list(self.warnings.keys()):
 warningAnnotations = []
 errorAnnotations = []
 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:
 styleAnnotations.append(
 self.trUtf8("Style: {0}").format(msg))
 else:
 warningAnnotations.append(
 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(
 self.trUtf8("Error: {0}").format(msg))
 # clear syntax error markers
 self.clearSyntaxError()
 # clear flakes warning markers
-self.clearFlakesWarnings()
+self.clearWarnings()
 # clear breakpoint markers
 for handle in list(self.breaks.keys()):
 self.markerDeleteHandle(handle)
 self.breaks = {}

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Editor.py

QScintilla/Editor.py