aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidplugin.cpp
diff options
context:
space:
mode:
authorDavid Schulz <[email protected]>2021-02-11 15:21:23 +0100
committerDavid Schulz <[email protected]>2021-02-18 13:56:42 +0000
commitacd33a45d87bff18a607ad22ef5e7d49ed7962cf (patch)
tree5d5ec00945c9b91626f9f62039ee6fc3d42bb434 /src/plugins/android/androidplugin.cpp
parentfc411cd0d1806435a9c89e8a10cdfed012663fd9 (diff)
Java: add java language server settings
Change-Id: Ic8e8ce5833052fcbb3acb004ae577722e2ef8fc3 Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
-rw-r--r--src/plugins/android/androidplugin.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 4156965b93b..f135b427a16 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -41,6 +41,7 @@
#include "androidsettingswidget.h"
#include "androidtoolchain.h"
#include "javaeditor.h"
+#include "javalanguageserver.h"
#ifdef HAVE_QBS
# include "androidqbspropertyprovider.h"
@@ -50,6 +51,8 @@
#include <utils/checkablemessagebox.h>
#include <utils/infobar.h>
+#include <languageclient/languageclientsettings.h>
+
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/deployconfiguration.h>
@@ -162,6 +165,10 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
connect(KitManager::instance(), &KitManager::kitsLoaded,
this, &AndroidPlugin::kitsRestored);
+ LanguageClient::LanguageClientSettings::registerClientType({Android::Constants::JLS_SETTINGS_ID,
+ tr("Java Language Server"),
+ []() { return new JLSSettings; }});
+
return true;
}