Some more improvements

Author: EgorkaKulikov

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt

@@ -41,33 +41,23 @@ class UTBotAllProjectSettings(val project: Project) {
 
     val convertedProjectPath: String get() = projectPath.convertToRemotePathIfNeeded(project)
 
-    //TODO: it is unclear, requires a comment
+    /**
+     * If this property returns true, plugin must convert path sent and returned from server.
+     * @see [String.convertToRemotePathIfNeeded], [String.convertFromRemotePathIfNeeded]
+     *
+     * If we are on Windows, this is not a server, so it is always a remote scenario.
+     */
     val isRemoteScenario: Boolean
         get() {
             val isLocalHost = projectIndependentSettings.serverName == "localhost" || projectIndependentSettings.serverName == "127.0.0.01"
             return !(storedSettings.remotePath == projectPath && isLocalHost) || isWindows
         }
 
-    fun asModel() = UTBotSettingsModel(storedSettings, projectIndependentSettings)
-
     fun fromModel(model: UTBotSettingsModel) {
-        projectIndependentSettings.port = model.globalSettings.port
-        projectIndependentSettings.serverName = model.globalSettings.serverName
-        storedSettings.buildDirRelativePath = model.projectSettings.buildDirRelativePath
-        storedSettings.testDirPath = model.projectSettings.testDirPath
-        storedSettings.targetPath = model.projectSettings.targetPath
-        storedSettings.remotePath = model.projectSettings.remotePath
-        storedSettings.sourceDirs = model.projectSettings.sourceDirs
-        storedSettings.cmakeOptions = model.projectSettings.cmakeOptions
-        storedSettings.generateForStaticFunctions = model.projectSettings.generateForStaticFunctions
-        storedSettings.useStubs = model.projectSettings.useStubs
-        storedSettings.useDeterministicSearcher = model.projectSettings.useDeterministicSearcher
-        storedSettings.verbose = model.projectSettings.verbose
-        storedSettings.timeoutPerFunction = model.projectSettings.timeoutPerFunction
-        storedSettings.timeoutPerTest = model.projectSettings.timeoutPerTest
+        storedSettings.fromSettingsModel(model)
+        projectIndependentSettings.fromSettingsModel(model)
     }
 
-
     fun fireUTBotSettingsChanged() {
         project.messageBus.syncPublisher(UTBotSettingsChangedListener.TOPIC).settingsChanged(this)
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotProjectIndependentSettings.kt

@@ -17,7 +17,12 @@ class UTBotProjectIndependentSettings : PersistentStateComponent<UTBotProjectInd
     data class State(
         var port: Int = UTBotAllProjectSettings.DEFAULT_PORT,
         var serverName: String = UTBotAllProjectSettings.DEFAULT_HOST,
-    )
+    ) {
+        fun fromSettingsModel(model: UTBotSettingsModel) {
+            port = model.globalSettings.port
+            serverName = model.globalSettings.serverName
+        }
+    }
 
     private var myState: State = State()
     override fun getState(): State = myState

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotProjectStoredSettings.kt

@@ -33,7 +33,22 @@ class UTBotProjectStoredSettings(val project: Project) : PersistentStateComponen
         var verbose: Boolean = false,
         var timeoutPerFunction: Int = 0,
         var timeoutPerTest: Int = 30
-    )
+    ) {
+        fun fromSettingsModel(model: UTBotSettingsModel) {
+            buildDirRelativePath = model.projectSettings.buildDirRelativePath
+            testDirPath = model.projectSettings.testDirPath
+            targetPath = model.projectSettings.targetPath
+            remotePath = model.projectSettings.remotePath
+            sourceDirs = model.projectSettings.sourceDirs
+            cmakeOptions = model.projectSettings.cmakeOptions
+            generateForStaticFunctions = model.projectSettings.generateForStaticFunctions
+            useStubs = model.projectSettings.useStubs
+            useDeterministicSearcher = model.projectSettings.useDeterministicSearcher
+            verbose = model.projectSettings.verbose
+            timeoutPerFunction = model.projectSettings.timeoutPerFunction
+            timeoutPerTest = model.projectSettings.timeoutPerTest
+        }
+    }
 
     override fun getState() = myState
     override fun loadState(state: State) {

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/UTBotWizard.kt

@@ -4,6 +4,8 @@ import com.intellij.ide.BrowserUtil
 import com.intellij.ide.wizard.AbstractWizard
 import com.intellij.openapi.project.Project
 import org.utbot.cpp.clion.plugin.UTBot
+import org.utbot.cpp.clion.plugin.settings.UTBotSettingsModel
+import org.utbot.cpp.clion.plugin.settings.projectIndependentSettings
 import org.utbot.cpp.clion.plugin.settings.settings
 import org.utbot.cpp.clion.plugin.ui.wizard.steps.BuildOptionsStep
 import org.utbot.cpp.clion.plugin.ui.wizard.steps.ConnectionStep
@@ -12,7 +14,7 @@ import org.utbot.cpp.clion.plugin.ui.wizard.steps.SuccessStep
 
 class UTBotWizard(private val project: Project) : AbstractWizard<UTBotWizardStep>("UTBot: Quickstart", project) {
     // copy of settings to make changes during wizard steps
-    private val mySettingsModel = project.settings.asModel()
+    private val mySettingsModel = UTBotSettingsModel(project.settings.storedSettings, projectIndependentSettings)
 
     init {
         addStep(IntroStrep())