@codingame/monaco-vscode-merge-conflict-default-extension 1.82.6 → 1.83.1

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  import { registerExtension } from 'vscode/extensions';
2
2
 
3
- var manifest = {name:"merge-conflict",publisher:"vscode",displayName:"Merge Conflict",description:"Highlighting and commands for inline merge conflicts.",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:"Merge Conflict",title:"Accept All Current",original:"Accept All Current",command:"merge-conflict.accept.all-current",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept All Incoming",original:"Accept All Incoming",command:"merge-conflict.accept.all-incoming",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept All Both",original:"Accept All Both",command:"merge-conflict.accept.all-both",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Current",original:"Accept Current",command:"merge-conflict.accept.current",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Incoming",original:"Accept Incoming",command:"merge-conflict.accept.incoming",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Selection",original:"Accept Selection",command:"merge-conflict.accept.selection",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Both",original:"Accept Both",command:"merge-conflict.accept.both",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Next Conflict",original:"Next Conflict",command:"merge-conflict.next",enablement:"!isMergeEditor",icon:"$(arrow-down)"},{category:"Merge Conflict",title:"Previous Conflict",original:"Previous Conflict",command:"merge-conflict.previous",enablement:"!isMergeEditor",icon:"$(arrow-up)"},{category:"Merge Conflict",title:"Compare Current Conflict",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:"Merge Conflict",properties:{"merge-conflict.codeLens.enabled":{type:"boolean",description:"Create a CodeLens for merge conflict blocks within editor.","default":true},"merge-conflict.decorators.enabled":{type:"boolean",description:"Create decorators for merge conflict blocks within editor.","default":true},"merge-conflict.autoNavigateNextConflict.enabled":{type:"boolean",description:"Whether to automatically navigate to the next merge conflict after resolving a merge conflict.","default":false},"merge-conflict.diffViewPosition":{type:"string","enum":["Current","Beside","Below"],description:"Controls where the diff view should be opened when comparing changes in merge conflicts.",enumDescriptions:["Open the diff view in the current editor group.","Open the diff view next to the current editor group.","Open the diff view below the current editor group."],"default":"Current"}}}},dependencies:{"@vscode/extension-telemetry":"^0.8.4"},devDependencies:{"@types/node":"18.x"},repository:{type:"git",url:"https://github.com/microsoft/vscode.git"}};
3
+ var manifest = {name:"merge-conflict",publisher:"vscode",displayName:"Merge Conflict",description:"Highlighting and commands for inline merge conflicts.",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:"Merge Conflict",title:"Accept All Current",original:"Accept All Current",command:"merge-conflict.accept.all-current",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept All Incoming",original:"Accept All Incoming",command:"merge-conflict.accept.all-incoming",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept All Both",original:"Accept All Both",command:"merge-conflict.accept.all-both",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Current",original:"Accept Current",command:"merge-conflict.accept.current",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Incoming",original:"Accept Incoming",command:"merge-conflict.accept.incoming",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Selection",original:"Accept Selection",command:"merge-conflict.accept.selection",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Accept Both",original:"Accept Both",command:"merge-conflict.accept.both",enablement:"!isMergeEditor"},{category:"Merge Conflict",title:"Next Conflict",original:"Next Conflict",command:"merge-conflict.next",enablement:"!isMergeEditor",icon:"$(arrow-down)"},{category:"Merge Conflict",title:"Previous Conflict",original:"Previous Conflict",command:"merge-conflict.previous",enablement:"!isMergeEditor",icon:"$(arrow-up)"},{category:"Merge Conflict",title:"Compare Current Conflict",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:"Merge Conflict",properties:{"merge-conflict.codeLens.enabled":{type:"boolean",description:"Create a CodeLens for merge conflict blocks within editor.","default":true},"merge-conflict.decorators.enabled":{type:"boolean",description:"Create decorators for merge conflict blocks within editor.","default":true},"merge-conflict.autoNavigateNextConflict.enabled":{type:"boolean",description:"Whether to automatically navigate to the next merge conflict after resolving a merge conflict.","default":false},"merge-conflict.diffViewPosition":{type:"string","enum":["Current","Beside","Below"],description:"Controls where the diff view should be opened when comparing changes in merge conflicts.",enumDescriptions:["Open the diff view in the current editor group.","Open the diff view next to the current editor group.","Open the diff view below the current editor group."],"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');
@@ -1175,12 +1175,11 @@ const webAppInsightsClientFactory = async (key, replacementOptions) => {
1175
1175
  appInsightsClient?.flush(false);
1176
1176
  },
1177
1177
  dispose: async () => {
1178
- appInsightsClient?.flush(true);
1179
1178
  const unloadPromise = new Promise((resolve) => {
1180
1179
  appInsightsClient?.unload(true, () => {
1181
1180
  resolve();
1182
1181
  appInsightsClient = undefined;
1183
- });
1182
+ }, 1000);
1184
1183
  });
1185
1184
  return unloadPromise;
1186
1185
  }
@@ -1278,7 +1277,7 @@ class TelemetryUtil {
1278
1277
  "common.nodeArch": osShim.architecture,
1279
1278
  "common.platformversion": (osShim.release || "").replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, "$1$2$3"),
1280
1279
  // Do not change this string as it gets found and replaced upon packaging
1281
- "common.telemetryclientversion": "0.8.4"
1280
+ "common.telemetryclientversion": "0.8.5"
1282
1281
  };
1283
1282
  }
1284
1283
  // Get singleton instance of TelemetryUtil
@@ -1550,17 +1549,16 @@ const oneDataSystemClientFactory = async (key, vscodeAPI, xhrOverride) => {
1550
1549
  },
1551
1550
  flush: flushOneDS,
1552
1551
  dispose: async () => {
1553
- await flushOneDS();
1554
1552
  const disposePromise = new Promise((resolve) => {
1555
1553
  if (!appInsightsCore) {
1556
1554
  resolve();
1557
1555
  return;
1558
1556
  }
1559
- appInsightsCore.unload(true, () => {
1557
+ appInsightsCore.unload(false, () => {
1560
1558
  resolve();
1561
1559
  appInsightsCore = undefined;
1562
1560
  return;
1563
- });
1561
+ }, 1000);
1564
1562
  });
1565
1563
  return disposePromise;
1566
1564
  }
@@ -14992,7 +14990,6 @@ class BaseTelemetrySender {
14992
14990
  return this._telemetryClient?.flush();
14993
14991
  }
14994
14992
  async dispose() {
14995
- await this.flush();
14996
14993
  if (this._telemetryClient) {
14997
14994
  await this._telemetryClient.dispose();
14998
14995
  this._telemetryClient = undefined;