@codingame/monaco-vscode-merge-conflict-default-extension 5.1.2 → 5.2.0

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.
Files changed (2) hide show
  1. package/index.js +7 -7
  2. package/package.json +2 -2
package/index.js CHANGED
@@ -3,12 +3,12 @@ import { registerExtension } from 'vscode/extensions';
3
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",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"}}}},repository:{type:"git",url:"https://github.com/microsoft/vscode.git"}};
4
4
 
5
5
  const { registerFileUrl, whenReady } = registerExtension(manifest, undefined, {"system":true,"readmePath":"README.md"});
6
- registerFileUrl('README.md', new URL('./resources/README.md', import.meta.url).toString(), 'text/markdown');
7
- registerFileUrl('package.json', new URL('./resources/package.json', import.meta.url).toString(), 'application/json');
8
- registerFileUrl('package.nls.json', new URL('./resources/package.nls.json', import.meta.url).toString(), 'application/json');
9
- registerFileUrl('media/icon.png', new URL('./resources/icon.png', import.meta.url).toString(), 'image/png');
10
- registerFileUrl('dist/browser/mergeConflictMain.js', new URL('./resources/mergeConflictMain.js', import.meta.url).toString(), 'application/javascript');
11
- registerFileUrl('dist/browser/mergeConflictMain', new URL('./resources/mergeConflictMain.js', import.meta.url).toString(), 'application/javascript');
12
- registerFileUrl('dist/browser/mergeConflictMain.js.map', new URL('./resources/mergeConflictMain.js.map', import.meta.url).toString(), 'application/json');
6
+ registerFileUrl('README.md', new URL('./resources/README.md', import.meta.url).toString(), {"mimeType":"text/markdown","size":286});
7
+ registerFileUrl('package.json', new URL('./resources/package.json', import.meta.url).toString(), {"mimeType":"application/json","size":3624});
8
+ registerFileUrl('package.nls.json', new URL('./resources/package.nls.json', import.meta.url).toString(), {"mimeType":"application/json","size":1285});
9
+ registerFileUrl('media/icon.png', new URL('./resources/icon.png', import.meta.url).toString(), {"mimeType":"image/png","size":2439});
10
+ registerFileUrl('dist/browser/mergeConflictMain.js', new URL('./resources/mergeConflictMain.js', import.meta.url).toString(), {"mimeType":"application/javascript","size":169519});
11
+ registerFileUrl('dist/browser/mergeConflictMain', new URL('./resources/mergeConflictMain.js', import.meta.url).toString(), {"mimeType":"application/javascript","size":169519});
12
+ registerFileUrl('dist/browser/mergeConflictMain.js.map', new URL('./resources/mergeConflictMain.js.map', import.meta.url).toString(), {"mimeType":"application/json","size":1397769});
13
13
 
14
14
  export { whenReady };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-merge-conflict-default-extension",
3
- "version": "5.1.2",
3
+ "version": "5.2.0",
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@5.1.2"
21
+ "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
22
22
  }
23
23
  }