Merge origin/master into nak-powered-search

Conflicts: src/packages/command-panel/lib/preview-list.coffee src/packages/fuzzy-finder/lib/load-paths-task.coffee
2026-02-07 21:25:05 -05:00 · 2013-04-03 11:43:35 -07:00
parent 0b3a91b5fe 40aa81e9c1
commit ede5e88a19
79 changed files with 782 additions and 677 deletions
--- a/src/app/atom-theme.coffee
+++ b/src/app/atom-theme.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 Theme = require 'theme'
 CSON = require 'cson'

@@ -9,17 +9,17 @@ class AtomTheme extends Theme
    @stylesheets[stylesheetPath] = window.loadStylesheet(stylesheetPath)

  load: ->
-    if fs.extension(@path) in ['.css', '.less']
+    if fsUtils.extension(@path) in ['.css', '.less']
      @loadStylesheet(@path)
    else
-      metadataPath = fs.resolveExtension(fs.join(@path, 'package'), ['cson', 'json'])
-      if fs.isFile(metadataPath)
+      metadataPath = fsUtils.resolveExtension(fsUtils.join(@path, 'package'), ['cson', 'json'])
+      if fsUtils.isFile(metadataPath)
        stylesheetNames = CSON.readObject(metadataPath)?.stylesheets
        if stylesheetNames
          for name in stylesheetNames
-            filename = fs.resolveExtension(fs.join(@path, name), ['.css', '.less', ''])
+            filename = fsUtils.resolveExtension(fsUtils.join(@path, name), ['.css', '.less', ''])
            @loadStylesheet(filename)
      else
-        @loadStylesheet(stylesheetPath) for stylesheetPath in fs.list(@path, ['.css', '.less'])
+        @loadStylesheet(stylesheetPath) for stylesheetPath in fsUtils.list(@path, ['.css', '.less'])

    super
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 _ = require 'underscore'
 Package = require 'package'
 TextMatePackage = require 'text-mate-package'
@@ -74,9 +74,9 @@ _.extend atom,
      throw new Error("Could not resolve '#{id}' to a package path")

  resolvePackagePath: _.memoize (id) ->
-    return id if fs.isDirectory(id)
-    path = fs.resolve(config.packageDirPaths..., id)
-    path if fs.isDirectory(path)
+    return id if fsUtils.isDirectory(id)
+    path = fsUtils.resolve(config.packageDirPaths..., id)
+    path if fsUtils.isDirectory(path)

  getLoadedPackage: (id) ->
    if path = @resolvePackagePath(id)
@@ -90,13 +90,13 @@ _.extend atom,

  isPackageDisabled: (id) ->
    if path = @resolvePackagePath(id)
-      _.include(config.get('core.disabledPackages') ? [], fs.base(path))
+      _.include(config.get('core.disabledPackages') ? [], fsUtils.base(path))

  getPackagePaths: ->
    packagePaths = []
    for packageDirPath in config.packageDirPaths
-      for packagePath in fs.list(packageDirPath)
-        packagePaths.push(packagePath) if fs.isDirectory(packagePath)
+      for packagePath in fsUtils.list(packageDirPath)
+        packagePaths.push(packagePath) if fsUtils.isDirectory(packagePath)
    _.uniq(packagePaths)

  loadThemes: ->
@@ -109,9 +109,10 @@ _.extend atom,
    @loadedThemes.push Theme.load(name)

  loadUserStylesheet: ->
-    userStylesheetPath = fs.join(config.configDirPath, 'user.css')
-    if fs.isFile(userStylesheetPath)
-      applyStylesheet(userStylesheetPath, fs.read(userStylesheetPath), 'userTheme')
+    userStylesheetPath = fsUtils.resolve(fsUtils.join(config.configDirPath, 'user'), ['css', 'less'])
+    if fsUtils.isFile(userStylesheetPath)
+      userStyleesheetContents = loadStylesheet(userStylesheetPath)
+      applyStylesheet(userStylesheetPath, userStyleesheetContents, 'userTheme')

  getAtomThemeStylesheets: ->
    themeNames = config.get("core.themes") ? ['atom-dark-ui', 'atom-dark-syntax']
@@ -232,10 +233,12 @@ _.extend atom,
      null

  getSavedWindowState: ->
