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

cleanup: read & remove the config migration marker file within a single method to encapsulate the state transition

Browse Source 
IDEA-CR-60006, IDEA-233305

GitOrigin-RevId: 5cfad729a8537d93f6faa805ac4efb37ca3b4a6f
This commit is contained in:
Kirill Likhodedov
2020-03-22 16:37:41 +00:00
committed by intellij-monorepo-bot
parent c62430919b
commit 66ddd2ee21
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+1 -2
View File
@@ -85,8 +85,7 @@ public final class ConfigImportHelper {
catch (Exception ignored) { }
List<Path> guessedOldConfigDirs = findConfigDirectories(newConfigDir);
CustomConfigMigrationOption customMigrationOption = CustomConfigMigrationOption.readCustomConfigMigrationOption();
CustomConfigMigrationOption.removeCustomConfigMigrationFile();
CustomConfigMigrationOption customMigrationOption = CustomConfigMigrationOption.readCustomConfigMigrationOptionAndRemoveMarkerFile();
File tempBackup = null;
try {
platform/platform-impl/src/com/intellij/openapi/application/CustomConfigMigrationOption.kt
+7 -5
View File
@@ -7,6 +7,7 @@ import com.intellij.util.io.delete
import com.intellij.util.io.exists
import com.intellij.util.io.systemIndependentPath
import com.intellij.util.io.write
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
@@ -20,7 +21,7 @@ sealed class CustomConfigMigrationOption {
companion object {
@JvmStatic
fun readCustomConfigMigrationOption(): CustomConfigMigrationOption? {
fun readCustomConfigMigrationOptionAndRemoveMarkerFile(): CustomConfigMigrationOption? {
val markerFile = getMarkerFilePath()
if (!markerFile.exists()) return null
@@ -38,14 +39,15 @@ sealed class CustomConfigMigrationOption {
log.warn("Couldn't load content of $markerFile")
return null
}
finally {
removeMarkerFile(markerFile)
}
}
@JvmStatic
fun needsCustomConfigMigration(): Boolean = readCustomConfigMigrationOption() != null
fun needsCustomConfigMigration(): Boolean = Files.exists(getMarkerFilePath())
@JvmStatic
fun removeCustomConfigMigrationFile() {
val markerFile = getMarkerFilePath()
private fun removeMarkerFile(markerFile: Path) {
try {
markerFile.delete()
}