Rope Refactoring: comparison RefactoringRope/CodeAssistServer.py

-:ccb5c268df65
+:d98e971d9e4c
 from .JsonServer import JsonServer
 import Globals
 import Preferences
+import Utilities
 class CodeAssistServer(JsonServer):
 """
 Class implementing the autocompletion interface to rope.
 """
+IdProject = "Project"
 def __init__(self, plugin, parent=None):
 """
 Constructor
 @param plugin reference to the plugin object
 "CodeAssistServer", multiplex=True, parent=parent)
 self.__plugin = plugin
 self.__ui = parent
 self.__vm = e5App().getObject("ViewManager")
+self.__e5project = e5App().getObject("Project")
 self.__editorLanguageMapping = {}
 self.__clientConfigs = {}
 self.__editors = {}
 elif name == "Python3":
 self.__editorLanguageMapping.update({
 "Python3": "Python3",
 "Pygments|Python 3": "Python3",
 })
+def isSupportedLanguage(self, language):
+"""
+Public method to check, if the given language is supported.
+@param language editor programming language to check
+@type str
+@return flag indicating the support status
+@rtype bool
+"""
+return language in self.__editorLanguageMapping
+def __idString(self, editor):
+"""
+Private method to determine the ID string for the back-end.
+@param editor reference to the editor to determine the ID string for
+@type QScintilla.Editor
+@return ID string
+@rtype str
+"""
+idString = ""
+language = editor.getLanguage()
+if self.__e5project.isOpen() and \
+self.__e5project.getProjectLanguage() == language:
+filename = editor.getFileName()
+if self.__e5project.isProjectSource(filename):
+idString = CodeAssistServer.IdProject
+if not idString and language in self.__editorLanguageMapping:
+idString = self.__editorLanguageMapping[language]
+return idString
 def __getConfigs(self):
 """
 Private method to get the configurations of all connected clients.
 """
 self.__ui,
 self.tr("Configure Rope"),
 self.tr("""The Rope configuration file '{0}' does"""
 """ not exist.""").format(configfile))
-def isSupportedLanguage(self, language):
-"""
-Public method to check, if the given language is supported.
-@param language editor programming language to check
-@type str
-@return flag indicating the support status
-@rtype bool
-"""
-return language in self.__editorLanguageMapping
 def getCompletions(self, editor, context):
 """
 Public method to calculate the possible completions.
 Note: This is the synchronous variant for eric6 before 17.11.
 @rtype list of str
 """
 # reset the completions buffer
 self.__completions = None
-language = editor.getLanguage()
+if not self.__idString(editor):
-if language not in self.__editorLanguageMapping:
 return []
 self.requestCompletions(editor, context, "")
 # emulate the synchronous behaviour
 @param context flag indicating to autocomplete a context
 @type bool
 @param acText text to be completed
 @type str
 """
-language = editor.getLanguage()
+idString = self.__idString(editor)
-if language not in self.__editorLanguageMapping:
+if not idString:
 return
-idString = self.__editorLanguageMapping[language]
 filename = editor.getFileName()
 line, index = editor.getCursorPosition()
 source = editor.text()
 offset = len("".join(source.splitlines(True)[:line])) + index
 @rtype list of str
 """
 # reset the calltips buffer
 self.__calltips = None
-language = editor.getLanguage()
+idString = self.__idString(editor)
-if language not in self.__editorLanguageMapping:
+if not idString:
 return []
-idString = self.__editorLanguageMapping[language]
 filename = editor.getFileName()
 source = editor.text()
 line, index = editor.lineIndexFromPosition(pos)
 offset = len("".join(source.splitlines(True)[:line])) + index
 @param oldSource source code before the change
 @type str
 """
 editor = self.__vm.getOpenEditor(filename)
 if editor is not None:
-language = editor.getLanguage()
+idString = self.__idString(editor)
-if language in self.__editorLanguageMapping:
+if idString:
-idString = self.__editorLanguageMapping[language]
 self.__ensureActive(idString)
 self.sendJson("reportChanged", {
 "FileName": filename,
 "OldSource": oldSource,
 }, idString=idString)
 """
 if self.__documentationViewer is None:
 return
 language = editor.getLanguage()
-if language not in self.__editorLanguageMapping:
+if not self.isSupportedLanguage(language):
 if Preferences.getDocuViewer("ShowInfoAsRichText"):
 warning = self.tr("Language <b>{0}</b> is not supported.")\
 .format(language)
 else:
 warning = self.tr("Language '{0}' is not supported.")\
 .format(language)
 self.__documentationViewer.documentationReady(
 warning, isWarning=True)
 return
-idString = self.__editorLanguageMapping[language]
+idString = self.__idString(editor)
+if not idString:
+return
 filename = editor.getFileName()
 source = editor.text()
 line, index = editor.getCursorPosition()
 offset = len("".join(source.splitlines(True)[:line])) + index
 @rtype bool
 """
 ok = False
 if interpreter:
