@codingame/monaco-vscode-merge-conflict-default-extension 1.83.2 → 1.83.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +2 -1
- package/package.json +2 -2
- package/package.nls.json +23 -0
package/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { registerExtension } from 'vscode/extensions';
|
|
2
2
|
|
|
3
|
-
var manifest = {name:"merge-conflict",publisher:"vscode",displayName:"
|
|
3
|
+
var manifest = {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:undefined,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.8.5"},devDependencies:{"@types/node":"18.x"},repository:{type:"git",url:"https://github.com/microsoft/vscode.git"}};
|
|
4
4
|
|
|
5
5
|
const { registerFileUrl, whenReady } = registerExtension(manifest);
|
|
6
6
|
registerFileUrl('./dist/browser/mergeConflictMain', new URL('./mergeConflictMain.js', import.meta.url).toString(), 'text/javascript');
|
|
7
7
|
registerFileUrl('./dist/browser/mergeConflictMain.js', new URL('./mergeConflictMain.js', import.meta.url).toString(), 'text/javascript');
|
|
8
8
|
registerFileUrl('dist/browser/mergeConflictMain.js.map', new URL('./mergeConflictMain.js.map', import.meta.url).toString(), 'application/json');
|
|
9
|
+
registerFileUrl('package.nls.json', new URL('./package.nls.json', import.meta.url).toString(), 'application/json');
|
|
9
10
|
|
|
10
11
|
export { whenReady };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-merge-conflict-default-extension",
|
|
3
|
-
"version": "1.83.
|
|
3
|
+
"version": "1.83.3",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -18,6 +18,6 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@1.83.
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.83.3"
|
|
22
22
|
}
|
|
23
23
|
}
|
package/package.nls.json
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
{
|
|
2
|
+
"displayName": "Merge Conflict",
|
|
3
|
+
"description": "Highlighting and commands for inline merge conflicts.",
|
|
4
|
+
"command.category": "Merge Conflict",
|
|
5
|
+
"command.accept.all-current": "Accept All Current",
|
|
6
|
+
"command.accept.all-incoming": "Accept All Incoming",
|
|
7
|
+
"command.accept.all-both": "Accept All Both",
|
|
8
|
+
"command.accept.current": "Accept Current",
|
|
9
|
+
"command.accept.incoming": "Accept Incoming",
|
|
10
|
+
"command.accept.selection": "Accept Selection",
|
|
11
|
+
"command.accept.both": "Accept Both",
|
|
12
|
+
"command.next": "Next Conflict",
|
|
13
|
+
"command.previous": "Previous Conflict",
|
|
14
|
+
"command.compare": "Compare Current Conflict",
|
|
15
|
+
"config.title": "Merge Conflict",
|
|
16
|
+
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
|
|
17
|
+
"config.codeLensEnabled": "Create a CodeLens for merge conflict blocks within editor.",
|
|
18
|
+
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
|
|
19
|
+
"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
|
|
20
|
+
"config.diffViewPosition.current": "Open the diff view in the current editor group.",
|
|
21
|
+
"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
|
|
22
|
+
"config.diffViewPosition.below": "Open the diff view below the current editor group."
|
|
23
|
+
}
|