From c895a903e5d8e6ae61f6e5de1f6c20b88657665b Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 1 Jun 2022 21:16:21 +0000
Subject: [PATCH] safety checks in kiss-vscode config swap

---
 projects/kiss-vscode/src/Main.kiss | 33 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/projects/kiss-vscode/src/Main.kiss b/projects/kiss-vscode/src/Main.kiss
index 697e6c7e..faba7c11 100644
--- a/projects/kiss-vscode/src/Main.kiss
+++ b/projects/kiss-vscode/src/Main.kiss
@@ -30,9 +30,13 @@
 (function :Void tryLoadConfig [&opt :Bool force :Bool fallbackToDefault :String _]
     (let [handleConfigFailure
                 ->errorMessage {
-                    (FileSystem.deleteDirectory activeConfigDir)
-                    (when (FileSystem.exists lastConfigDir)
-                        (FileSystem.rename lastConfigDir activeConfigDir))
+                    (try
+                        {
+                            (FileSystem.deleteDirectory activeConfigDir)
+                            (when (FileSystem.exists lastConfigDir)
+                                (FileSystem.rename lastConfigDir activeConfigDir))
+                        }
+                        (catch [e] (throw "failed to delete bad config: $e")))
                     // When user config fails to build, use the default
                     // Counterintuitively, this unless is correct:
                     (unless fallbackToDefault
@@ -66,17 +70,18 @@
             (#unless test
                 (unless force
                     (let [oldConfigFile (joinPath activeConfigDir "config.js")]
-                        (when (let [mTime
-                                        ->file (.getTime .mtime (FileSystem.stat file))
-                                    oldFileMTime
-                                        (mTime oldConfigFile)
-                                    userConfigMTime
-                                        (let [foldersToCheck [(userConfigDir) builtinConfigDir]]
-                                            (when commandsDir
-                                                (foldersToCheck.push commandsDir))
-                                            (apply max
-                                                (map (apply concat (map foldersToCheck readDirectory)) mTime)))]
-                                (> oldFileMTime userConfigMTime))
+                        (when (and (FileSystem.exists oldConfigFile) 
+                                (let [mTime
+                                            ->file (.getTime .mtime (FileSystem.stat file))
+                                        oldFileMTime
+                                            (mTime oldConfigFile)
+                                        userConfigMTime
+                                            (let [foldersToCheck [(userConfigDir) builtinConfigDir]]
+                                                (when commandsDir
+                                                    (foldersToCheck.push commandsDir))
+                                                (apply max
+                                                    (map (apply concat (map foldersToCheck readDirectory)) mTime)))]
+                                    (> oldFileMTime userConfigMTime)))
                             (requireConfigJs oldConfigFile)
                             (Vscode.window.showInformationMessage "Config loaded successfully!")
                             (return)))))