From 9fd54cc59786510011ff4539dee7315f864275c0 Mon Sep 17 00:00:00 2001
From: Steven Arcangeli <stevearc@stevearc.com>
Date: Thu, 21 Sep 2023 07:45:54 -0700
Subject: refactor: rename ruff -> ruff_fix

---
 lua/conform/formatters/latexindent.lua |  1 +
 lua/conform/formatters/ruff.lua        | 24 ++++--------------------
 lua/conform/formatters/ruff_fix.lua    | 21 +++++++++++++++++++++
 lua/conform/formatters/ruff_format.lua |  3 ++-
 lua/conform/init.lua                   |  1 +
 5 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 lua/conform/formatters/ruff_fix.lua

(limited to 'lua/conform')

diff --git a/lua/conform/formatters/latexindent.lua b/lua/conform/formatters/latexindent.lua
index 1ac3c4e..64451e9 100644
--- a/lua/conform/formatters/latexindent.lua
+++ b/lua/conform/formatters/latexindent.lua
@@ -1,3 +1,4 @@
+---@type conform.FileFormatterConfig
 return {
   meta = {
     url = "https://github.com/cmhughes/latexindent.pl",
diff --git a/lua/conform/formatters/ruff.lua b/lua/conform/formatters/ruff.lua
index ea9d6c2..9a1d780 100644
--- a/lua/conform/formatters/ruff.lua
+++ b/lua/conform/formatters/ruff.lua
@@ -1,20 +1,4 @@
-return {
-  meta = {
-    url = "https://beta.ruff.rs/docs/",
-    description = "An extremely fast Python linter, written in Rust.",
-  },
-  command = "ruff",
-  args = {
-    "--fix",
-    "-e",
-    "-n",
-    "--stdin-filename",
-    "$FILENAME",
-    "-",
-  },
-  stdin = true,
-  cwd = require("conform.util").root_file({
-    "pyproject.toml",
-    "ruff.conf",
-  }),
-}
+-- This was renamed to ruff_fix
+local conf = vim.deepcopy(require("conform.formatters.ruff_fix"))
+conf.meta.deprecated = true
+return conf
diff --git a/lua/conform/formatters/ruff_fix.lua b/lua/conform/formatters/ruff_fix.lua
new file mode 100644
index 0000000..e6ccfec
--- /dev/null
+++ b/lua/conform/formatters/ruff_fix.lua
@@ -0,0 +1,21 @@
+---@type conform.FileFormatterConfig
+return {
+  meta = {
+    url = "https://beta.ruff.rs/docs/",
+    description = "An extremely fast Python linter, written in Rust. Fix lint errors.",
+  },
+  command = "ruff",
+  args = {
+    "--fix",
+    "-e",
+    "-n",
+    "--stdin-filename",
+    "$FILENAME",
+    "-",
+  },
+  stdin = true,
+  cwd = require("conform.util").root_file({
+    "pyproject.toml",
+    "ruff.toml",
+  }),
+}
diff --git a/lua/conform/formatters/ruff_format.lua b/lua/conform/formatters/ruff_format.lua
index 3f368eb..1c9246a 100644
--- a/lua/conform/formatters/ruff_format.lua
+++ b/lua/conform/formatters/ruff_format.lua
@@ -1,3 +1,4 @@
+---@type conform.FileFormatterConfig
 return {
   meta = {
     url = "https://beta.ruff.rs/docs/",
@@ -13,6 +14,6 @@ return {
   stdin = true,
   cwd = require("conform.util").root_file({
     "pyproject.toml",
-    "ruff.conf",
+    "ruff.toml",
   }),
 }
diff --git a/lua/conform/init.lua b/lua/conform/init.lua
index 864d6eb..3e2b01c 100644
--- a/lua/conform/init.lua
+++ b/lua/conform/init.lua
@@ -24,6 +24,7 @@ local M = {}
 ---@class (exact) conform.FormatterMeta
 ---@field url string
 ---@field description string
+---@field deprecated? boolean
 
 ---@class (exact) conform.Context
 ---@field buf integer
-- 
cgit v1.2.3-70-g09d2