Sat, 12 Oct 2024 17:50:15 +0200
Fixed some place in the Jedi interface related to eric-ide server editors and projects.
src/eric7/JediInterface/AssistantJedi.py | file | annotate | diff | comparison | revisions | |
src/eric7/JediInterface/JediServer.py | file | annotate | diff | comparison | revisions |
--- a/src/eric7/JediInterface/AssistantJedi.py Sat Oct 12 16:41:06 2024 +0200 +++ b/src/eric7/JediInterface/AssistantJedi.py Sat Oct 12 17:50:15 2024 +0200 @@ -59,7 +59,8 @@ """ for editor in self.__editors: self.__disconnectMouseClickHandler(editor) - self.__connectMouseClickHandler(editor) + if not FileSystemUtilities.isRemoteFileName(editor.getFileName()): + self.__connectMouseClickHandler(editor) def __determineLanguage(self): """ @@ -84,13 +85,14 @@ @param editor reference to the new editor @type Editor """ - languages = self.__determineLanguage() + if not FileSystemUtilities.isRemoteFileName(editor.getFileName()): + languages = self.__determineLanguage() - if editor.getLanguage() in languages: - self.__connectEditor(editor) + if editor.getLanguage() in languages: + self.__connectEditor(editor) - editor.languageChanged.connect(self.__editorLanguageChanged) - self.__editors.append(editor) + editor.languageChanged.connect(self.__editorLanguageChanged) + self.__editors.append(editor) def __editorClosed(self, editor): """ @@ -125,19 +127,20 @@ @param editor reference to the editor @type Editor """ - self.__setAutoCompletionHook(editor) - self.__setCalltipsHook(editor) + if not FileSystemUtilities.isRemoteFileName(editor.getFileName()): + self.__setAutoCompletionHook(editor) + self.__setCalltipsHook(editor) - self.__connectMouseClickHandler(editor) - - editor.registerMouseHoverHelpFunction(self.__jediServer.hoverHelp) + self.__connectMouseClickHandler(editor) - menu = editor.getMenu("Main") - if menu is not None: - checkAction = editor.getMenu("Checks").menuAction() - act = menu.insertMenu(checkAction, self.__menu) - self.__menuActions[editor] = [act] - editor.showMenu.connect(self.__editorShowMenu) + editor.registerMouseHoverHelpFunction(self.__jediServer.hoverHelp) + + menu = editor.getMenu("Main") + if menu is not None: + checkAction = editor.getMenu("Checks").menuAction() + act = menu.insertMenu(checkAction, self.__menu) + self.__menuActions[editor] = [act] + editor.showMenu.connect(self.__editorShowMenu) def __disconnectEditor(self, editor): """ @@ -170,7 +173,10 @@ @param editor reference to the editor @type Editor """ - if Preferences.getJedi("MouseClickGotoButton"): + if ( + Preferences.getJedi("MouseClickGotoButton") + and not FileSystemUtilities.isRemoteFileName(editor.getFileName()) + ): editor.setMouseClickHandler( "jedi", Preferences.getJedi("MouseClickGotoModifiers"),
--- a/src/eric7/JediInterface/JediServer.py Sat Oct 12 16:41:06 2024 +0200 +++ b/src/eric7/JediInterface/JediServer.py Sat Oct 12 17:50:15 2024 +0200 @@ -19,7 +19,7 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.QScintilla.Editor import EditorIconId, ReferenceItem -from eric7.SystemUtilities import PythonUtilities +from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities from .RefactoringPreviewDialog import RefactoringPreviewDialog @@ -979,14 +979,17 @@ """ Private slot to handle the projectOpened signal. """ - self.__ensureActive(JediServer.IdProject) - self.sendJson( - "openProject", - { - "ProjectPath": self.__ericProject.getProjectPath(), - }, - idString=JediServer.IdProject, - ) + if not FileSystemUtilities.isRemoteFileName( + self.__ericProject.getProjectFile() + ): + self.__ensureActive(JediServer.IdProject) + self.sendJson( + "openProject", + { + "ProjectPath": self.__ericProject.getProjectPath(), + }, + idString=JediServer.IdProject, + ) @pyqtSlot() def __projectClosed(self):