Merge pull request #564 from koxudaxi/fix-invalid-ruff-command-option

fix: fix invalid ruff command option

Author: koxudaxi

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+- fix: fix invalid ruff command option [[#564](https://github.com/koxudaxi/ruff-pycharm-plugin/pull/564)]
 
 ## [0.0.44] - 2025-03-04
 

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.koxudaxi.ruff
 pluginName = Ruff
 pluginRepositoryUrl = https://github.com/koxudaxi/ruff-pycharm-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.44
+pluginVersion = 0.0.45
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 243.21565.199

src/com/koxudaxi/ruff/Ruff.kt

@@ -470,7 +470,7 @@ fun runRuff(sourceFile: SourceFile, args: List<String>): String? =
     generateCommandArgs(sourceFile, args, true)?.let { runRuff(it) }
 
 fun runRuff(project: Project, args: List<String>, withoutConfig: Boolean = false): String? =
-    generateCommandArgs(project, null, args, withoutConfig)?.let { runRuff(it) }
+    generateCommandArgs(project, null, args, false, withoutConfig)?.let { runRuff(it) }
 
 
 data class CommandArgs(
@@ -482,13 +482,15 @@ fun generateCommandArgs(sourceFile: SourceFile, args: List<String>, setStdin: Bo
     generateCommandArgs(
         sourceFile.project,
         if (setStdin) sourceFile.asStdin else null,
-        args + getStdinFileNameArgs(sourceFile)
+        args + getStdinFileNameArgs(sourceFile),
+        true
     )
 
 fun generateCommandArgs(
     project: Project,
     stdin: ByteArray?,
     args: List<String>,
+    addStdinOption: Boolean,
     withoutConfig: Boolean = false
 ): CommandArgs? {
     val ruffConfigService = project.configService
@@ -502,7 +504,7 @@ fun generateCommandArgs(
         executable,
         project,
         stdin,
-        (customConfigArgs ?: args) + if (stdin == null) listOf() else listOf("-")
+        (customConfigArgs ?: args) + if (stdin == null && !addStdinOption) listOf() else listOf("-")
     )
 }
 
@@ -545,7 +547,7 @@ inline fun <reified T> runRuffInBackground(
 inline fun <reified T> runRuffInBackground(
     project: Project, stdin: ByteArray?, args: List<String>, description: String, crossinline callback: (String?) -> T
 ): ProgressIndicator? {
-    val commandArgs = generateCommandArgs(project, stdin, args) ?: return null
+    val commandArgs = generateCommandArgs(project, stdin, args, true) ?: return null
     val task = object : Task.Backgroundable(project, StringUtil.toTitleCase(description), true) {
         override fun run(indicator: ProgressIndicator) {
             indicator.text = "$description..."

src/com/koxudaxi/ruff/RuffApplyService.kt

@@ -88,7 +88,8 @@ class RuffApplyService(val project: Project) {
             val formatCommandArgs = generateCommandArgs(
                 sourceFile.project,
                 sourceByte,
-                FORMAT_ARGS
+                FORMAT_ARGS,
+                true
             ) ?: return
 
             if (projectRef.isDisposed) return

src/com/koxudaxi/ruff/RuffAsyncFormatter.kt

@@ -6,6 +6,7 @@ import com.intellij.formatting.service.AsyncFormattingRequest
 import com.intellij.formatting.service.FormattingService
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.psi.PsiFile
+import com.jetbrains.python.packaging.PyExecutionException
 import java.io.FileNotFoundException
 
 
@@ -26,15 +27,11 @@ class RuffAsyncFormatter : AsyncDocumentFormattingService() {
             @Volatile
             private var cancelled = false
 
-            private fun noUpdate() {
-                request.onTextReady(null)
-            }
-
-            private fun updateText(currentText: String, text: String?) {
-                when {
-                    text == null -> noUpdate()
-                    currentText == text -> noUpdate()
-                    else -> request.onTextReady(text)
+            private fun assertResult(currentText: String, text: String?): String? {
+                return when {
+                    text == null -> null
+                    currentText == text -> null
+                    else -> text
                 }
             }
 
@@ -45,11 +42,7 @@ class RuffAsyncFormatter : AsyncDocumentFormattingService() {
                 }
                 runCatching {
                     val formattingContext: FormattingContext = request.context
-                    val ioFile = request.ioFile
-                    if (ioFile == null) {
-                        request.onTextReady(null)
-                        return@runCatching
-                    }
+                    val ioFile = request.ioFile ?: return@runCatching null
                     val sourceFile = formattingContext.containingFile.sourceFile
                     val currentText = ioFile.readText()
 
@@ -61,47 +54,41 @@ class RuffAsyncFormatter : AsyncDocumentFormattingService() {
 
                     if (formatRange != null) {
                         // When a range is specified, only run the format command.
-                        val formatCommandArgs = generateCommandArgs(sourceFile, FORMAT_ARGS + formatRange.formatRangeArgs(currentText), false)
-                            ?: return@runCatching
-                        val formatCommandStdout = runRuff(formatCommandArgs, currentText.toByteArray())
-                        if (formatCommandStdout == null) {
-                            request.onTextReady(null)
-                            return@runCatching
-                        }
-                        updateText(currentText, formatCommandStdout)
-                        return@runCatching
+                        val formatCommandArgs = generateCommandArgs(
+                            sourceFile,
+                            FORMAT_ARGS + formatRange.formatRangeArgs(currentText),
+                            false
+                        )
+                            ?: return@runCatching null
+                        val formatCommandStdout = runRuff(formatCommandArgs, currentText.toByteArray()) ?: return@runCatching null
+                        return@runCatching assertResult(currentText, formatCommandStdout)
                     }
 
                     val fixCommandArgs = generateCommandArgs(sourceFile, formattingContext.project.FIX_ARGS, false)
-                        ?: return@runCatching
-                    val fixCommandStdout = runRuff(fixCommandArgs, currentText.toByteArray())
-                    if (fixCommandStdout == null) {
-                        request.onTextReady(null)
-                        return@runCatching
-                    }
+                        ?: return@runCatching null
+                    val fixCommandStdout = runRuff(fixCommandArgs, currentText.toByteArray()) ?: return@runCatching null
                     if (!RuffConfigService.getInstance(formattingContext.project).useRuffFormat) {
-                        updateText(currentText, fixCommandStdout)
-                        return@runCatching
+                        return@runCatching assertResult(currentText, fixCommandStdout)
                     }
                     val formatCommandArgs = generateCommandArgs(sourceFile, FORMAT_ARGS, false)
-                        ?: return@runCatching
+                        ?: return@runCatching null
                     if (cancelled) {
-                        noUpdate()
-                        return@runCatching
+                        return@runCatching null
                     }
                     val formatCommandStdout = runRuff(formatCommandArgs, fixCommandStdout.toByteArray())
                     if (cancelled) {
-                        noUpdate()
-                        return@runCatching
+                        return@runCatching null
                     }
-                    updateText(currentText, formatCommandStdout)
-
+                    assertResult(currentText, formatCommandStdout)
                 }.onFailure { exception ->
                     when (exception) {
-                        is ProcessCanceledException -> { /* ignore */ }
-                        is FileNotFoundException -> noUpdate()
+                        is ProcessCanceledException -> request.onTextReady(null)
+                        is FileNotFoundException -> request.onTextReady(null)
+                        is PyExecutionException -> request.onTextReady(null)
                         else -> request.onError("Ruff Error", exception.localizedMessage)
                     }
+                }.onSuccess {
+                    request.onTextReady(it)
                 }
             }
 

src/com/koxudaxi/ruff/RuffCacheService.kt

@@ -92,9 +92,7 @@ class RuffCacheService(val project: Project) {
             if (projectRef.isDisposed) return@supplyAsync null
             val newVersion = fetchVersionFromCommand()
             if (!projectRef.isDisposed) {
-                lock.withLock {
-                    version = newVersion
-                }
+                setVersion(newVersion)
             }
             newVersion
         }, executor)