rebase Multi drag

ISSUE_TEMPLATE.md

@@ -0,0 +1,40 @@
+<!--
+
+Have you read Atom's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/atom/atom/blob/master/CODE_OF_CONDUCT.md
+
+Do you want to ask a question? Are you looking for support? The Atom message board is the best place for getting support: https://discuss.atom.io
+
+-->
+
+### Prerequisites
+
+* [ ] Put an X between the brackets on this line if you have done all of the following:
+    * Reproduced the problem in Safe Mode: http://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode
+    * Followed all applicable steps in the debugging guide: http://flight-manual.atom.io/hacking-atom/sections/debugging/
+    * Checked the FAQs on the message board for common solutions: https://discuss.atom.io/c/faq
+    * Checked that your issue isn't already filed: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aatom
+    * Checked that there is not already an Atom package that provides the described functionality: https://atom.io/packages
+
+### Description
+
+[Description of the issue]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+**Reproduces how often:** [What percentage of the time does it reproduce?]
+
+### Versions
+
+You can get this information from copy and pasting the output of `atom --version` and `apm --version` from the command line. Also, please include the OS and what version of the OS you're running.
+
+### Additional Information
+
+Any additional information, configuration or data that might be necessary to reproduce the issue.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+### Requirements
+
+* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+### Description of the Change
+
+<!--
+
+We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
+
+-->
+
+### Alternate Designs
+
+<!-- Explain what other alternates were considered and why the proposed version was selected -->
+
+### Benefits
+
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- Enter any applicable Issues here -->

README.md

@@ -19,4 +19,3 @@ The Tree View displays icons next to files. These icons are customizable by inst
 The `atom.file-icons` service must provide the following methods:
 
 * `iconClassForPath(path)` - Returns a CSS class name to add to the file view
-* `onWillDeactivate` - An event that lets the tree view return to its default icon strategy

appveyor.yml

@@ -18,7 +18,7 @@ environment:
   - ATOM_CHANNEL: beta
 
 install:
-  - ps: Install-Product node 4
+  - ps: Install-Product node 6
 
 build_script:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))

keymaps/tree-view.cson

@@ -68,6 +68,7 @@
   'alt-left': 'tree-view:recursive-collapse-directory'
   'h': 'tree-view:collapse-directory'
   'enter': 'tree-view:open-selected-entry'
+  'escape': 'tree-view:unfocus'
   'ctrl-C': 'tree-view:copy-full-path'
   'm': 'tree-view:move'
   'f2': 'tree-view:move'

lib/add-dialog.coffee

@@ -23,6 +23,12 @@ class AddDialog extends Dialog
       select: false
       iconClass: if isCreatingFile then 'icon-file-add' else 'icon-file-directory-create'
 
+  onDidCreateFile: (callback) ->
+    @emitter.on('did-create-file', callback)
+
+  onDidCreateDirectory: (callback) ->
+    @emitter.on('did-create-directory', callback)
+
   onConfirm: (newPath) ->
     newPath = newPath.replace(/\s+$/, '') # Remove trailing whitespace
     endsWithDirectorySeparator = newPath[newPath.length - 1] is path.sep
@@ -44,11 +50,11 @@ class AddDialog extends Dialog
         else
           fs.writeFileSync(newPath, '')
           repoForPath(newPath)?.getPathStatus(newPath)
-          @trigger 'file-created', [newPath]
+          @emitter.emit('did-create-file', newPath)
           @close()
       else
         fs.makeTreeSync(newPath)
-        @trigger 'directory-created', [newPath]
+        @emitter.emit('did-create-directory', newPath)
         @cancel()
     catch error
       @showError("#{error.message}.")

lib/copy-dialog.coffee

@@ -5,7 +5,7 @@ Dialog = require './dialog'
 
 module.exports =
 class CopyDialog extends Dialog
-  constructor: (@initialPath) ->
+  constructor: (@initialPath, {@onCopy}) ->
     super
       prompt: 'Enter the new path for the duplicate.'
       initialPath: atom.project.relativize(@initialPath)
@@ -32,8 +32,10 @@ class CopyDialog extends Dialog
     try
       if fs.isDirectorySync(@initialPath)
         fs.copySync(@initialPath, newPath)
+        @onCopy?({initialPath: @initialPath, newPath: newPath})
       else
-        fs.copy @initialPath, newPath, ->
+        fs.copy @initialPath, newPath, =>
+          @onCopy?({initialPath: @initialPath, newPath: newPath})
           atom.workspace.open newPath,
             activatePane: true
             initialLine: activeEditor?.getLastCursor().getBufferRow()

lib/dialog.coffee

@@ -1,48 +1,71 @@
-{$, TextEditorView, View} = require 'atom-space-pen-views'
+{TextEditor, CompositeDisposable, Disposable, Emitter, Range, Point} = require 'atom'
 path = require 'path'
