From 83adb975f3739fb8209d61659076b8ef12cc6ad9 Mon Sep 17 00:00:00 2001 From: "pavel.mikhailovskii" Date: Wed, 7 Jan 2026 16:14:53 +0100 Subject: [PATCH] test lsp: Reuse end-to-end tests from build tools in LSP GitOrigin-RevId: 3d20f74d9f99979e37e871fab4c6c42153a0cfe0 --- .../org/jetbrains/idea/maven/project/MavenSettingsCache.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenSettingsCache.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenSettingsCache.kt index 89d68d8b9a57..daa599c06f51 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenSettingsCache.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenSettingsCache.kt @@ -3,7 +3,6 @@ package org.jetbrains.idea.maven.project import com.intellij.openapi.components.Service import com.intellij.openapi.components.service -import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.openapi.progress.runBlockingMaybeCancellable import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VfsUtil @@ -26,7 +25,11 @@ class MavenSettingsCache(val project: Project) { } suspend fun reloadAsync() { - val settings = MavenProjectsManager.getInstance(project).generalSettings + val settings = MavenWorkspaceSettingsComponent.getInstance(project) + .settings + .generalSettings + .also { it.setProject(project) } + val userSettings = MavenEelUtil.getUserSettingsAsync(project, settings.userSettingsFile, settings.mavenConfig) val globalSettings = MavenEelUtil.getGlobalSettingsAsync(project, settings.mavenHomeType.staticOrBundled(), settings.mavenConfig) val localRepo = MavenEelUtil.getLocalRepoAsync(project, settings.localRepository, settings.mavenHomeType.staticOrBundled(), settings.userSettingsFile,