From 93f3d4cabe41473477a314c731e635175458f591 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Tue, 26 Mar 2024 00:33:56 +0530
Subject: fix: use `--force-exclude` with Ruff (#348)

---
 lua/conform/formatters/ruff_fix.lua    | 9 ++++++---
 lua/conform/formatters/ruff_format.lua | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lua')

diff --git a/lua/conform/formatters/ruff_fix.lua b/lua/conform/formatters/ruff_fix.lua
index e6ccfec..ecf3ed7 100644
--- a/lua/conform/formatters/ruff_fix.lua
+++ b/lua/conform/formatters/ruff_fix.lua
@@ -1,14 +1,16 @@
 ---@type conform.FileFormatterConfig
 return {
   meta = {
-    url = "https://beta.ruff.rs/docs/",
+    url = "https://docs.astral.sh/ruff/",
     description = "An extremely fast Python linter, written in Rust. Fix lint errors.",
   },
   command = "ruff",
   args = {
+    "check",
     "--fix",
-    "-e",
-    "-n",
+    "--force-exclude",
+    "--exit-zero",
+    "--no-cache",
     "--stdin-filename",
     "$FILENAME",
     "-",
@@ -17,5 +19,6 @@ return {
   cwd = require("conform.util").root_file({
     "pyproject.toml",
     "ruff.toml",
+    ".ruff.toml",
   }),
 }
diff --git a/lua/conform/formatters/ruff_format.lua b/lua/conform/formatters/ruff_format.lua
index 1c9246a..20a2e95 100644
--- a/lua/conform/formatters/ruff_format.lua
+++ b/lua/conform/formatters/ruff_format.lua
@@ -1,12 +1,13 @@
 ---@type conform.FileFormatterConfig
 return {
   meta = {
-    url = "https://beta.ruff.rs/docs/",
+    url = "https://docs.astral.sh/ruff/",
     description = "An extremely fast Python linter, written in Rust. Formatter subcommand.",
   },
   command = "ruff",
   args = {
     "format",
+    "--force-exclude",
     "--stdin-filename",
     "$FILENAME",
     "-",
@@ -15,5 +16,6 @@ return {
   cwd = require("conform.util").root_file({
     "pyproject.toml",
     "ruff.toml",
+    ".ruff.toml",
   }),
 }
-- 
cgit v1.2.3-70-g09d2