-    localStorage[window.location.params.pathToOpen]
+    if pathToOpen = window.location.params.pathToOpen
+      localStorage[pathToOpen]

  saveWindowState: ->
-    localStorage[@getPathToOpen()] = JSON.stringify(@getWindowState())
+    if pathToOpen = @getPathToOpen()
+      localStorage[pathToOpen] = JSON.stringify(@getWindowState())

  update: ->
    @sendMessageToBrowserProcess('update')
@@ -244,9 +247,9 @@ _.extend atom,
    @sendMessageToBrowserProcess('getUpdateStatus', [], callback)

  requireUserInitScript: ->
-    userInitScriptPath = fs.join(config.configDirPath, "user.coffee")
+    userInitScriptPath = fsUtils.join(config.configDirPath, "user.coffee")
    try
-      require userInitScriptPath if fs.isFile(userInitScriptPath)
+      require userInitScriptPath if fsUtils.isFile(userInitScriptPath)
    catch error
      console.error "Failed to load `#{userInitScriptPath}`", error.stack, error

--- a/src/app/binding-set.coffee
+++ b/src/app/binding-set.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'

 Specificity = require 'specificity'
 PEG = require 'pegjs'
@@ -17,7 +17,7 @@ class BindingSet
  name: null

  constructor: (@selector, commandsByKeystrokes, @index, @name) ->
-    BindingSet.parser ?= PEG.buildParser(fs.read(require.resolve 'keystroke-pattern.pegjs'))
+    BindingSet.parser ?= PEG.buildParser(fsUtils.read(require.resolve 'keystroke-pattern.pegjs'))
    @specificity = Specificity(@selector)
    @commandsByKeystrokes = @normalizeCommandsByKeystrokes(commandsByKeystrokes)

--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -1,15 +1,15 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 _ = require 'underscore'
 EventEmitter = require 'event-emitter'
 CSON = require 'cson'

-configDirPath = fs.absolute("~/.atom")
-bundledPackagesDirPath = fs.join(resourcePath, "src/packages")
-bundledThemesDirPath = fs.join(resourcePath, "themes")
-vendoredPackagesDirPath = fs.join(resourcePath, "vendor/packages")
-vendoredThemesDirPath = fs.join(resourcePath, "vendor/themes")
-userThemesDirPath = fs.join(configDirPath, "themes")
-userPackagesDirPath = fs.join(configDirPath, "packages")
+configDirPath = fsUtils.absolute("~/.atom")
+bundledPackagesDirPath = fsUtils.join(resourcePath, "src/packages")
+bundledThemesDirPath = fsUtils.join(resourcePath, "themes")
+vendoredPackagesDirPath = fsUtils.join(resourcePath, "vendor/packages")
+vendoredThemesDirPath = fsUtils.join(resourcePath, "vendor/themes")
+userThemesDirPath = fsUtils.join(configDirPath, "themes")
+userPackagesDirPath = fsUtils.join(configDirPath, "packages")

 module.exports =
 class Config
@@ -26,34 +26,34 @@ class Config
      core: _.clone(require('root-view').configDefaults)
      editor: _.clone(require('editor').configDefaults)
    @settings = {}
-    @configFilePath = fs.resolve(configDirPath, 'config', ['json', 'cson'])
-    @configFilePath ?= fs.join(configDirPath, 'config.cson')
+    @configFilePath = fsUtils.resolve(configDirPath, 'config', ['json', 'cson'])
+    @configFilePath ?= fsUtils.join(configDirPath, 'config.cson')

  initializeConfigDirectory: ->
-    return if fs.exists(@configDirPath)
+    return if fsUtils.exists(@configDirPath)

-    fs.makeDirectory(@configDirPath)
+    fsUtils.makeDirectory(@configDirPath)

-    templateConfigDirPath = fs.resolve(window.resourcePath, 'dot-atom')
+    templateConfigDirPath = fsUtils.resolve(window.resourcePath, 'dot-atom')
    onConfigDirFile = (path) =>
      relativePath = path.substring(templateConfigDirPath.length + 1)
-      configPath = fs.join(@configDirPath, relativePath)
-      fs.write(configPath, fs.read(path))
-    fs.traverseTreeSync(templateConfigDirPath, onConfigDirFile, (path) -> true)
+      configPath = fsUtils.join(@configDirPath, relativePath)
+      fsUtils.write(configPath, fsUtils.read(path))
+    fsUtils.traverseTreeSync(templateConfigDirPath, onConfigDirFile, (path) -> true)

