eric: comparison src/eric7/QScintilla/Lexers/LexerCPP.py

-:e9e7eca7efee
+:bf71ee032bb4
 class LexerCPP(SubstyledLexer, QsciLexerCPP):
 """
 Subclass to implement some additional lexer dependant methods.
 """
 def __init__(self, parent=None, caseInsensitiveKeywords=False):
 """
 Constructor
 @param parent parent widget of this lexer
 @param caseInsensitiveKeywords flag indicating keywords are case
 insensitive (boolean)
 """
 QsciLexerCPP.__init__(self, parent, caseInsensitiveKeywords)
 SubstyledLexer.__init__(self)
 self.commentString = "//"
-self.streamCommentString = {
+self.streamCommentString = {"start": "/* ", "end": " */"}
-'start': '/* ',
+self.boxCommentString = {"start": "/* ", "middle": " * ", "end": " */"}
-'end': ' */'
-}
-self.boxCommentString = {
-'start': '/* ',
-'middle': ' * ',
-'end': ' */'
-}
 self.keywordSetDescriptions = [
 self.tr("Primary keywords and identifiers"),
 self.tr("Secondary keywords and identifiers"),
 self.tr("Documentation comment keywords"),
 self.tr("Global classes and typedefs"),
 self.tr("Preprocessor definitions"),
 self.tr("Task marker and error marker keywords"),
 ]
 ##############################################################
 ## default sub-style definitions
 ##############################################################
 diffToSecondary = 0x40
 # This may need to be changed to be in line with Scintilla C++ lexer.
 # list of style numbers, that support sub-styling
 self.baseStyles = [11, 17, 11 + diffToSecondary, 17 + diffToSecondary]
 self.defaultSubStyles = {
 11: {
 0: {
 "Description": self.tr("Additional Identifier"),
 "Words": "std map string vector",
 "Style": {
 "fore": 0xEE00AA,
-}
+},
 },
 },
 17: {
 0: {
 "Description": self.tr("Additional JavaDoc keyword"),
 "Words": "check",
 "Style": {
 "fore": 0x00AAEE,
-}
+},
 },
 },
-11 + diffToSecondary: {
+11
++ diffToSecondary: {
 0: {
 "Description": self.tr("Inactive additional identifier"),
 "Words": "std map string vector",
 "Style": {
 "fore": 0xBB6666,
-}
+},
 },
 },
-17 + diffToSecondary: {
+17
++ diffToSecondary: {
 0: {
-"Description": self.tr(
+"Description": self.tr("Inactive additional JavaDoc keyword"),
-"Inactive additional JavaDoc keyword"),
 "Words": "check",
 "Style": {
 "fore": 0x6699AA,
-}
+},
 },
 },
 }
 def initProperties(self):
 self.setAutoIndentStyle(indentStyle)
 self.setFoldCompact(Preferences.getEditor("AllFoldCompact"))
 with contextlib.suppress(AttributeError):
 self.setDollarsAllowed(Preferences.getEditor("CppDollarsAllowed"))
 with contextlib.suppress(AttributeError):
-self.setStylePreprocessor(
+self.setStylePreprocessor(Preferences.getEditor("CppStylePreprocessor"))
-Preferences.getEditor("CppStylePreprocessor"))
 with contextlib.suppress(AttributeError):
 self.setHighlightTripleQuotedStrings(
-Preferences.getEditor("CppHighlightTripleQuotedStrings"))
+Preferences.getEditor("CppHighlightTripleQuotedStrings")
+)
 with contextlib.suppress(AttributeError):
 self.setHighlightHashQuotedStrings(
-Preferences.getEditor("CppHighlightHashQuotedStrings"))
+Preferences.getEditor("CppHighlightHashQuotedStrings")
+)
 with contextlib.suppress(AttributeError):
 self.setHighlightBackQuotedStrings(
-Preferences.getEditor("CppHighlightBackQuotedStrings"))
+Preferences.getEditor("CppHighlightBackQuotedStrings")
+)
 with contextlib.suppress(AttributeError):
 self.setHighlightEscapeSequences(
-Preferences.getEditor("CppHighlightEscapeSequences"))
+Preferences.getEditor("CppHighlightEscapeSequences")
+)
 with contextlib.suppress(AttributeError):
 self.setVerbatimStringEscapeSequencesAllowed(
-Preferences.getEditor(
+Preferences.getEditor("CppVerbatimStringEscapeSequencesAllowed")
-"CppVerbatimStringEscapeSequencesAllowed"))
+)
 def autoCompletionWordSeparators(self):
 """
 Public method to return the list of separators for autocompletion.
 @return list of separators (list of strings)
 """
-return ['::', '->', '.']
+return ["::", "->", "."]
 def isCommentStyle(self, style):
 """
 Public method to check, if a style is a comment style.
 @param style style to check (integer)
 @return flag indicating a comment style (boolean)
 """
-return style in [QsciLexerCPP.Comment,
+return style in [
-QsciLexerCPP.CommentDoc,
+QsciLexerCPP.Comment,
-QsciLexerCPP.CommentLine,
+QsciLexerCPP.CommentDoc,
-QsciLexerCPP.CommentLineDoc]
+QsciLexerCPP.CommentLine,
+QsciLexerCPP.CommentLineDoc,
+]
 def isStringStyle(self, style):
 """
 Public method to check, if a style is a string style.
 @param style style to check (integer)
 @return flag indicating a string style (boolean)
 """
-return style in [QsciLexerCPP.DoubleQuotedString,
+return style in [
-QsciLexerCPP.SingleQuotedString,
+QsciLexerCPP.DoubleQuotedString,
-QsciLexerCPP.UnclosedString,
+QsciLexerCPP.SingleQuotedString,
-QsciLexerCPP.VerbatimString]
+QsciLexerCPP.UnclosedString,
+QsciLexerCPP.VerbatimString,
+]
 def defaultKeywords(self, kwSet):
 """
 Public method to get the default keywords.
 @param kwSet number of the keyword set (integer)
 @return string giving the keywords (string) or None
 """
 return QsciLexerCPP.keywords(self, kwSet)
 def maximumKeywordSet(self):
 """
 Public method to get the maximum keyword set.
 @return maximum keyword set (integer)
 """
 return 4

Mercurial Repositories > eric / file comparison

comparison: src/eric7/QScintilla/Lexers/LexerCPP.py

src/eric7/QScintilla/Lexers/LexerCPP.py