Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sun Mar 17 19:37:28 2019 +0100
+++ b/APIs/Python3/eric6.api	Sun Mar 17 19:38:42 2019 +0100
@@ -7423,6 +7423,7 @@
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage?1(lexers)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.NoFontsOption?7
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.MaxKeywordSets?7
 eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.on_languageCombo_activated?4(language)
 eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.on_setSpinBox_valueChanged?4(kwSet)
 eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.save?4()
@@ -8737,12 +8738,14 @@
 eric6.QScintilla.Lexers.Lexer.Lexer.canBoxComment?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.canStreamComment?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.commentStr?4()
+eric6.QScintilla.Lexers.Lexer.Lexer.defaultKeywords?4(kwSet)
 eric6.QScintilla.Lexers.Lexer.Lexer.hasSmartIndent?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.hasSubstyles?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.initProperties?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.isCommentStyle?4(style)
 eric6.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style)
 eric6.QScintilla.Lexers.Lexer.Lexer.keywords?4(kwSet)
+eric6.QScintilla.Lexers.Lexer.Lexer.keywordsDescription?4(kwSet)
 eric6.QScintilla.Lexers.Lexer.Lexer.lexerName?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.maximumKeywordSet?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.smartIndentLine?4(editor)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Mar 17 19:37:28 2019 +0100
+++ b/Documentation/Help/source.qhp	Sun Mar 17 19:38:42 2019 +0100
@@ -10706,12 +10706,14 @@
       <keyword name="Lexer.canBoxComment" id="Lexer.canBoxComment" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.canBoxComment" />
       <keyword name="Lexer.canStreamComment" id="Lexer.canStreamComment" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.canStreamComment" />
       <keyword name="Lexer.commentStr" id="Lexer.commentStr" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.commentStr" />
+      <keyword name="Lexer.defaultKeywords" id="Lexer.defaultKeywords" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.defaultKeywords" />
       <keyword name="Lexer.hasSmartIndent" id="Lexer.hasSmartIndent" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSmartIndent" />
       <keyword name="Lexer.hasSubstyles" id="Lexer.hasSubstyles" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSubstyles" />
       <keyword name="Lexer.initProperties" id="Lexer.initProperties" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.initProperties" />
       <keyword name="Lexer.isCommentStyle" id="Lexer.isCommentStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isCommentStyle" />
       <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" />
       <keyword name="Lexer.keywords" id="Lexer.keywords" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.keywords" />
+      <keyword name="Lexer.keywordsDescription" id="Lexer.keywordsDescription" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.keywordsDescription" />
       <keyword name="Lexer.lexerName" id="Lexer.lexerName" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.lexerName" />
       <keyword name="Lexer.maximumKeywordSet" id="Lexer.maximumKeywordSet" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.maximumKeywordSet" />
       <keyword name="Lexer.smartIndentLine" id="Lexer.smartIndentLine" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.smartIndentLine" />

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorKeywordsPage.html	Sun Mar 17 19:37:28 2019 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorKeywordsPage.html	Sun Mar 17 19:38:42 2019 +0100
@@ -51,7 +51,7 @@
 ConfigurationPageBase, Ui_EditorKeywordsPage
 <h3>Class Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>MaxKeywordSets</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>

--- a/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html	Sun Mar 17 19:37:28 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html	Sun Mar 17 19:38:42 2019 +0100
@@ -81,6 +81,9 @@
 <td><a href="#Lexer.commentStr">commentStr</a></td>
 <td>Public method to return the comment string.</td>
 </tr><tr>
+<td><a href="#Lexer.defaultKeywords">defaultKeywords</a></td>
+<td>Public method to get the default keywords.</td>
+</tr><tr>
 <td><a href="#Lexer.hasSmartIndent">hasSmartIndent</a></td>
 <td>Public method indicating whether lexer can do smart indentation.</td>
 </tr><tr>
@@ -99,6 +102,9 @@
 <td><a href="#Lexer.keywords">keywords</a></td>
 <td>Public method to get the keywords.</td>
 </tr><tr>
+<td><a href="#Lexer.keywordsDescription">keywordsDescription</a></td>
+<td>Public method to get the description for a keywords set.</td>
+</tr><tr>
 <td><a href="#Lexer.lexerName">lexerName</a></td>
 <td>Public method to return the lexer name.</td>
 </tr><tr>
