diff -r d001bc703c29 -r aedc309827c7 eric6/QScintilla/Lexers/SubstyledLexer.py
--- a/eric6/QScintilla/Lexers/SubstyledLexer.py Wed Sep 25 18:25:43 2019 +0200
+++ b/eric6/QScintilla/Lexers/SubstyledLexer.py Wed Sep 25 18:37:35 2019 +0200
@@ -95,9 +95,9 @@
if subStyleLength:
self.__subStyles[baseStyle] = {}
for subStyle in range(subStyleLength):
- substyleKey = \
- "Scintilla/{0}/style{1}/substyle{2}/"\
- .format(self.language(), baseStyle, subStyle)
+ substyleKey = (
+ "Scintilla/{0}/style{1}/substyle{2}/"
+ ).format(self.language(), baseStyle, subStyle)
if settings.contains(substyleKey + "Description"):
subStyleData = {}
subStyleData["Description"] = settings.value(
@@ -121,8 +121,9 @@
style["font_family"] = settings.value(key)
key = substyleKey + "font_size"
if settings.contains(key):
- style["font_size"] = \
+ style["font_size"] = (
int(settings.value(key))
+ )
key = substyleKey + "font_bold"
if settings.contains(key):
style["font_bold"] = Preferences.toBool(
@@ -133,19 +134,22 @@
settings.value(key))
key = substyleKey + "font_underline"
if settings.contains(key):
- style["font_underline"] = \
+ style["font_underline"] = (
Preferences.toBool(settings.value(key))
+ )
subStyleData["Style"] = style
- self.__subStyles[baseStyle][subStyle] = \
+ self.__subStyles[baseStyle][subStyle] = (
subStyleData
+ )
else:
# initialize with default
- self.__subStyles[baseStyle][subStyle] = \
+ self.__subStyles[baseStyle][subStyle] = (
copy.deepcopy(self.defaultSubStyles
[baseStyle][subStyle])
+ )
self.__subStylesInitialized = True
@@ -253,8 +257,9 @@
subStyleLength = int(settings.value(key))
if subStyleLength:
for subStyle in range(subStyleLength):
- substyleKey = "Scintilla/{0}/style{1}/substyle{2}/"\
- .format(self.language(), baseStyle, subStyle)
+ substyleKey = (
+ "Scintilla/{0}/style{1}/substyle{2}/"
+ ).format(self.language(), baseStyle, subStyle)
settings.remove(substyleKey)
# Step 2: save the defined sub-styles
@@ -269,8 +274,10 @@
self.language(), baseStyle, subStyleIndex)
subStyleData = self.__subStyles[baseStyle][subStyle]
- if not subStyleData["Description"] and \
- not subStyleData["Words"]:
+ if (
+ not subStyleData["Description"] and
+ not subStyleData["Words"]
+ ):
# invalid or incomplete sub-style definition
continue
@@ -370,8 +377,9 @@
@type int
"""
if style in self.__subStyles and substyle in self.__subStyles[style]:
- self.__subStyles[style][substyle]["Description"] = \
+ self.__subStyles[style][substyle]["Description"] = (
description.strip()
+ )
def substyleDescription(self, style, substyle):
"""
@@ -435,8 +443,9 @@
@type int
"""
if style in self.__subStyles and substyle in self.__subStyles[style]:
- self.__subStyles[style][substyle]["Style"]["fore"] = \
+ self.__subStyles[style][substyle]["Style"]["fore"] = (
color.red() << 16 | color.green() << 8 | color.blue()
+ )
def substyleColor(self, style, substyle):
"""
@@ -474,8 +483,9 @@
@type int
"""
if style in self.__subStyles and substyle in self.__subStyles[style]:
- self.__subStyles[style][substyle]["Style"]["paper"] = \
+ self.__subStyles[style][substyle]["Style"]["paper"] = (
color.red() << 16 | color.green() << 8 | color.blue()
+ )
def substylePaper(self, style, substyle):
"""
@@ -513,8 +523,9 @@
@type int
"""
if style in self.__subStyles and substyle in self.__subStyles[style]:
- self.__subStyles[style][substyle]["Style"]["eolfill"] = \
+ self.__subStyles[style][substyle]["Style"]["eolfill"] = (
eolFill
+ )
def substyleEolFill(self, style, substyle):
"""
@@ -548,16 +559,21 @@
@type int
"""
if style in self.__subStyles and substyle in self.__subStyles[style]:
- self.__subStyles[style][substyle]["Style"]["font_family"] = \
+ self.__subStyles[style][substyle]["Style"]["font_family"] = (
font.family()
- self.__subStyles[style][substyle]["Style"]["font_size"] = \
+ )
+ self.__subStyles[style][substyle]["Style"]["font_size"] = (
font.pointSize()
- self.__subStyles[style][substyle]["Style"]["font_bold"] = \
+ )
+ self.__subStyles[style][substyle]["Style"]["font_bold"] = (
font.bold()
- self.__subStyles[style][substyle]["Style"]["font_italic"] = \
+ )
+ self.__subStyles[style][substyle]["Style"]["font_italic"] = (
font.italic()
- self.__subStyles[style][substyle]["Style"]["font_underline"] = \
+ )
+ self.__subStyles[style][substyle]["Style"]["font_underline"] = (
font.underline()
+ )
def substyleFont(self, style, substyle):
"""
@@ -600,8 +616,10 @@
"""
description = ""
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
substyleData = self.defaultSubStyles[style][substyle]
description = substyleData["Description"].strip()
@@ -620,8 +638,10 @@
"""
words = ""
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
substyleData = self.defaultSubStyles[style][substyle]
words = substyleData["Words"].strip()
@@ -640,8 +660,10 @@
"""
color = self.defaultColor(style)
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
styleData = self.defaultSubStyles[style][substyle]["Style"]
if "fore" in styleData:
color = QColor(
@@ -665,8 +687,10 @@
"""
color = self.defaultPaper(style)
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
styleData = self.defaultSubStyles[style][substyle]["Style"]
if "paper" in styleData:
color = QColor(
@@ -690,8 +714,10 @@
"""
eolFill = self.defaultEolFill(style)
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
styleData = self.defaultSubStyles[style][substyle]["Style"]
if "eolfill" in styleData:
eolFill = styleData["eolfill"]
@@ -711,8 +737,10 @@
"""
font = self.defaultFont(style)
- if style in self.defaultSubStyles and \
- substyle in self.defaultSubStyles[style]:
+ if (
+ style in self.defaultSubStyles and
+ substyle in self.defaultSubStyles[style]
+ ):
styleData = self.defaultSubStyles[style][substyle]["Style"]
if "font_family" in styleData:
font.setFamily(styleData["font_family"])
