Keyboard shortcuts

keymaps/git.cson

@@ -1,22 +1,23 @@
-'.platform-darwin':
-  'cmd-shift-c': 'github:toggle-git-panel'
-
-'.platform-win32, .platform-linux':
-  'alt-shift-c': 'github:toggle-git-panel'
+'.workspace':
+  'ctrl-9': 'github:toggle-git-panel'
+  'ctrl-(': 'github:toggle-git-panel-focus' # ctrl-shift-9
 
 '.github-StagingView':
   'left': 'github:focus-diff-view'
+  'tab': 'core:focus-next'
+  'shift-tab': 'core:focus-previous'
 
 '.github-CommitView-editor atom-text-editor:not([mini])':
   'cmd-enter': 'github:commit'
   'ctrl-enter': 'github:commit'
+  'shift-tab': 'core:focus-previous'
 
 '.github-FilePatchView':
   '/': 'github:toggle-patch-selection-mode'
   'tab': 'github:select-next-hunk'
   'shift-tab': 'github:select-previous-hunk'
-  'right': 'github:focus-git-panel'
+  'right': 'core:move-right'
 
 '.github-Prompt-input':
   'enter': 'core:confirm'
-  'esc': 'core:cancel'
+  'esc': 'tool-panel:unfocus'

lib/controllers/commit-view-controller.js

@@ -62,6 +62,7 @@ export default class CommitViewController {
         isAmending={this.props.isAmending}
         lastCommit={this.props.lastCommit}
         onChangeMessage={this.handleMessageChange}
+        didMoveUpOnFirstLine={this.props.didMoveUpOnFirstLine}
       />
     );
   }
@@ -82,6 +83,14 @@ export default class CommitViewController {
     etch.update(this);
   }
 
