Mercurial Repositories > eric / file diff

--- a/eric6/QScintilla/Editor.py	Sat Jan 23 12:10:31 2021 +0100
+++ b/eric6/QScintilla/Editor.py	Sat Jan 23 12:52:18 2021 +0100
@@ -8691,12 +8691,16 @@
         @param cursorPosition current cursor position (line and column)
         @type tuple of (int, int)
         """
-        if self.getDocstringGenerator().isDocstringIntro(cursorPosition):
-            lineText = self.text(cursorPosition[0])
+        if (
+            Preferences.getEditor("DocstringAutoGenerate") and
+            self.getDocstringGenerator().isDocstringIntro(cursorPosition)
+        ):
+            lineText2Cursor = self.text(cursorPosition[0])[:cursorPosition[1]]
             
             QTimer.singleShot(
                 300,
-                lambda: self.__popupDocstringMenu(lineText, cursorPosition)
+                lambda: self.__popupDocstringMenu(lineText2Cursor,
+                                                  cursorPosition)
             )
     
     def __popupDocstringMenu(self, lastLineText, lastCursorPosition):
@@ -8714,7 +8718,7 @@
         if lastCursorPosition != cursorPosition:
             return
         
-        if self.text(cursorPosition[0]) != lastLineText:
+        if self.text(cursorPosition[0])[:cursorPosition[1]] != lastLineText:
             return
         
         generator = self.getDocstringGenerator()