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

QbsProjectManager: Provide classpath data to Java language server

Browse Source 
Change-Id: Idf09ae566139a752184defe26fee082af8be31aa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Aaron McCarthy
2023-07-21 22:45:06 +10:00
parent df7619de8d
commit 5977c26f2e
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/android/javalanguageserver.cpp
View File

@@ -291,16 +291,29 @@ void JLSClient::updateProjectFiles()
return;
const FilePath packageSourceDir = FilePath::fromVariant(
node->data(Constants::AndroidPackageSourceDir));
FilePath sourceDir = packageSourceDir.pathAppended("src");
if (!sourceDir.exists())
return;
FilePath sourceDir = packageSourceDir.pathAppended("src/main/java");
if (!sourceDir.exists()) {
sourceDir = packageSourceDir.pathAppended("src");
if (!sourceDir.exists()) {
return;
}
}
sourceDir = sourceDir.relativeChildPath(projectDir);
const QStringList classPaths = node->data(Constants::AndroidClassPaths).toStringList();
const FilePath &sdkLocation = AndroidConfigurations::currentConfig().sdkLocation();
const QString &targetSDK = AndroidManager::buildTargetSDK(m_currentTarget);
const FilePath androidJar = sdkLocation / QString("platforms/%2/android.jar")
.arg(targetSDK);
FilePaths libs = {androidJar};
libs << packageSourceDir.pathAppended("libs").dirEntries({{"*.jar"}, QDir::Files});
for (const QString &path : classPaths)
libs << FilePath::fromString(path);
generateProjectFile(projectDir, qtSrc, project()->displayName());
generateClassPathFile(projectDir, sourceDir, libs);
}