+  focus() {
+    this.refs.commitView.focus();
+  }
+
+  isFocused() {
+    return this.refs.commitView.isFocused();
+  }
+
   destroy() {
     this.repoStateRegistry.save();
     return etch.destroy(this);

lib/controllers/file-patch-controller.js

@@ -15,6 +15,7 @@ export default class FilePatchController {
 
     this.attemptHunkStageOperation = this.attemptHunkStageOperation.bind(this);
     this.attemptLineStageOperation = this.attemptLineStageOperation.bind(this);
+    this.didSurfaceFile = this.didSurfaceFile.bind(this);
 
     etch.initialize(this);
   }
@@ -44,7 +45,9 @@ export default class FilePatchController {
         <div className="github-PaneView pane-item">
           <FilePatchView
             ref="filePatchView"
+            commandRegistry={this.props.commandRegistry}
             attemptLineStageOperation={this.attemptLineStageOperation}
+            didSurfaceFile={this.didSurfaceFile}
             attemptHunkStageOperation={this.attemptHunkStageOperation}
             hunks={hunks}
             stagingStatus={this.props.stagingStatus}
@@ -152,6 +155,12 @@ export default class FilePatchController {
     return this.emitter.on('did-destroy', callback);
   }
 
+  didSurfaceFile() {
+    if (this.props.didSurfaceFile) {
+      this.props.didSurfaceFile(this.props.filePatch.getPath(), this.props.stagingStatus);
+    }
+  }
+
   didUpdateFilePatch() {
     // FilePatch was mutated so all we need to do is re-render
     return etch.update(this);

lib/controllers/git-controller.js

@@ -60,18 +60,22 @@ export default class GitController extends React.Component {
     });
 
     this.showFilePatchForPath = this.showFilePatchForPath.bind(this);
+    this.diveIntoFilePatchForPath = this.diveIntoFilePatchForPath.bind(this);
+    this.surfaceFromFileAtPath = this.surfaceFromFileAtPath.bind(this);
     this.showMergeConflictFileForPath = this.showMergeConflictFileForPath.bind(this);
+    this.diveIntoMergeConflictFileForPath = this.diveIntoMergeConflictFileForPath.bind(this);
     this.didChangeAmending = this.didChangeAmending.bind(this);
     this.onRepoRefresh = this.onRepoRefresh.bind(this);
     this.toggleGitPanel = this.toggleGitPanel.bind(this);
-    this.openAndFocusGitPanel = this.openAndFocusGitPanel.bind(this);
+    this.toggleGitPanelFocus = this.toggleGitPanelFocus.bind(this);
     this.focusFilePatchView = this.focusFilePatchView.bind(this);
     this.focusGitPanel = this.focusGitPanel.bind(this);
+
     this.subscriptions = new CompositeDisposable();
     this.subscriptions.add(
       props.commandRegistry.add('atom-workspace', {
-        'github:toggle-git-panel': this.toggleGitPanel.bind(this),
-        'github:focus-git-panel': this.openAndFocusGitPanel.bind(this),
+        'github:toggle-git-panel': this.toggleGitPanel,
+        'github:toggle-git-panel-focus': this.toggleGitPanelFocus,
       }),
     );
 
@@ -133,7 +137,9 @@ export default class GitController extends React.Component {
             repository={this.props.repository}
             isAmending={this.state.amending}
             didSelectFilePath={this.showFilePatchForPath}
+            didDiveIntoFilePath={this.diveIntoFilePatchForPath}
             didSelectMergeConflictFile={this.showMergeConflictFileForPath}
+            didDiveIntoMergeConflictPath={this.diveIntoMergeConflictFileForPath}
             didChangeAmending={this.didChangeAmending}
             focusFilePatchView={this.focusFilePatchView}
           />
@@ -152,9 +158,11 @@ export default class GitController extends React.Component {
         <EtchWrapper ref={c => { this.filePatchController = c; }} reattachDomNode={false}>
           <FilePatchController
             repository={this.props.repository}
+            commandRegistry={this.props.commandRegistry}
             filePatch={this.state.filePatch}
             stagingStatus={this.state.stagingStatus}
             onRepoRefresh={this.onRepoRefresh}
+            didSurfaceFile={this.surfaceFromFileAtPath}
           />
         </EtchWrapper>
       </PaneItem>
@@ -190,6 +198,17 @@ export default class GitController extends React.Component {
     }
   }
 
+  async diveIntoFilePatchForPath(filePath, stagingStatus, {amending} = {}) {
+    await this.showFilePatchForPath(filePath, stagingStatus, {activate: true, amending});
+    this.focusFilePatchView();
+  }
+
+  surfaceFromFileAtPath(filePath, stagingStatus) {
+    if (this.gitPanelController) {
+      this.gitPanelController.getWrappedComponent().focusAndSelectStagingItem(filePath, stagingStatus);
+    }
+  }
+
   onRepoRefresh() {
     return this.showFilePatchForPath(this.state.filePath, this.state.stagingStatus, {amending: this.state.amending});
   }
@@ -204,6 +223,10 @@ export default class GitController extends React.Component {
     }
   }
 
+  diveIntoMergeConflictFileForPath(relativeFilePath) {
+    return this.showMergeConflictFileForPath(relativeFilePath, {focus: true});
+  }
+
   didChangeAmending(isAmending) {
     this.setState({amending: isAmending});
     return this.showFilePatchForPath(this.state.filePath, this.state.stagingStatus, {amending: isAmending});
@@ -213,23 +236,28 @@ export default class GitController extends React.Component {
     this.setState(state => ({gitPanelActive: !state.gitPanelActive}));
   }
 
-  openAndFocusGitPanel() {
+  toggleGitPanelFocus() {
     if (!this.state.gitPanelActive) {
-      this.setState({gitPanelActive: true}, () => this.focusGitPanel());
+      this.setState({gitPanelActive: true}, () => this.toggleGitPanelFocus());
+      return;
+    }
+
+    if (this.gitPanelHasFocus()) {
+      this.props.workspace.getActivePane().activate();
     } else {
       this.focusGitPanel();
     }
   }
 
   focusGitPanel() {
-    if (this.gitPanelController) {
-      this.gitPanelController.getWrappedComponent().focus();
-    }
+    this.gitPanelController.getWrappedComponent().focus();
+  }
+
+  gitPanelHasFocus() {
+    return this.gitPanelController.getWrappedComponent().isFocused();
   }
 
   focusFilePatchView() {
-    if (this.filePatchController) {
-      this.filePatchController.getWrappedComponent().focus();
-    }
+    this.filePatchController.getWrappedComponent().focus();
   }
 }

lib/controllers/git-panel-controller.js

@@ -37,7 +37,9 @@ export default class GitPanelController {
         commandRegistry={this.props.commandRegistry}
         notificationManager={this.props.notificationManager}
         didSelectFilePath={this.props.didSelectFilePath}
+        didDiveIntoFilePath={this.props.didDiveIntoFilePath}
         didSelectMergeConflictFile={this.props.didSelectMergeConflictFile}
+        didDiveIntoMergeConflictPath={this.props.didDiveIntoMergeConflictPath}
         focusFilePatchView={this.props.focusFilePatchView}
         stageFilePatch={this.stageFilePatch}
         unstageFilePatch={this.unstageFilePatch}
@@ -210,8 +212,14 @@ export default class GitPanelController {
   }
 
   focus() {
-    if (this.refs.gitPanel) {
-      this.refs.gitPanel.focus();
-    }
+    this.refs.gitPanel.focus();
+  }
+
+  focusAndSelectStagingItem(filePath, stagingStatus) {
+    return this.refs.gitPanel.focusAndSelectStagingItem(filePath, stagingStatus);
+  }
+
+  isFocused() {
+    return this.refs.gitPanel.isFocused();
   }
 }

lib/views/commit-view.js

@@ -11,17 +11,22 @@ const COMMIT_GRAMMAR_SCOPE = 'text.git-commit';
 export default class CommitView {
   constructor(props) {
     this.props = props;
+
+    this.commit = this.commit.bind(this);
     this.abortMerge = this.abortMerge.bind(this);
     this.handleAmendBoxClick = this.handleAmendBoxClick.bind(this);
     this.commit = this.commit.bind(this);
     this.abortMerge = this.abortMerge.bind(this);
     etch.initialize(this);
+
     this.editor = this.refs.editor;
+    // FIXME Use props-injected view registry instead of the Atom global
+    this.editorElement = atom.views.getView(this.editor);
     this.editor.setText(this.props.message || '');
     this.subscriptions = new CompositeDisposable(
       this.editor.onDidChange(() => this.props.onChangeMessage && this.props.onChangeMessage(this.editor.getText())),
       this.editor.onDidChangeCursorPosition(() => { etch.update(this); }),
-      props.commandRegistry.add(this.element, {'github:commit': () => this.commit()}),
+      props.commandRegistry.add(this.element, {'github:commit': this.commit}),
     );
 
     const grammar = atom.grammars.grammarForScopeName(COMMIT_GRAMMAR_SCOPE);
@@ -146,4 +151,12 @@ export default class CommitView {
       }
     }
   }
+
+  focus() {
+    this.editorElement.focus();
+  }
+
+  isFocused() {
+    return this.element === document.activeElement || this.element.contains(document.activeElement);
+  }
 }

lib/views/composite-list-selection.js

@@ -113,6 +113,16 @@ export default class CompositeListSelection {
     return false;
   }
 
+  activateLastSelection() {
+    for (let i = this.selections.length - 1; i >= 0; i--) {
+      if (this.selections[i].getItems().length > 0) {
+        this.activeSelectionIndex = i;
+        return true;
+      }
+    }
+    return false;
+  }
+
   selectItem(item, preserveTail = false) {
     const selection = this.selectionForItem(item);
     if (!selection) { throw new Error(`No item found: ${item}`); }
@@ -160,23 +170,41 @@ export default class CompositeListSelection {
     if (!preserveTail && this.getActiveSelection().getHeadItem() === this.getActiveSelection().getLastItem()) {
       if (this.activateNextSelection()) {
         this.getActiveSelection().selectFirstItem();
+        return true;
       } else {
         this.getActiveSelection().selectLastItem();
+        return false;
       }
     } else {
       this.getActiveSelection().selectNextItem(preserveTail);
+      return true;
     }
   }
 
   selectPreviousItem(preserveTail = false) {
     if (!preserveTail && this.getActiveSelection().getHeadItem() === this.getActiveSelection().getItems()[0]) {
       if (this.activatePreviousSelection()) {
         this.getActiveSelection().selectLastItem();
+        return true;
       } else {
         this.getActiveSelection().selectFirstItem();
+        return false;
       }
     } else {
       this.getActiveSelection().selectPreviousItem(preserveTail);
+      return true;
+    }
+  }
+
+  findItem(predicate) {
+    for (let i = 0; i < this.selections.length; i++) {
+      const selection = this.selections[i];
+      const key = this.keysBySelection.get(selection);
+      const found = selection.getItems().find(item => predicate(item, key));
+      if (found !== undefined) {
+        return found;
+      }
     }
+    return null;
   }
 }

lib/views/file-patch-view.js

@@ -13,11 +13,12 @@ export default class FilePatchView {
     this.props = props;
     this.selection = new FilePatchSelection(this.props.hunks);
     this.fontSize = atom.config.get('editor.fontSize');
-
     this.mouseSelectionInProgress = false;
+
     this.mousedownOnLine = this.mousedownOnLine.bind(this);
     this.mousemoveOnLine = this.mousemoveOnLine.bind(this);
     this.mouseup = this.mouseup.bind(this);
+
     window.addEventListener('mouseup', this.mouseup);
     this.disposables = new CompositeDisposable();
     this.disposables.add(new Disposable(() => window.removeEventListener('mouseup', this.mouseup)));
@@ -27,11 +28,13 @@ export default class FilePatchView {
     }));
 
     etch.initialize(this);
-    this.disposables.add(atom.commands.add(this.element, {
-      'github:toggle-patch-selection-mode': this.togglePatchSelectionMode.bind(this),
+
+    this.disposables.add(this.props.commandRegistry.add(this.element, {
+      'github:toggle-patch-selection-mode': () => this.togglePatchSelectionMode(),
       'core:confirm': () => this.didConfirm(),
       'core:move-up': () => this.selectPrevious(),
       'core:move-down': () => this.selectNext(),
+      'core:move-right': () => this.didMoveRight(),
       'core:move-to-top': () => this.selectFirst(),
       'core:move-to-bottom': () => this.selectLast(),
       'core:select-up': () => this.selectToPrevious(),
@@ -205,6 +208,12 @@ export default class FilePatchView {
     return this.props.attemptLineStageOperation(this.selection.getSelectedLines());
   }
 
+  didMoveRight() {
+    if (this.props.didSurfaceFile) {
+      this.props.didSurfaceFile();
+    }
+  }
+
   focus() {
     this.element.focus();
   }