WIP: Start on making tree view a dock item

Author: Nathan Sobo

lib/constants.js

@@ -0,0 +1 @@
+exports.TREE_VIEW_URI = 'atom://tree-view'

lib/tree-view-package.js

@@ -3,40 +3,33 @@ const path = require('path')
 
 const FileIcons = require('./file-icons')
 const TreeView = require('./tree-view')
+const {TREE_VIEW_URI} = require('./constants')
 
 module.exports =
 class TreeViewPackage {
-  constructor () {
-    this.treeView = null
-  }
-
-  activate (state) {
-    this.state = state
+  activate () {
     this.disposables = new CompositeDisposable()
-    if (this.shouldAttach()) {
-      if (this.state.attached == null) {
-        this.state.attached = true
-      }
-    }
 
-    if (this.state.attached) {
-      this.createView()
-    }
+    this.disposables.add(atom.commands.add('atom-workspace', {
+      'tree-view:show': () => this.getTreeViewInstance().show(),
+      'tree-view:toggle': () => this.getTreeViewInstance().toggle(),
+      'tree-view:toggle-focus': () => this.getTreeViewInstance().toggleFocus(),
+      'tree-view:reveal-active-file': () => this.getTreeViewInstance().revealActiveFile(),
+      'tree-view:toggle-side': () => this.getTreeViewInstance().toggleSide(),
+      'tree-view:add-file': () => this.getTreeViewInstance().add(true),
+      'tree-view:add-folder': () => this.getTreeViewInstance().add(false),
+      'tree-view:duplicate': () => this.getTreeViewInstance().copySelectedEntry(),
+      'tree-view:remove': () => this.getTreeViewInstance().removeSelectedEntries(),
+      'tree-view:rename': () => this.getTreeViewInstance().moveSelectedEntry(),
+      'tree-view:show-current-file-in-file-manager': () => this.getTreeViewInstance().showCurrentFileInFileManager()
+    }))
 
-    return this.disposables.add(atom.commands.add('atom-workspace', {
-      'tree-view:show': () => this.createView().show(),
-      'tree-view:toggle': () => this.createView().toggle(),
-      'tree-view:toggle-focus': () => this.createView().toggleFocus(),
-      'tree-view:reveal-active-file': () => this.createView().revealActiveFile(),
-      'tree-view:toggle-side': () => this.createView().toggleSide(),
-      'tree-view:add-file': () => this.createView().add(true),
-      'tree-view:add-folder': () => this.createView().add(false),
-      'tree-view:duplicate': () => this.createView().copySelectedEntry(),
-      'tree-view:remove': () => this.createView().removeSelectedEntries(),
-      'tree-view:rename': () => this.createView().moveSelectedEntry(),
-      'tree-view:show-current-file-in-file-manager': () => this.createView().showCurrentFileInFileManager()
-    })
-    )
+    this.disposables.add(atom.workspace.addOpener((URI) => {
+      if (URI === TREE_VIEW_URI) return this.getTreeViewInstance()
+    }))
+
+    this.disposables.add(atom.project.onDidChangePaths(this.createOrDestroyTreeViewIfNeeded.bind(this)))
+    this.createOrDestroyTreeViewIfNeeded()
   }
 
   deactivate () {
@@ -56,33 +49,36 @@ class TreeViewPackage {
     )
   }
 
-  serialize () {
-    if (this.treeView != null) {
-      return this.treeView.serialize()
-    } else {
-      return this.state
+  getTreeViewInstance (state = {}) {
+    if (this.treeView == null) {
+      this.treeView = new TreeView(state)
     }
+    return this.treeView
   }
 
-  createView () {
-    if (this.treeView == null) {
-      this.treeView = new TreeView(this.state)
+  createOrDestroyTreeViewIfNeeded () {
+    if (this.shouldAttachTreeView()) {
+      // TODO: Pass activate: false here
+      // {activate: !atom.workspace.getActivePaneItem()}
+      atom.workspace.open(TREE_VIEW_URI)
+    } else {
+      if (this.treeView) this.treeView.destroy()
     }
-    return this.treeView
   }
 
-  shouldAttach () {
-    const projectPath = atom.project.getPaths()[0] || ''
+  shouldAttachTreeView () {
+    if (atom.project.getPaths().length === 0) return false
 
-    if (atom.workspace.getActivePaneItem()) {
-      return false
-    } else if (path.basename(projectPath) === '.git') {
-      // Only attach when the project path matches the path to open signifying
-      // the .git folder was opened explicitly and not by using Atom as the Git
-      // editor.
-      return projectPath === atom.getLoadSettings().pathToOpen
-    } else {
-      return true
+    // Avoid opening the tree view if Atom was opened as the Git editor...
+    // Only show it if the .git folder was explicitly opened.
+    if (path.basename(atom.project.getPaths()[0]) === '.git') {
+      return atom.project.getPaths()[0] === atom.getLoadSettings().pathToOpen
     }
+
+    return true
+  }
+
+  shouldShowTreeViewAfterAttaching () {
+    if (atom.workspace.getActivePaneItem()) return false
   }
 }