-configDir = os.path.join(Globals.getConfigDir(), "rope", idString)
+if idString == CodeAssistServer.IdProject:
+configDir = self.__e5project.getProjectPath()
+else:
+configDir = os.path.join(Globals.getConfigDir(), "rope",
+idString)
 if not os.path.exists(configDir):
 os.makedirs(configDir)
 client = os.path.join(os.path.dirname(__file__),
 "CodeAssistClient.py")
 @rtype bool
 """
 ok = idString in self.connectionNames()
 if not ok:
 # client is not running
-try:
+if idString == CodeAssistServer.IdProject:
-# new code using virtual environments
+interpreter = self.__interpreterForProject()
-venvManager = e5App().getObject("VirtualEnvManager")
+else:
-if idString == "Python2":
+interpreter = ""
-# Python 2
+venvName = ""
-venvName = Preferences.getDebugger("Python2VirtualEnv")
+try:
-if not venvName and sys.version_info[0] == 2:
+# new code using virtual environments
-try:
+venvManager = e5App().getObject("VirtualEnvManager")
-venvName, _ = venvManager.getDefaultEnvironment()
+if idString == "Python2":
-except AttributeError:
+# Python 2
-# ignore for eric6 < 18.10
+venvName = Preferences.getDebugger("Python2VirtualEnv")
-pass
+if not venvName and sys.version_info[0] == 2:
-elif idString == "Python3":
+try:
-# Python 3
+venvName, _ = \
-venvName = Preferences.getDebugger("Python3VirtualEnv")
+venvManager.getDefaultEnvironment()
-if not venvName and sys.version_info[0] == 3:
+except AttributeError:
-try:
+# ignore for eric6 < 18.10
-venvName, _ = venvManager.getDefaultEnvironment()
+pass
-except AttributeError:
+elif idString == "Python3":
-# ignore for eric6 < 18.10
+# Python 3
-pass
+venvName = Preferences.getDebugger("Python3VirtualEnv")
-else:
+if not venvName and sys.version_info[0] == 3:
-venvName = ""
+try:
-if venvName:
+venvName, _ = \
-interpreter = e5App().getObject("VirtualEnvManager")\
+venvManager.getDefaultEnvironment()
-.getVirtualenvInterpreter(venvName)
+except AttributeError:
-else:
+# ignore for eric6 < 18.10
-interpreter = ""
+pass
-except KeyError:
+if venvName:
-# backward compatibility (eric <18.07)
+interpreter = \
-if idString == "Python2":
+venvManager.getVirtualenvInterpreter(venvName)
-# Python 2
+except KeyError:
-interpreter = Preferences.getDebugger("PythonInterpreter")
+# backward compatibility (eric <18.07)
-elif idString == "Python3":
+if idString == "Python2":
-# Python 3
+# Python 2
-interpreter = Preferences.getDebugger("Python3Interpreter")
+interpreter = \
-else:
+Preferences.getDebugger("PythonInterpreter")
-interpreter = ""
+elif idString == "Python3":
+# Python 3
+interpreter = \
+Preferences.getDebugger("Python3Interpreter")
 if interpreter:
 ok = self.__startCodeAssistClient(interpreter, idString)
 else:
 ok = False
 return ok
+def __interpreterForProject(self):
+"""
+Private method to determine the interpreter for the current project.
+@return interpreter of the current project
+@rtype str
+"""
+interpreter = ""
+projectLanguage = self.__e5project.getProjectLanguage()
+if projectLanguage.startswith("Python"):
+try:
+# new code using virtual environments
+venvManager = e5App().getObject("VirtualEnvManager")
+# get virtual environment from project first
+venvName = self.__e5project.getDebugProperty("VIRTUALENV")
+if not venvName:
+# get it from debugger settings next
+if projectLanguage == "Python2":
+# Python 2
+venvName = Preferences.getDebugger("Python2VirtualEnv")
+if not venvName and sys.version_info[0] == 2:
+try:
+venvName, _ = \
+venvManager.getDefaultEnvironment()
+except AttributeError:
+# ignore for eric6 < 18.10
+pass
+elif projectLanguage == "Python3":
+# Python 3
+venvName = Preferences.getDebugger("Python3VirtualEnv")
+if not venvName and sys.version_info[0] == 3:
+try:
+venvName, _ = \
+venvManager.getDefaultEnvironment()
+except AttributeError:
+# ignore for eric6 < 18.10
+pass
+else:
+venvName = ""
+if venvName:
+interpreter = \
+venvManager.getVirtualenvInterpreter(venvName)
+except KeyError:
+# backward compatibility (eric < 18.07)
+# get interpreter from project first
+interpreter = self.__e5project.getDebugProperty("INTERPRETER")
+if not interpreter or not Utilities.isinpath(interpreter):
+# get it from debugger settings second
+if projectLanguage == "Python2":
+interpreter = Preferences.getDebugger(
+"PythonInterpreter")
+elif projectLanguage == "Python3":
+interpreter = Preferences.getDebugger(
+"Python3Interpreter")
+return interpreter
 @pyqtSlot()
 def handleNewConnection(self):
 """
 Public slot for new incoming connections from a client.
 "rope", self.tr("Rope"), self.requestCodeDocumentation,
 self.isSupportedLanguage)
 except AttributeError:
 # eric6 before 17.11 doesn't have this
 pass
+self.__e5project.projectClosed.connect(self.__projectClosed)
 def deactivate(self):
 """
 Public method to deactivate the code assist server.
 """
 self.__documentationViewer.unregisterProvider("rope")
 for idString in self.connectionNames():
 self.sendJson("closeProject", {}, flush=True, idString=idString)
+try:
+self.__e5project.projectClosed.disconnect(self.__projectClosed)
+except TypeError:
+# ignore it, the signal may be disconnected already
+pass
 self.stopAllClients()
+@pyqtSlot()
+def __projectClosed(self):
+"""
+Private slot to handle the projectClosed signal.
+"""
+self.stopClient(idString=CodeAssistServer.IdProject)
 #######################################################################
 ## Methods below handle setting/unsetting the hook methods
 #######################################################################

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/CodeAssistServer.py

RefactoringRope/CodeAssistServer.py