vscode/extensions/merge-conflict/package.json

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

179 lines
5.2 KiB
JSON
Raw Permalink Normal View History

{
"name": "merge-conflict",
"publisher": "vscode",
"displayName": "%displayName%",
"description": "%description%",
"icon": "media/icon.png",
2018-02-27 14:56:35 +00:00
"version": "1.0.0",
"license": "MIT",
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"engines": {
"vscode": "^1.5.0"
},
"categories": [
"Other"
],
"capabilities": {
"virtualWorkspaces": true,
"untrustedWorkspaces": {
"supported": true
}
2021-04-13 19:42:54 +00:00
},
"activationEvents": [
2021-01-12 07:16:00 +00:00
"onStartupFinished"
],
2020-06-12 09:03:52 +00:00
"main": "./out/mergeConflictMain",
2020-06-26 09:14:23 +00:00
"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%",
2018-01-16 10:04:49 +00:00
"original": "Accept All Current",
"command": "merge-conflict.accept.all-current",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.all-incoming%",
2018-01-16 10:04:49 +00:00
"original": "Accept All Incoming",
"command": "merge-conflict.accept.all-incoming",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.all-both%",
2018-01-16 10:04:49 +00:00
"original": "Accept All Both",
"command": "merge-conflict.accept.all-both",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.current%",
2018-01-16 10:04:49 +00:00
"original": "Accept Current",
"command": "merge-conflict.accept.current",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.incoming%",
2018-01-16 10:04:49 +00:00
"original": "Accept Incoming",
"command": "merge-conflict.accept.incoming",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.selection%",
2018-01-16 10:04:49 +00:00
"original": "Accept Selection",
"command": "merge-conflict.accept.selection",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.both%",
2018-01-16 10:04:49 +00:00
"original": "Accept Both",
"command": "merge-conflict.accept.both",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.next%",
2018-01-16 10:04:49 +00:00
"original": "Next Conflict",
2021-03-31 08:45:21 +00:00
"command": "merge-conflict.next",
"enablement": "!isMergeEditor",
2021-03-31 08:46:11 +00:00
"icon": "$(arrow-down)"
},
{
"category": "%command.category%",
"title": "%command.previous%",
2018-01-16 10:04:49 +00:00
"original": "Previous Conflict",
2021-03-31 08:45:21 +00:00
"command": "merge-conflict.previous",
"enablement": "!isMergeEditor",
2021-03-31 08:46:11 +00:00
"icon": "$(arrow-up)"
},
{
"category": "%command.category%",
"title": "%command.compare%",
2018-09-06 12:31:11 +00:00
"original": "Compare Current Conflict",
"command": "merge-conflict.compare",
"enablement": "!isMergeEditor"
}
],
"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"
}
2021-03-31 08:45:21 +00:00
],
"editor/title": [
{
"command": "merge-conflict.previous",
2021-03-31 08:46:11 +00:00
"group": "navigation@1",
"when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"
2021-03-31 08:45:21 +00:00
},
{
"command": "merge-conflict.next",
2021-03-31 08:46:11 +00:00
"group": "navigation@2",
"when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"
2021-03-31 08:45:21 +00:00
}
]
},
"configuration": {
"title": "%config.title%",
"properties": {
2017-05-23 16:50:23 +00:00
"merge-conflict.codeLens.enabled": {
"type": "boolean",
2017-05-23 16:50:23 +00:00
"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%",
2018-10-02 14:00:43 +00:00
"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"
}
}
}
},
2022-11-28 11:00:08 +00:00
"dependencies": {
2023-11-01 19:51:03 +00:00
"@vscode/extension-telemetry": "^0.9.0"
2022-11-28 11:00:08 +00:00
},
"devDependencies": {
chore: update to electron 29 (#209818) * chore: update electron@29.1.0 * chore: update typings to 20.x * chore: bump electron@29.1.5 * ci: fix crash in compiling extensions-ci * chore: disable .d.ts check for build/ $ ../node_modules/.bin/tsc -p tsconfig.build.json node_modules/@types/chokidar/index.d.ts:21:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/@types/chokidar/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'. Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref 21 export class FSWatcher extends EventEmitter implements fs.FSWatcher { ~~~~~~~~~ node_modules/chokidar/types/index.d.ts:8:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/chokidar/types/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'. Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref 8 export class FSWatcher extends EventEmitter implements fs.FSWatcher { ~~~~~~~~~ Found 2 errors in 2 files. Errors Files 1 node_modules/@types/chokidar/index.d.ts:21 1 node_modules/chokidar/types/index.d.ts:8 Refs https://github.com/paulmillr/chokidar/commit/a0f9e09f64ce7ae70cc6ae1f5615f65cb35f532f * chore: update core types * temp: fix layer validation * chore: update nodejs checksums * ci: use latest v20 LTS for missing node-gyp Refs https://github.com/npm/cli/commit/eacec5f49060d3dfcdc3c7043115619e4bb22864 * ci: define LIBCPP_HARDENING_MODE * ci: fix crash in vscode-web-min-ci * chore: update rpm deps-list * chore: bump tree-sitter-typescript@0.20.5 * chore: bump electron@29.3.0 * chore: bump electron@29.3.1 * chore: update rpm deps-list for x86_64 * ci: disable io_uring UV backend on linux * ci: disable io_uring backend for oss as well * chore: update typings to 20.x * ci: add TODO for io_uring workaround * chore: bump distro * chore: update preinstall node version checks * chore: update @types/gulp Refs https://github.com/microsoft/vscode/issues/212442 * ci: disable io_uring in more test suites
2024-05-10 16:20:28 +00:00
"@types/node": "20.x"
},
"repository": {
"type": "git",
"url": "https://github.com/microsoft/vscode.git"
}
2018-09-06 12:31:11 +00:00
}