From 77e106742ae6acfac1f223c99cab02c91559b791 Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Sun, 20 Oct 2024 02:57:01 +0000
Subject: [PATCH 1/2] fix: disabling of addons

---
 client/src/addon_manager/models/addon.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/addon_manager/models/addon.ts b/client/src/addon_manager/models/addon.ts
index 3bb7f7d..4b60e2f 100644
--- a/client/src/addon_manager/models/addon.ts
+++ b/client/src/addon_manager/models/addon.ts
@@ -278,7 +278,7 @@ export class Addon {
         )) ?? []) as string[];
 
         const regex = new RegExp(
-            `[/\\\\]+sumneko.lua[/\\\\]+addonManager[/\\\\]+addons[/\\\\]+${this.name}`,
+            `addons}?[/\\\\]+${this.name}[/\\\\]+module[/\\\\]+library`,
             "g"
         );
         const index = librarySetting.findIndex((path) => regex.test(path));

From 6f22dc34b98f1d70f0f0efbbbae09d20d0deee98 Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Sun, 20 Oct 2024 03:01:46 +0000
Subject: [PATCH 2/2] fix: addon uninstalling

---
 client/src/addon_manager/models/addon.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/client/src/addon_manager/models/addon.ts b/client/src/addon_manager/models/addon.ts
index 4b60e2f..383d164 100644
--- a/client/src/addon_manager/models/addon.ts
+++ b/client/src/addon_manager/models/addon.ts
@@ -328,11 +328,18 @@ export class Addon {
         for (const folder of vscode.workspace.workspaceFolders ?? []) {
             await this.disable(folder, true);
         }
-        const moduleURI = vscode.Uri.joinPath(this.uri, "module");
-        await filesystem.deleteFile(moduleURI, {
-            recursive: true,
-            useTrash: false,
+        const files =
+            (await filesystem.readDirectory(
+                vscode.Uri.joinPath(this.uri, "module"),
+                { depth: 1 }
+            )) ?? [];
+        files.map((f) => {
+            return filesystem.deleteFile(f.uri, {
+                recursive: true,
+                useTrash: false,
+            });
         });
+        await Promise.all(files);
         localLogger.info(`Uninstalled ${this.name}`);
         this.#installed = false;
         this.setLock(false);