Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Fri Dec 22 19:52:58 2017 +0100
+++ b/APIs/Python3/eric6.api	Sat Dec 23 16:30:40 2017 +0100
@@ -8540,7 +8540,6 @@
 eric6.QScintilla.Lexers.LexerContainer.LexerContainer.keywords?4(kwSet)
 eric6.QScintilla.Lexers.LexerContainer.LexerContainer.language?4()
 eric6.QScintilla.Lexers.LexerContainer.LexerContainer.lexer?4()
-eric6.QScintilla.Lexers.LexerContainer.LexerContainer.styleBitsNeeded?4()
 eric6.QScintilla.Lexers.LexerContainer.LexerContainer.styleText?4(start, end)
 eric6.QScintilla.Lexers.LexerContainer.LexerContainer?1(parent=None)
 eric6.QScintilla.Lexers.LexerD.LexerD.autoCompletionWordSeparators?4()
@@ -8660,7 +8659,6 @@
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.isStringStyle?4(style)
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.language?4()
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.name?4()
-eric6.QScintilla.Lexers.LexerPygments.LexerPygments.styleBitsNeeded?4()
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.styleText?4(start, end)
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent=None, name="")
 eric6.QScintilla.Lexers.LexerPygments.PYGMENTS_ATTRIBUTE?7
@@ -9016,7 +9014,6 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setLexer?4(lex=None)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setModified?4(m)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setRectangularSelection?4(startLine, startIndex, endLine, endIndex)
-eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyleBits?4(bits)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setVirtualSpaceOptions?4(options)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showFindIndicator?4(sline, sindex, eline, eindex)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Fri Dec 22 19:52:58 2017 +0100
+++ b/Documentation/Help/source.qhp	Sat Dec 23 16:30:40 2017 +0100
@@ -10404,7 +10404,6 @@
       <keyword name="LexerContainer.keywords" id="LexerContainer.keywords" ref="eric6.QScintilla.Lexers.LexerContainer.html#LexerContainer.keywords" />
       <keyword name="LexerContainer.language" id="LexerContainer.language" ref="eric6.QScintilla.Lexers.LexerContainer.html#LexerContainer.language" />
       <keyword name="LexerContainer.lexer" id="LexerContainer.lexer" ref="eric6.QScintilla.Lexers.LexerContainer.html#LexerContainer.lexer" />
-      <keyword name="LexerContainer.styleBitsNeeded" id="LexerContainer.styleBitsNeeded" ref="eric6.QScintilla.Lexers.LexerContainer.html#LexerContainer.styleBitsNeeded" />
       <keyword name="LexerContainer.styleText" id="LexerContainer.styleText" ref="eric6.QScintilla.Lexers.LexerContainer.html#LexerContainer.styleText" />
       <keyword name="LexerD" id="LexerD" ref="eric6.QScintilla.Lexers.LexerD.html#LexerD" />
       <keyword name="LexerD (Constructor)" id="LexerD (Constructor)" ref="eric6.QScintilla.Lexers.LexerD.html#LexerD.__init__" />
@@ -10567,7 +10566,6 @@
       <keyword name="LexerPygments.isStringStyle" id="LexerPygments.isStringStyle" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.isStringStyle" />
       <keyword name="LexerPygments.language" id="LexerPygments.language" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.language" />
       <keyword name="LexerPygments.name" id="LexerPygments.name" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.name" />
-      <keyword name="LexerPygments.styleBitsNeeded" id="LexerPygments.styleBitsNeeded" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.styleBitsNeeded" />
       <keyword name="LexerPygments.styleText" id="LexerPygments.styleText" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.styleText" />
       <keyword name="LexerPython" id="LexerPython" ref="eric6.QScintilla.Lexers.LexerPython.html#LexerPython" />
       <keyword name="LexerPython (Constructor)" id="LexerPython (Constructor)" ref="eric6.QScintilla.Lexers.LexerPython.html#LexerPython.__init__" />
