1 files changed, 14 insertions, 4 deletions

diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 191960960..4b2d3c8a5 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -19,9 +19,8 @@ let ctx: Ctx | undefined;
 const RUST_PROJECT_CONTEXT_NAME = "inRustProject";
 
 export async function activate(context: vscode.ExtensionContext) {
-    // For some reason vscode not always shows pop-up error notifications
-    // when an extension fails to activate, so we do it explicitly by ourselves.
-    // FIXME: remove this bit of code once vscode fixes this issue: https://github.com/microsoft/vscode/issues/101242
+    // VS Code doesn't show a notification when an extension fails to activate
+    // so we do it ourselves.
     await tryActivate(context).catch(err => {
         void vscode.window.showErrorMessage(`Cannot activate rust-analyzer: ${err.message}`);
         throw err;
@@ -292,6 +291,8 @@ async function getServer(config: Config, state: PersistentState): Promise<string
         if (process.platform === "linux") platform = "linux";
         if (process.platform === "darwin") platform = "mac";
         if (process.platform === "win32") platform = "windows";
+    } else if (process.arch === "arm64" && process.platform === "darwin") {
+        platform = "mac";
     }
     if (platform === undefined) {
         vscode.window.showErrorMessage(
@@ -340,7 +341,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
     });
 
     // Patching executable if that's NixOS.
-    if (await fs.stat("/etc/nixos").then(_ => true).catch(_ => false)) {
+    if (await isNixOs()) {
         await patchelf(dest);
     }
 
@@ -348,6 +349,15 @@ async function getServer(config: Config, state: PersistentState): Promise<string
     return dest;
 }
 
+async function isNixOs(): Promise<boolean> {
+    try {
+        const contents = await fs.readFile("/etc/os-release");
+        return contents.indexOf("ID=nixos") !== -1;
+    } catch (e) {
+        return false;
+    }
+}
+
 async function downloadWithRetryDialog<T>(state: PersistentState, downloadFunc: () => Promise<T>): Promise<T> {
     while (true) {
         try {