Add open function to open the file from the diff

benogle · benogle · commit 729c93ec9cfe · 2016-02-03T14:54:37.000-08:00
diff --git a/lib/diff-component.js b/lib/diff-component.js
@@ -31,7 +31,8 @@ export default class DiffComponent {
       'core:confirm': () => this.diffViewModel.toggleSelectedLinesStageStatus(),
       'git:expand-selection-up': () => this.diffViewModel.expandSelectionUp(),
       'git:expand-selection-down': () => this.diffViewModel.expandSelectionDown(),
-      'git:toggle-selection-mode': () => this.diffViewModel.toggleSelectionMode()
+      'git:toggle-selection-mode': () => this.diffViewModel.toggleSelectionMode(),
+      'git:open-file-to-line': () => this.diffViewModel.openFileAtSelection()
     })
   }
 
diff --git a/lib/diff-hunk.js b/lib/diff-hunk.js
@@ -44,6 +44,13 @@ export default class DiffHunk {
     this.didChange()
   }
 
+  getFirstChangedLine() {
+    for (const line of this.lines)
+      if (line.isChanged())
+        return line
+    return null
+  }
+
   stage() {
     this.transactor.transact(() => {
       for (let line of this.lines)
diff --git a/lib/diff-view-model.js b/lib/diff-view-model.js
@@ -2,6 +2,7 @@
 
 import {Emitter, CompositeDisposable} from 'atom'
 import DiffSelection from './diff-selection'
+import DiffHunk from './diff-hunk'
 
 export default class DiffViewModel {
   constructor({fileList, uri, title}) {
@@ -237,4 +238,23 @@ export default class DiffViewModel {
   getFileDiffs() {
     return this.fileList.getFiles()
   }
+
+  openFileAtSelection() {
+    // TODO: this is maybe a naive line-choosing approach. Basically picks the
+    // first line of the most recent selection. It could look for an addition,
+    // and if not found, it'll use the deleted line. Depends on how this feels
+    const selection = this.getLastSelection()
+    const [firstPosition, secondPosition] = selection.getRange()
+    const pathName = this.getFileDiffs()[firstPosition[0]].getNewPathName()
+    const lineOrHunk = this.fileList.getObjectAtPosition(firstPosition)
+
+    let lineObject
+    if (lineOrHunk instanceof DiffHunk)
+      lineObject = lineOrHunk.getFirstChangedLine()
+    else
+      lineObject = lineOrHunk
+
+    initialLine = (lineObject.getNewLineNumber() || lineObject.getOldLineNumber()) - 1
+    atom.workspace.open(pathName, {initialLine})
+  }
 }
diff --git a/lib/file-list.js b/lib/file-list.js
@@ -37,6 +37,20 @@ export default class FileList {
     return this.files
   }
 
+  // position = [0, 2] will get you the third hunk in the first file.
+  // position = [0, 2, 1] will get you the 2nd line in the third hunk in the first file.
+  getObjectAtPosition(position) {
+    let file, hunk, line
+    const [fileIndex, hunkIndex, lineIndex] = position
+
+    file = this.getFiles()[fileIndex]
+    hunk = file.getHunks()[hunkIndex]
+    if (lineIndex != null)
+      return hunk.getLines()[lineIndex]
+    else
+      return hunk
+  }
+
   toString() {
     return this.files.map((file) => { return file.toString() }).join('\n')
   }
diff --git a/spec/diff-view-model-spec.js b/spec/diff-view-model-spec.js
@@ -25,11 +25,12 @@ function expectLineToBeSelected(isSelected, viewModel, fileDiffIndex, diffHunkIn
 }
 
 describe("DiffViewModel", function() {
+  let viewModel
   describe("selecting diffs", function() {
-    let viewModel
     beforeEach(function() {
       viewModel = createDiffs('fixtures/two-file-diff.txt')
     })
+
     it("initially selects the first hunk", function() {
       expectHunkToBeSelected(true, viewModel, 0, 0)
       expectHunkToBeSelected(false, viewModel, 0, 1)
@@ -479,7 +480,6 @@ describe("DiffViewModel", function() {
   })
 
   describe("staging diffs", function() {
-    let viewModel
     beforeEach(function() {
       viewModel = createDiffs('fixtures/two-file-diff.txt')
     })
@@ -514,7 +514,6 @@ describe("DiffViewModel", function() {
   })
 
   describe("handling events from the fileList", function() {
-    let viewModel
     beforeEach(function() {
       viewModel = createDiffs('fixtures/two-file-diff.txt')
     })
@@ -528,6 +527,38 @@ describe("DiffViewModel", function() {
       expect(changeHandler).toHaveBeenCalled()
     })
   })
+
+  describe("opening the selected file", function() {
+    beforeEach(function() {
+      viewModel = createDiffs('fixtures/two-file-diff.txt')
+      spyOn(atom.workspace, 'open')
+    })
+
+    it("opens the file to the first line in the selected hunk when in hunk mode and ::openFileAtSelection() is called", function() {
+      viewModel.moveSelectionDown()
+
+      viewModel.openFileAtSelection()
+      expect(atom.workspace.open).toHaveBeenCalled()
+      args = atom.workspace.open.mostRecentCall.args
+      expect(args[0]).toBe('src/config.coffee')
+      expect(args[1]).toEqual({initialLine: 433})
+    })
+
+    it("opens the file to the first selected line in line mode when ::openFileAtSelection() is called", function() {
+      let selection = new DiffSelection(viewModel, {
+        mode: 'line',
+        headPosition: [0, 2, 4],
+        tailPosition: [0, 2, 5]
+      })
+      viewModel.setSelection(selection)
+
+      viewModel.openFileAtSelection()
+      expect(atom.workspace.open).toHaveBeenCalled()
+      args = atom.workspace.open.mostRecentCall.args
+      expect(args[0]).toBe('src/config.coffee')
+      expect(args[1]).toEqual({initialLine: 515})
+    })
+  })
 })
 
 FileStr = `FILE src/config.coffee - modified - unstaged

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ export default class DiffComponent {`
`31`	`31`	`'core:confirm': () => this.diffViewModel.toggleSelectedLinesStageStatus(),`
`32`	`32`	`'git:expand-selection-up': () => this.diffViewModel.expandSelectionUp(),`
`33`	`33`	`'git:expand-selection-down': () => this.diffViewModel.expandSelectionDown(),`
`34`		`- 'git:toggle-selection-mode': () => this.diffViewModel.toggleSelectionMode()`
	`34`	`+ 'git:toggle-selection-mode': () => this.diffViewModel.toggleSelectionMode(),`
	`35`	`+ 'git:open-file-to-line': () => this.diffViewModel.openFileAtSelection()`
`35`	`36`	`})`
`36`	`37`	`}`
`37`	`38`