From 167eabf8b6299b2bd0fded4718ce9bfd32f853b2 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Thu, 18 Jul 2024 11:16:23 +0530
Subject: [PATCH] Avoid passing `--preview` flag for stable `ruff server`

---
 src/common/constants.ts | 5 +++--
 src/common/server.ts    | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/common/constants.ts b/src/common/constants.ts
index 179c446..c12738a 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -61,6 +61,7 @@ export const FIND_RUFF_BINARY_SCRIPT_PATH = path.join(
 export const RUFF_SERVER_SUBCOMMAND = "server";
 
 /**
- * Required arguments for the `ruff server` command.
+ * Arguments for the `ruff server` command required when it's under preview i.e.,
+ * not yet stabilized.
  */
-export const RUFF_SERVER_REQUIRED_ARGS = ["--preview"];
+export const RUFF_SERVER_PREVIEW_ARGS = ["--preview"];
diff --git a/src/common/server.ts b/src/common/server.ts
index 1b88bb3..4db424b 100644
--- a/src/common/server.ts
+++ b/src/common/server.ts
@@ -11,7 +11,7 @@ import {
 import {
   BUNDLED_RUFF_EXECUTABLE,
   DEBUG_SERVER_SCRIPT_PATH,
-  RUFF_SERVER_REQUIRED_ARGS,
+  RUFF_SERVER_PREVIEW_ARGS,
   RUFF_SERVER_SUBCOMMAND,
   RUFF_LSP_SERVER_SCRIPT_PATH,
   FIND_RUFF_BINARY_SCRIPT_PATH,
@@ -176,7 +176,12 @@ async function createNativeServer(
     return Promise.reject();
   }
 
-  const ruffServerArgs = [RUFF_SERVER_SUBCOMMAND, ...RUFF_SERVER_REQUIRED_ARGS];
+  let ruffServerArgs: string[];
+  if (supportsStableNativeServer(ruffVersion)) {
+    ruffServerArgs = [RUFF_SERVER_SUBCOMMAND];
+  } else {
+    ruffServerArgs = [RUFF_SERVER_SUBCOMMAND, ...RUFF_SERVER_PREVIEW_ARGS];
+  }
   traceInfo(`Server run command: ${[ruffBinaryPath, ...ruffServerArgs].join(" ")}`);
 
   let serverOptions = {