--- a/eric6/QScintilla/Editor.py Sat Dec 19 15:06:20 2020 +0100
+++ b/eric6/QScintilla/Editor.py Sat Dec 19 15:22:26 2020 +0100
@@ -1451,7 +1451,7 @@
Private slot handling a change of a connected editor's language.
@param language language to be set (string)
- @keyparam propagate flag indicating to propagate the change (boolean)
+ @param propagate flag indicating to propagate the change (boolean)
"""
if language == '':
self.__resetLanguage(propagate=propagate)
@@ -1472,7 +1472,7 @@
"""
Private method used to reset the language selection.
- @keyparam propagate flag indicating to propagate the change (boolean)
+ @param propagate flag indicating to propagate the change (boolean)
"""
if (
self.lexer_ is not None and
@@ -1508,8 +1508,8 @@
language (string)
@param initTextDisplay flag indicating an initialization of the text
display is required as well (boolean)
- @keyparam propagate flag indicating to propagate the change (boolean)
- @keyparam pyname name of the pygments lexer to use (string)
+ @param propagate flag indicating to propagate the change (boolean)
+ @param pyname name of the pygments lexer to use (string)
"""
# clear all warning and syntax error markers
self.clearSyntaxError()
@@ -1589,7 +1589,7 @@
Private slot to handle a change of the encoding.
@param encoding changed encoding (string)
- @keyparam propagate flag indicating to propagate the change (boolean)
+ @param propagate flag indicating to propagate the change (boolean)
"""
self.encoding = encoding
self.__checkEncoding()
@@ -1703,7 +1703,7 @@
@param filename filename used to determine the associated lexer
language (string)
- @keyparam pyname name of the pygments lexer to use (string)
+ @param pyname name of the pygments lexer to use (string)
"""
if (
self.lexer_ is not None and
@@ -1825,9 +1825,9 @@
"""
Public method to retrieve the language of the editor.
- @keyparam normalized flag indicating to normalize some Pygments
+ @param normalized flag indicating to normalize some Pygments
lexer names (boolean)
- @keyparam forPygments flag indicating to normalize some lexer
+ @param forPygments flag indicating to normalize some lexer
names for Pygments (boolean)
@return language of the editor (string)
"""
@@ -3073,9 +3073,9 @@
Public slot to read the text from a file.
@param fn filename to read from (string)
- @keyparam createIt flag indicating the creation of a new file, if the
+ @param createIt flag indicating the creation of a new file, if the
given one doesn't exist (boolean)
- @keyparam encoding encoding to be used to read the file (string)
+ @param encoding encoding to be used to read the file (string)
(Note: this parameter overrides encoding detection)
"""
self.__loadEditorConfig(fileName=fn)
@@ -3399,7 +3399,7 @@
Public slot to save a file with a new name.
@param path directory to save the file in (string)
- @keyparam toProject flag indicating a save to project operation
+ @param toProject flag indicating a save to project operation
(boolean)
@return tuple of two values (boolean, string) giving a success
indicator and the name of the saved file
@@ -3448,7 +3448,7 @@
@param line line number to make visible
@type int
- @keyparam expand flag indicating to expand all folds
+ @param expand flag indicating to expand all folds
@type bool
"""
self.ensureLineVisible(line - 1)
@@ -3463,7 +3463,7 @@
@param line line number to make visible
@type int
- @keyparam expand flag indicating to expand all folds
+ @param expand flag indicating to expand all folds
@type bool
"""
self.ensureVisible(line)
@@ -3514,7 +3514,7 @@
@param line number of line to look at (int)
@param index position to look at (int)
- @keyparam useWordChars flag indicating to use the wordCharacters
+ @param useWordChars flag indicating to use the wordCharacters
method (boolean)
@return tuple with start and end indexes of the word at the position
(integer, integer)
@@ -3546,7 +3546,7 @@
@param index position to look at (int)
@param direction direction to look in (0 = whole word, 1 = left,
2 = right)
- @keyparam useWordChars flag indicating to use the wordCharacters
+ @param useWordChars flag indicating to use the wordCharacters
method (boolean)
@return the word at that position (string)
"""
@@ -4198,12 +4198,12 @@
@param line line number to go to
@type int
- @keyparam pos position in line to go to
+ @param pos position in line to go to
@type int
- @keyparam firstVisible flag indicating to make the line the first
+ @param firstVisible flag indicating to make the line the first
visible line
@type bool
- @keyparam expand flag indicating to expand all folds
+ @param expand flag indicating to expand all folds
@type bool
"""
self.setCursorPosition(line - 1, pos - 1)
@@ -4931,9 +4931,9 @@
"""
Public method to start auto-completion.
- @keyparam auto flag indicating a call from the __charAdded method
+ @param auto flag indicating a call from the __charAdded method
(boolean)
- @keyparam context flag indicating to complete a context (boolean)
+ @param context flag indicating to complete a context (boolean)
"""
if auto and not Preferences.getEditor("AutoCompletionEnabled"):
# auto-completion is disabled
@@ -4982,9 +4982,9 @@
"""
Private method to start auto-completion via plug-ins.
- @keyparam auto flag indicating a call from the __charAdded method
+ @param auto flag indicating a call from the __charAdded method
(boolean)
- @keyparam context flag indicating to complete a context
+ @param context flag indicating to complete a context
@type bool or None
"""
self.__acCompletions.clear()
@@ -6202,7 +6202,7 @@
@param error flag indicating if the error marker should be
set or deleted (boolean)
@param msg error message (string)
- @keyparam show flag indicating to set the cursor to the error position
+ @param show flag indicating to set the cursor to the error position
(boolean)
"""
if line == 0:
@@ -6360,7 +6360,7 @@
@param warning flag indicating if the warning marker should be
set or deleted (boolean)
@param msg warning message (string)
- @keyparam warningType type of warning message (integer)
+ @param warningType type of warning message (integer)
"""
if line == 0:
line = 1
@@ -7688,8 +7688,8 @@
Private slot to set the spell checking language.
@param language spell checking language to be set (string)
- @keyparam pwl name of the personal/project word list (string)
- @keyparam pel name of the personal/project exclude list (string)
+ @param pwl name of the personal/project word list (string)
+ @param pel name of the personal/project exclude list (string)
"""
if self.spell and self.spell.getLanguage() != language:
self.spell.setLanguage(language, pwl=pwl, pel=pel)
@@ -7984,7 +7984,7 @@
"""
Public slot to cancel a shared edit session for the editor.
- @keyparam send flag indicating to send the CancelEdit command (boolean)
+ @param send flag indicating to send the CancelEdit command (boolean)
"""
self.__inSharedEdit = False
self.__savedText = ""