@@ -197,6 +203,26 @@
 <dd>
 comment string (string)
 </dd>
+</dl><a NAME="Lexer.defaultKeywords" ID="Lexer.defaultKeywords"></a>
+<h4>Lexer.defaultKeywords</h4>
+<b>defaultKeywords</b>(<i>kwSet</i>)
+<p>
+        Public method to get the default keywords.
+</p><dl>
+<dt><i>kwSet</i> (int)</dt>
+<dd>
+number of the keyword set
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+space separated list of keywords
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str or None
+</dd>
 </dl><a NAME="Lexer.hasSmartIndent" ID="Lexer.hasSmartIndent"></a>
 <h4>Lexer.hasSmartIndent</h4>
 <b>hasSmartIndent</b>(<i></i>)
@@ -264,14 +290,39 @@
 <p>
         Public method to get the keywords.
 </p><dl>
-<dt><i>kwSet</i></dt>
+<dt><i>kwSet</i> (int)</dt>
 <dd>
-number of the keyword set (integer)
+number of the keyword set
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-string giving the keywords (string) or None
+space separated list of keywords
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str or None
+</dd>
+</dl><a NAME="Lexer.keywordsDescription" ID="Lexer.keywordsDescription"></a>
+<h4>Lexer.keywordsDescription</h4>
+<b>keywordsDescription</b>(<i>kwSet</i>)
+<p>
+        Public method to get the description for a keywords set.
+</p><dl>
+<dt><i>kwSet</i> (int)</dt>
+<dd>
+number of the keyword set
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+description of the keyword set
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl><a NAME="Lexer.lexerName" ID="Lexer.lexerName"></a>
 <h4>Lexer.lexerName</h4>
@@ -293,7 +344,12 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-maximum keyword set (integer)
+maximum keyword set
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
 </dd>
 </dl><a NAME="Lexer.smartIndentLine" ID="Lexer.smartIndentLine"></a>
 <h4>Lexer.smartIndentLine</h4>

--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html	Sun Mar 17 19:37:28 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html	Sun Mar 17 19:38:42 2019 +0100
@@ -58,7 +58,7 @@
 <table>
 <tr>
 <td><a href="#LexerPython.__init__">LexerPython</a></td>
-<td>__future__ with_statement unicode_literals print_function division absolute_import generator_stop annotations</td>
+<td>PyQt5 Qsci Qt QtCore QtDBus QtDesigner QtGui QtHelp QtLocation QtMacExtras QtMultimedia QtMultimediaWidgets QtNetwork QtNetworkAuth QtNfc QtOpenGL QtPositioning QtPrintSupport QtQml QtQuick QtQuickWidgets QtRemoteObjects QtSensors QtSerialPort QtSql QtSvg QtTest QtWebChannel QtWebEngine QtWebEngineCore QtWebEngineWidgets QtWebSockets QtWidgets QtWinExtras QtX11Extras QtXml QtXmlPatterns sip QtWebKit QtWebKitWidgets</td>
 </tr><tr>
 <td><a href="#LexerPython.autoCompletionWordSeparators">autoCompletionWordSeparators</a></td>
 <td>Public method to return the list of separators for autocompletion.</td>
@@ -93,8 +93,12 @@
 <h4>LexerPython (Constructor)</h4>
 <b>LexerPython</b>(<i>variant="", parent=None</i>)
 <p>
-__future__ with_statement unicode_literals print_function division
- absolute_import generator_stop annotations
+ PyQt5 Qsci Qt QtCore QtDBus QtDesigner QtGui QtHelp QtLocation QtMacExtras
+ QtMultimedia QtMultimediaWidgets QtNetwork QtNetworkAuth QtNfc QtOpenGL
+ QtPositioning QtPrintSupport QtQml QtQuick QtQuickWidgets QtRemoteObjects
+ QtSensors QtSerialPort QtSql QtSvg QtTest QtWebChannel QtWebEngine
+ QtWebEngineCore QtWebEngineWidgets QtWebSockets QtWidgets QtWinExtras
+ QtX11Extras QtXml QtXmlPatterns sip QtWebKit QtWebKitWidgets
 </p><a NAME="LexerPython.autoCompletionWordSeparators" ID="LexerPython.autoCompletionWordSeparators"></a>
 <h4>LexerPython.autoCompletionWordSeparators</h4>
 <b>autoCompletionWordSeparators</b>(<i></i>)