2 files changed, 30 insertions, 6 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index d5f3da2ed..418845436 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -64,9 +64,24 @@ export class Config {
      * `platform` on GitHub releases. (It is also stored under the same name when
      * downloaded by the extension).
      */
-    private static prebuiltLangServerFileName(platform: NodeJS.Platform): null | string {
+    private static prebuiltLangServerFileName(
+        platform: NodeJS.Platform,
+        arch: string
+    ): null | string {
+        // See possible `arch` values here:
+        // https://nodejs.org/api/process.html#process_process_arch
+
         switch (platform) {
-            case "linux":  return "ra_lsp_server-linux";
+
+            case "linux": {
+                switch (arch) {
+                    case "arm":
+                    case "arm64": return null;
+
+                    default: return "ra_lsp_server-linux";
+                }
+            }
+
             case "darwin": return "ra_lsp_server-mac";
             case "win32":  return "ra_lsp_server-windows.exe";
 
@@ -95,7 +110,9 @@ export class Config {
             };
         }
 
-        const prebuiltBinaryName = Config.prebuiltLangServerFileName(process.platform);
+        const prebuiltBinaryName = Config.prebuiltLangServerFileName(
+            process.platform, process.arch
+        );
 
         if (!prebuiltBinaryName) return null;
 
diff --git a/editors/code/src/installation/download_file.ts b/editors/code/src/installation/download_file.ts
index fe356c39d..8a0766c66 100644
--- a/editors/code/src/installation/download_file.ts
+++ b/editors/code/src/installation/download_file.ts
@@ -13,16 +13,23 @@ export async function downloadFile(
     destFilePath: fs.PathLike,
     onProgress: (readBytes: number, totalBytes: number) => void
 ): Promise<void> {
-    const response = await fetch(url);
+    const res = await fetch(url);
 
-    const totalBytes = Number(response.headers.get('content-length'));
+    if (!res.ok) {
+        console.log("Error", res.status, "while downloading file from", url);
+        console.dir({ body: await res.text(), headers: res.headers }, { depth: 3 });
+
+        throw new Error(`Got response ${res.status} when trying to download a file`);
+    }
+
+    const totalBytes = Number(res.headers.get('content-length'));
     assert(!Number.isNaN(totalBytes), "Sanity check of content-length protocol");
 
     let readBytes = 0;
 
     console.log("Downloading file of", totalBytes, "bytes size from", url, "to", destFilePath);
 
-    return new Promise<void>((resolve, reject) => response.body
+    return new Promise<void>((resolve, reject) => res.body
         .on("data", (chunk: Buffer) => {
             readBytes += chunk.length;
             onProgress(readBytes, totalBytes);