Merge pull request #145 from t9md/disable-wrap

Add config option wrapAroundOnMoveToDiff

Author: Max Brunsfeld

lib/git-diff-view.coffee

@@ -54,7 +54,8 @@ class GitDiffView
       firstDiffLineNumber = Math.min(newStart - 1, firstDiffLineNumber)
 
     # Wrap around to the first diff in the file
-    nextDiffLineNumber = firstDiffLineNumber unless nextDiffLineNumber?
+    if atom.config.get('git-diff.wrapAroundOnMoveToDiff') and not nextDiffLineNumber?
+      nextDiffLineNumber = firstDiffLineNumber
 
     @moveToLineNumber(nextDiffLineNumber)
 
@@ -75,7 +76,8 @@ class GitDiffView
       lastDiffLineNumber = Math.max(newStart - 1, lastDiffLineNumber)
 
     # Wrap around to the last diff in the file
-    previousDiffLineNumber = lastDiffLineNumber if previousDiffLineNumber is -1
+    if atom.config.get('git-diff.wrapAroundOnMoveToDiff') and previousDiffLineNumber is -1
+      previousDiffLineNumber = lastDiffLineNumber
 
     @moveToLineNumber(previousDiffLineNumber)
 

package.json

@@ -21,6 +21,11 @@
       "type": "boolean",
       "default": false,
       "description": "Show colored icons for added (`+`), modified (`·`) and removed (`-`) lines in the editor's gutter, instead of colored markers (`|`)."
+    },
+    "wrapAroundOnMoveToDiff": {
+      "type": "boolean",
+      "default": true,
+      "description": "Wraps around to the first/last diff in the file when moving to next/previous diff."
     }
   }
 }

spec/git-diff-spec.coffee

@@ -130,6 +130,29 @@ describe "GitDiff package", ->
       atom.commands.dispatch(editorView, 'git-diff:move-to-previous-diff')
       expect(editor.getCursorBufferPosition()).toEqual [4, 4]
 
+    describe "when the wrapAroundOnMoveToDiff config option is false", ->
+      beforeEach ->
+        atom.config.set 'git-diff.wrapAroundOnMoveToDiff', false
+
+      it "does not wraps around to the first/last diff in the file", ->
+        editor.insertText('a')
+        editor.setCursorBufferPosition([5])
+        editor.deleteLine()
+        advanceClock(editor.getBuffer().stoppedChangingDelay)
+
+        editor.setCursorBufferPosition([0])
+        atom.commands.dispatch(editorView, 'git-diff:move-to-next-diff')
+        expect(editor.getCursorBufferPosition()).toEqual [4, 4]
+
+        atom.commands.dispatch(editorView, 'git-diff:move-to-next-diff')
+        expect(editor.getCursorBufferPosition()).toEqual [4, 4]
+
+        atom.commands.dispatch(editorView, 'git-diff:move-to-previous-diff')
+        expect(editor.getCursorBufferPosition()).toEqual [0, 0]
+
+        atom.commands.dispatch(editorView, 'git-diff:move-to-previous-diff')
+        expect(editor.getCursorBufferPosition()).toEqual [0, 0]
+
   describe "when the showIconsInEditorGutter config option is true", ->
     beforeEach ->
       atom.config.set 'git-diff.showIconsInEditorGutter', true