Merge pull request #412 from koxudaxi/improve_ruff_config_path_in_wsl

Improve ruff config path in wsl

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+- Improve ruff config path in wsl [[#412](https://github.com/koxudaxi/ruff-pycharm-plugin/pull/412)]
 - Fix wsl detection on 2024.1 [[#414](https://github.com/koxudaxi/ruff-pycharm-plugin/pull/414)]
 
 ## [0.0.32] - 2024-04-01

src/com/koxudaxi/ruff/Ruff.kt

@@ -60,6 +60,8 @@ val RUFF_LSP_COMMAND = when {
 }
 const val WSL_RUFF_LSP_COMMAND = "ruff-lsp"
 
+const val CONFIG_ARG = "--config"
+
 val ruffVersionCache: ConcurrentHashMap<String, RuffVersion> = ConcurrentHashMap()
 
 fun getRuffCommand(lsp: Boolean) = if (lsp) RUFF_LSP_COMMAND else RUFF_COMMAND
@@ -217,16 +219,25 @@ fun getGeneralCommandLine(command: List<String>, projectPath: String?): GeneralC
     GeneralCommandLine(command).withWorkDirectory(projectPath).withCharset(Charsets.UTF_8)
 
 fun runCommand(
-    executable: File, project: Project, stdin: ByteArray?, vararg args: String
+    executable: File, project: Project?, stdin: ByteArray?, vararg args: String
 ): String? {
-    val projectPath = project.basePath
+    val projectPath = project?.basePath
     val indicator = ProgressManager.getInstance().progressIndicator
     val handler = if (WslPath.isWslUncPath(executable.path)) {
         val windowsUncPath = WslPath.parseWindowsUncPath(executable.path) ?: return null
+        val configArgIndex = args.indexOf(CONFIG_ARG)
+        val injectedArgs = if (configArgIndex != -1 && configArgIndex < args.size - 1) {
+            val configPathIndex = configArgIndex + 1
+            val configPath = args[configPathIndex]
+            val windowsUncConfigPath = WslPath.parseWindowsUncPath(configPath)?.linuxPath ?: configPath
+            args.toMutableList().apply { this[configPathIndex] = windowsUncConfigPath }.toTypedArray()
+        } else {
+            args
+        }
+        val commandLine = getGeneralCommandLine(listOf(windowsUncPath.linuxPath) + injectedArgs, projectPath)
         val options = WSLCommandLineOptions()
         options.setExecuteCommandInShell(false)
         options.setLaunchWithWslExe(true)
-        val commandLine = getGeneralCommandLine(listOf(windowsUncPath.linuxPath) + args, projectPath)
         windowsUncPath.distribution.patchCommandLine<GeneralCommandLine>(commandLine, project, options)
     } else {
         getGeneralCommandLine(listOf(executable.path) + args, projectPath)
@@ -337,7 +348,7 @@ fun generateCommandArgs(
             project, ruffConfigService, false
         ) ?: return null
     val customConfigArgs = if (withoutConfig) null else ruffConfigService.ruffConfigPath?.let {
-        args + listOf("--config", it)
+        args + listOf(CONFIG_ARG, it)
     }
     return CommandArgs(
         executable,

src/com/koxudaxi/ruff/RuffLspServerSupportProvider.kt

@@ -58,7 +58,7 @@ private class RuffLspServerDescriptor(project: Project, val executable: File, va
 
     override fun createInitializationOptions(): Any? {
         val config = ruffConfig.ruffConfigPath?.let { File(it) }?.takeIf { it.exists() } ?: return null
-        return InitOptions(Settings(listOf("--config", config.absolutePath)))
+        return InitOptions(Settings(listOf(CONFIG_ARG, config.absolutePath)))
     }
 
     override val lspGoToDefinitionSupport: Boolean = false