(#264, #265) Settings: store a setting with working directory

Author: ForNeVeR

src/rider/main/kotlin/me/fornever/avaloniarider/idea/settings/AvaloniaWorkspaceSettings.kt

@@ -15,9 +15,12 @@ import java.nio.file.Paths
  */
 class AvaloniaWorkspaceState : BaseState() {
     var projectPerEditor by map<String, String>()
+
+    // TODO[#265]: Move to AvaloniaProjectSettingsState
+    var workingDirectory by property<WorkingDirectorySpecification>(DefinedByMsBuild) { it == DefinedByMsBuild }
 }
 
-@State(name = "AvaloniaProject", storages = [Storage("avalonia.xml")]) // TODO[#265]: move to a workspace-related file
+@State(name = "AvaloniaProject", storages = [Storage("avalonia.xml")]) // TODO[#265]: Move to a workspace-related file
 @Service(Service.Level.PROJECT)
 class AvaloniaWorkspaceSettings(private val project: Project) : SimplePersistentStateComponent<AvaloniaWorkspaceState>(
     AvaloniaWorkspaceState()

src/rider/main/kotlin/me/fornever/avaloniarider/idea/settings/WorkingDirectorySpecification.kt

@@ -0,0 +1,16 @@
+package me.fornever.avaloniarider.idea.settings
+
+import java.nio.file.Path
+
+sealed interface WorkingDirectorySpecification {
+    fun getPath(): Path
+}
+
+object DefinedByMsBuild : WorkingDirectorySpecification {
+    override fun getPath(): Path {
+        TODO("Not yet implemented")
+    }
+}
+
+object SolutionDirectory : WorkingDirectorySpecification
+data class CustomPath(val path: String) : WorkingDirectorySpecification

src/rider/main/kotlin/me/fornever/avaloniarider/previewer/AvaloniaPreviewerProcess.kt

@@ -31,7 +31,8 @@ data class AvaloniaPreviewerParameters(
     /**
      * Path to the assembly containing a XAML file in question.
      */
-    val xamlContainingAssemblyPath: Path
+    val xamlContainingAssemblyPath: Path,
+    val workingDirectory: Path
 )
 
 class AvaloniaPreviewerProcess(
@@ -60,7 +61,7 @@ class AvaloniaPreviewerProcess(
             else -> GeneralCommandLine().withExePath(parameters.previewerBinary.toAbsolutePath().toString())
                 .withParameters(previewerArguments)
         }
-        return commandLine.withWorkDirectory(parameters.targetDir.toFile())
+        return commandLine.withWorkDirectory(parameters.workingDirectory.toFile())
     }
 
     private fun startProcess(

src/rider/main/kotlin/me/fornever/avaloniarider/previewer/MsBuildParameterCollector.kt

@@ -5,22 +5,21 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.workspaceModel.ide.toPath
-import com.jetbrains.rider.model.RdTargetFrameworkId
 import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
 import com.jetbrains.rider.run.environment.MSBuildEvaluator
 import com.jetbrains.rider.runtime.DotNetRuntime
 import com.jetbrains.rider.runtime.RiderDotNetActiveRuntimeHost
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntime
 import me.fornever.avaloniarider.exceptions.AvaloniaPreviewerInitializationException
+import me.fornever.avaloniarider.idea.settings.AvaloniaWorkspaceSettings
 import me.fornever.avaloniarider.model.RdProjectOutput
 import me.fornever.avaloniarider.rider.AvaloniaRiderProjectModelHost
 import org.jetbrains.concurrency.await
 import java.nio.file.Path
 import java.nio.file.Paths
-import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.nameWithoutExtension
 
-@Service
+@Service(Service.Level.PROJECT)
 class MsBuildParameterCollector(private val project: Project) {
     companion object {
         fun getInstance(project: Project): MsBuildParameterCollector =
@@ -29,18 +28,22 @@ class MsBuildParameterCollector(private val project: Project) {
         private val logger = logger<MsBuildParameterCollector>()
     }
 
+    private val workspaceSettings
+        get() = AvaloniaWorkspaceSettings.getInstance(project)
+
     private fun getPathKey(runtime: DotNetRuntime): String = when (runtime) {
         is DotNetCoreRuntime -> "AvaloniaPreviewerNetCoreToolPath"
         else -> "AvaloniaPreviewerNetFullToolPath"
     }
 
-    @OptIn(ExperimentalPathApi::class)
     private fun createParameters(
         runtime: DotNetRuntime,
         runnableProjectFilePath: Path,
         avaloniaPreviewerPathKey: String,
         runnableProjectProperties: Map<String, String>,
-        xamlContainingProjectProperties: Map<String, String>): AvaloniaPreviewerParameters {
+        xamlContainingProjectProperties: Map<String, String>,
+        runnableProjectWorkingDirectory: Path
+    ): AvaloniaPreviewerParameters {
         fun getProperty(properties: Map<String, String>, key: String, errorMessage: String? = null): String {
             val property = properties[key]
             if (property.isNullOrEmpty()) {
@@ -64,7 +67,15 @@ class MsBuildParameterCollector(private val project: Project) {
 
         val xamlAssemblyPath = Paths.get(getProperty(xamlContainingProjectProperties, "TargetPath"))
 
-        return AvaloniaPreviewerParameters(runtime, previewerPath, targetDir, targetName, targetPath, xamlAssemblyPath)
+        return AvaloniaPreviewerParameters(
+            runtime,
+            previewerPath,
+            targetDir,
+            targetName,
+            targetPath,
+            xamlAssemblyPath,
+            workspaceSettings.state.workingDirectory.getPath()
+        )
     }
 
     @Suppress("UnstableApiUsage")
@@ -95,14 +106,9 @@ class MsBuildParameterCollector(private val project: Project) {
         val runtime = DotNetRuntime.detectRuntimeForProjectOrThrow(
             runnableProject.kind,
             runtimeHost,
-            null,
+            runtimeType = null,
             runnableProjectOutput.outputPath,
-            RdTargetFrameworkId(
-                tfm.shortName,
-                tfm.presentableName,
-                isNetCoreApp = tfm.isNetCoreApp,
-                isNetFramework = tfm.isNetFramework
-            )
+            tfm
         )
         val avaloniaPreviewerPathKey = getPathKey(runtime)
 
@@ -126,6 +132,8 @@ class MsBuildParameterCollector(private val project: Project) {
             runnableProjectFilePath,
             avaloniaPreviewerPathKey,
             runnableProjectProperties.await(),
-            xamlProjectProperties.await())
+            xamlProjectProperties.await(),
+            TODO("Determine program working directory from the runnableProject")
+        )
     }
 }