Mercurial Repositories > eric / file diff

--- a/QScintilla/Lexers/SubstyledLexer.py	Sat Mar 16 14:11:43 2019 +0100
+++ b/QScintilla/Lexers/SubstyledLexer.py	Sat Mar 16 18:38:01 2019 +0100
@@ -357,7 +357,8 @@
         @type int
         """
         if style in self.__subStyles and substyle in self.__subStyles[style]:
-            self.__subStyles[style][substyle]["Description"] = description
+            self.__subStyles[style][substyle]["Description"] = \
+                description.strip()
     
     def substyleDescription(self, style, substyle):
         """
@@ -371,7 +372,7 @@
         @rtype str
         """
         if style in self.__subStyles and substyle in self.__subStyles[style]:
-            desc = self.__subStyles[style][substyle]["Description"]
+            desc = self.__subStyles[style][substyle]["Description"].strip()
         else:
             desc = ""
         
@@ -389,7 +390,7 @@
         @type int
         """
         if style in self.__subStyles and substyle in self.__subStyles[style]:
-            self.__subStyles[style][substyle]["Words"] = words
+            self.__subStyles[style][substyle]["Words"] = words.strip()
     
     def substyleWords(self, style, substyle):
         """
@@ -403,7 +404,7 @@
         @rtype str
         """
         if style in self.__subStyles and substyle in self.__subStyles[style]:
-            words = self.__subStyles[style][substyle]["Words"]
+            words = self.__subStyles[style][substyle]["Words"].strip()
         else:
             words = ""
         
@@ -588,8 +589,8 @@
         
         if style in self.defaultSubStyles and \
            substyle in self.defaultSubStyles[style]:
-            styleData = self.defaultSubStyles[style][substyle]["Style"]
-            description = styleData["Description"]
+            substyleData = self.defaultSubStyles[style][substyle]
+            description = substyleData["Description"].strip()
         
         return description
     
@@ -608,8 +609,8 @@
         
         if style in self.defaultSubStyles and \
            substyle in self.defaultSubStyles[style]:
-            styleData = self.defaultSubStyles[style][substyle]["Style"]
-            words = styleData["Words"]
+            substyleData = self.defaultSubStyles[style][substyle]
+            words = substyleData["Words"].strip()
         
         return words
     
@@ -767,3 +768,14 @@
         """
         return (style in self.__subStyles and
                 substyle in self.__subStyles[style])
+    
+    def isBaseStyle(self, style):
+        """
+        Public method to test, if a given style may have sub-styles.
+        
+        @param style base style number
+        @type int
+        @return flag indicating that the style may have sub-styles
+        @rtype bool
+        """
+        return style in self.baseStyles