Merge remote-tracking branch 'origin/dev' into sidebar

src/app/atom-package.coffee

@@ -35,10 +35,7 @@ class AtomPackage extends Package
       keymaps.map (relativePath) =>
         fs.resolve(@keymapsDirPath, relativePath, ['cson', 'json', ''])
     else
-      if fs.exists(@keymapsDirPath)
-        fs.list(@keymapsDirPath)
-      else
-        []
+      fs.list(@keymapsDirPath)
 
   loadStylesheets: ->
     for stylesheetPath in @getStylesheetPaths()
@@ -46,7 +43,4 @@ class AtomPackage extends Package
 
   getStylesheetPaths: ->
     stylesheetDirPath = fs.join(@path, 'stylesheets')
-    if fs.exists stylesheetDirPath
-      fs.list stylesheetDirPath
-    else
-      []
+    fs.list(stylesheetDirPath)

src/app/atom.coffee

@@ -75,6 +75,9 @@ _.extend atom,
   focus: ->
     @sendMessageToBrowserProcess('focus')
 
+  show: ->
+    @sendMessageToBrowserProcess('show')
+
   exit: (status) ->
     @sendMessageToBrowserProcess('exit', [status])
 

src/app/binding-set.coffee

@@ -7,13 +7,16 @@ PEG = require 'pegjs'
 
 module.exports =
 class BindingSet
+
+  @parser: null
+
   selector: null
   commandsByKeystrokes: null
   commandForEvent: null
   parser: null
 
   constructor: (@selector, commandsByKeystrokes, @index) ->
-    @parser = PEG.buildParser(fs.read(require.resolve 'keystroke-pattern.pegjs'))
+    BindingSet.parser ?= PEG.buildParser(fs.read(require.resolve 'keystroke-pattern.pegjs'))
     @specificity = Specificity(@selector)
     @commandsByKeystrokes = @normalizeCommandsByKeystrokes(commandsByKeystrokes)
 
@@ -42,7 +45,7 @@ class BindingSet
     normalizedKeystrokes.join(' ')
 
   normalizeKeystroke: (keystroke) ->
-    keys = @parser.parse(keystroke)
+    keys = BindingSet.parser.parse(keystroke)
     modifiers = keys[0...-1]
     modifiers.sort()
     [modifiers..., _.last(keys)].join('-')

src/app/buffer.coffee

@@ -54,6 +54,8 @@ class Buffer
     @destroy() if @refcount <= 0
     this
 
+  hasEditors: -> @refcount > 1
+
   subscribeToFile: ->
     @file.on "contents-changed", =>
       if @isModified()

src/app/edit-session.coffee

@@ -142,6 +142,8 @@ class EditSession
   lineLengthForBufferRow: (row) -> @buffer.lineLengthForRow(row)
   scanInRange: (args...) -> @buffer.scanInRange(args...)
   backwardsScanInRange: (args...) -> @buffer.backwardsScanInRange(args...)
+  isModified: -> @buffer.isModified()
+  hasEditors: -> @buffer.hasEditors()
 
   screenPositionForBufferPosition: (bufferPosition, options) -> @displayBuffer.screenPositionForBufferPosition(bufferPosition, options)
   bufferPositionForScreenPosition: (screenPosition, options) -> @displayBuffer.bufferPositionForScreenPosition(screenPosition, options)
@@ -206,6 +208,9 @@ class EditSession
   toggleLineCommentsInSelection: ->
     @mutateSelectedText (selection) -> selection.toggleLineComments()
 
+  autoIndentSelectedRows: ->
+    @mutateSelectedText (selection) -> selection.autoIndentSelectedRows()
+
   cutToEndOfLine: ->
     maintainPasteboard = false
     @mutateSelectedText (selection) ->

src/app/editor.coffee

@@ -117,6 +117,7 @@ class Editor extends View
       'editor:select-word': @selectWord
       'editor:newline': @insertNewline
       'editor:indent': @indent
+      'editor:auto-indent': @autoIndent
       'editor:indent-selected-rows': @indentSelectedRows
       'editor:outdent-selected-rows': @outdentSelectedRows
       'editor:backspace-to-beginning-of-word': @backspaceToBeginningOfWord
@@ -151,6 +152,7 @@ class Editor extends View
         'core:select-to-bottom': @selectToBottom
         'core:close': @destroyActiveEditSession
         'editor:save': @save
+        'editor:save-as': @saveAs
         'editor:newline-below': @insertNewlineBelow
         'editor:toggle-soft-tabs': @toggleSoftTabs
         'editor:toggle-soft-wrap': @toggleSoftWrap