-    configThemeDirPath = fs.join(@configDirPath, 'themes')
+    configThemeDirPath = fsUtils.join(@configDirPath, 'themes')
    onThemeDirFile = (path) ->
      relativePath = path.substring(bundledThemesDirPath.length + 1)
-      configPath = fs.join(configThemeDirPath, relativePath)
-      fs.write(configPath, fs.read(path))
-    fs.traverseTreeSync(bundledThemesDirPath, onThemeDirFile, (path) -> true)
+      configPath = fsUtils.join(configThemeDirPath, relativePath)
+      fsUtils.write(configPath, fsUtils.read(path))
+    fsUtils.traverseTreeSync(bundledThemesDirPath, onThemeDirFile, (path) -> true)

  load: ->
    @initializeConfigDirectory()
    @loadUserConfig()

  loadUserConfig: ->
-    if fs.exists(@configFilePath)
+    if fsUtils.exists(@configFilePath)
      try
        userConfig = CSON.readObject(@configFilePath)
        _.extend(@settings, userConfig)
--- a/src/app/cursor.coffee
+++ b/src/app/cursor.coffee
@@ -133,20 +133,20 @@ class Cursor

  moveToFirstCharacterOfLine: ->
    position = @getBufferPosition()
-    range = @getCurrentLineBufferRange()
+    scanRange = @getCurrentLineBufferRange()
    newPosition = null
-    @editSession.scanInRange /^\s*/, range, (match, matchRange) =>
-      newPosition = matchRange.end
+    @editSession.scanInBufferRange /^\s*/, scanRange, ({range}) =>
+      newPosition = range.end
    return unless newPosition
    newPosition = [position.row, 0] if newPosition.isEqual(position)
    @setBufferPosition(newPosition)

  skipLeadingWhitespace: ->
    position = @getBufferPosition()
-    range = @getCurrentLineBufferRange()
+    scanRange = @getCurrentLineBufferRange()
    endOfLeadingWhitespace = null
-    @editSession.scanInRange /^[ \t]*/, range, (match, matchRange) =>
-      endOfLeadingWhitespace = matchRange.end
+    @editSession.scanInBufferRange /^[ \t]*/, scanRange, ({range}) =>
+      endOfLeadingWhitespace = range.end

    @setBufferPosition(endOfLeadingWhitespace) if endOfLeadingWhitespace.isGreaterThan(position)

@@ -164,12 +164,12 @@ class Cursor
    allowPrevious = options.allowPrevious ? true
    currentBufferPosition = @getBufferPosition()
    previousNonBlankRow = @editSession.buffer.previousNonBlankRow(currentBufferPosition.row)
-    range = [[previousNonBlankRow, 0], currentBufferPosition]
+    scanRange = [[previousNonBlankRow, 0], currentBufferPosition]

    beginningOfWordPosition = null
-    @editSession.backwardsScanInRange (options.wordRegex ? @wordRegExp()), range, (match, matchRange, { stop }) =>
-      if matchRange.end.isGreaterThanOrEqual(currentBufferPosition) or allowPrevious
-        beginningOfWordPosition = matchRange.start
+    @editSession.backwardsScanInBufferRange (options.wordRegex ? @wordRegExp()), scanRange, ({range, stop}) =>
+      if range.end.isGreaterThanOrEqual(currentBufferPosition) or allowPrevious
+        beginningOfWordPosition = range.start
      if not beginningOfWordPosition?.isEqual(currentBufferPosition)
        stop()

@@ -178,12 +178,12 @@ class Cursor
  getEndOfCurrentWordBufferPosition: (options = {}) ->
    allowNext = options.allowNext ? true
    currentBufferPosition = @getBufferPosition()
-    range = [currentBufferPosition, @editSession.getEofBufferPosition()]
+    scanRange = [currentBufferPosition, @editSession.getEofBufferPosition()]

    endOfWordPosition = null
