From 3c83308ebeedf5ee6634079a029861e151b97426 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Thu, 22 Dec 2022 22:15:48 +0100
Subject: Replace black, flake8, and pyright with ruff

---
 fnl/config/lsp/mason-lspconfig.fnl  | 6 ------
 fnl/config/lsp/mason-null-ls.fnl    | 5 +----
 fnl/config/lsp/null-ls.fnl          | 4 ++--
 fnl/config/lsp/settings/pyright.fnl | 4 ----
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 fnl/config/lsp/settings/pyright.fnl

(limited to 'fnl')

diff --git a/fnl/config/lsp/mason-lspconfig.fnl b/fnl/config/lsp/mason-lspconfig.fnl
index 1ac5dde..8aeaff1 100644
--- a/fnl/config/lsp/mason-lspconfig.fnl
+++ b/fnl/config/lsp/mason-lspconfig.fnl
@@ -8,7 +8,6 @@
                :hls
                :html
                :jsonls
-               :pyright
                :rust_analyzer
                :sqls
                :sumneko_lua
@@ -31,10 +30,6 @@
        (let [sumneko-lua (require :config.lsp.settings.sumneko-lua)]
          (vim.tbl_deep_extend :force sumneko-lua.opts (handler-opts))))
 
-(defn- pyright-opts []
-       (let [pyright (require :config.lsp.settings.pyright)]
-         (vim.tbl_deep_extend :force pyright.opts (handler-opts))))
-
 (defn- rust-opts []
        (let [rust (require :config.lsp.settings.rust)]
          (vim.tbl_deep_extend :force rust.opts (handler-opts))))
@@ -42,7 +37,6 @@
 (defn- get-server-opts [server]
        (match server
          :jsonls (jsonls-opts)
-         :pyright (pyright-opts)
          :sumneko_lua (sumneko-lua-opts)
          :rust_analyzer (rust-opts)
          _ (handler-opts)))
diff --git a/fnl/config/lsp/mason-null-ls.fnl b/fnl/config/lsp/mason-null-ls.fnl
index f4c1f6e..5200cea 100644
--- a/fnl/config/lsp/mason-null-ls.fnl
+++ b/fnl/config/lsp/mason-null-ls.fnl
@@ -1,9 +1,7 @@
 ;; Ensure that tools needed for null-ls are installed.
 (module config.mason-null-ls {autoload {util config.util}})
 
-(def- opts {:ensure_installed [:black
-                               :cpplint
-                               :flake8
+(def- opts {:ensure_installed [:cpplint
                                :fnlfmt
                                :gitlint
                                :hadolint
@@ -16,7 +14,6 @@
                                :stylua
                                :terraform-fmt
                                :yamllint]
-
             :auto_update true
             :automatic_installation true})
 
diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl
index 674fa1c..7b810c8 100644
--- a/fnl/config/lsp/null-ls.fnl
+++ b/fnl/config/lsp/null-ls.fnl
@@ -5,7 +5,7 @@
   (let [formatting null-ls.builtins.formatting
         diagnostics null-ls.builtins.diagnostics]
     (null-ls.setup {:debug false
-                    :sources [diagnostics.flake8
+                    :sources [diagnostics.ruff
                               diagnostics.jsonlint
                               diagnostics.shellcheck
                               diagnostics.sqlfluff
@@ -13,7 +13,7 @@
                               diagnostics.hadolint
                               diagnostics.cpplint
                               diagnostics.yamllint
-                              (formatting.black.with {:extra_args [:--fast]})
+                              formatting.ruff
                               formatting.fnlfmt
                               (formatting.prettier.with {:extra_args [:--no-semi
                                                                       :--single-quote
diff --git a/fnl/config/lsp/settings/pyright.fnl b/fnl/config/lsp/settings/pyright.fnl
deleted file mode 100644
index 639ecff..0000000
--- a/fnl/config/lsp/settings/pyright.fnl
+++ /dev/null
@@ -1,4 +0,0 @@
-;; Config for pyright language server.
-(module config.lsp.settings.pyright)
-
-(def opts {:settings {:python {:analysis {:typeCheckingMode :off}}}})
-- 
cgit v1.2.3-70-g09d2