@@ -13347,7 +13345,6 @@
       <keyword name="QsciScintillaCompat.setLexer" id="QsciScintillaCompat.setLexer" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setLexer" />
       <keyword name="QsciScintillaCompat.setModified" id="QsciScintillaCompat.setModified" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setModified" />
       <keyword name="QsciScintillaCompat.setRectangularSelection" id="QsciScintillaCompat.setRectangularSelection" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setRectangularSelection" />
-      <keyword name="QsciScintillaCompat.setStyleBits" id="QsciScintillaCompat.setStyleBits" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyleBits" />
       <keyword name="QsciScintillaCompat.setStyling" id="QsciScintillaCompat.setStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyling" />
       <keyword name="QsciScintillaCompat.setVirtualSpaceOptions" id="QsciScintillaCompat.setVirtualSpaceOptions" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setVirtualSpaceOptions" />
       <keyword name="QsciScintillaCompat.showFindIndicator" id="QsciScintillaCompat.showFindIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showFindIndicator" />

--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerContainer.html	Fri Dec 22 19:52:58 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerContainer.html	Sat Dec 23 16:30:40 2017 +0100
@@ -72,9 +72,6 @@
 <td><a href="#LexerContainer.lexer">lexer</a></td>
 <td>Public method returning the type of the lexer.</td>
 </tr><tr>
-<td><a href="#LexerContainer.styleBitsNeeded">styleBitsNeeded</a></td>
-<td>Public method to get the number of style bits needed by the lexer.</td>
-</tr><tr>
 <td><a href="#LexerContainer.styleText">styleText</a></td>
 <td>Public method to perform the styling.</td>
 </tr>
@@ -146,16 +143,6 @@
 <dd>
 type of the lexer (string)
 </dd>
-</dl><a NAME="LexerContainer.styleBitsNeeded" ID="LexerContainer.styleBitsNeeded"></a>
-<h4>LexerContainer.styleBitsNeeded</h4>
-<b>styleBitsNeeded</b>(<i></i>)
-<p>
-        Public method to get the number of style bits needed by the lexer.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-number of style bits needed (integer)
-</dd>
 </dl><a NAME="LexerContainer.styleText" ID="LexerContainer.styleText"></a>
 <h4>LexerContainer.styleText</h4>
 <b>styleText</b>(<i>start, end</i>)

--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerPygments.html	Fri Dec 22 19:52:58 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerPygments.html	Sat Dec 23 16:30:40 2017 +0100
@@ -96,9 +96,6 @@
 <td><a href="#LexerPygments.name">name</a></td>
 <td>Public method to get the name of the pygments lexer.</td>
 </tr><tr>
-<td><a href="#LexerPygments.styleBitsNeeded">styleBitsNeeded</a></td>
-<td>Public method to get the number of style bits needed by the lexer.</td>
-</tr><tr>
 <td><a href="#LexerPygments.styleText">styleText</a></td>
 <td>Public method to perform the styling.</td>
 </tr>
@@ -286,16 +283,6 @@
 <dd>
 name of the pygments lexer (string)
 </dd>
-</dl><a NAME="LexerPygments.styleBitsNeeded" ID="LexerPygments.styleBitsNeeded"></a>
-<h4>LexerPygments.styleBitsNeeded</h4>
-<b>styleBitsNeeded</b>(<i></i>)
-<p>
-        Public method to get the number of style bits needed by the lexer.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-number of style bits needed (integer)
-</dd>
 </dl><a NAME="LexerPygments.styleText" ID="LexerPygments.styleText"></a>
 <h4>LexerPygments.styleText</h4>
 <b>styleText</b>(<i>start, end</i>)

--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Fri Dec 22 19:52:58 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Dec 23 16:30:40 2017 +0100
@@ -364,9 +364,6 @@
 <td><a href="#QsciScintillaCompat.setRectangularSelection">setRectangularSelection</a></td>
 <td>Public method to set a rectangular selection.</td>
 </tr><tr>
-<td><a href="#QsciScintillaCompat.setStyleBits">setStyleBits</a></td>
-<td>Public method to set the number of bits to be used for styling.</td>
-</tr><tr>
 <td><a href="#QsciScintillaCompat.setStyling">setStyling</a></td>
 <td>Public method to style some text.</td>
 </tr><tr>
