Merge pull request atom#742 from atom/ku-focus-tree

Focus tree-view if name of active file is clicked

Author: kuychaco

lib/tree-view.coffee

@@ -205,13 +205,17 @@ class TreeView extends View
       when 1
         @selectEntry(entry)
         if entry instanceof FileView
-          @openedItem = atom.workspace.open(entry.getPath(), pending: true)
+          if entry.getPath() is atom.workspace.getActivePaneItem()?.getPath?()
+            @focus()
+          else
+            @openedItem = atom.workspace.open(entry.getPath(), pending: true)
         else if entry instanceof DirectoryView
           entry.toggleExpansion(isRecursive)
       when 2
         if entry instanceof FileView
           @openedItem.then((item) -> item.terminatePendingState?())
-          @unfocus()
+          unless entry.getPath() is atom.workspace.getActivePaneItem()?.getPath?()
+            @unfocus()
         else if entry instanceof DirectoryView
           entry.toggleExpansion(isRecursive)
 

spec/tree-view-spec.coffee

@@ -614,12 +614,18 @@ describe "TreeView", ->
           expect(activePaneItem.isPending()).toBe true
 
         it "terminates pending state on the double-click and focuses file", ->
-          sampleJs.trigger clickEvent(originalEvent: {detail: 1})
           sampleJs.trigger clickEvent(originalEvent: {detail: 2})
           expect(atom.views.getView(activePaneItem)).toHaveFocus()
           waitsFor ->
             activePaneItem.isPending() is false
 
+        it "keeps focus on tree-view if the file is the active pane item", ->
+          sampleJs.trigger clickEvent(originalEvent: {detail: 1})
+          expect(treeView).toHaveFocus()
+
+          sampleJs.trigger clickEvent(originalEvent: {detail: 2})
+          expect(treeView).toHaveFocus()
+
   describe "when a directory is single-clicked", ->
     it "is selected", ->
       subdir = root1.find('.directory:first')