@@ -247,6 +249,7 @@ class Editor extends View
   insertNewline: -> @activeEditSession.insertNewline()
   insertNewlineBelow: -> @activeEditSession.insertNewlineBelow()
   indent: (options) -> @activeEditSession.indent(options)
+  autoIndent: (options) -> @activeEditSession.autoIndentSelectedRows(options)
   indentSelectedRows: -> @activeEditSession.indentSelectedRows()
   outdentSelectedRows: -> @activeEditSession.outdentSelectedRows()
   cutSelection: -> @activeEditSession.cutSelectedText()
@@ -463,7 +466,7 @@ class Editor extends View
       @remove() if @editSessions.length is 0
       callback(index) if callback
 
-    if editSession.buffer.isModified()
+    if editSession.isModified() and not editSession.hasEditors()
       @promptToSaveDirtySession(editSession, destroySession)
     else
       destroySession(editSession)
@@ -653,6 +656,9 @@ class Editor extends View
       session.save()
       onSuccess?()
     else
+      @saveAs(session, onSuccess)
+
+  saveAs: (session=@activeEditSession, onSuccess) ->
       atom.showSaveDialog (path) =>
         if path
           session.saveAs(path)

src/app/keymaps/atom.cson

@@ -22,7 +22,7 @@
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
 
-  'meta-S': 'window:save-all'
+  'meta-alt-s': 'window:save-all'
   'meta-W': 'window:close'
   'meta-+': 'window:increase-font-size'
   'meta--': 'window:decrease-font-size'
@@ -33,4 +33,4 @@
 '.tool-panel':
   'meta-escape': 'tool-panel:unfocus'
   'escape': 'core:close'
-  'meta-w': 'noop'
+  'meta-w': 'noop'

src/app/keymaps/editor.cson

@@ -1,8 +1,10 @@
 '.editor':
   'meta-s': 'editor:save'
+  'meta-S': 'editor:save-as'
   'enter': 'editor:newline'
   'meta-enter': 'editor:newline-below'
   'tab': 'editor:indent'
+  'meta-=': 'editor:auto-indent'
   'meta-d': 'editor:delete-line'
   'ctrl-[': 'editor:fold-current-row'
   'ctrl-]': 'editor:unfold-current-row'

src/app/pane.coffee

@@ -6,14 +6,14 @@ module.exports =
 class Pane extends View
   @content: (wrappedView) ->
     @div class: 'pane', =>
-      @subview 'wrappedView', wrappedView
+      @subview 'wrappedView', wrappedView if wrappedView
 
   @deserialize: ({wrappedView}, rootView) ->
     new Pane(rootView.deserializeView(wrappedView))
 
   serialize: ->
     viewClass: "Pane"
-    wrappedView: @wrappedView.serialize()
+    wrappedView: @wrappedView?.serialize()
 
   adjustDimensions: -> # do nothing
 

src/app/root-view.coffee

@@ -42,6 +42,12 @@ class RootView extends View
     window.rootView = this
     @packageStates ?= {}
     @packageModules = {}
+    @viewClasses = {
+      "Pane": Pane,
+      "PaneRow": PaneRow,
+      "PaneColumn": PaneColumn,
+      "Editor": Editor
+    }
     @handleEvents()
 
     if not projectOrPathToOpen or _.isString(projectOrPathToOpen)
@@ -121,12 +127,11 @@ class RootView extends View
         console?.error("Exception serializing '#{name}' package's module\n", e.stack)
     packageStates
 
+  registerViewClass: (viewClass) ->
+    @viewClasses[viewClass.name] = viewClass
+
   deserializeView: (viewState) ->
-    switch viewState.viewClass
-      when 'Pane' then Pane.deserialize(viewState, this)
-      when 'PaneRow' then PaneRow.deserialize(viewState, this)
-      when 'PaneColumn' then PaneColumn.deserialize(viewState, this)
-      when 'Editor' then Editor.deserialize(viewState, this)
+    @viewClasses[viewState.viewClass]?.deserialize(viewState, this)
 
   activatePackage: (name, packageModule) ->
     config.setDefaults(name, packageModule.configDefaults) if packageModule.configDefaults?

src/app/selection.coffee

@@ -307,6 +307,10 @@ class Selection
       if matchLength = buffer.lineForRow(row).match(leadingTabRegex)?[0].length
         buffer.delete [[row, 0], [row, matchLength]]
 
+  autoIndentSelectedRows: ->
+    [start, end] = @getBufferRowRange()
+    @editSession.autoIndentBufferRows(start, end)
+
   toggleLineComments: ->
     @modifySelection =>
       @editSession.toggleLineCommentsForBufferRows(@getBufferRowRange()...)

src/app/window.coffee

@@ -99,9 +99,10 @@ windowAdditions =
 
   measure: (description, fn) ->
     start = new Date().getTime()
