feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: cache the module path for executable

Browse Source 
This reduces ui freezes when switching the interpreter for a python
project.

Change-Id: Iaa8ce8ed8d51666f8696eb96f504aaf8c4a11822
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-10-30 14:33:04 +01:00
parent 37d378f479
commit 54f2ebf91d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/python/pythonutils.cpp
View File

@@ -94,6 +94,11 @@ static QString pythonName(const FilePath &pythonPath)
FilePath getPylsModulePath(CommandLine pylsCommand) FilePath getPylsModulePath(CommandLine pylsCommand)
{ {
static QMap<FilePath, FilePath> cache;
const FilePath &modulePath = cache.value(pylsCommand.executable());
if (!modulePath.isEmpty())
return modulePath;
pylsCommand.addArg("-h"); pylsCommand.addArg("-h");
SynchronousProcess pythonProcess; SynchronousProcess pythonProcess;
pythonProcess.setEnvironment(pythonProcess.environment() + QStringList("PYTHONVERBOSE=x")); pythonProcess.setEnvironment(pythonProcess.environment() + QStringList("PYTHONVERBOSE=x"));
@@ -111,8 +116,11 @@ FilePath getPylsModulePath(CommandLine pylsCommand)
const QString &output = response.allOutput(); const QString &output = response.allOutput();
for (auto regex : {regexCached, regexNotCached}) { for (auto regex : {regexCached, regexNotCached}) {
QRegularExpressionMatch result = regex.match(output); QRegularExpressionMatch result = regex.match(output);
if (result.hasMatch()) if (result.hasMatch()) {
return FilePath::fromUserInput(result.captured(1)); const FilePath &modulePath = FilePath::fromUserInput(result.captured(1));
cache[pylsCommand.executable()] = modulePath;
return modulePath;
}
} }
return {}; return {};
} }
@@ -146,7 +154,7 @@ static PythonLanguageServerState checkPythonLanguageServer(const FilePath &pytho
} }
} }
return {PythonLanguageServerState::AlreadyInstalled, getPylsModulePath(pythonLShelpCommand)}; return {PythonLanguageServerState::AlreadyInstalled, modulePath};
} }
const CommandLine pythonPipVersionCommand(python, {"-m", "pip", "-V"}); const CommandLine pythonPipVersionCommand(python, {"-m", "pip", "-V"});