Add AbstractSettings.areCustomized() ability to tell template from us…

…er-defined custom settings Make newly created ".utbot" folder hidden under Windows only
UnitTestBot · Vassiliy-Kudryashov · Dec 2, 2022 · Nov 17, 2022 · Nov 17, 2022 · Nov 17, 2022
commit 8ab15789e69ff40bfd596570c21399caec4cb532
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/AbstractSettings.kt b/utbot-core/src/main/kotlin/org/utbot/common/AbstractSettings.kt
@@ -11,6 +11,9 @@ import kotlin.reflect.KProperty
 
 interface SettingsContainer {
     fun <T> settingFor(defaultValue: T, converter: (String) -> T): PropertyDelegateProvider<Any?, ReadWriteProperty<Any?, T>>
+
+    // Returns true iff some properties have non-default values
+    fun isCustomized() = false
 }
 
 interface SettingsContainerFactory {
@@ -47,6 +50,7 @@ class PropertiesSettingsContainer(
     }
 
     private val settingsValues: MutableMap<KProperty<*>, Any?> = mutableMapOf()
+    private var customized: Boolean = false
 
     inner class SettingDelegate<T>(val property: KProperty<*>, val initializer: () -> T): ReadWriteProperty<Any?, T> {
         private var value = initializer()
@@ -74,7 +78,12 @@ class PropertiesSettingsContainer(
         return PropertyDelegateProvider { _, property ->
             SettingDelegate(property) {
                 try {
-                    properties.getProperty(property.name)?.let(converter) ?: defaultValue
+                    properties.getProperty(property.name)?.let {
+                        val parsedValue = converter.invoke(it)
+                        customized = customized or (parsedValue != defaultValue)
+                        parsedValue
+                    }
+                    defaultValue
                 } catch (e: Throwable) {
                     logger.info(e) { e.message }
                     defaultValue
@@ -83,6 +92,10 @@ class PropertiesSettingsContainer(
         }
     }
 
+    override fun isCustomized(): Boolean {
+        return customized
+    }
+
     override fun toString(): String =
         settingsValues
             .mapKeys { it.key.name }
@@ -115,6 +128,8 @@ abstract class AbstractSettings(
         }
     }
 
+    fun areCustomized(): Boolean = container.isCustomized()
+
     protected fun <T> getProperty(
         defaultValue: T,
         converter: (String) -> T

diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt
@@ -35,6 +35,7 @@ import org.utbot.framework.plugin.api.TreatOverflowAsError
 import org.utbot.intellij.plugin.models.GenerateTestsModel
 import java.util.concurrent.CompletableFuture
 import kotlin.reflect.KClass
+import org.utbot.common.isWindows
 import org.utbot.framework.plugin.api.isSummarizationCompatible
 
 @State(
@@ -176,19 +177,22 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
         super.initializeComponent()
         CompletableFuture.runAsync {
             FileUtil.clearTempDirectory(UtSettings.daysLimitForTempFiles)
-            // In case settings.properties file is not yet presented in {homeDir}/.utbot folder
-            // we copy it from plugin resource file
+
+            // Don't replace file with custom user's settings
+            if (UtSettings.areCustomized()) return@runAsync
+            // In case settings.properties file is not yet presented
+            // (or stays with all default template values) in {homeDir}/.utbot folder
+            // we copy (or re-write) it from plugin resource file
             val settingsClass = javaClass
             Paths.get(UtSettings.defaultSettingsPath()).toFile().apply {
-                if (!this.isFile) {
-                    val parentFile = this.parentFile
-                    if (parentFile.mkdirs()) Files.setAttribute(parentFile.toPath(), "dos:hidden", true)
-                    try {
-                        settingsClass.getResource("../../../../../settings.properties")?.let {
-                            this.writeBytes(it.openStream().readBytes())
-                        }
-                    } catch (ignored: IOException) {
+                try {
+                    this.parentFile.apply {
+                        if (this.mkdirs() && isWindows) Files.setAttribute(this.toPath(), "dos:hidden", true)
+                    }
+                    settingsClass.getResource("../../../../../settings.properties")?.let {
+                        this.writeBytes(it.openStream().readBytes())
                     }
+                } catch (ignored: IOException) {
                 }
             }
         }