ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,9 +237,9 @@ export default class CommandHandler implements vscode.Disposable {
return null;
}
for (let i = 0; i < conflicts.length; i++) {
if (conflicts[i].range.contains(editor.selection.active)) {
return conflicts[i];
for (const conflict of conflicts) {
if (conflict.range.contains(editor.selection.active)) {
return conflict;
}
}
@@ -282,11 +282,11 @@ export default class CommandHandler implements vscode.Disposable {
throw new Error(`Unsupported direction ${direction}`);
}
for (let i = 0; i < conflicts.length; i++) {
if (predicate(conflicts[i]) && !conflicts[i].range.contains(selection)) {
for (const conflict of conflicts) {
if (predicate(conflict) && !conflict.range.contains(selection)) {
return {
canNavigate: true,
conflict: conflicts[i]
conflict: conflict
};
}
}