From 2382a7d7fa5e829f90e9a67fbbbb98cad50ac327 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 22 Aug 2024 20:03:08 +0200
Subject: [PATCH] revert to ruff-lsp

---
 frontend/src/lib/components/Editor.svelte | 2 +-
 lsp/Dockerfile                            | 4 ++--
 lsp/pyls_launcher.py                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 0244c302e3..733cb6dbcc 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -803,7 +803,7 @@
 				connectToLanguageServer(
 					`${wsProtocol}://${window.location.host}/ws/ruff`,
 					'ruff',
-					{ 'ruff.lint.select': ['E', 'F'], extendSelect: ['I'], 'ruff.logLevel': 'debug' },
+					{},
 					undefined
 				)
 			} else if (lang === 'go') {
diff --git a/lsp/Dockerfile b/lsp/Dockerfile
index a02d073fc2..d325fd8a5b 100644
--- a/lsp/Dockerfile
+++ b/lsp/Dockerfile
@@ -24,9 +24,9 @@ RUN set -eux; \
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GOBIN=/usr/local/go/bin
 RUN /usr/local/go/bin/go install -v golang.org/x/tools/gopls@latest
-RUN pip3 install tornado python-lsp-jsonrpc ruff
+RUN pip3 install tornado python-lsp-jsonrpc ruff-lsp
 
-COPY --from=denoland/deno:1.45.4 --chmod=755 /usr/bin/deno /usr/bin/deno
+COPY --from=denoland/deno:1.46.0 --chmod=755 /usr/bin/deno /usr/bin/deno
 
 COPY Pipfile .
 
diff --git a/lsp/pyls_launcher.py b/lsp/pyls_launcher.py
index af6a22e810..93636b5786 100644
--- a/lsp/pyls_launcher.py
+++ b/lsp/pyls_launcher.py
@@ -81,7 +81,7 @@ class DiagnosticLS(LanguageServerWebSocketHandler):
 
 
 class RuffLS(LanguageServerWebSocketHandler):
-    procargs = ["ruff", "server", "--preview"]
+    procargs = ["ruff-lsp"]
 
 
 class DenoLS(LanguageServerWebSocketHandler):