--- a/src/eric7/JediInterface/JediServer.py Wed Jan 03 12:12:44 2024 +0100 +++ b/src/eric7/JediInterface/JediServer.py Wed Jan 03 16:29:32 2024 +0100 @@ -18,7 +18,7 @@ from eric7.EricNetwork.EricJsonServer import EricJsonServer from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.QScintilla.Editor import Editor, ReferenceItem +from eric7.QScintilla.Editor import EditorIconId, ReferenceItem from eric7.SystemUtilities import PythonUtilities from .RefactoringPreviewDialog import RefactoringPreviewDialog @@ -32,24 +32,24 @@ IdProject = "Project" PictureIDs = { - "class": "?{0}".format(Editor.ClassID), - "_class": "?{0}".format(Editor.ClassProtectedID), - "__class": "?{0}".format(Editor.ClassPrivateID), - "instance": "?{0}".format(Editor.ClassID), - "_instance": "?{0}".format(Editor.ClassProtectedID), - "__instance": "?{0}".format(Editor.ClassPrivateID), - "function": "?{0}".format(Editor.MethodID), - "_function": "?{0}".format(Editor.MethodProtectedID), - "__function": "?{0}".format(Editor.MethodPrivateID), - "module": "?{0}".format(Editor.ModuleID), - "_module": "?{0}".format(Editor.ModuleID), - "__module": "?{0}".format(Editor.ModuleID), - "param": "?{0}".format(Editor.AttributeID), - "_param": "?{0}".format(Editor.AttributeProtectedID), - "__param": "?{0}".format(Editor.AttributePrivateID), - "statement": "?{0}".format(Editor.AttributeID), - "_statement": "?{0}".format(Editor.AttributeProtectedID), - "__statement": "?{0}".format(Editor.AttributePrivateID), + "class": "?{0}".format(EditorIconId.Class), + "_class": "?{0}".format(EditorIconId.ClassProtected), + "__class": "?{0}".format(EditorIconId.ClassPrivate), + "instance": "?{0}".format(EditorIconId.Class), + "_instance": "?{0}".format(EditorIconId.ClassProtected), + "__instance": "?{0}".format(EditorIconId.ClassPrivate), + "function": "?{0}".format(EditorIconId.Method), + "_function": "?{0}".format(EditorIconId.MethodProtected), + "__function": "?{0}".format(EditorIconId.MethodPrivate), + "module": "?{0}".format(EditorIconId.Module), + "_module": "?{0}".format(EditorIconId.Module), + "__module": "?{0}".format(EditorIconId.Module), + "param": "?{0}".format(EditorIconId.Attribute), + "_param": "?{0}".format(EditorIconId.AttributeProtected), + "__param": "?{0}".format(EditorIconId.AttributePrivate), + "statement": "?{0}".format(EditorIconId.Attribute), + "_statement": "?{0}".format(EditorIconId.AttributeProtected), + "__statement": "?{0}".format(EditorIconId.AttributePrivate), "import": "", "None": "", }