mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[maven] IDEA-381950 normalize tracked file paths in auto-import
A fix to support Windows paths. Test `MavenProjectsManagerAutoImportTest.testUpdatingProjectsWhenAbsentModuleFileAppears` GitOrigin-RevId: d22dcb2a4cddb6b6612d4e59584585e0f81a5c27
This commit is contained in:
committed by
intellij-monorepo-bot
parent
7a85b590cd
commit
179cfeaa18
+2
-1
@@ -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<String> {
|
||||
return settingsFilesCache.getOrCreateValueBlocking(modificationTracker.modificationCount) {
|
||||
projectAware.settingsFiles
|
||||
projectAware.settingsFiles.map { toSystemIndependentName(it) }.toSet()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user