+{getFullExtension} = require "./helpers"
 
 module.exports =
-class Dialog extends View
-  @content: ({prompt} = {}) ->
-    @div class: 'tree-view-dialog', =>
-      @label prompt, class: 'icon', outlet: 'promptText'
-      @subview 'miniEditor', new TextEditorView(mini: true)
-      @div class: 'error-message', outlet: 'errorMessage'
-
-  initialize: ({initialPath, select, iconClass} = {}) ->
-    @promptText.addClass(iconClass) if iconClass
+class Dialog
+  constructor: ({initialPath, select, iconClass, prompt} = {}) ->
+    @emitter = new Emitter()
+    @disposables = new CompositeDisposable()
+
+    @element = document.createElement('div')
+    @element.classList.add('tree-view-dialog')
+
+    @promptText = document.createElement('label')
+    @promptText.classList.add('icon')
+    @promptText.classList.add(iconClass) if iconClass
+    @promptText.textContent = prompt
+    @element.appendChild(@promptText)
+
+    @miniEditor = new TextEditor({mini: true})
+    blurHandler = =>
+      @close() if document.hasFocus()
+    @miniEditor.element.addEventListener('blur', blurHandler)
+    @disposables.add(new Disposable(=> @miniEditor.element.removeEventListener('blur', blurHandler)))
+    @disposables.add(@miniEditor.onDidChange => @showError())
+    @element.appendChild(@miniEditor.element)
+
+    @errorMessage = document.createElement('div')
+    @errorMessage.classList.add('error-message')
+    @element.appendChild(@errorMessage)
+
     atom.commands.add @element,
       'core:confirm': => @onConfirm(@miniEditor.getText())
       'core:cancel': => @cancel()
-    @miniEditor.on 'blur', => @close() if document.hasFocus()
-    @miniEditor.getModel().onDidChange => @showError()
-    @miniEditor.getModel().setText(initialPath)
+
+    @miniEditor.setText(initialPath)
 
     if select
-      extension = path.extname(initialPath)
+      extension = getFullExtension(initialPath)
       baseName = path.basename(initialPath)
+      selectionStart = initialPath.length - baseName.length
       if baseName is extension
         selectionEnd = initialPath.length
       else
         selectionEnd = initialPath.length - extension.length
-      range = [[0, initialPath.length - baseName.length], [0, selectionEnd]]
-      @miniEditor.getModel().setSelectedBufferRange(range)
+      @miniEditor.setSelectedBufferRange(Range(Point(0, selectionStart), Point(0, selectionEnd)))
 
   attach: ->
-    @panel = atom.workspace.addModalPanel(item: this.element)
-    @miniEditor.focus()
-    @miniEditor.getModel().scrollToCursorPosition()
+    @panel = atom.workspace.addModalPanel(item: this)
+    @miniEditor.element.focus()
+    @miniEditor.scrollToCursorPosition()
 
   close: ->
-    panelToDestroy = @panel
+    panel = @panel
     @panel = null
-    panelToDestroy?.destroy()
-    atom.workspace.getActivePane().activate()
+    panel?.destroy()
+    @emitter.dispose()
+    @disposables.dispose()
+    @miniEditor.destroy()
+    activePane = atom.workspace.getCenter().getActivePane()
+    activePane.activate() unless activePane.isDestroyed()
 
   cancel: ->
     @close()
-    $('.tree-view').focus()
+    document.querySelector('.tree-view')?.focus()
 
   showError: (message='') ->
-    @errorMessage.text(message)
-    @flashError() if message
+    @errorMessage.textContent = message
+    if message
+      @element.classList.add('error')
+      window.setTimeout((=> @element.classList.remove('error')), 300)

lib/directory-view.coffee

@@ -3,13 +3,16 @@ Directory = require './directory'
 FileView = require './file-view'
 {repoForPath} = require './helpers'
 
-class DirectoryView extends HTMLElement
-  initialize: (@directory) ->
+module.exports =
+class DirectoryView
+  constructor: (@directory) ->
     @subscriptions = new CompositeDisposable()
     @subscriptions.add @directory.onDidDestroy => @subscriptions.dispose()
     @subscribeToDirectory()
 
-    @classList.add('directory', 'entry',  'list-nested-item',  'collapsed')
+    @element = document.createElement('li')
+    @element.setAttribute('is', 'tree-view-directory')
+    @element.classList.add('directory', 'entry',  'list-nested-item',  'collapsed')
 
     @header = document.createElement('div')
     @header.classList.add('header', 'list-item')
@@ -29,36 +32,51 @@ class DirectoryView extends HTMLElement
       else
         iconClass = 'icon-file-submodule' if @directory.submodule
     @directoryName.classList.add(iconClass)
-    @directoryName.dataset.name = @directory.name
-    @directoryName.title = @directory.name
     @directoryName.dataset.path = @directory.path
 