@@ -1626,16 +1623,6 @@
 <dd>
 index number of the end of the selection (int)
 </dd>
-</dl><a NAME="QsciScintillaCompat.setStyleBits" ID="QsciScintillaCompat.setStyleBits"></a>
-<h4>QsciScintillaCompat.setStyleBits</h4>
-<b>setStyleBits</b>(<i>bits</i>)
-<p>
-        Public method to set the number of bits to be used for styling.
-</p><dl>
-<dt><i>bits</i></dt>
-<dd>
-number of style bits (integer)
-</dd>
 </dl><a NAME="QsciScintillaCompat.setStyling" ID="QsciScintillaCompat.setStyling"></a>
 <h4>QsciScintillaCompat.setStyling</h4>
 <b>setStyling</b>(<i>length, style</i>)

--- a/QScintilla/Editor.py	Fri Dec 22 19:52:58 2017 +0100
+++ b/QScintilla/Editor.py	Sat Dec 23 16:30:40 2017 +0100
@@ -1622,7 +1622,6 @@
         self.setLexer(self.lexer_)
         self.__setMarginsDisplay()
         if self.lexer_.lexer() == "container" or self.lexer_.lexer() is None:
-            self.setStyleBits(self.lexer_.styleBitsNeeded())
             self.SCN_STYLENEEDED.connect(self.__styleNeeded)
         
         # get the font for style 0 and set it as the default font

--- a/QScintilla/Lexers/LexerContainer.py	Fri Dec 22 19:52:58 2017 +0100
+++ b/QScintilla/Lexers/LexerContainer.py	Sat Dec 23 16:30:40 2017 +0100
@@ -60,14 +60,6 @@
         """
         return ""
     
-    def styleBitsNeeded(self):
-        """
-        Public method to get the number of style bits needed by the lexer.
-        
-        @return number of style bits needed (integer)
-        """
-        return 5
-    
     def styleText(self, start, end):
         """
         Public method to perform the styling.

--- a/QScintilla/Lexers/LexerPygments.py	Fri Dec 22 19:52:58 2017 +0100
+++ b/QScintilla/Lexers/LexerPygments.py	Sat Dec 23 16:30:40 2017 +0100
@@ -396,14 +396,6 @@
         except KeyError:
             return LexerContainer.defaultEolFill(self, style)
         
-    def styleBitsNeeded(self):
-        """
-        Public method to get the number of style bits needed by the lexer.
-        
-        @return number of style bits needed (integer)
-        """
-        return 6
-    
     def __guessLexer(self, text):
         """
         Private method to guess a pygments lexer.

--- a/QScintilla/MiniEditor.py	Fri Dec 22 19:52:58 2017 +0100
+++ b/QScintilla/MiniEditor.py	Sat Dec 23 16:30:40 2017 +0100
@@ -2929,7 +2929,6 @@
             self.apiLanguage = self.lexer_.language()
         self.__textEdit.setLexer(self.lexer_)
         if self.lexer_.lexer() == "container" or self.lexer_.lexer() is None:
-            self.__textEdit.setStyleBits(self.lexer_.styleBitsNeeded())
             self.__textEdit.SCN_STYLENEEDED.connect(self.__styleNeeded)
         
         # get the font for style 0 and set it as the default font

--- a/QScintilla/QsciScintillaCompat.py	Fri Dec 22 19:52:58 2017 +0100
+++ b/QScintilla/QsciScintillaCompat.py	Sat Dec 23 16:30:40 2017 +0100
@@ -242,14 +242,6 @@
         """
         self.SendScintilla(QsciScintilla.SCI_SETSTYLING, length, style)
     
-    def setStyleBits(self, bits):
-        """
-        Public method to set the number of bits to be used for styling.
-        
-        @param bits number of style bits (integer)
-        """
-        self.SendScintilla(QsciScintilla.SCI_SETSTYLEBITS, bits)
-    
     def charAt(self, pos):
         """
         Public method to get the character at a position in the text observing