fix: error when library setting undefined

Author: carsakiller

client/src/addon_manager/commands/disable.ts

@@ -15,21 +15,20 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
     const addon = addonManager.addons.get(message.data.name);
     const workspaceFolders = vscode.workspace.workspaceFolders;
 
-    const folderOptions = await (
-        await addon.getEnabled()
-    )
-        .filter((entry) => entry.enabled === true)
-        .map((entry) => {
-            return {
-                label: entry.folder.name,
-                detail: entry.folder.uri.path,
-            };
-        });
-
     try {
         if (workspaceFolders.length === 1) {
             await addon.disable(workspaceFolders[0]);
         } else {
+            const folderOptions = await (
+                await addon.getEnabled()
+            )
+                .filter((entry) => entry.enabled === true)
+                .map((entry) => {
+                    return {
+                        label: entry.folder.name,
+                        detail: entry.folder.uri.path,
+                    };
+                });
             const targetFolders = await vscode.window.showQuickPick(
                 folderOptions,
                 {
@@ -48,7 +47,11 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
                     (folder) => folder.name === target.label
                 );
                 await addon.disable(folder);
-                await setSetting(folder, "Lua.workspace.checkThirdParty", false);
+                await setSetting(
+                    folder,
+                    "Lua.workspace.checkThirdParty",
+                    false
+                );
             }
         }
     } catch (e) {

client/src/addon_manager/commands/enable.ts

@@ -15,22 +15,22 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
     const addon = addonManager.addons.get(message.data.name);
     const workspaceFolders = vscode.workspace.workspaceFolders;
 
-    const folderOptions = await (
-        await addon.getEnabled()
-    )
-        .filter((entry) => entry.enabled === false)
-        .map((entry) => {
-            return {
-                label: entry.folder.name,
-                detail: entry.folder.uri.path,
-            };
-        });
-
     try {
         if (workspaceFolders.length === 1) {
             await addon.enable(workspaceFolders[0]);
             await setSetting(workspaceFolders[0], "Lua.workspace.checkThirdParty", false);
         } else {
+            const folderOptions = await (
+                await addon.getEnabled()
+            )
+                .filter((entry) => entry.enabled === false)
+                .map((entry) => {
+                    return {
+                        label: entry.folder.name,
+                        detail: entry.folder.uri.path,
+                    };
+                });
+
             const targetFolders = await vscode.window.showQuickPick(
                 folderOptions,
                 {

client/src/addon_manager/services/settings.service.ts

@@ -31,6 +31,9 @@ export const getSettingsFile = async (
 
     let rawSettings = await filesystem.readFile(settingFileUri);
     if (!rawSettings) {
+        localLogger.warn(
+            `Could not get settings file for ${folder.name} folder, falling back to no settings`
+        );
         rawSettings = "{}";
     }
 
@@ -56,12 +59,8 @@ export const getSetting = async (
     name: string,
     folder: vscode.WorkspaceFolder
 ): Promise<unknown> => {
-    try {
-        const workspaceSettings = await getSettingsFile(folder);
-        return workspaceSettings[name];
-    } catch (e) {
-        return undefined;
-    }
+    const workspaceSettings = await getSettingsFile(folder);
+    return workspaceSettings[name] ?? [];
 };
 
 /** Set a setting in this workspace's `.vscode/settings.json` file.
@@ -92,7 +91,7 @@ export const setSetting = async (
 
 export type WorkspaceLibrary = {
     folder: vscode.WorkspaceFolder;
-    paths: string[];
+    paths?: string[];
 };
 
 export const getLibraryPaths = async () => {
@@ -101,7 +100,7 @@ export const getLibraryPaths = async () => {
     for (const folder of vscode.workspace.workspaceFolders) {
         folders.push({
             folder,
-            paths: (await getSetting(LIBRARY_SETTING, folder)) as string[],
+            paths: (await getSetting(LIBRARY_SETTING, folder)) as string[] | undefined,
         });
     }