mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-27 03:54:24 +01:00
12326f9906
* chore: bump electron@35.0.1 * chore: update types/node@22.x * chore: update web types for node v22.x * chore: bump electron@35.1.2 * chore: update node.js build * chore: update app.dock usage Refs71f3ff6bf2* chore: bump electron@35.1.4 * chore: bump electron@35.1.5 * ci: bump sysroot to glibc 2.28 and gcc 10.5.0 * ci: enable timeout for smoketests * chore: bump min glibcxx to 3.4.26 for server * Revert "ci: enable timeout for smoketests" This reverts commitafb637e85d. * chore: update debian dependencies * fix: workaround npm.ps1 argument parsing with powershell * chore: update rpm dependencies * test: partially revert changes from 242535 * test: remove redudant keybinding dispatch for selectTab * test: fix test failure from running configured tasks * test: focus settings editor for preferences.test.ts * node - adopt compile cache (#246835) * node - adopt compile cache * adopt for utility process * tweaks * log state of compilation cache * Revert "log state of compilation cache" This reverts commit f3840387a583013834762e2c44f6e8424929297f. * Revert "node - adopt compile cache (#246835)" This reverts commit 673a00cab66c9bac87f3cd27b80efa41c80150f1. * chore: update builds * chore: bump electron@35.2.0 * chore: bump electron@35.2.1 * chore: bump electron@35.2.2 --------- Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
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.8"
|
|
},
|
|
"devDependencies": {
|
|
"@types/node": "22.x"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/microsoft/vscode.git"
|
|
}
|
|
}
|