fix: refresh source control view on exception

close #183
denolehov · Mar 18, 2022 · c1eee7b · c1eee7b
1 parent 59214d8
commit c1eee7b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/ui/sidebar/components/fileComponent.svelte b/src/ui/sidebar/components/fileComponent.svelte
@@ -45,7 +45,7 @@
   }
 
   function stage() {
-    manager.stage(change.path).then(() => {
+    manager.stage(change.path).finally(() => {
       dispatchEvent(new CustomEvent("git-refresh"));
     });
   }
@@ -66,11 +66,11 @@
       .then((shouldDiscard) => {
         if (shouldDiscard === true) {
           if (deleteFile) {
-            view.app.vault.adapter.remove(change.path).then(() => {
+            view.app.vault.adapter.remove(change.path).finally(() => {
               dispatchEvent(new CustomEvent("git-refresh"));
             });
           } else {
-            manager.discard(change.path).then(() => {
+            manager.discard(change.path).finally(() => {
               dispatchEvent(new CustomEvent("git-refresh"));
             });
           }

diff --git a/src/ui/sidebar/components/stagedFileComponent.svelte b/src/ui/sidebar/components/stagedFileComponent.svelte
@@ -43,7 +43,7 @@
   }
 
   function unstage() {
-    manager.unstage(formattedPath).then(() => {
+    manager.unstage(formattedPath).finally(() => {
       dispatchEvent(new CustomEvent("git-refresh"));
     });
   }

diff --git a/src/ui/sidebar/gitView.svelte b/src/ui/sidebar/gitView.svelte
@@ -85,8 +85,7 @@
       if (commitMessage !== plugin.settings.commitMessage) {
         commitMessage = "";
       }
-      refresh();
-    });
+    }).finally(refresh);
   }
 
   addEventListener("git-refresh", (_) => {
@@ -112,30 +111,22 @@
 
   function stageAll() {
     loading = true;
-    plugin.gitManager.stageAll().then(() => {
-      refresh();
-    });
+    plugin.gitManager.stageAll().finally(refresh);
   }
   function unstageAll() {
     loading = true;
-    plugin.gitManager.unstageAll().then(() => {
-      refresh();
-    });
+    plugin.gitManager.unstageAll().finally(refresh);
   }
   function push() {
     loading = true;
 
     if (ready) {
-      plugin.push().then((pushedFiles) => {
-        refresh();
-      });
+      plugin.push().finally(refresh);
     }
   }
   function pull() {
     loading = true;
-    plugin.pullChangesFromRemote().then(() => {
-      refresh();
-    });
+    plugin.pullChangesFromRemote().finally(refresh);
   }
 </script>