Merge pull request #2532 from atom/jump-to-first-conflict

Scroll to first conflict when opening editor

Author: smashwilson

lib/controllers/editor-conflict-controller.js

@@ -48,6 +48,8 @@ export default class EditorConflictController extends React.Component {
       this.props.editor.onDidDestroy(() => this.props.refreshResolutionProgress(this.props.editor.getPath())),
       buffer.onDidReload(() => this.reparseConflicts()),
     );
+
+    this.scrollToFirstConflict();
   }
 
   render() {
@@ -219,6 +221,19 @@ export default class EditorConflictController extends React.Component {
     this.updateMarkerCount();
   }
 
+  scrollToFirstConflict() {
+    let firstConflict = null;
+    for (const conflict of this.state.conflicts) {
+      if (firstConflict == null || firstConflict.getRange().compare(conflict.getRange()) > 0) {
+        firstConflict = conflict;
+      }
+    }
+
+    if (firstConflict) {
+      this.props.editor.scrollToBufferPosition(firstConflict.getRange().start, {center: true});
+    }
+  }
+
   reparseConflicts() {
     const newConflicts = new Set(Conflict.allFromEditor(this.props.editor, this.layer, this.props.isRebase));
     this.setState({conflicts: newConflicts});

test/controllers/editor-conflict-controller.test.js

@@ -3,6 +3,7 @@ import temp from 'temp';
 import path from 'path';
 import React from 'react';
 import {mount} from 'enzyme';
+import {Point} from 'atom';
 
 import ResolutionProgress from '../../lib/models/conflicts/resolution-progress';
 import {OURS, BASE, THEIRS} from '../../lib/models/conflicts/source';
@@ -48,14 +49,17 @@ describe('EditorConflictController', function() {
     atomEnv.destroy();
   });
 
-  const useFixture = async function(fixtureName, {isRebase} = {isRebase: false}) {
+  const useFixture = async function(fixtureName, {isRebase, withEditor} = {isRebase: false}) {
     const fixturePath = path.join(
       path.dirname(__filename), '..', 'fixtures', 'conflict-marker-examples', fixtureName);
     const tempDir = temp.mkdirSync('conflict-fixture-');
     fixtureFile = path.join(tempDir, fixtureName);
     fs.copySync(fixturePath, fixtureFile);
 
     editor = await workspace.open(fixtureFile);
+    if (withEditor) {
+      withEditor(editor);
+    }
     editorView = atomEnv.views.getView(editor);
 
     app = (
@@ -75,6 +79,14 @@ describe('EditorConflictController', function() {
     return editor.getTextInBufferRange(side.marker.getBufferRange());
   };
 
+  it('scrolls the first conflict into view', async function() {
+    await useFixture('triple-2way-diff.txt', {
+      withEditor(e) { sinon.stub(e, 'scrollToBufferPosition'); },
+    });
+
+    assert.isTrue(editor.scrollToBufferPosition.calledWith(new Point(4, 0), {center: true}));
+  });
+
   describe('on a file with 2-way diff markers', function() {
     let conflicts;