-    fn()
+    value = fn()
     result = new Date().getTime() - start
     console.log description, result
+    value
 
 window[key] = value for key, value of windowAdditions
 window.startup()

src/packages/command-logger/src/command-logger.coffee

@@ -2,7 +2,6 @@
 ScrollView = require 'scroll-view'
 $ = require 'jquery'
 _ = require 'underscore'
-d3 = require 'd3.v3'
 
 module.exports =
 class CommandLogger extends ScrollView
@@ -121,6 +120,8 @@ class CommandLogger extends ScrollView
     w = @treeMap.width()
     h = @treeMap.height()
 
+    d3 = require 'd3.v3'
+
     x = d3.scale.linear().range([0, w])
     y = d3.scale.linear().range([0, h])
     color = d3.scale.category20()

src/packages/command-panel/src/command-interpreter.coffee

@@ -4,9 +4,9 @@ PEG = require 'pegjs'
 module.exports =
 class CommandInterpreter
   constructor: (@project) ->
-    @parser = PEG.buildParser(fs.read(require.resolve 'command-panel/commands.pegjs'))
 
   eval: (string, activeEditSession) ->
+    @parser ?= PEG.buildParser(fs.read(require.resolve 'command-panel/commands.pegjs'))
     compositeCommand = @parser.parse(string)
     @lastRelativeAddress = compositeCommand if compositeCommand.isRelativeAddress()
     compositeCommand.execute(@project, activeEditSession)

src/stdlib/require.coffee

@@ -28,7 +28,7 @@ require = (path, cb) ->
   parts = file.split '.'
   ext   = parts[parts.length-1]
 
-  if __modules[file]?
+  if __moduleExists file
     if not __modules.loaded[file.toLowerCase()]?
       console.warn "Circular require: #{__filename} required #{file}"
     return __modules[file]
@@ -73,16 +73,26 @@ resolve = (name, {verifyExistence}={}) ->
     file = file.replace '../', "#{prefix}/"
 
   if file[0] isnt '/'
-    paths.some (path) ->
-      fileExists = /\.(.+)$/.test(file) and __exists "#{path}/#{file}"
-      jsFileExists = not /\.(.+)$/.test(file) and __exists "#{path}/#{file}.js"
-
-      if jsFileExists
-        file = "#{path}/#{file}.js"
-      else if fileExists
+    moduleAlreadyLoaded = paths.some (path) ->
+      if __moduleExists "#{path}/#{file}"
         file = "#{path}/#{file}"
-      else if expanded = __expand "#{path}/#{file}"
+      else if __moduleExists "#{path}/#{file}.js"
+        file = "#{path}/#{file}.js"
+      else if expanded = __moduleExpand "#{path}/#{file}"
         file = expanded
+
+    if not moduleAlreadyLoaded
+      hasExtension = /\.(.+)$/.test(file)
+      paths.some (path) ->
+        fileExists = hasExtension and __exists "#{path}/#{file}"
+        jsFileExists = not hasExtension and __exists "#{path}/#{file}.js"
+
+        if jsFileExists
+          file = "#{path}/#{file}.js"
+        else if fileExists
+          file = "#{path}/#{file}"
+        else if expanded = __expand "#{path}/#{file}"
+          file = expanded
   else
     file = __expand(file) or file
 
@@ -92,16 +102,27 @@ resolve = (name, {verifyExistence}={}) ->
     console.warn("Failed to resolve '#{name}'") if verifyExistence
     null
 
+__moduleExists = (path) ->
+  __modules[path]?
+
+__moduleExpand = (path) ->
+  return path if __moduleExists path
+  for ext, handler of exts
+    return "#{path}.#{ext}" if __moduleExists "#{path}.#{ext}"
+    return "#{path}/index.#{ext}" if __moduleExists "#{path}/index.#{ext}"
+  null
+
 __expand = (path) ->
+  modulePath = __moduleExpand path
+  return modulePath if modulePath
+
   return path if __isFile path
   for ext, handler of exts
-    if __exists "#{path}.#{ext}"
-      return "#{path}.#{ext}"
-    else if __exists "#{path}/index.#{ext}"
-      return "#{path}/index.#{ext}"
+    return "#{path}.#{ext}" if __exists "#{path}.#{ext}"
+    return "#{path}/index.#{ext}" if __exists "#{path}/index.#{ext}"
 
   return path if __exists path
-  return null
+  null
 
 __exists = (path) ->
   $native.exists path

src/window-bootstrap.coffee

@@ -4,3 +4,4 @@ require 'window'
 
 pathToOpen = atom.getWindowState('pathToOpen') ? window.location.params.pathToOpen
 window.attachRootView(pathToOpen)
+atom.show()