From 179cfeaa18f049822ee0e18afc8a1cb5b399d742 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Wed, 12 Nov 2025 15:49:38 +0100 Subject: [PATCH] [maven] IDEA-381950 normalize tracked file paths in auto-import A fix to support Windows paths. Test `MavenProjectsManagerAutoImportTest.testUpdatingProjectsWhenAbsentModuleFileAppears` GitOrigin-RevId: d22dcb2a4cddb6b6612d4e59584585e0f81a5c27 --- .../externalSystem/autoimport/ProjectSettingsTracker.kt | 3 ++- .../idea/maven/project/auto/reload/MavenProjectAware.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectSettingsTracker.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectSettingsTracker.kt index 2a737a7f47db..d90b0d182d64 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectSettingsTracker.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectSettingsTracker.kt @@ -28,6 +28,7 @@ import com.intellij.openapi.observable.operation.core.whenOperationStarted import com.intellij.openapi.project.Project import com.intellij.openapi.util.SimpleModificationTracker import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtilRt.toSystemIndependentName import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import kotlinx.serialization.Serializable @@ -358,7 +359,7 @@ class ProjectSettingsTracker( private fun getOrCollectSettingsFiles(): Set { return settingsFilesCache.getOrCreateValueBlocking(modificationTracker.modificationCount) { - projectAware.settingsFiles + projectAware.settingsFiles.map { toSystemIndependentName(it) }.toSet() } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/auto/reload/MavenProjectAware.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/auto/reload/MavenProjectAware.kt index ea4bebccf680..1450a48b690f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/auto/reload/MavenProjectAware.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/auto/reload/MavenProjectAware.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.observable.properties.AtomicBooleanProperty import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.project.Project +import com.intellij.openapi.util.io.FileUtilRt.toSystemIndependentName import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.annotations.ApiStatus import org.jetbrains.idea.maven.buildtool.MavenSyncSpec @@ -87,7 +88,7 @@ class MavenProjectAware( result.add(rootDirectory + "/" + MavenConstants.MAVEN_CONFIG_RELATIVE_PATH) result.add(rootDirectory + "/" + MavenConstants.MAVEN_WRAPPER_RELATIVE_PATH) } - return result + return result.map { toSystemIndependentName(it) }.toSet() } init {