Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/Editor.py	Fri Jul 30 13:44:39 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Fri Jul 30 13:56:50 2021 +0200
@@ -5218,10 +5218,9 @@
         elif listId == ReferencesListID:
             with contextlib.suppress(ValueError, IndexError):
                 index = self.__referencesList.index(txt)
-                filename, line, column = self.__referencesPositionsList(index)
-                self.__vm.openSourceFile(
+                filename, line, column = self.__referencesPositionsList[index]
+                self.vm.openSourceFile(
                     filename, lineno=line, pos=column, addNext=True)
-                
     
     def canProvideDynamicAutoCompletion(self):
         """
@@ -8552,23 +8551,25 @@
         @param referencesList list of references for a 'goto' action
         @type ReferenceItem
         """
-        referencesList = []
-        referencesPositionsList = []
-        
-        for reference in referencesPositionsList:
+        references = []
+        referencePositions = []
+        
+        for reference in referencesList:
             if (
-                reference.modulePath != self.fileName() and
+                reference.modulePath != self.getFileName() or
                 self.getCursorPosition()[0] + 1 != reference.line
             ):
-                referencesList.append(
-                    "{0}\t{1}".format(reference.line, reference.codeLine))
-                referencesPositionsList.append(
-                    reference.modulePath, reference.line, reference.column)
-        
-        if referencesList:
-            self.__referencesList = referencesList
-            self.__referencesPositionsList = referencesPositionsList
-            self.showUserList(ReferencesListID, referencesList)
+                references.append(
+                    self.tr("{0:4d}    {1}", "line number, source code")
+                    .format(reference.line, reference.codeLine.strip())
+                )
+                referencePositions.append(
+                    (reference.modulePath, reference.line, reference.column))
+        
+        if references:
+            self.__referencesList = references
+            self.__referencesPositionsList = referencePositions
+            self.showUserList(ReferencesListID, references)
     
     #######################################################################
     ## Methods implementing a Shell interface