mirror of
https://github.com/Microsoft/vscode
synced 2024-10-14 15:29:54 +00:00
5216c04428
* 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 Refsa0f9e09f64
* chore: update core types * temp: fix layer validation * chore: update nodejs checksums * ci: use latest v20 LTS for missing node-gyp Refseacec5f490
* 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
179 lines
5.2 KiB
JSON
179 lines
5.2 KiB
JSON
{
|
|
"name": "merge-conflict",
|
|
"publisher": "vscode",
|
|
"displayName": "%displayName%",
|
|
"description": "%description%",
|
|
"icon": "media/icon.png",
|
|
"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
|
|
}
|
|
},
|
|
"activationEvents": [
|
|
"onStartupFinished"
|
|
],
|
|
"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",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.all-incoming%",
|
|
"original": "Accept All Incoming",
|
|
"command": "merge-conflict.accept.all-incoming",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.all-both%",
|
|
"original": "Accept All Both",
|
|
"command": "merge-conflict.accept.all-both",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.current%",
|
|
"original": "Accept Current",
|
|
"command": "merge-conflict.accept.current",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.incoming%",
|
|
"original": "Accept Incoming",
|
|
"command": "merge-conflict.accept.incoming",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.selection%",
|
|
"original": "Accept Selection",
|
|
"command": "merge-conflict.accept.selection",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.accept.both%",
|
|
"original": "Accept Both",
|
|
"command": "merge-conflict.accept.both",
|
|
"enablement": "!isMergeEditor"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.next%",
|
|
"original": "Next Conflict",
|
|
"command": "merge-conflict.next",
|
|
"enablement": "!isMergeEditor",
|
|
"icon": "$(arrow-down)"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.previous%",
|
|
"original": "Previous Conflict",
|
|
"command": "merge-conflict.previous",
|
|
"enablement": "!isMergeEditor",
|
|
"icon": "$(arrow-up)"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.compare%",
|
|
"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"
|
|
}
|
|
],
|
|
"editor/title": [
|
|
{
|
|
"command": "merge-conflict.previous",
|
|
"group": "navigation@1",
|
|
"when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"
|
|
},
|
|
{
|
|
"command": "merge-conflict.next",
|
|
"group": "navigation@2",
|
|
"when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"
|
|
}
|
|
]
|
|
},
|
|
"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/extension-telemetry": "^0.9.0"
|
|
},
|
|
"devDependencies": {
|
|
"@types/node": "20.x"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/microsoft/vscode.git"
|
|
}
|
|
}
|