-    @editSession.scanInRange (options.wordRegex ? @wordRegExp()), range, (match, matchRange, { stop }) =>
-      if matchRange.start.isLessThanOrEqual(currentBufferPosition) or allowNext
-        endOfWordPosition = matchRange.end
+    @editSession.scanInBufferRange (options.wordRegex ? @wordRegExp()), scanRange, ({range, stop}) =>
+      if range.start.isLessThanOrEqual(currentBufferPosition) or allowNext
+        endOfWordPosition = range.end
      if not endOfWordPosition?.isEqual(currentBufferPosition)
        stop()

--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -8,16 +8,17 @@ EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
 Range = require 'range'
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'

 module.exports =
 class EditSession
  registerDeserializer(this)

+  @version: 1
+
  @deserialize: (state) ->
-    if fs.exists(state.buffer)
-      session = project.buildEditSession(state.buffer)
-    else
+    session = project.buildEditSessionForBuffer(Buffer.deserialize(state.buffer))
+    if !session?
      console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists" if state.buffer
      session = project.buildEditSession(null)
    session.setScrollTop(state.scrollTop)
@@ -44,7 +45,7 @@ class EditSession

    @buffer.retain()
    @subscribe @buffer, "path-changed", =>
-      @project.setPath(fs.directory(@getPath())) unless @project.getPath()?
+      @project.setPath(fsUtils.directory(@getPath())) unless @project.getPath()?
      @trigger "title-changed"
      @trigger "path-changed"
    @subscribe @buffer, "contents-conflicted", => @trigger "contents-conflicted"
@@ -63,14 +64,14 @@ class EditSession

  getTitle: ->
    if path = @getPath()
-      fs.base(path)
+      fsUtils.base(path)
    else
      'untitled'

  getLongTitle: ->
    if path = @getPath()
-      fileName = fs.base(path)
-      directory = fs.base(fs.directory(path))
+      fileName = fsUtils.base(path)
+      directory = fsUtils.base(fsUtils.directory(path))
      "#{fileName} - #{directory}"
    else
      'untitled'
@@ -88,7 +89,8 @@ class EditSession

  serialize: ->
    deserializer: 'EditSession'
-    buffer: @buffer.getPath()
+    version: @constructor.version
+    buffer: @buffer.serialize()
    scrollTop: @getScrollTop()
    scrollLeft: @getScrollLeft()
    cursorScreenPosition: @getCursorScreenPosition().serialize()
@@ -161,8 +163,8 @@ class EditSession
  bufferRangeForBufferRow: (row, options) -> @buffer.rangeForRow(row, options)
  lineForBufferRow: (row) -> @buffer.lineForRow(row)
  lineLengthForBufferRow: (row) -> @buffer.lineLengthForRow(row)
-  scanInRange: (args...) -> @buffer.scanInRange(args...)
-  backwardsScanInRange: (args...) -> @buffer.backwardsScanInRange(args...)
+  scanInBufferRange: (args...) -> @buffer.scanInRange(args...)
+  backwardsScanInBufferRange: (args...) -> @buffer.backwardsScanInRange(args...)
  isModified: -> @buffer.isModified()
  hasEditors: -> @buffer.hasEditors()

@@ -243,7 +245,7 @@ class EditSession

  normalizeTabsInBufferRange: (bufferRange) ->
    return unless @softTabs
-    @scanInRange /\t/, bufferRange, (match, range, {replace}) => replace(@getTabText())
+    @scanInBufferRange /\t/, bufferRange, ({replace}) => replace(@getTabText())

  cutToEndOfLine: ->
    maintainPasteboard = false
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -6,7 +6,7 @@ Range = require 'range'
 EditSession = require 'edit-session'
 CursorView = require 'cursor-view'
 SelectionView = require 'selection-view'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 $ = require 'jquery'
 _ = require 'underscore'

@@ -122,6 +122,7 @@ class Editor extends View
      'editor:select-to-beginning-of-line': @selectToBeginningOfLine
      'editor:select-to-end-of-word': @selectToEndOfWord
      'editor:select-to-beginning-of-word': @selectToBeginningOfWord
+      'editor:select-line': @selectLine
      'editor:transpose': @transpose
      'editor:upper-case': @upperCase
      'editor:lower-case': @lowerCase
@@ -211,6 +212,7 @@ class Editor extends View
  selectToBeginningOfWord: -> @activeEditSession.selectToBeginningOfWord()
  selectToEndOfWord: -> @activeEditSession.selectToEndOfWord()
  selectWord: -> @activeEditSession.selectWord()
