Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

2020-12-15 15:52:33 -07:00
parent 6c5c22ea8e be3e823608
commit 41bee49d07
4649 changed files with 1311795 additions and 0 deletions
--- a/lib/vscode/extensions/merge-conflict/package.json
+++ b/lib/vscode/extensions/merge-conflict/package.json
@@ -0,0 +1,144 @@
+{
+  "name": "merge-conflict",
+  "publisher": "vscode",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "icon": "resources/icons/merge-conflict.png",
+  "version": "1.0.0",
+  "license": "MIT",
+  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "engines": {
+    "vscode": "^1.5.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "activationEvents": [
+    "*"
+  ],
+  "main": "./out/mergeConflictMain",
+  "browser": "./dist/browser/mergeConflictMain",
+  "scripts": {
+    "compile": "gulp compile-extension:merge-conflict",
+    "watch": "gulp watch-extension:merge-conflict"
+  },
+  "contributes": {
+    "commands": [
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.all-current%",
+        "original": "Accept All Current",
+        "command": "merge-conflict.accept.all-current"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.all-incoming%",
+        "original": "Accept All Incoming",
+        "command": "merge-conflict.accept.all-incoming"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.all-both%",
+        "original": "Accept All Both",
+        "command": "merge-conflict.accept.all-both"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.current%",
+        "original": "Accept Current",
+        "command": "merge-conflict.accept.current"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.incoming%",
+        "original": "Accept Incoming",
+        "command": "merge-conflict.accept.incoming"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.selection%",
+        "original": "Accept Selection",
+        "command": "merge-conflict.accept.selection"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.accept.both%",
+        "original": "Accept Both",
+        "command": "merge-conflict.accept.both"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.next%",
+        "original": "Next Conflict",
+        "command": "merge-conflict.next"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.previous%",
+        "original": "Previous Conflict",
+        "command": "merge-conflict.previous"
+      },
+      {
+        "category": "%command.category%",
+        "title": "%command.compare%",
+        "original": "Compare Current Conflict",
+        "command": "merge-conflict.compare"
+      }
+    ],
+    "menus": {
+      "scm/resourceState/context": [
+        {
+          "command": "merge-conflict.accept.all-current",
+          "when": "scmProvider == git && scmResourceGroup == merge",
+          "group": "1_modification"
+        },
+        {
+          "command": "merge-conflict.accept.all-incoming",
+          "when": "scmProvider == git && scmResourceGroup == merge",
+          "group": "1_modification"
+        }
+      ]
+    },
+    "configuration": {
+      "title": "%config.title%",
+      "properties": {
+        "merge-conflict.codeLens.enabled": {
+          "type": "boolean",
+          "description": "%config.codeLensEnabled%",
+          "default": true
+        },
+        "merge-conflict.decorators.enabled": {
+          "type": "boolean",
+          "description": "%config.decoratorsEnabled%",
+          "default": true
+        },
+        "merge-conflict.autoNavigateNextConflict.enabled": {
+          "type": "boolean",
+          "description": "%config.autoNavigateNextConflictEnabled%",
+          "default": false
+        },
+        "merge-conflict.diffViewPosition": {
+          "type": "string",
+          "enum": [
+            "Current",
+            "Beside",
+            "Below"
+          ],
+          "description": "%config.diffViewPosition%",
+          "enumDescriptions": [
+            "%config.diffViewPosition.current%",
+            "%config.diffViewPosition.beside%",
+            "%config.diffViewPosition.below%"
+          ],
+          "default": "Current"
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "vscode-nls": "^4.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.7"
+  }
+}