feat: ctrl + enter to commit-and-sync

In addition, when some files are already staged pressing the
commit-and-sync button or new via ctrl + enter will only commit the
staged files and not all changes.

 #901

Author: Vinzent03

src/automaticsManager.ts

@@ -166,7 +166,7 @@ export default class AutomaticsManager {
                 if (this.plugin.settings.differentIntervalCommitAndPush) {
                     await this.plugin.commit({ fromAuto: true });
                 } else {
-                    await this.plugin.commitAndSync(true);
+                    await this.plugin.commitAndSync({ fromAutoBackup: true });
                 }
                 return true;
             },

src/commands.ts

@@ -153,15 +153,17 @@ export function addCommmands(plugin: ObsidianGit) {
         id: "push",
         name: "Commit-and-sync",
         callback: () =>
-            plugin.promiseQueue.addTask(() => plugin.commitAndSync(false)),
+            plugin.promiseQueue.addTask(() =>
+                plugin.commitAndSync({ fromAutoBackup: false })
+            ),
     });
 
     plugin.addCommand({
         id: "backup-and-close",
         name: "Commit-and-sync and then close Obsidian",
         callback: () =>
             plugin.promiseQueue.addTask(async () => {
-                await plugin.commitAndSync(false);
+                await plugin.commitAndSync({ fromAutoBackup: false });
                 window.close();
             }),
     });
@@ -171,7 +173,10 @@ export function addCommmands(plugin: ObsidianGit) {
         name: "Commit-and-sync with specific message",
         callback: () =>
             plugin.promiseQueue.addTask(() =>
-                plugin.commitAndSync(false, true)
+                plugin.commitAndSync({
+                    fromAutoBackup: false,
+                    requestCustomMessage: true,
+                })
             ),
     });
 

src/main.ts

@@ -751,11 +751,17 @@ export default class ObsidianGit extends Plugin {
         this.setPluginState({ gitAction: CurrentGitAction.idle });
     }
 
-    async commitAndSync(
-        fromAutoBackup: boolean,
+    async commitAndSync({
+        fromAutoBackup,
         requestCustomMessage = false,
-        commitMessage?: string
-    ): Promise<void> {
+        commitMessage,
+        onlyStaged = false,
+    }: {
+        fromAutoBackup: boolean;
+        requestCustomMessage?: boolean;
+        commitMessage?: string;
+        onlyStaged?: boolean;
+    }): Promise<void> {
         if (!(await this.isAllInitialized())) return;
 
         if (
@@ -769,6 +775,7 @@ export default class ObsidianGit extends Plugin {
             fromAuto: fromAutoBackup,
             requestCustomMessage,
             commitMessage,
+            onlyStaged,
         });
         if (!commitSuccessful) {
             return;

src/ui/sourceControl/sourceControl.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Platform, setIcon } from "obsidian";
+    import { Platform, Scope, setIcon } from "obsidian";
     import { SOURCE_CONTROL_VIEW_CONFIG } from "src/constants";
     import type ObsidianGit from "src/main";
     import type {
@@ -81,6 +81,11 @@
         });
     });
 
+    view.scope = new Scope(plugin.app.scope);
+    view.scope.register(["Ctrl"], "Enter", (_: KeyboardEvent) =>
+        commitAndSync()
+    );
+
     async function commit() {
         loading = true;
         if (status) {
@@ -100,9 +105,16 @@
     function commitAndSync() {
         loading = true;
         if (status) {
+            // If staged files exist only commit them, but if not, commit all.
+            // I hope this is the most intuitive way.
+            const onlyStaged = status.staged.length > 0;
             plugin.promiseQueue.addTask(() =>
                 plugin
-                    .commitAndSync(false, false, commitMessage)
+                    .commitAndSync({
+                        fromAutoBackup: false,
+                        commitMessage,
+                        onlyStaged,
+                    })
                     .then(() => {
                         commitMessage = plugin.settings.commitMessage;
                     })