Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

auto-fixed prefer-const violation

Browse Source
This commit is contained in:
Johannes
2022-06-08 17:49:21 +02:00
parent aa23a0dbb7
commit 0656d21d11
862 changed files with 6489 additions and 6489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/merge-conflict/src/codelensProvider.ts
View File

@@ -52,7 +52,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
return null;
}
let conflicts = await this.tracker.getConflicts(document);
const conflicts = await this.tracker.getConflicts(document);
const conflictsCount = conflicts?.length ?? 0;
vscode.commands.executeCommand('setContext', 'mergeConflictsCount', conflictsCount);
@@ -60,28 +60,28 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
return null;
}
let items: vscode.CodeLens[] = [];
const items: vscode.CodeLens[] = [];
conflicts.forEach(conflict => {
let acceptCurrentCommand: vscode.Command = {
const acceptCurrentCommand: vscode.Command = {
command: 'merge-conflict.accept.current',
title: localize('acceptCurrentChange', 'Accept Current Change'),
arguments: ['known-conflict', conflict]
};
let acceptIncomingCommand: vscode.Command = {
const acceptIncomingCommand: vscode.Command = {
command: 'merge-conflict.accept.incoming',
title: localize('acceptIncomingChange', 'Accept Incoming Change'),
arguments: ['known-conflict', conflict]
};
let acceptBothCommand: vscode.Command = {
const acceptBothCommand: vscode.Command = {
command: 'merge-conflict.accept.both',
title: localize('acceptBothChanges', 'Accept Both Changes'),
arguments: ['known-conflict', conflict]
};
let diffCommand: vscode.Command = {
const diffCommand: vscode.Command = {
command: 'merge-conflict.compare',
title: localize('compareChanges', 'Compare Changes'),
arguments: [conflict]