diff -r 82b608e352ec -r 2bbec88047dd eric6/QScintilla/Lexers/SubstyledLexer.py
--- a/eric6/QScintilla/Lexers/SubstyledLexer.py Wed Apr 21 17:56:12 2021 +0200
+++ b/eric6/QScintilla/Lexers/SubstyledLexer.py Wed Apr 21 19:40:50 2021 +0200
@@ -200,30 +200,31 @@
# set the style
style = subStyle["Style"]
- if "fore" in style:
- color = QColor(
+ color = (
+ QColor(
style["fore"] >> 16 & 0xff,
style["fore"] >> 8 & 0xff,
- style["fore"] & 0xff,
- )
- else:
- color = self.color(baseStyleNo)
+ style["fore"] & 0xff,)
+ if "fore" in style else
+ self.color(baseStyleNo)
+ )
self.setColor(color, styleNo)
- if "paper" in style:
- color = QColor(
+ color = (
+ QColor(
style["paper"] >> 16 & 0xff,
style["paper"] >> 8 & 0xff,
- style["paper"] & 0xff,
- )
- else:
- color = self.paper(baseStyleNo)
+ style["paper"] & 0xff,)
+ if "paper" in style else
+ self.paper(baseStyleNo)
+ )
self.setPaper(color, styleNo)
- if "eolfill" in style:
- eolFill = style["eolfill"]
- else:
- eolFill = self.eolFill(baseStyleNo)
+ eolFill = (
+ style["eolfill"]
+ if "eolfill" in style else
+ self.eolFill(baseStyleNo)
+ )
self.setEolFill(eolFill, styleNo)
font = self.font(baseStyleNo)
@@ -309,10 +310,11 @@
settings.setValue(substyleKey + "font_bold", bold)
italic = style.get("font_italic", font.italic())
settings.setValue(substyleKey + "font_italic", italic)
- if "font_underline" in style:
- underline = style["font_underline"]
- else:
- underline = font.underline()
+ underline = (
+ style["font_underline"]
+ if "font_underline" in style else
+ font.underline()
+ )
settings.setValue(substyleKey + "font_underline", underline)
def hasSubstyles(self):
@@ -374,10 +376,12 @@
@return sub-style description
@rtype str
"""
- if style in self.__subStyles and substyle in self.__subStyles[style]:
- desc = self.__subStyles[style][substyle]["Description"].strip()
- else:
- desc = ""
+ desc = (
+ self.__subStyles[style][substyle]["Description"].strip()
+ if (style in self.__subStyles and
+ substyle in self.__subStyles[style]) else
+ ""
+ )
return desc
@@ -406,10 +410,12 @@
@return white-space separated word list
@rtype str
"""
- if style in self.__subStyles and substyle in self.__subStyles[style]:
- words = self.__subStyles[style][substyle]["Words"].strip()
- else:
- words = ""
+ words = (
+ self.__subStyles[style][substyle]["Words"].strip()
+ if (style in self.__subStyles and
+ substyle in self.__subStyles[style]) else
+ ""
+ )
return words
