Merge branch 'nak-nostream' into nak-powered-search

src/packages/tree-view/lib/directory-view.coffee

@@ -11,7 +11,7 @@ class DirectoryView extends View
       @div outlet: 'header', class: 'header', =>
         @span class: 'disclosure-arrow', outlet: 'disclosureArrow'
         @span directory.getBaseName(), class: 'name', outlet: 'directoryName'
-      @span "", class: 'highlight'
+      @span class: 'highlight'
 
   directory: null
   entries: null

src/packages/tree-view/lib/file-view.coffee

@@ -9,7 +9,7 @@ class FileView extends View
   @content: ({file} = {}) ->
     @li class: 'file entry', =>
       @span file.getBaseName(), class: 'name', outlet: 'fileName'
-      @span '', class: 'highlight'
+      @span class: 'highlight'
 
   file: null
 

src/packages/tree-view/lib/tree-view.coffee

@@ -56,6 +56,7 @@ class TreeView extends ScrollView
   afterAttach: (onDom) ->
     @focus() if @focusAfterAttach
     @scrollTop(@scrollTopAfterAttach) if @scrollTopAfterAttach > 0
+    @find('.selected > .highlight').width(@treeViewList[0].scrollWidth)
 
   serialize: ->
     directoryExpansionStates: @root?.serializeEntryExpansionStates()
@@ -304,10 +305,11 @@ class TreeView extends ScrollView
     entry = entry.view() unless entry instanceof View
     @selectedPath = entry.getPath()
     @deselect()
+    entry.children('.highlight').width(@treeViewList[0].scrollWidth)
     entry.addClass('selected')
 
   deselect: ->
-    @treeViewList.find('.selected').removeClass('selected')
+    @treeViewList.find('.selected').removeClass('selected').children('.highlight').width('')
 
   scrollTop: (top) ->
     if top