From 1692004b6bb4cf03f46f973c7e2042e0495bcbd3 Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sun, 31 Dec 2023 19:13:25 -0500
Subject: [PATCH] init: Improve error message formatting

Instead of manually formatting the error message and stack, use the same
formatting mechanism as we do when displaying errors to the user that
occur while opening extension preferences. This should correctly
indicate where syntax errors from imported modules occur.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3041>
---
 js/ui/init.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/ui/init.js b/js/ui/init.js
index a7cf7db3e..735a367bb 100644
--- a/js/ui/init.js
+++ b/js/ui/init.js
@@ -2,6 +2,7 @@ import GLib from 'gi://GLib';
 import Gio from 'gi://Gio';
 
 import './environment.js';
+import {formatError} from '../misc/errorUtils.js';
 
 // Run the Mutter main loop after
 // GJS finishes resolving this module.
@@ -10,8 +11,7 @@ imports._promiseNative.setMainLoopHook(() => {
     GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
         import('./main.js').then(main => main.start()).catch(e => {
             const error = new GLib.Error(
-                Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED,
-                `${e.message}\n${e.stack}`);
+                Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED, formatError(e));
             global.context.terminate_with_error(error);
         });
         return GLib.SOURCE_REMOVE;