MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-43780 ignore new config dir

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-02-21 12:11:17 +01:00
parent 555f077b6d
commit 291ac583c2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/testSrc/ConfigImportHelperTest.kt
+6 -1
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.components.StoragePathMacros
import com.intellij.openapi.components.stateStore
import com.intellij.testFramework.ApplicationRule
import com.intellij.testFramework.rules.InMemoryFsRule
import com.intellij.util.io.createDirectories
import com.intellij.util.io.directoryStreamIfExists
import com.intellij.util.io.exists
import com.intellij.util.io.write
@@ -68,7 +69,11 @@ class ConfigImportHelperTest {
writeStorageFile("2020.1", 100, isMacOs)
writeStorageFile("2021.1", 200, isMacOs)
writeStorageFile("2022.1", 300, isMacOs)
val newConfigPath = fs.getPath("/data/${constructConfigPath("2022.1", isMacOs)}")
val newConfigPath = fs.getPath("/data/${constructConfigPath("2022.3", isMacOs)}")
// create new config dir to test that it will be not suggested too (as on start of new version config dir can be created)
newConfigPath.createDirectories()
assertThat(ConfigImportHelper.findRecentConfigDirectory(newConfigPath, isMacOs).joinToString("\n")).isEqualTo("""
/data/${constructConfigPath("2022.1", isMacOs)}
/data/${constructConfigPath("2021.1", isMacOs)}
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+4 -1
View File
@@ -159,7 +159,10 @@ public class ConfigImportHelper {
}
final List<Path> candidates;
try (DirectoryStream<Path> stream = Files.newDirectoryStream(configsHome, it -> StringUtil.startsWithIgnoreCase(it.getFileName().toString(), prefix))) {
try (DirectoryStream<Path> stream = Files.newDirectoryStream(configsHome, it -> {
//noinspection CodeBlock2Expr
return StringUtil.startsWithIgnoreCase(it.getFileName().toString(), prefix) && !it.equals(isMacOs ? newConfigDir : newConfigDir.getParent());
})) {
candidates = ContainerUtilRt.newArrayList(stream);
}
catch (IOException ignore) {