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

Python: prefer python-lsp-server

Browse Source 
python-language-server is dead... long live python-lsp-server.

Task-number: QTCREATORBUG-26230
Change-Id: I9343f231c732b135bc4f8a704a29541c48cc36ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-12-10 10:46:34 +01:00
parent 1eda803e29
commit 922cce1634
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ FilePath getPylsModulePath(CommandLine pylsCommand)
static const QString pylsInitPattern = "(.*)" static const QString pylsInitPattern = "(.*)"
+ QRegularExpression::escape( + QRegularExpression::escape(
QDir::toNativeSeparators("/pyls/__init__.py")) QDir::toNativeSeparators("/pylsp/__init__.py"))
+ '$'; + '$';
static const QRegularExpression regexCached(" matches " + pylsInitPattern, static const QRegularExpression regexCached(" matches " + pylsInitPattern,
QRegularExpression::MultilineOption); QRegularExpression::MultilineOption);
@@ -149,7 +149,7 @@ QList<const StdIOSettings *> configuredPythonLanguageServer()
static PythonLanguageServerState checkPythonLanguageServer(const FilePath &python) static PythonLanguageServerState checkPythonLanguageServer(const FilePath &python)
{ {
using namespace LanguageClient; using namespace LanguageClient;
const CommandLine pythonLShelpCommand(python, {"-m", "pyls", "-h"}); const CommandLine pythonLShelpCommand(python, {"-m", "pylsp", "-h"});
const FilePath &modulePath = getPylsModulePath(pythonLShelpCommand); const FilePath &modulePath = getPylsModulePath(pythonLShelpCommand);
for (const StdIOSettings *serverSetting : configuredPythonLanguageServer()) { for (const StdIOSettings *serverSetting : configuredPythonLanguageServer()) {
if (modulePath == getPylsModulePath(serverSetting->command())) { if (modulePath == getPylsModulePath(serverSetting->command())) {
@@ -217,7 +217,7 @@ const StdIOSettings *PyLSConfigureAssistant::languageServerForPython(const FileP
{ {
return findOrDefault(configuredPythonLanguageServer(), return findOrDefault(configuredPythonLanguageServer(),
[pythonModulePath = getPylsModulePath( [pythonModulePath = getPylsModulePath(
CommandLine(python, {"-m", "pyls"}))](const StdIOSettings *setting) { CommandLine(python, {"-m", "pylsp"}))](const StdIOSettings *setting) {
return getPylsModulePath(setting->command()) == pythonModulePath; return getPylsModulePath(setting->command()) == pythonModulePath;
}); });
} }
@@ -226,7 +226,7 @@ static Client *registerLanguageServer(const FilePath &python)
{ {
auto *settings = new StdIOSettings(); auto *settings = new StdIOSettings();
settings->m_executable = python; settings->m_executable = python;
settings->m_arguments = "-m pyls"; settings->m_arguments = "-m pylsp";
settings->m_name = PyLSConfigureAssistant::tr("Python Language Server (%1)") settings->m_name = PyLSConfigureAssistant::tr("Python Language Server (%1)")
.arg(pythonName(python)); .arg(pythonName(python));
settings->m_languageFilter.mimeTypes = QStringList(Constants::C_PY_MIMETYPE); settings->m_languageFilter.mimeTypes = QStringList(Constants::C_PY_MIMETYPE);
@@ -266,7 +266,7 @@ public:
connect(&m_killTimer, &QTimer::timeout, this, &PythonLSInstallHelper::cancel); connect(&m_killTimer, &QTimer::timeout, this, &PythonLSInstallHelper::cancel);
connect(&m_watcher, &QFutureWatcher<void>::canceled, this, &PythonLSInstallHelper::cancel); connect(&m_watcher, &QFutureWatcher<void>::canceled, this, &PythonLSInstallHelper::cancel);
QStringList arguments = {"-m", "pip", "install", "python-language-server[all]"}; QStringList arguments = {"-m", "pip", "install", "python-lsp-server[all]"};
// add --user to global pythons, but skip it for venv pythons // add --user to global pythons, but skip it for venv pythons
if (!QDir(m_python.parentDir().toString()).exists("activate")) if (!QDir(m_python.parentDir().toString()).exists("activate"))