+  selectLine: -> @activeEditSession.selectLine()
  selectToScreenPosition: (position) -> @activeEditSession.selectToScreenPosition(position)
  transpose: -> @activeEditSession.transpose()
  upperCase: -> @activeEditSession.upperCase()
@@ -313,8 +315,8 @@ class Editor extends View
  lineForBufferRow: (row) -> @getBuffer().lineForRow(row)
  lineLengthForBufferRow: (row) -> @getBuffer().lineLengthForRow(row)
  rangeForBufferRow: (row) -> @getBuffer().rangeForRow(row)
-  scanInRange: (args...) -> @getBuffer().scanInRange(args...)
-  backwardsScanInRange: (args...) -> @getBuffer().backwardsScanInRange(args...)
+  scanInBufferRange: (args...) -> @getBuffer().scanInRange(args...)
+  backwardsScanInBufferRange: (args...) -> @getBuffer().backwardsScanInRange(args...)

  configure: ->
    @observeConfig 'editor.showLineNumbers', (showLineNumbers) => @gutter.setShowLineNumbers(showLineNumbers)
@@ -1096,7 +1098,7 @@ class Editor extends View
    range.detach()
    leftPixels

-  pixelOffsetForScreenPosition: (position) ->
+  pixelOffsUtilsetForScreenPosition: (position) ->
    {top, left} = @pixelPositionForScreenPosition(position)
    offset = @renderedLines.offset()
    {top: top + offset.top, left: left + offset.left}
@@ -1179,7 +1181,7 @@ class Editor extends View

  saveDebugSnapshot: ->
    atom.showSaveDialog (path) =>
