mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-30 13:31:07 +01:00
* chore: bump electron@15.3.0 * chore: bump node@16.x * chore: enable render process reuse * Revert "watcher - use `type` property for crash reporter location" This reverts commitbfa488dd8f. * Revert "watcher - enable crash reports on linux (#136264)" This reverts commitaf261488f8. * chore: enable crashpad on linux * chore: bump electron@15.3.1 * chore: update api changes * chore: bump @vscode/sqlite3@5.0.3 * spec: skip non-context aware module unittests * chore: fix perf hook integration with node environment * fix: adopt fs api changes * chore: fix integration tests * chore: bump electron@15.3.2 * chore: bump electron@16.0.0 * temp(macOS): kill test instances in OSS * Revert "temp(macOS): kill test instances in OSS" This reverts commit b0d796c8d64227a5ec012c060bbbee7d9da27568. * chore: update chromium version for clang downloader * some 💄 changes * align with changes * adopt more fs.rm * 💄 * chore: bump @vscode/sqlite3@5.0.4 * fix layers check to account for duplicated types from node.js * update todo for type casts * smoke - fix compile issue * chore: update module cache * watcher - fix unhandled rejection (fix #137416) * ci: update node version * enable stack dumping * update electron types to 16.x * chore: bump @vscode/sqlite3@5.0.5 Refs https://github.com/microsoft/vscode/issues/137496 * fix layer issue * add `AbortSignal` to core types * chore: update linux compile flags Refs797723ec83* ci: fix linux build * ci: update github ci cache * ci: fix remote build in github ci * ci: better fix for remote build * chore: bump azure cache * chore: fix merge conflict * :chore: update to electron@16.0.2 * chore: bump @vscode/sqlite3@5.0.7 * ci: update to gcc-4.9 for remote Refs https://github.com/microsoft/vscode/issues/137659 * ci: switch to buster for linux arm Refs https://github.com/microsoft/vscode/issues/137927 * ci: fix build on linux arm64 * ci: fix arm client compiler toolchain Refs #137927 * chore: bump electron@16.0.3 * ci: fix compile flags for the c toolchain * chore: bump electron@16.0.4 * Add experimental dark mode flag (#139109) * Add experimental dark mode flag * Apply PR feedback * chore: bump electron@16.0.6 * chore: bump electron@16.0.7 Fixes https://github.com/microsoft/vscode/issues/138792 Fixes https://github.com/microsoft/vscode/issues/139300 * chore: experimental highlight API * smoke - fix compile issue * FIXME: custom ELECTRON_RUN_AS_NODE with node worker * Revert "chore: bump electron@16.0.7" This reverts commit5fd01cf37c. * Revert "Revert "chore: bump electron@16.0.7"" This reverts commita7f1b73951. * chore: fix github linux workflow * chore: address review feedback * chore: bump electron@16.0.8 * ci: revert to stretch distro for linux arm Refs https://github.com/microsoft/vscode/issues/137927 * ci: force build * chore: update yarn.lock * address feedback * Revert "FIXME: custom ELECTRON_RUN_AS_NODE with node worker" This reverts commit7b48fa3732. * ci: fix remote folder build * chore: fix github linux ci * 🆙 `versionSpec` Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com> Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
169 lines
4.7 KiB
JSON
169 lines
4.7 KiB
JSON
{
|
|
"name": "merge-conflict",
|
|
"publisher": "vscode",
|
|
"displayName": "%displayName%",
|
|
"description": "%description%",
|
|
"icon": "media/icon.png",
|
|
"version": "1.0.0",
|
|
"license": "MIT",
|
|
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
|
|
"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"
|
|
},
|
|
{
|
|
"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",
|
|
"icon": "$(arrow-down)"
|
|
},
|
|
{
|
|
"category": "%command.category%",
|
|
"title": "%command.previous%",
|
|
"original": "Previous Conflict",
|
|
"command": "merge-conflict.previous",
|
|
"icon": "$(arrow-up)"
|
|
},
|
|
{
|
|
"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"
|
|
}
|
|
],
|
|
"editor/title": [
|
|
{
|
|
"command": "merge-conflict.previous",
|
|
"group": "navigation@1",
|
|
"when": "mergeConflictsCount && mergeConflictsCount != 0"
|
|
},
|
|
{
|
|
"command": "merge-conflict.next",
|
|
"group": "navigation@2",
|
|
"when": "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-nls": "^5.0.0"
|
|
},
|
|
"devDependencies": {
|
|
"@types/node": "16.x"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/microsoft/vscode.git"
|
|
}
|
|
}
|