cleanup

Author: carsakiller

client/src/addon_manager/models/addon.ts

@@ -11,7 +11,7 @@ import {
 } from "../services/settings.service";
 import { git } from "../services/git.service";
 import filesystem from "../services/filesystem.service";
-import { DiffResultBinaryFile, DiffResultTextFile } from "simple-git";
+import { DiffResultTextFile } from "simple-git";
 
 const localLogger = createChildLogger("Addon");
 
@@ -70,10 +70,17 @@ export class Addon {
             "module",
             CONFIG_FILENAME
         );
-        const rawConfig = await filesystem.readFile(configURI);
-        const config = JSON.parse(rawConfig);
 
-        return config as AddonConfig;
+        try {
+            const rawConfig = await filesystem.readFile(configURI);
+            const config = JSON.parse(rawConfig);
+            return config as AddonConfig;
+        } catch (e) {
+            localLogger.error(
+                `Failed to read config.json file for ${this.name} (${e})`
+            );
+            throw e;
+        }
     }
 
     public async update() {

client/src/addon_manager/panels/WebVue.ts

@@ -7,6 +7,7 @@ import { WebVueMessage } from "../types/webvue";
 import { DEVELOPMENT_IFRAME_URL } from "../config";
 
 const localLogger = createChildLogger("WebVue");
+const commandLogger = createChildLogger("Command");
 
 export class WebVue {
     public static currentPanel: WebVue | undefined;
@@ -242,7 +243,6 @@ export class WebVue {
         webview: vscode.Webview,
         context: vscode.ExtensionContext
     ) {
-        const commandLogger = createChildLogger("Command");
 
         return webview.onDidReceiveMessage((message: WebVueMessage) => {
             const command = message.command;

client/src/addon_manager/registration.ts

@@ -5,7 +5,6 @@ import VSCodeLogFileTransport from "./services/logging/vsCodeLogFileTransport";
 import { logger } from "./services/logging.service";
 import dayjs from "dayjs";
 import RelativeTime from "dayjs/plugin/relativeTime";
-import { setSetting } from "./services/settings.service";
 import { setupGit } from "./services/git.service";
 
 dayjs.extend(RelativeTime);
@@ -16,10 +15,9 @@ export async function activate(context: vscode.ExtensionContext) {
     // Register commands
     context.subscriptions.push(
         vscode.commands.registerCommand("lua.addon_manager.open", () => {
-            Promise.allSettled(setupPromises).then(() =>
-                WebVue.render(context)
-            );
-            setSetting("Lua.workspace.checkThirdParty", false);
+            Promise.allSettled(setupPromises)
+                .then(() => WebVue.render(context))
+                .catch((e) => logger.error(e));
         })
     );
     // Create log file transport and add to logger