do

Author: Malix-Labs

package.json

@@ -99,7 +99,7 @@
           ]
         },
         "nix.serverPath": {
-          "default": "nil",
+          "default": "nixd",
           "description": "Location of the nix language server command.",
           "oneOf": [
             {

src/client.ts

@@ -2,26 +2,15 @@
 
 import { inspect } from "node:util";
 import { sync as commandExistsSync } from "command-exists";
-import {
-  type Disposable,
-  type ExtensionContext,
-  env,
-  Uri,
-  window,
-  workspace,
-} from "vscode";
+import { type Disposable, type ExtensionContext, env, Uri, window, workspace } from "vscode";
 import type {
   CancellationToken,
   ConfigurationParams,
   LanguageClientOptions,
   LSPArray,
   MessageSignature,
 } from "vscode-languageclient";
-import {
-  type Executable,
-  LanguageClient,
-  type ServerOptions,
-} from "vscode-languageclient/node";
+import { type Executable, LanguageClient, type ServerOptions } from "vscode-languageclient/node";
 import { config, type UriMessageItem } from "./configuration";
 
 class Client extends LanguageClient {
@@ -35,18 +24,10 @@ class Client extends LanguageClient {
     showNotification?: boolean,
   ): T {
     if (config.hiddenErrorKinds.includes(type.method)) {
-      this.outputChannel.appendLine(
-        `Suppressing failed ${inspect(type.method)} notification`,
-      );
+      this.outputChannel.appendLine(`Suppressing failed ${inspect(type.method)} notification`);
       return super.handleFailedRequest(type, token, error, defaultValue, false);
     }
-    return super.handleFailedRequest(
-      type,
-      token,
-      error,
-      defaultValue,
-      showNotification,
-    );
+    return super.handleFailedRequest(type, token, error, defaultValue, showNotification);
   }
 
   override dispose(timeout?: number): Promise<void> {
@@ -70,25 +51,39 @@ class Client extends LanguageClient {
 
 let client: Client;
 
+const defaultServerCandidates = [["nixd"], ["nil"]];
+
+function resolveServerPath(): Array<string> {
+  const configured = config.serverPath;
+  if (configured.length > 0) {
+    return configured;
+  }
+
+  for (const candidate of defaultServerCandidates) {
+    if (commandExistsSync(candidate[0])) {
+      return candidate;
+    }
+  }
+
+  return ["nixd"];
+}
+
 export async function activate(context: ExtensionContext): Promise<void> {
-  if (!commandExistsSync(config.serverPath[0])) {
-    const selection = await window.showErrorMessage<UriMessageItem>(
-      `Command ${config.serverPath} not found in $PATH`,
-      {
-        title: "Install language server",
-        uri: Uri.parse(
-          "https://github.com/nix-community/vscode-nix-ide?tab=readme-ov-file#language-servers",
-        ),
-      },
-    );
+  const serverPath = resolveServerPath();
+
+  if (!commandExistsSync(serverPath[0])) {
+    const selection = await window.showErrorMessage<UriMessageItem>(`Command ${serverPath} not found in $PATH`, {
+      title: "Install language server",
+      uri: Uri.parse("https://github.com/nix-community/vscode-nix-ide?tab=readme-ov-file#language-servers"),
+    });
     if (selection?.uri !== undefined) {
       await env.openExternal(selection?.uri);
       return;
     }
   }
   const serverExecutable: Executable = {
-    command: config.serverPath[0],
-    args: config.serverPath.slice(1),
+    command: serverPath[0],
+    args: serverPath.slice(1),
   };
   const serverOptions: ServerOptions = serverExecutable;
 
@@ -117,12 +112,9 @@ export async function activate(context: ExtensionContext): Promise<void> {
             if (!item?.section) {
               continue;
             }
-            const sectionSettings =
-              settings[item.section as keyof typeof settings];
+            const sectionSettings = settings[item.section as keyof typeof settings];
             if (!sectionSettings) {
-              client.warn(
-                `failed to find "${item.section}" in "nix.serverSettings"`,
-              );
+              client.warn(`failed to find "${item.section}" in "nix.serverSettings"`);
             }
             res.push(sectionSettings ?? null);
           }
@@ -149,9 +141,7 @@ export async function deactivate(): Promise<void> {
 }
 
 export async function restart(context: ExtensionContext): Promise<void> {
-  const restartingMsg = window.setStatusBarMessage(
-    "$(loading~spin) Restarting Nix language server",
-  );
+  const restartingMsg = window.setStatusBarMessage("$(loading~spin) Restarting Nix language server");
 
   try {
     await deactivate();

src/configuration.ts

@@ -1,9 +1,5 @@
 import type { MessageItem, Uri } from "vscode";
-import {
-  type ConfigurationChangeEvent,
-  type WorkspaceConfiguration,
-  workspace,
-} from "vscode";
+import { type ConfigurationChangeEvent, type WorkspaceConfiguration, workspace } from "vscode";
 import type { LSPObject } from "vscode-languageclient";
 import { transformConfigValueByVscodeVariables } from "./utils";
 
@@ -18,13 +14,8 @@ export class Config {
     return workspace.getConfiguration(this.rootSection);
   }
 
-  private get<T extends string | boolean | LSPObject>(
-    path: string,
-    def_val: T,
-  ): T {
-    return transformConfigValueByVscodeVariables(
-      this.cfg.get<T>(path) ?? def_val,
-    );
+  private get<T extends string | boolean | LSPObject>(path: string, def_val: T): T {
+    return transformConfigValueByVscodeVariables(this.cfg.get<T>(path) ?? def_val);
   }
 
   get formatterPath(): Array<string> {
@@ -43,7 +34,7 @@ export class Config {
   }
 
   get serverPath(): Array<string> {
-    const path: Array<string> | string = this.get("serverPath", "nil");
+    const path: Array<string> | string = this.get("serverPath", "nixd");
     if (typeof path === "string") {
       return [path];
     }
@@ -65,10 +56,7 @@ export class Config {
   requiresServerRestart(change: ConfigurationChangeEvent): boolean {
     // NOTE: this might be easier if all the settings were nested under
     // e.g. `"nix.languageServer" or something like that, to deduplicate keys
-    return (
-      change.affectsConfiguration("nix.serverPath") ||
-      change.affectsConfiguration("nix.enableLanguageServer")
-    );
+    return change.affectsConfiguration("nix.serverPath") || change.affectsConfiguration("nix.enableLanguageServer");
   }
 }
 export const config = new Config();

src/extension.ts

@@ -9,7 +9,7 @@ import { startLinting } from "./linter";
  * Activate this extension.
  *
  * If LSP is enabled
- *    then support IDE features with {@link https://github.com/oxalica/nil|nil}
+ *    then support IDE features with an available LSP
  * Else
  *    Format with nixpkgs-format
  *    validate with nix-instantiate
@@ -18,13 +18,10 @@ import { startLinting } from "./linter";
  * @return A promise for the initialization
  */
 export async function activate(context: ExtensionContext): Promise<void> {
-  if (config.LSPEnabled) {
-    try {
-      await client.activate(context);
-    } catch (err) {
-      console.error(err);
-    }
-  } else {
+  try {
+    await client.activate(context);
+  } catch (err) {
+    console.error(err);
     await startLinting(context);
     const subs = [
       vscode.languages.registerDocumentFormattingEditProvider,
@@ -34,14 +31,15 @@ export async function activate(context: ExtensionContext): Promise<void> {
   }
 
   context.subscriptions.push(
-    vscode.commands.registerCommand(
-      "nix-ide.restartLanguageServer",
-      async () => {
-        if (config.LSPEnabled) {
-          await client.restart(context);
-        }
-      },
-    ),
+    vscode.commands.registerCommand("nix-ide.restartLanguageServer", async () => {
+      if (config.LSPEnabled) {
+        await client.restart(context);
+      } else {
+        await client.activate(context).catch(async () => {
+          await startLinting(context);
+        });
+      }
+    }),
   );
 
   vscode.workspace.onDidChangeConfiguration(async (event) => {