Reveal commit box only when last editor is closed

kuychaco · kuychaco · commit ea32a4e0b785 · 2017-06-06T17:14:10.000-07:00
diff --git a/lib/controllers/commit-view-controller.js b/lib/controllers/commit-view-controller.js
@@ -41,6 +41,24 @@ export default class CommitViewController {
 
     this.subscriptions = new CompositeDisposable();
     etch.initialize(this);
+    this.subscriptions.add(
+      this.props.workspace.onDidAddTextEditor(({textEditor}) => {
+        if (textEditor.getPath() === this.getCommitMessagePath()) {
+          const grammar = this.props.grammars.grammarForScopeName(COMMIT_GRAMMAR_SCOPE);
+          if (grammar) {
+            textEditor.setGrammar(grammar);
+          }
+        }
+        etch.update(this);
+      }),
+      this.props.workspace.onDidDestroyPaneItem(async ({item}) => {
+        if (item.getPath() === this.getCommitMessagePath() && this.getCommitMessageEditors().length === 0) {
+          // we closed the last editor pointing to the commit message file
+          this.regularCommitMessage = await readFile(this.getCommitMessagePath());
+          etch.update(this);
+        }
+      }),
+    );
   }
 
   update(props) {
@@ -80,15 +98,15 @@ export default class CommitViewController {
         onChangeMessage={this.handleMessageChange}
         didMoveUpOnFirstLine={this.props.didMoveUpOnFirstLine}
         openCommitEditor={this.openCommitEditor}
-        deactivateCommitBox={!!this.commitEditor}
+        deactivateCommitBox={!!this.getCommitMessageEditors().length > 0}
       />
     );
   }
 
   @autobind
   async commit(message) {
     try {
-      if (this.commitEditor) {
+      if (this.getCommitMessageEditors().length > 0) {
         await this.props.commit({filePath: this.getCommitMessagePath()});
       } else {
         await this.props.commit(message);
@@ -125,50 +143,49 @@ export default class CommitViewController {
     etch.update(this);
   }
 
+  getCommitMessageEditors() {
+    if (!this.props.repository.isPresent()) {
+      return [];
+    }
+    return this.props.workspace.getTextEditors().filter(editor => editor.getPath() === this.getCommitMessagePath());
+  }
+
   activateCommitEditor() {
     const panes = this.props.workspace.getPanes();
+    let editor;
     const paneWithEditor = panes.find(pane => {
-      const editor = pane.getItems().find(item => item === this.commitEditor);
+      editor = pane.getItems().find(item => item.getPath && item.getPath() === this.getCommitMessagePath());
       return !!editor;
     });
     paneWithEditor.activate();
-    paneWithEditor.activateItem(this.commitEditor);
+    paneWithEditor.activateItem(editor);
   }
 
   @autobind
   async openCommitEditor(messageFromBox) {
-    if (this.commitEditor) {
+    if (this.getCommitMessageEditors().length > 0) {
       this.activateCommitEditor();
       return;
     }
 
-    this.commitEditor = await this.props.workspace.open(this.getCommitMessagePath());
-    this.commitEditor.setText(messageFromBox);
+    const commitEditor = await this.props.workspace.open(this.getCommitMessagePath());
+    commitEditor.setText(messageFromBox);
 
     const grammar = this.props.grammars.grammarForScopeName(COMMIT_GRAMMAR_SCOPE);
     if (grammar) {
-      this.commitEditor.setGrammar(grammar);
+      commitEditor.setGrammar(grammar);
     } else {
       this.grammarSubscription = this.props.grammars.onDidAddGrammar(this.grammarAdded);
       this.subscriptions.add(this.grammarSubscription);
     }
     etch.update(this);
-
-    this.editorSubscription = this.commitEditor.onDidDestroy(async () => {
-      this.commitEditor = null;
-      const contents = await readFile(this.getCommitMessagePath());
-      this.regularCommitMessage = contents;
-      this.editorSubscription.dispose();
-      etch.update(this);
-    });
-    this.subscriptions.add(this.editorSubscription);
   }
 
   @autobind
   grammarAdded(grammar) {
     if (grammar.scopeName !== COMMIT_GRAMMAR_SCOPE) { return; }
 
-    this.commitEditor.setGrammar(grammar);
+    this.getCommitMessageEditors().forEach(editor => editor.setGrammar(grammar));
     this.grammarSubscription.dispose();
   }
 
diff --git a/test/controllers/commit-view-controller.test.js b/test/controllers/commit-view-controller.test.js
@@ -148,17 +148,29 @@ describe('CommitViewController', function() {
     });
 
     describe('toggling between commit box and commit editor', function() {
-      it('transfers the commit message contents', async function() {
+      it('transfers the commit message contents of the last editor', async function() {
         controller.refs.commitView.editor.setText('message in box');
 
         commandRegistry.dispatch(atomEnvironment.views.getView(workspace), 'github:edit-commit-message-in-editor');
         await assert.async.equal(workspace.getActiveTextEditor().getPath(), controller.getCommitMessagePath());
+        await assert.async.isTrue(controller.refs.commitView.props.deactivateCommitBox);
         const editor = workspace.getActiveTextEditor();
         assert.equal(editor.getText(), 'message in box');
 
         editor.setText('message in editor');
         editor.save();
+
+        commandRegistry.dispatch(atomEnvironment.views.getView(editor), 'pane:split-right-and-copy-active-item');
+        await assert.async.notEqual(workspace.getActiveTextEditor(), editor);
+
+        sinon.spy(controller.refs.commitView, 'update');
         editor.destroy();
+        await assert.async.isTrue(controller.refs.commitView.update.called);
+        assert.equal(controller.refs.commitView.editor.getText(), 'message in box');
+        assert.isTrue(controller.refs.commitView.props.deactivateCommitBox);
+
+        workspace.getActiveTextEditor().destroy();
+        await assert.async.isFalse(controller.refs.commitView.props.deactivateCommitBox);
         await assert.async.equal(controller.refs.commitView.editor.getText(), 'message in editor');
       });
 
