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

Python: add task for pyls installation

Browse Source 
Change-Id: I0a85a3ae9fe4e8b327b3b90732556bf940215b7a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-09-30 10:48:31 +02:00
parent 94f717bd3c
commit a30b936760
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/python/pythoneditor.cpp
View File

@@ -33,6 +33,7 @@
#include "pythonsettings.h" #include "pythonsettings.h"
#include <coreplugin/infobar.h> #include <coreplugin/infobar.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <languageclient/client.h> #include <languageclient/client.h>
#include <languageclient/languageclientinterface.h> #include <languageclient/languageclientinterface.h>
@@ -50,6 +51,7 @@
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFutureWatcher>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTimer> #include <QTimer>
@@ -61,6 +63,7 @@ namespace Internal {
static constexpr char startPylsInfoBarId[] = "PythonEditor::StartPyls"; static constexpr char startPylsInfoBarId[] = "PythonEditor::StartPyls";
static constexpr char installPylsInfoBarId[] = "PythonEditor::InstallPyls"; static constexpr char installPylsInfoBarId[] = "PythonEditor::InstallPyls";
static constexpr char installPylsTaskId[] = "PythonEditor::InstallPylsTask";
struct PythonForProject struct PythonForProject
{ {
@@ -203,10 +206,13 @@ public:
PythonLSInstallHelper(const PythonForProject &python, QPointer<TextEditor::TextDocument> document) PythonLSInstallHelper(const PythonForProject &python, QPointer<TextEditor::TextDocument> document)
: m_python(python) : m_python(python)
, m_document(document) , m_document(document)
{} {
m_watcher.setFuture(m_future.future());
}
void run() void run()
{ {
Core::ProgressManager::addTask(m_future.future(), "Install PyLS", installPylsTaskId);
connect(&m_process, connect(&m_process,
QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, this,
@@ -219,10 +225,9 @@ public:
&QProcess::readyReadStandardOutput, &QProcess::readyReadStandardOutput,
this, this,
&PythonLSInstallHelper::outputAvailable); &PythonLSInstallHelper::outputAvailable);
connect(&m_killTimer, &QTimer::timeout, [this]() {
SynchronousProcess::stopProcess(m_process); connect(&m_killTimer, &QTimer::timeout, this, &PythonLSInstallHelper::cancel);
Core::MessageManager::write(tr("The Python language server installation timed out.")); connect(&m_watcher, &QFutureWatcher<void>::canceled, this, &PythonLSInstallHelper::cancel);
});
// on windows the pyls 0.28.3 crashes with pylint so just install the pyflakes linter // on windows the pyls 0.28.3 crashes with pylint so just install the pyflakes linter
const QString &pylsVersion = HostOsInfo::isWindowsHost() const QString &pylsVersion = HostOsInfo::isWindowsHost()
@@ -235,12 +240,22 @@ public:
Core::MessageManager::write(tr("Running '%1 %2' to install python language server") Core::MessageManager::write(tr("Running '%1 %2' to install python language server")
.arg(m_process.program(), m_process.arguments().join(' '))); .arg(m_process.program(), m_process.arguments().join(' ')));
m_killTimer.setSingleShot(true);
m_killTimer.start(5 /*minutes*/ * 60 * 1000); m_killTimer.start(5 /*minutes*/ * 60 * 1000);
} }
private: private:
void cancel()
{
SynchronousProcess::stopProcess(m_process);
Core::MessageManager::write(
tr("The Python language server installation canceled by %1.")
.arg(m_killTimer.isActive() ? tr("user") : tr("time out")));
}
void installFinished(int exitCode, QProcess::ExitStatus exitStatus) void installFinished(int exitCode, QProcess::ExitStatus exitStatus)
{ {
m_future.reportFinished();
if (exitStatus == QProcess::NormalExit && exitCode == 0) { if (exitStatus == QProcess::NormalExit && exitCode == 0) {
if (LanguageClient::Client *client = registerLanguageServer(m_python)) if (LanguageClient::Client *client = registerLanguageServer(m_python))
LanguageClient::LanguageClientManager::reOpenDocumentWithClient(m_document, client); LanguageClient::LanguageClientManager::reOpenDocumentWithClient(m_document, client);
@@ -264,6 +279,8 @@ private:
Core::MessageManager::write(stdErr); Core::MessageManager::write(stdErr);
} }
QFutureInterface<void> m_future;
QFutureWatcher<void> m_watcher;
QProcess m_process; QProcess m_process;
QTimer m_killTimer; QTimer m_killTimer;
const PythonForProject m_python; const PythonForProject m_python;
@@ -301,7 +318,7 @@ static void updateEditorInfoBar(const PythonForProject &python, TextEditor::Text
&& infoBar->canInfoBeAdded(installPylsInfoBarId)) { && infoBar->canInfoBeAdded(installPylsInfoBarId)) {
auto message auto message
= PythonEditorFactory::tr( = PythonEditorFactory::tr(
"Install and set up Python language server for %1 (%2). " "Install and set up Python language server (PyLS) for %1 (%2). "
"The language server provides Python specific completions and annotations.") "The language server provides Python specific completions and annotations.")
.arg(python.name(), python.path.toUserOutput()); .arg(python.name(), python.path.toUserOutput());
Core::InfoBarEntry info(installPylsInfoBarId, Core::InfoBarEntry info(installPylsInfoBarId,