--- a/src/eric7/QScintilla/Lexers/LexerXML.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/QScintilla/Lexers/LexerXML.py Wed Jul 13 14:55:47 2022 +0200 @@ -19,20 +19,18 @@ """ Subclass to implement some additional lexer dependant methods. """ + def __init__(self, parent=None): """ Constructor - + @param parent parent widget of this lexer """ QsciLexerXML.__init__(self, parent) Lexer.__init__(self) - - self.streamCommentString = { - 'start': '<!-- ', - 'end': ' -->' - } - + + self.streamCommentString = {"start": "<!-- ", "end": " -->"} + self.keywordSetDescriptions = [ self.tr(""), self.tr(""), @@ -41,81 +39,82 @@ self.tr(""), self.tr("SGML and DTD keywords"), ] - + def initProperties(self): """ Public slot to initialize the properties. """ self.setFoldPreprocessor(Preferences.getEditor("HtmlFoldPreprocessor")) - self.setCaseSensitiveTags( - Preferences.getEditor("HtmlCaseSensitiveTags")) + self.setCaseSensitiveTags(Preferences.getEditor("HtmlCaseSensitiveTags")) self.setFoldCompact(Preferences.getEditor("AllFoldCompact")) with contextlib.suppress(AttributeError): - self.setFoldScriptComments( - Preferences.getEditor("HtmlFoldScriptComments")) - self.setFoldScriptHeredocs( - Preferences.getEditor("HtmlFoldScriptHeredocs")) + self.setFoldScriptComments(Preferences.getEditor("HtmlFoldScriptComments")) + self.setFoldScriptHeredocs(Preferences.getEditor("HtmlFoldScriptHeredocs")) self.setScriptsStyled(Preferences.getEditor("XMLStyleScripts")) - + 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 [QsciLexerXML.HTMLComment, - QsciLexerXML.ASPXCComment, - QsciLexerXML.SGMLComment, - QsciLexerXML.SGMLParameterComment, - QsciLexerXML.JavaScriptComment, - QsciLexerXML.JavaScriptCommentDoc, - QsciLexerXML.JavaScriptCommentLine, - QsciLexerXML.ASPJavaScriptComment, - QsciLexerXML.ASPJavaScriptCommentDoc, - QsciLexerXML.ASPJavaScriptCommentLine, - QsciLexerXML.VBScriptComment, - QsciLexerXML.ASPVBScriptComment, - QsciLexerXML.PythonComment, - QsciLexerXML.ASPPythonComment, - QsciLexerXML.PHPComment] - + return style in [ + QsciLexerXML.HTMLComment, + QsciLexerXML.ASPXCComment, + QsciLexerXML.SGMLComment, + QsciLexerXML.SGMLParameterComment, + QsciLexerXML.JavaScriptComment, + QsciLexerXML.JavaScriptCommentDoc, + QsciLexerXML.JavaScriptCommentLine, + QsciLexerXML.ASPJavaScriptComment, + QsciLexerXML.ASPJavaScriptCommentDoc, + QsciLexerXML.ASPJavaScriptCommentLine, + QsciLexerXML.VBScriptComment, + QsciLexerXML.ASPVBScriptComment, + QsciLexerXML.PythonComment, + QsciLexerXML.ASPPythonComment, + QsciLexerXML.PHPComment, + ] + 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 [QsciLexerXML.HTMLDoubleQuotedString, - QsciLexerXML.HTMLSingleQuotedString, - QsciLexerXML.SGMLDoubleQuotedString, - QsciLexerXML.SGMLSingleQuotedString, - QsciLexerXML.JavaScriptDoubleQuotedString, - QsciLexerXML.JavaScriptSingleQuotedString, - QsciLexerXML.JavaScriptUnclosedString, - QsciLexerXML.ASPJavaScriptDoubleQuotedString, - QsciLexerXML.ASPJavaScriptSingleQuotedString, - QsciLexerXML.ASPJavaScriptUnclosedString, - QsciLexerXML.VBScriptString, - QsciLexerXML.VBScriptUnclosedString, - QsciLexerXML.ASPVBScriptString, - QsciLexerXML.ASPVBScriptUnclosedString, - QsciLexerXML.PythonDoubleQuotedString, - QsciLexerXML.PythonSingleQuotedString, - QsciLexerXML.PythonTripleDoubleQuotedString, - QsciLexerXML.PythonTripleSingleQuotedString, - QsciLexerXML.ASPPythonDoubleQuotedString, - QsciLexerXML.ASPPythonSingleQuotedString, - QsciLexerXML.ASPPythonTripleDoubleQuotedString, - QsciLexerXML.ASPPythonTripleSingleQuotedString, - QsciLexerXML.PHPDoubleQuotedString, - QsciLexerXML.PHPSingleQuotedString] - + return style in [ + QsciLexerXML.HTMLDoubleQuotedString, + QsciLexerXML.HTMLSingleQuotedString, + QsciLexerXML.SGMLDoubleQuotedString, + QsciLexerXML.SGMLSingleQuotedString, + QsciLexerXML.JavaScriptDoubleQuotedString, + QsciLexerXML.JavaScriptSingleQuotedString, + QsciLexerXML.JavaScriptUnclosedString, + QsciLexerXML.ASPJavaScriptDoubleQuotedString, + QsciLexerXML.ASPJavaScriptSingleQuotedString, + QsciLexerXML.ASPJavaScriptUnclosedString, + QsciLexerXML.VBScriptString, + QsciLexerXML.VBScriptUnclosedString, + QsciLexerXML.ASPVBScriptString, + QsciLexerXML.ASPVBScriptUnclosedString, + QsciLexerXML.PythonDoubleQuotedString, + QsciLexerXML.PythonSingleQuotedString, + QsciLexerXML.PythonTripleDoubleQuotedString, + QsciLexerXML.PythonTripleSingleQuotedString, + QsciLexerXML.ASPPythonDoubleQuotedString, + QsciLexerXML.ASPPythonSingleQuotedString, + QsciLexerXML.ASPPythonTripleDoubleQuotedString, + QsciLexerXML.ASPPythonTripleSingleQuotedString, + QsciLexerXML.PHPDoubleQuotedString, + QsciLexerXML.PHPSingleQuotedString, + ] + 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 """