Merge pull request atom#160 from atom/ku-nav-hunks

kuychaco · web-flow · commit ee24fa8950e4 · 2016-06-30T23:32:37.000-07:00
Various File Patch View things
diff --git a/keymaps/git.cson b/keymaps/git.cson
@@ -7,3 +7,7 @@
 '.git-CommitView-editor atom-text-editor:not([mini])':
   'cmd-enter': 'git:commit'
   'ctrl-enter': 'git:commit'
+
+'.git-FilePatchView':
+  '/': 'git:toggle-patch-selection-mode'
+  'tab': 'git:focus-next-hunk'
diff --git a/lib/models/hunk-line.js b/lib/models/hunk-line.js
@@ -38,6 +38,10 @@ export default class HunkLine {
     return this.status
   }
 
+  isChanged () {
+    return this.getStatus() === 'added' || this.getStatus() === 'removed'
+  }
+
   getOrigin () {
     switch (this.getStatus()) {
       case 'added':
diff --git a/lib/views/file-patch-view.js b/lib/views/file-patch-view.js
@@ -9,22 +9,53 @@ import HunkView from './hunk-view'
 const EMPTY_SET = new Set()
 
 export default class FilePatchView {
-  constructor ({filePatch, repository, stagingStatus, registerHunkView}) {
+  constructor ({filePatch, repository, stagingStatus, selectionMode, registerHunkView}) {
     this.filePatch = filePatch
     this.repository = repository
     this.filePatchSubscriptions = new CompositeDisposable(
       this.filePatch.onDidUpdate(this.didUpdateFilePatch.bind(this)),
       this.filePatch.onDidDestroy(this.didDestroyFilePatch.bind(this))
     )
     this.stagingStatus = stagingStatus
-    this.selectedLines = null
-    this.selectedHunk = null
+    this.selectedHunk = filePatch.getHunks()[0]
+    this.selectedHunkIndex = 0
+    this.setInitialSelection(this.selectedHunk)
     this.registerHunkView = registerHunkView
     this.emitter = new Emitter()
+    this.selectionMode = selectionMode || 'hunk'
     etch.initialize(this)
+    this.subscriptions = atom.commands.add(this.element, {
+      'git:toggle-patch-selection-mode': this.togglePatchSelectionMode.bind(this),
+      'git:focus-next-hunk': this.focusNextHunk.bind(this)
+    })
   }
 
-  update ({filePatch, repository, stagingStatus}) {
+  setInitialSelection (hunk) {
+    if (hunk) {
+      if (this.selectionMode === 'hunk') {
+        this.selectNonContextLines(hunk.getLines())
+      } else {
+        this.selectNonContextLines([this.getFirstNonContextLine(hunk)])
+      }
+    } else {
+      this.selectNonContextLines([])
+    }
+  }
+
+  selectNonContextLines (lines) {
+    this.selectedLines = new Set(lines.filter(l => l.isChanged()))
+  }
+
+  focusNextHunk () {
+    const hunks = this.filePatch.getHunks()
+    let index = hunks.indexOf(this.selectedHunk)
+    this.selectedHunk = ++index < hunks.length ? hunks[index] : hunks[0]
+    this.selectedHunkIndex = index < hunks.length ? index : 0
+    this.setInitialSelection(this.selectedHunk)
+    return etch.update(this)
+  }
+
+  update ({filePatch, repository, stagingStatus, selectionMode}) {
     if (this.filePatchSubscriptions) this.filePatchSubscriptions.dispose()
 
     this.filePatch = filePatch
@@ -34,21 +65,26 @@ export default class FilePatchView {
     )
     this.repository = repository
     this.stagingStatus = stagingStatus
+    this.selectionMode = selectionMode || this.selectionMode
+    this.selectedHunk = filePatch.getHunks()[0]
+    this.selectedHunkIndex = 0
+    this.setInitialSelection(this.selectedHunk)
     this.emitter.emit('did-change-title', this.getTitle())
     return etch.update(this)
   }
 
   destroy () {
     this.emitter.emit('did-destroy')
+    this.subscriptions.dispose()
     return etch.destroy(this)
   }
 
   render () {
     let stageButtonLabelPrefix = this.stagingStatus === 'unstaged' ? 'Stage' : 'Unstage'
     return (
-      <div className='git-FilePatchView'>{this.filePatch.getHunks().map((hunk) => {
+      <div className='git-FilePatchView' tabIndex='-1'>{this.filePatch.getHunks().map((hunk) => {
         const isSelected = hunk === this.selectedHunk
-        const selectedLines = (isSelected && this.selectedLines != null) ? this.selectedLines : EMPTY_SET
+        const selectedLines = isSelected ? this.selectedLines : EMPTY_SET
         return (
           <HunkView
             hunk={hunk}
@@ -64,6 +100,20 @@ export default class FilePatchView {
     )
   }
 
+  getFirstNonContextLine (hunk) {
+    const lines = hunk.getLines()
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i]
+      if (line.isChanged()) return line
+    }
+  }
+
+  togglePatchSelectionMode () {
+    this.selectionMode = this.selectionMode === 'hunk' ? 'hunkLine' : 'hunk'
+    this.setInitialSelection(this.selectedHunk)
+    return etch.update(this)
+  }
+
   getTitle () {
     let title = this.stagingStatus === 'staged' ? 'Staged' : 'Unstaged'
     title += ' Changes: '
@@ -80,12 +130,17 @@ export default class FilePatchView {
   }
 
   didSelectLinesForHunk (hunk, selectedLines) {
-    this.selectedLines = selectedLines
     this.selectedHunk = hunk
+    this.selectedHunkIndex = this.filePatch.getHunks().indexOf(hunk)
+    if (this.selectionMode === 'hunk') {
+      this.selectNonContextLines(hunk.getLines())
+    } else {
+      this.selectNonContextLines([...selectedLines])
+    }
     etch.update(this)
   }
 
-  didClickStageButtonForHunk (hunk) {
+  async didClickStageButtonForHunk (hunk) {
     // TODO: Test the behavior of this line, which ensure we only attempt to
     // stage the selected lines if we clicked the stage button on the hunk
     // containing them.
@@ -95,26 +150,37 @@ export default class FilePatchView {
     if (this.stagingStatus === 'unstaged') {
       if (this.selectedLines && clickedSelectedHunk) {
         patchToApply = this.filePatch.getStagePatchForLines(this.selectedLines)
-        this.selectedLines = null
+        this.selectedLines = EMPTY_SET
       } else {
         patchToApply = this.filePatch.getStagePatchForHunk(hunk)
       }
     } else if (this.stagingStatus === 'staged') {
       if (this.selectedLines && clickedSelectedHunk) {
         patchToApply = this.filePatch.getUnstagePatchForLines(this.selectedLines)
-        this.selectedLines = null
+        this.selectedLines = EMPTY_SET
       } else {
         patchToApply = this.filePatch.getUnstagePatchForHunk(hunk)
       }
     } else {
       throw new Error(`Unknown stagingStatus: ${this.stagingStatus}`)
     }
 
-    return this.repository.applyPatchToIndex(patchToApply)
+    await this.repository.applyPatchToIndex(patchToApply)
+    return etch.update(this)
   }
 
   didUpdateFilePatch () {
-    etch.update(this)
+    const hunks = this.filePatch.getHunks()
+    if (hunks.includes(this.selectedHunk)) {
+      // retain existing selectedHunk
+    } else if (hunks[this.selectedHunkIndex]) {
+      this.selectedHunk = hunks[this.selectedHunkIndex]
+    } else {
+      this.selectedHunkIndex = hunks.length - 1
+      this.selectedHunk = hunks[this.selectedHunkIndex]
+    }
+    this.setInitialSelection(this.selectedHunk)
+    return etch.update(this)
   }
 
   didDestroyFilePatch () {
diff --git a/lib/views/hunk-view.js b/lib/views/hunk-view.js
@@ -83,7 +83,7 @@ export default class HunkView {
           const newLineNumber = line.getNewLineNumber() === -1 ? ' ' : line.getNewLineNumber()
           const lineSelectedClass = this.selectedLines.has(line) ? 'is-selected' : ''
           return (
-            <div className={`git-HunkView-line ${lineSelectedClass}`}
+            <div className={`git-HunkView-line ${lineSelectedClass} ${line.getStatus()}`}
                  onmousedown={() => this.onMouseDown(line)}
                  onmousemove={() => this.onMouseMove(line)}
                  onmouseup={() => this.onMouseUp(line)}>
diff --git a/styles/hunk-view.less b/styles/hunk-view.less
@@ -39,8 +39,28 @@
     display:flex;
     line-height: 1.5em;
 
-    &.is-selected {
-      background-color: @background-color-selected;
+    &.is-selected.added, &.is-selected.removed {
+      background-color: tint(@background-color-selected, 10%);
+    }
+
+    .hunk-line-mixin(@bg; @fg) {
+      .git-HunkView-oldLineNumber, .git-HunkView-newLineNumber {
+        background-color: fadeout(shade(@bg, 30%), 80%);
+        color: tint(@fg, 50%);
+      }
+
+      .git-HunkView-lineContent {
+        background-color: fadeout(shade(@bg, 30%), 20%);
+        color: tint(@fg, 50%);
+      }
+    }
+
+    &.added {
+      .hunk-line-mixin(@background-color-success, @text-color-success);
+    }
+
+    &.removed {
+      .hunk-line-mixin(@background-color-error, @text-color-error);
     }
   }
 
diff --git a/test/views/file-patch-view.test.js b/test/views/file-patch-view.test.js
