OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

chore(vscode): update to 1.56.0

Browse Source
This commit is contained in:
Akash Satheesan
2021-04-30 20:25:17 +05:30
parent 0d9fe6ff44 58ce849223
commit ec8894d6c4
1749 changed files with 88014 additions and 43316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vscode/extensions/merge-conflict/src/codelensProvider.ts
View File

@ -53,8 +53,10 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
}
let conflicts = await this.tracker.getConflicts(document);
const conflictsCount = conflicts?.length ?? 0;
vscode.commands.executeCommand('setContext', 'mergeConflictsCount', conflictsCount);
if (!conflicts || conflicts.length === 0) {
if (!conflictsCount) {
return null;
}
@ -99,6 +101,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
private registerCodeLensProvider() {
this.codeLensRegistrationHandle = vscode.languages.registerCodeLensProvider([
{ scheme: 'file' },
{ scheme: 'vscode-vfs' },
{ scheme: 'untitled' },
{ scheme: 'vscode-userdata' },
], this);

5
lib/vscode/extensions/merge-conflict/src/commandHandler.ts
View File

@ -339,18 +339,21 @@ export default class CommandHandler implements vscode.Disposable {
let predicate: (_conflict: any) => boolean;
let fallback: () => interfaces.IDocumentMergeConflict;
let scanOrder: interfaces.IDocumentMergeConflict[];
if (direction === NavigationDirection.Forwards) {
predicate = (conflict) => selection.isBefore(conflict.range.start);
fallback = () => conflicts![0];
scanOrder = conflicts;
} else if (direction === NavigationDirection.Backwards) {
predicate = (conflict) => selection.isAfter(conflict.range.start);
fallback = () => conflicts![conflicts!.length - 1];
scanOrder = conflicts.slice().reverse();
} else {
throw new Error(`Unsupported direction ${direction}`);
}
for (const conflict of conflicts) {
for (const conflict of scanOrder) {
if (predicate(conflict) && !conflict.range.contains(selection)) {
return {
canNavigate: true,