fix: properly detect 1.37.0 (#911)

denoland · Sep 6, 2023 · 2a45179 · 2a45179
1 parent d60350a
commit 2a45179
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/client/src/extension.ts b/client/src/extension.ts
@@ -66,9 +66,10 @@ function configToWorkspaceSettings(
   const workspaceSettings = Object.create(null);
   for (const key of workspaceSettingsKeys) {
     workspaceSettings[key] = config.get(key);
-    // Deno LSP versions < 1.37.0 require `deno.enable` to be non-null.
+    // TODO(nayeemrmn): Deno LSP versions < 1.37.0 require `deno.enable` to be
+    // non-null. Eventually remove this.
     if (
-      semver.lt(extensionContext.serverInfo?.version ?? "1.0.0", "1.37.0") &&
+      semver.lt(extensionContext.serverInfo?.version ?? "1.0.0", "1.37.0-rc") &&
       key == "enable"
     ) {
       workspaceSettings[key] ??= false;
@@ -153,6 +154,8 @@ function handleConfigurationChange(event: vscode.ConfigurationChangeEvent) {
 
     // restart when certain config changes
     if (
+      event.affectsConfiguration("deno.enable") ||
+      event.affectsConfiguration("deno.enablePaths") ||
       event.affectsConfiguration("deno.path") ||
       event.affectsConfiguration("deno.maxTsServerMemory")
     ) {
@@ -312,6 +315,12 @@ export async function activate(
   handleDocumentOpen(...vscode.workspace.textDocuments);
 
   await commands.startLanguageServer(context, extensionContext)();
+  // TODO(nayeemrmn): Deno LSP versions < 1.37.0 has different compat logic.
+  // We restart here if it's detected. Eventually remove this.
+  if (!semver.lt(extensionContext.serverInfo!.version, "1.37.0-rc")) {
+    extensionContext.workspaceSettings = getWorkspaceSettings();
+    await commands.startLanguageServer(context, extensionContext)();
+  }
 
   // Register any commands.
   const registerCommand = createRegisterCommand(context);