-    if @directory.squashedName?
-      @squashedDirectoryName = document.createElement('span')
-      @squashedDirectoryName.classList.add('squashed-dir')
-      @squashedDirectoryName.textContent = @directory.squashedName
-
-    directoryNameTextNode = document.createTextNode(@directory.name)
+    if @directory.squashedNames?
+      @directoryName.dataset.name = @directory.squashedNames.join('')
+      @directoryName.title = @directory.squashedNames.join('')
+      squashedDirectoryNameNode = document.createElement('span')
+      squashedDirectoryNameNode.classList.add('squashed-dir')
+      squashedDirectoryNameNode.textContent = @directory.squashedNames[0]
+      @directoryName.appendChild(squashedDirectoryNameNode)
+      @directoryName.appendChild(document.createTextNode(@directory.squashedNames[1]))
+    else
+      @directoryName.dataset.name = @directory.name
+      @directoryName.title = @directory.name
+      @directoryName.textContent = @directory.name
 
-    @appendChild(@header)
-    if @squashedDirectoryName?
-      @directoryName.appendChild(@squashedDirectoryName)
-    @directoryName.appendChild(directoryNameTextNode)
+    @element.appendChild(@header)
     @header.appendChild(@directoryName)
-    @appendChild(@entries)
+    @element.appendChild(@entries)
 
     if @directory.isRoot
-      @classList.add('project-root')
+      @element.classList.add('project-root')
+      @header.classList.add('project-root-header')
     else
-      @draggable = true
+      @element.draggable = true
       @subscriptions.add @directory.onDidStatusChange => @updateStatus()
       @updateStatus()
 
     @expand() if @directory.expansionState.isExpanded
 
+    @element.collapse = @collapse.bind(this)
+    @element.expand = @expand.bind(this)
+    @element.toggleExpansion = @toggleExpansion.bind(this)
+    @element.reload = @reload.bind(this)
+    @element.isExpanded = @isExpanded
+    @element.updateStatus = @updateStatus.bind(this)
+    @element.isPathEqual = @isPathEqual.bind(this)
+    @element.getPath = @getPath.bind(this)
+    @element.directory = @directory
+    @element.header = @header
+    @element.entries = @entries
+    @element.directoryName = @directoryName
+
   updateStatus: ->
-    @classList.remove('status-ignored', 'status-modified', 'status-added')
-    @classList.add("status-#{@directory.status}") if @directory.status?
+    @element.classList.remove('status-ignored', 'status-modified', 'status-added')
+    @element.classList.add("status-#{@directory.status}") if @directory.status?
 
   subscribeToDirectory: ->
     @subscriptions.add @directory.onDidAddEntries (addedEntries) =>
@@ -71,9 +89,9 @@ class DirectoryView extends HTMLElement
 
         insertionIndex = entry.indexInParentDirectory
         if insertionIndex < numberOfEntries
-          @entries.insertBefore(view, @entries.children[insertionIndex])
+          @entries.insertBefore(view.element, @entries.children[insertionIndex])
         else
-          @entries.appendChild(view)
+          @entries.appendChild(view.element)
 
         numberOfEntries++
 
@@ -85,16 +103,14 @@ class DirectoryView extends HTMLElement
 
   createViewForEntry: (entry) ->
     if entry instanceof Directory
-      view = new DirectoryElement()
+      view = new DirectoryView(entry)
     else
-      view = new FileView()
-    view.initialize(entry)
+      view = new FileView(entry)
 
     subscription = @directory.onDidRemoveEntries (removedEntries) ->
-      for removedName, removedEntry of removedEntries when entry is removedEntry
-        view.remove()
+      if removedEntries.has(entry)
+        view.element.remove()
         subscription.dispose()
-        break
     @subscriptions.add(subscription)
 
     view
@@ -108,27 +124,26 @@ class DirectoryView extends HTMLElement
   expand: (isRecursive=false) ->
     unless @isExpanded
       @isExpanded = true
-      @classList.add('expanded')
-      @classList.remove('collapsed')
+      @element.isExpanded = @isExpanded
+      @element.classList.add('expanded')
+      @element.classList.remove('collapsed')
       @directory.expand()
 
     if isRecursive
-      for entry in @entries.children when entry instanceof DirectoryView
+      for entry in @entries.children when entry.classList.contains('directory')
         entry.expand(true)
 
     false
 
   collapse: (isRecursive=false) ->
     @isExpanded = false
+    @element.isExpanded = false
 
     if isRecursive
       for entry in @entries.children when entry.isExpanded
         entry.collapse(true)
 
-    @classList.remove('expanded')
-    @classList.add('collapsed')
+    @element.classList.remove('expanded')
+    @element.classList.add('collapsed')
     @directory.collapse()
     @entries.innerHTML = ''
-
-DirectoryElement = document.registerElement('tree-view-directory', prototype: DirectoryView.prototype, extends: 'li')
-module.exports = DirectoryElement