feat: add configuration for prefered merge method

Author: KnisterPeter

package.json

@@ -10,16 +10,31 @@
   "version": "0.5.0",
   "publisher": "KnisterPeter",
   "engines": {
-    "vscode": "^1.5.0"
+    "vscode": "^1.7.0"
   },
   "categories": [
     "Other"
   ],
+  "keywords": [
+    "git",
+    "github",
+    "pull-request",
+    "pull request"
+  ],
   "activationEvents": [
     "*"
   ],
   "main": "./out/src/extension",
   "contributes": {
+    "configuration": {
+      "title": "GitHub configuration",
+      "properties": {
+        "github.preferedMergeMethod": {
+          "type": "string",
+          "description": "By default the extension asks the user during merge process. This could be set to on of 'merge', 'squash' or 'rebase' to define the prefered method and not to be asked every time."
+        }
+      }
+    },
     "commands": [
       {
         "command": "extension.setGitHubToken",

src/extension.ts

@@ -131,29 +131,36 @@ class Extension {
     });
   }
 
+  private async getMergeMethdod(): Promise<MergeMethod> {
+    if (vscode.workspace.getConfiguration('github').has('preferedMergeMethod')) {
+      return vscode.workspace.getConfiguration('github').get<MergeMethod>('preferedMergeMethod');
+    }
+    const items: MergeOptionItems[] = [
+      {
+        label: 'Create merge commit',
+        description: '',
+        method: 'merge'
+      },
+      {
+        label: 'Squash and merge',
+        description: '',
+        method: 'squash'
+      },
+      {
+        label: 'Rebase and merge',
+        description: '',
+        method: 'rebase'
+      }
+    ];
+    return (await vscode.window.showQuickPick(items)).method;
+  }
+
   private async mergePullRequest(): Promise<void> {
     const pullRequest = await this.githubManager.getPullRequestForCurrentBranch();
     if (pullRequest && pullRequest.mergeable) {
-      const items: MergeOptionItems[] = [
-        {
-          label: 'Create merge commit',
-          description: '',
-          method: 'merge'
-        },
-        {
-          label: 'Squash and merge',
-          description: '',
-          method: 'squash'
-        },
-        {
-          label: 'Rebase and merge',
-          description: '',
-          method: 'rebase'
-        }
-      ];
-      const selected = await vscode.window.showQuickPick(items);
-      if (selected) {
-        if (await this.githubManager.mergePullRequest(pullRequest, selected.method)) {
+      const method = await this.getMergeMethdod();
+      if (method) {
+        if (await this.githubManager.mergePullRequest(pullRequest, method)) {
           this.statusBarManager.updatePullRequestStatus();
           vscode.window.showInformationMessage(`Successfully merged`);
         } else {