Improve error messages and special case macOS compatibility error

rage · Sep 25, 2024 · 26441dc · 26441dc
1 parent 55f890b
commit 26441dc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/api/tmc.ts b/src/api/tmc.ts
@@ -1053,6 +1053,15 @@ export default class TMC {
                 if (timeout) {
                     clearTimeout(timeout);
                 }
+                if ("errno" in error) {
+                    // check for macos error code -88
+                    // which indicates an architecture mismatch
+                    if (error.errno === -88) {
+                        error.message = `A compatibility error was detected.
+If you're on macOS: Try installing Rosetta by running \`softwareupdate --install-rosetta\` in the terminal. (See https://support.apple.com/en-us/102527).
+${error.message}`;
+                    }
+                }
                 reject(error);
             });
             cprocess.stderr.on("data", (chunk) => {

diff --git a/src/panels/TmcPanel.ts b/src/panels/TmcPanel.ts
@@ -401,7 +401,8 @@ export class TmcPanel {
                         const organizations = await actionContext.tmc.getOrganizations();
                         if (organizations.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to open panel: ${organizations.err}`,
+                                "Failed to open panel.",
+                                organizations.val,
                             );
                             return;
                         }
@@ -423,7 +424,8 @@ export class TmcPanel {
                         const courses = await actionContext.tmc.getCourses(organization.slug);
                         if (courses.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to open panel: ${courses.err}`,
+                                "Failed to open panel.",
+                                courses.val,
                             );
                             return;
                         }
@@ -444,7 +446,8 @@ export class TmcPanel {
                         const organizations = await actionContext.tmc.getOrganizations();
                         if (organizations.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to open panel: ${organizations.err}`,
+                                "Failed to open panel.",
+                                organizations.val,
                             );
                             return;
                         }
@@ -590,8 +593,8 @@ export class TmcPanel {
                             await actionContext.tmc.listLocalCourseExercises(message.courseName);
                         if (localCourseExercises.err) {
                             actionContext.dialog.errorNotification(
-                                `Error trying to list local exercises while opening selected exercises. \
-                                ${localCourseExercises.val}`,
+                                "Error trying to list local exercises while opening selected exercises.",
+                                localCourseExercises.val,
                             );
                             return;
                         }
@@ -643,7 +646,7 @@ export class TmcPanel {
                         const updateResult = await updateCourse(actionContext, courseId);
                         if (updateResult.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to update course: ${updateResult.val.message}`,
+                                "Failed to update course.",
                                 updateResult.val,
                             );
                         }
@@ -675,7 +678,8 @@ export class TmcPanel {
                         );
                         if (result.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to add new course: ${result.val.message}`,
+                                "Failed to add new course.",
+                                result.val,
                             );
                         }
                         postMessageToWebview(webview, {
@@ -736,7 +740,7 @@ export class TmcPanel {
                         );
                         if (pasteResult.err) {
                             actionContext.dialog.errorNotification(
-                                `Failed to send to TMC Paste: ${pasteResult.val.message}.`,
+                                "Failed to send to TMC Paste.",
                                 pasteResult.val,
                             );
                             TmcPanel.postMessage({