Fix logic for selecting single/multiple items in StagingView

Author: Michelle Tilley

lib/views/staging-view.js

@@ -27,9 +27,9 @@ export default class StagingView {
     this.props = props;
     atom.config.observe('github.keyboardNavigationDelay', value => {
       if (value === 0) {
-        this.debouncedDidChangeSelectedItem = this.didChangeSelectedItem.bind(this);
+        this.debouncedDidChangeSelectedItem = this.didChangeSelectedItems.bind(this);
       } else {
-        this.debouncedDidChangeSelectedItem = debounce(this.didChangeSelectedItem.bind(this), value);
+        this.debouncedDidChangeSelectedItem = debounce(this.didChangeSelectedItems.bind(this), value);
       }
     });
     this.mouseSelectionInProgress = false;
@@ -136,10 +136,17 @@ export default class StagingView {
     if (headItem) { this.listElementsByItem.get(headItem).scrollIntoViewIfNeeded(); }
   }
 
-  didChangeSelectedItem() {
-    const selectedItem = this.selection.getHeadItem();
-    if (!this.isFocused() || !selectedItem) { return; }
+  didChangeSelectedItems() {
+    const selectedItems = Array.from(this.selection.getSelectedItems());
+    if (!this.isFocused() || !selectedItems.length) { return; }
 
+
+    if (selectedItems.length === 1) {
+      this.didSelectSingleItem(selectedItems[0]);
+    }
+  }
+
+  didSelectSingleItem(selectedItem) {
     if (this.selection.getActiveListKey() === 'conflicts') {
       if (this.props.didSelectMergeConflictFile) {
         this.props.didSelectMergeConflictFile(selectedItem.filePath);
@@ -187,7 +194,7 @@ export default class StagingView {
     if (this.mouseSelectionInProgress) {
       this.mouseSelectionInProgress = false;
       this.selection.coalesce();
-      this.didChangeSelectedItem();
+      this.didChangeSelectedItems();
     }
   }