Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Tue Apr 01 19:39:08 2014 +0200
+++ b/APIs/Python3/eric5.api	Wed Apr 02 19:01:16 2014 +0200
@@ -6955,6 +6955,7 @@
 eric5.QScintilla.Lexers.Lexer.Lexer.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style)
 eric5.QScintilla.Lexers.Lexer.Lexer.keywords?4(kwSet)
+eric5.QScintilla.Lexers.Lexer.Lexer.lexerName?4()
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentLine?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentSelection?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.streamCommentStr?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Tue Apr 01 19:39:08 2014 +0200
+++ b/Documentation/Help/source.qhp	Wed Apr 02 19:01:16 2014 +0200
@@ -7236,6 +7236,7 @@
       <keyword name="Lexer.isCommentStyle" id="Lexer.isCommentStyle" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.isCommentStyle" />
       <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" />
       <keyword name="Lexer.keywords" id="Lexer.keywords" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.keywords" />
+      <keyword name="Lexer.lexerName" id="Lexer.lexerName" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.lexerName" />
       <keyword name="Lexer.smartIndentLine" id="Lexer.smartIndentLine" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentLine" />
       <keyword name="Lexer.smartIndentSelection" id="Lexer.smartIndentSelection" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentSelection" />
       <keyword name="Lexer.streamCommentStr" id="Lexer.streamCommentStr" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.streamCommentStr" />

--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Tue Apr 01 19:39:08 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Wed Apr 02 19:01:16 2014 +0200
@@ -96,6 +96,9 @@
 <td><a href="#Lexer.keywords">keywords</a></td>
 <td>Public method to get the keywords.</td>
 </tr><tr>
+<td><a href="#Lexer.lexerName">lexerName</a></td>
+<td>Public method to return the lexer name.</td>
+</tr><tr>
 <td><a href="#Lexer.smartIndentLine">smartIndentLine</a></td>
 <td>Public method to handle smart indentation for a line.</td>
 </tr><tr>
@@ -249,6 +252,16 @@
 <dd>
 string giving the keywords (string) or None
 </dd>
+</dl><a NAME="Lexer.lexerName" ID="Lexer.lexerName"></a>
+<h4>Lexer.lexerName</h4>
+<b>lexerName</b>(<i></i>)
+<p>
+        Public method to return the lexer name.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+lexer name (string)
+</dd>
 </dl><a NAME="Lexer.smartIndentLine" ID="Lexer.smartIndentLine"></a>
 <h4>Lexer.smartIndentLine</h4>
 <b>smartIndentLine</b>(<i>editor</i>)

--- a/QScintilla/APIsManager.py	Tue Apr 01 19:39:08 2014 +0200
+++ b/QScintilla/APIsManager.py	Wed Apr 02 19:01:16 2014 +0200
@@ -183,9 +183,9 @@
                     Globals.getPyQt4ModulesDirectory(), "qsci")
                 if os.path.exists(qsciPath):
                     # it's the installer
-                    if self.__lexer.lexer() is not None:
+                    if self.__lexer.lexerName() is not None:
                         apidir = os.path.join(qsciPath, "api",
-                                              self.__lexer.lexer())
+                                              self.__lexer.lexerName())
                         fnames = []
                         filist = QDir(apidir).entryInfoList(
                             ["*.api"], QDir.Files, QDir.IgnoreCase)

--- a/QScintilla/Lexers/Lexer.py	Tue Apr 01 19:39:08 2014 +0200
+++ b/QScintilla/Lexers/Lexer.py	Wed Apr 02 19:01:16 2014 +0200
@@ -223,3 +223,11 @@
                 return kw
         else:
             return self.defaultKeywords(kwSet)
+    
+    def lexerName(self):
+        """
+        Public method to return the lexer name.
+        
+        @return lexer name (string)
+        """
+        return self.lexer()