-      fs.write(path, @getDebugSnapshot()) if path
+      fsUtils.write(path, @getDebugSnapshot()) if path

  getDebugSnapshot: ->
    [
--- a/src/app/git.coffee
+++ b/src/app/git.coffee
@@ -1,5 +1,5 @@
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 Subscriber = require 'subscriber'
 EventEmitter = require 'event-emitter'
 RepositoryStatusTask = require 'repository-status-task'
@@ -48,7 +48,7 @@ class Git
  refreshIndex: -> @getRepo().refreshIndex()

  getPath: ->
-    @path ?= fs.absolute(@getRepo().getPath())
+    @path ?= fsUtils.absolute(@getRepo().getPath())

  destroy: ->
    if @statusTask?
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 CSON = require 'cson'

 BindingSet = require 'binding-set'
@@ -32,13 +32,13 @@ class Keymap
    $(document).command 'open-dev', => atom.openDev()

  loadBundledKeymaps: ->
-    @loadDirectory(fs.resolveOnLoadPath('keymaps'))
+    @loadDirectory(fsUtils.resolveOnLoadPath('keymaps'))

  loadUserKeymaps: ->
-    @loadDirectory(fs.join(config.configDirPath, 'keymaps'))
+    @loadDirectory(fsUtils.join(config.configDirPath, 'keymaps'))

  loadDirectory: (directoryPath) ->
-    @load(filePath) for filePath in fs.list(directoryPath, ['.cson', '.json'])
+    @load(filePath) for filePath in fsUtils.list(directoryPath, ['.cson', '.json'])

  load: (path) ->
    @add(path, CSON.readObject(path))
--- a/src/app/package.coffee
+++ b/src/app/package.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'

 module.exports =
 class Package
@@ -20,4 +20,4 @@ class Package
  path: null

  constructor: (@path) ->
-    @name = fs.base(@path)
+    @name = fsUtils.base(@path)
--- a/src/app/pane-container.coffee
+++ b/src/app/pane-container.coffee
@@ -32,6 +32,17 @@ class PaneContainer extends View
    else
      false

+  focusPreviousPane: ->
+    panes = @getPanes()
+    if panes.length > 1
+      currentIndex = panes.indexOf(@getFocusedPane())
+      previousIndex = currentIndex - 1
+      previousIndex = panes.length - 1 if previousIndex < 0
+      panes[previousIndex].focus()
+      true
+    else
+      false
+
  makeNextPaneActive: ->
    panes = @getPanes()
    currentIndex = panes.indexOf(@getActivePane())
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 _ = require 'underscore'
 $ = require 'jquery'
 Range = require 'range'
@@ -41,7 +41,7 @@ class Project
    @rootDirectory?.off()

    if path?
-      directory = if fs.isDirectory(path) then path else fs.directory(path)
+      directory = if fsUtils.isDirectory(path) then path else fsUtils.directory(path)
      @rootDirectory = new Directory(directory)
    else
      @rootDirectory = null
@@ -56,7 +56,7 @@ class Project
    paths = []
    onFile = (path) => paths.push(path) unless @isPathIgnored(path)
    onDirectory = -> true
-    fs.traverseTreeSync(@getPath(), onFile, onDirectory)
+    fsUtils.traverseTreeSync(@getPath(), onFile, onDirectory)
    deferred.resolve(paths)
    deferred.promise()

@@ -68,11 +68,11 @@ class Project
    @ignoreRepositoryPath(path)

  ignoreRepositoryPath: (path) ->
-    config.get("core.hideGitIgnoredFiles") and git?.isPathIgnored(fs.join(@getPath(), path))
+    config.get("core.hideGitIgnoredFiles") and git?.isPathIgnored(fsUtils.join(@getPath(), path))

  resolve: (filePath) ->
-    filePath = fs.join(@getPath(), filePath) unless filePath[0] == '/'
-    fs.absolute filePath
+    filePath = fsUtils.join(@getPath(), filePath) unless filePath[0] == '/'
+    fsUtils.absolute filePath

  relativize: (fullPath) ->
    return fullPath unless fullPath.lastIndexOf(@getPath()) is 0
@@ -127,19 +127,17 @@ class Project
    else
      @on 'buffer-created', (buffer) -> callback(buffer)

-  bufferForPath: (filePath) ->
+  bufferForPath: (filePath, text) ->
    if filePath?
      filePath = @resolve(filePath)
      if filePath
        buffer = _.find @buffers, (buffer) -> buffer.getPath() == filePath
-        buffer or @buildBuffer(filePath)
-      else
-
+        buffer or @buildBuffer(filePath, text)
    else
-      @buildBuffer()
+      @buildBuffer(null, text)

-  buildBuffer: (filePath) ->
-    buffer = new Buffer(filePath, this)
+  buildBuffer: (filePath, text) ->
+    buffer = new Buffer(filePath, text)
    @buffers.push buffer
    @trigger 'buffer-created', buffer
    buffer
--- a/src/app/repository-status-handler.coffee
+++ b/src/app/repository-status-handler.coffee
@@ -1,5 +1,5 @@
 Git = require 'git-utils'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'

 module.exports =
  loadStatuses: (path) ->
@@ -8,7 +8,7 @@ module.exports =
      workingDirectoryPath = repo.getWorkingDirectory()
      statuses = {}
      for path, status of repo.getStatus()
-        statuses[fs.join(workingDirectoryPath, path)] = status
+        statuses[fsUtils.join(workingDirectoryPath, path)] = status
      upstream = repo.getAheadBehindCount()
      repo.release()
    else
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {$$} = require 'space-pen'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 _ = require 'underscore'

 {View} = require 'space-pen'
@@ -53,6 +53,7 @@ class RootView extends View
      config.set("editor.fontSize", fontSize - 1) if fontSize > 1

    @command 'window:focus-next-pane', => @focusNextPane()
+    @command 'window:focus-previous-pane', => @focusPreviousPane()
    @command 'window:save-all', => @saveAll()
    @command 'window:toggle-invisibles', =>
      config.set("editor.showInvisibles", !config.get("editor.showInvisibles"))
@@ -143,6 +144,7 @@ class RootView extends View
  getActiveView: ->
    @panes.getActiveView()

+  focusPreviousPane: -> @panes.focusPreviousPane()
  focusNextPane: -> @panes.focusNextPane()
  getFocusedPane: -> @panes.getFocusedPane()

@@ -172,4 +174,3 @@ class RootView extends View

  eachBuffer: (callback) ->
    project.eachBuffer(callback)
-
--- a/src/app/syntax.coffee
+++ b/src/app/syntax.coffee
@@ -2,7 +2,7 @@ _ = require 'underscore'
 jQuery = require 'jquery'
 Specificity = require 'specificity'
 {$$} = require 'space-pen'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 EventEmitter = require 'event-emitter'
 NullGrammar = require 'null-grammar'
 nodePath = require 'path'
@@ -71,7 +71,7 @@ class Syntax

  grammarByFirstLineRegex: (filePath, fileContents) ->
    try
-      fileContents ?= fs.read(filePath)
+      fileContents ?= fsUtils.read(filePath)
    catch e
      return

--- a/src/app/text-buffer.coffee
+++ b/src/app/text-buffer.coffee
@@ -1,5 +1,5 @@
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 File = require 'file'
 Point = require 'point'
 Range = require 'range'
@@ -11,6 +11,7 @@ BufferMarker = require 'buffer-marker'
 module.exports =
 class Buffer
  @idCounter = 1
+  registerDeserializer(this)
  stoppedChangingDelay: 300
  stoppedChangingTimeout: null
  undoManager: null
@@ -24,7 +25,10 @@ class Buffer
  invalidMarkers: null
  refcount: 0

-  constructor: (path, @project) ->
+  @deserialize: ({path, text}) ->
+    project.bufferForPath(path, text)
+
+  constructor: (path, initialText) ->
    @id = @constructor.idCounter++
    @nextMarkerId = 1
    @validMarkers = {}
@@ -33,11 +37,16 @@ class Buffer
    @lineEndings = []

    if path
-      throw "Path '#{path}' does not exist" unless fs.exists(path)
+      throw "Path '#{path}' does not exist" unless fsUtils.exists(path)
      @setPath(path)
-      @reload()
+      if initialText?
+        @setText(initialText)
+        @updateCachedDiskContents()
+      else
+        @reload()
    else
-      @setText('')
+      @setText(initialText ? '')
+

    @undoManager = new UndoManager(this)

@@ -45,7 +54,7 @@ class Buffer
    throw new Error("Destroying buffer twice with path '#{@getPath()}'") if @destroyed
    @file?.off()
    @destroyed = true
-    @project?.removeBuffer(this)
+    project?.removeBuffer(this)

  retain: ->
    @refcount++
@@ -56,6 +65,11 @@ class Buffer
    @destroy() if @refcount <= 0
    this

+  serialize: ->
+    deserializer: 'TextBuffer'
+    path: @getPath()
+    text: @getText() if @isModified()
+
  hasEditors: -> @refcount > 1

  subscribeToFile: ->
@@ -390,7 +404,7 @@ class Buffer
      range = new Range(startPosition, endPosition)
      keepLooping = true
      replacementText = null
-      iterator(match, range, { stop, replace })
+      iterator({match, range, stop, replace })

      if replacementText?
        @change(range, replacementText)
@@ -445,7 +459,7 @@ class Buffer
    @trigger 'modified-status-changed', modifiedStatus

  fileExists: ->
-    @file.exists()
+    @file? && @file.exists()

  logLines: (start=0, end=@getLastRow())->
    for row in [start..end]
--- a/src/app/text-mate-grammar.coffee
+++ b/src/app/text-mate-grammar.coffee
@@ -1,5 +1,5 @@
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 plist = require 'plist'
 Token = require 'token'
 CSON = require 'cson'
@@ -8,17 +8,17 @@ CSON = require 'cson'
 module.exports =
 class TextMateGrammar
  @readFromPath: (path) ->
-    fs.readPlist(path)
+    fsUtils.readPlist(path)

  @load: (path, done) ->
-    fs.readObjectAsync path, (err, object) ->
+    fsUtils.readObjectAsync path, (err, object) ->
      if err
        done(err)
      else
        done(null, new TextMateGrammar(object))

  @loadSync: (path) ->
-    new TextMateGrammar(fs.readObject(path))
+    new TextMateGrammar(fsUtils.readObject(path))

  name: null
  fileTypes: null
--- a/src/app/text-mate-theme.coffee
+++ b/src/app/text-mate-theme.coffee
@@ -1,5 +1,5 @@
 _ = require 'underscore'
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 plist = require 'plist'
 Theme = require 'theme'

--- a/src/app/theme.coffee
+++ b/src/app/theme.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'

 module.exports =
 class Theme
@@ -8,10 +8,10 @@ class Theme
    TextMateTheme = require 'text-mate-theme'
    AtomTheme = require 'atom-theme'

-    if fs.exists(name)
+    if fsUtils.exists(name)
      path = name
    else
-      path = fs.resolve(config.themeDirPaths..., name, ['', '.tmTheme', '.css', 'less'])
+      path = fsUtils.resolve(config.themeDirPaths..., name, ['', '.tmTheme', '.css', 'less'])

    throw new Error("No theme exists named '#{name}'") unless path

--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs-utils'
+fsUtils = require 'fs-utils'
 $ = require 'jquery'
 _ = require 'underscore'
 {less} = require 'less'
@@ -32,14 +32,14 @@ window.setUpEnvironment = ->
  requireStylesheet 'notification'
  requireStylesheet 'markdown'

-  if nativeStylesheetPath = fs.resolveOnLoadPath(process.platform, ['css', 'less'])
+  if nativeStylesheetPath = fsUtils.resolveOnLoadPath(process.platform, ['css', 'less'])
    requireStylesheet(nativeStylesheetPath)

 # This method is only called when opening a real application window
 window.startup = ->
-  directory = _.find ['/opt/boxen', '/opt/github', '/usr/local'], (dir) -> fs.isDirectory(dir)
+  directory = _.find ['/opt/boxen', '/opt/github', '/usr/local'], (dir) -> fsUtils.isDirectory(dir)
  if directory
-    installAtomCommand(fs.join(directory, 'bin/atom'))
+    installAtomCommand(fsUtils.join(directory, 'bin/atom'))
  else
    console.warn "Failed to install `atom` binary"

@@ -73,11 +73,11 @@ window.shutdown = ->
  window.git = null

 window.installAtomCommand = (commandPath) ->
-  return if fs.exists(commandPath)
+  return if fsUtils.exists(commandPath)

-  bundledCommandPath = fs.resolve(window.resourcePath, 'atom.sh')
+  bundledCommandPath = fsUtils.resolve(window.resourcePath, 'atom.sh')
  if bundledCommandPath?
-    fs.write(commandPath, fs.read(bundledCommandPath))
+    fsUtils.write(commandPath, fsUtils.read(bundledCommandPath))
    spawn('chmod', ['u+x', commandPath])

 window.handleWindowEvents = ->
@@ -99,7 +99,7 @@ window.deserializeWindowState = ->
  window.project = deserialize(windowState.project) ? new Project(pathToOpen)
  window.rootView = deserialize(windowState.rootView) ? new RootView

-  if !windowState.rootView and (!pathToOpen or fs.isFile(pathToOpen))
+  if !windowState.rootView and (!pathToOpen or fsUtils.isFile(pathToOpen))
    rootView.open(pathToOpen)

  $(rootViewParentSelector).append(rootView)
@@ -113,10 +113,10 @@ window.stylesheetElementForId = (id) ->
  $("head style[id='#{id}']")

 window.resolveStylesheet = (path) ->
-  if fs.extension(path).length > 0
-    fs.resolveOnLoadPath(path)
+  if fsUtils.extension(path).length > 0
+    fsUtils.resolveOnLoadPath(path)
  else
-    fs.resolveOnLoadPath(path, ['css', 'less'])
+    fsUtils.resolveOnLoadPath(path, ['css', 'less'])

 window.requireStylesheet = (path) ->
  if fullPath = window.resolveStylesheet(path)
@@ -126,8 +126,8 @@ window.requireStylesheet = (path) ->
    throw new Error("Could not find a file at path '#{path}'")

 window.loadStylesheet = (path) ->
-  content = fs.read(path)
-  if fs.extension(path) == '.less'
+  content = fsUtils.read(path)
+  if fsUtils.extension(path) == '.less'
    (new less.Parser).parse content, (e, tree) ->
      throw new Error(e.message, path, e.line) if e
      content = tree.toCSS()
@@ -147,15 +147,7 @@ window.applyStylesheet = (id, text, ttype = 'bundled') ->
      $("head").append "<style class='#{ttype}' id='#{id}'>#{text}</style>"

 window.reload = ->
-  if rootView?.getModifiedBuffers().length > 0
-    atom.confirm(
-      "There are unsaved buffers, reload anyway?",
-      "You will lose all unsaved changes if you reload",
-      "Reload", (-> $native.reload()),
-      "Cancel"
-    )
-  else
-    $native.reload()
+  $native.reload()

 window.onerror = ->
  atom.showDevTools()