Upgrade to tabs@0.29.0

Upgrade to pathwatcher@0.17.0
Merge pull request #1702 from atom/enable-csp
2014-03-10 08:52:35 -07:00 · 2014-03-10 12:13:50 +08:00 · 2014-03-08 02:20:22 +02:00 · 2014-03-07 17:19:53 -07:00 · 2014-03-07 17:13:11 -07:00 · 2014-03-07 17:01:51 -07:00
@@ -0,0 +1,2 @@
+ca =
+cache = ~/.atom/.npm
@@ -11,10 +11,6 @@ _ = require 'underscore-plus'

 packageJson = require '../package.json'

-# OAuth token for atom-bot
-# TODO Remove once all repositories are public
-process.env.ATOM_ACCESS_TOKEN ?= '362295be4c5258d3f7b967bbabae662a455ca2a7'
-
 # Shim harmony collections in case grunt was invoked without harmony
 # collections enabled
 _.extend(global, require('harmony-collections')) unless global.WeakMap?
@@ -45,6 +41,7 @@ module.exports = (grunt) ->
    tmpDir = os.tmpdir()
    installRoot = process.env.ProgramFiles
    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
    shellAppDir = path.join(buildDir, appName)
    contentsDir = shellAppDir
    appDir = path.join(shellAppDir, 'resources', 'app')
@@ -54,6 +51,7 @@ module.exports = (grunt) ->
    tmpDir = '/tmp'
    installRoot = '/Applications'
    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
    shellAppDir = path.join(buildDir, appName)
    contentsDir = path.join(shellAppDir, 'Contents')
    appDir = path.join(contentsDir, 'Resources', 'app')
@@ -127,7 +125,7 @@ module.exports = (grunt) ->
  grunt.initConfig
    pkg: grunt.file.readJSON('package.json')

-    atom: {appDir, appName, buildDir, contentsDir, installDir, shellAppDir}
+    atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}

    coffee: coffeeConfig

@@ -227,6 +225,6 @@ module.exports = (grunt) ->
  grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg'])
  grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
  grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
-  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'dump-symbols', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
  grunt.registerTask('docs', ['markdown:guides', 'build-docs'])
  grunt.registerTask('default', ['download-atom-shell', 'build', 'set-version', 'install'])
@@ -7,7 +7,7 @@
  },
  "dependencies": {
    "async": "~0.2.9",
-    "biscotto": ">=2.1 <3.0",
+    "biscotto": ">=2.1.1 <3.0",
    "formidable": "~1.0.14",
    "fs-plus": "2.x",
    "github-releases": "~0.2.0",
@@ -18,7 +18,7 @@
    "grunt-contrib-coffee": "~0.9.0",
    "grunt-contrib-less": "~0.8.0",
    "grunt-cson": "0.6.0",
-    "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.6.0",
+    "grunt-download-atom-shell": "git+https://atom-bot:467bac80a0017b96fb5be5cfc686f5e0cc607b10@github.com/atom/grunt-download-atom-shell#v0.6.0",
    "grunt-lesslint": "0.13.0",
    "grunt-markdown": "~0.4.0",
    "grunt-peg": "~1.1.0",
@@ -26,6 +26,7 @@
    "harmony-collections": "~0.3.8",
    "json-front-matter": "~0.1.3",
    "legal-eagle": "~0.3.0",
+    "minidump": "0.4.x",
    "rcedit": "~0.1.2",
    "request": "~2.27.0",
    "rimraf": "~2.2.2",
@@ -15,6 +15,9 @@ module.exports = (grunt) ->
        console.error(err)
        exit 1

+      for key of summary
+        delete summary[key] if key.match /^atom@/
+
      if size(summary)
        console.error "Found dependencies without permissive licenses:"
        for name in keys(summary).sort()
@@ -25,6 +25,7 @@ module.exports = (grunt) ->
          '--title', 'Atom API Documentation'
          '-o', 'docs/output/api'
          '-r', 'docs/README.md'
+          '--stability', '1'
          'src/'
          includePaths...
        ]
@@ -0,0 +1,39 @@
+async = require 'async'
+fs = require 'fs-plus'
+path = require 'path'
+minidump = require 'minidump'
+
+module.exports = (grunt) ->
+  {mkdir, rm} = require('./task-helpers')(grunt)
+
+  dumpSymbolTo = (binaryPath, targetDirectory, callback) ->
+    minidump.dumpSymbol binaryPath, (error, content) ->
+      return callback(error) if error?
+
+      moduleLine = /MODULE [^ ]+ [^ ]+ ([0-9A-F]+) (.*)\n/.exec(content)
+      if moduleLine.length isnt 3
+        return callback("Invalid output when dumping symbol for #{binaryPath}")
+
+      filename = moduleLine[2]
+      targetPathDirname = path.join(targetDirectory, filename, moduleLine[1])
+      mkdir targetPathDirname
+
+      targetPath = path.join(targetPathDirname, "#{filename}.sym")
+      fs.writeFile(targetPath, content, callback)
+
+  grunt.registerTask 'dump-symbols', 'Dump symbols for native modules', ->
+    done = @async()
+
+    symbolsDir = grunt.config.get('atom.symbolsDir')
+    rm symbolsDir
+    mkdir symbolsDir
+
+    tasks = []
+    onFile = (binaryPath) ->
+      if /.*\.node$/.test(binaryPath)
+        tasks.push(dumpSymbolTo.bind(this, binaryPath, symbolsDir))
+    onDirectory = ->
+      true
+    fs.traverseTreeSync 'node_modules', onFile, onDirectory
+
+    async.parallel tasks, done
@@ -2,14 +2,17 @@ child_process = require 'child_process'
 path = require 'path'

 _ = require 'underscore-plus'
+async = require 'async'
 fs = require 'fs-plus'
 GitHub = require 'github-releases'
 request = require 'request'

 grunt = null
 maxReleases = 10
-assetName = 'atom-mac.zip'
-assetPath = "/tmp/atom-build/#{assetName}"
+assets = [
+  {assetName: 'atom-mac.zip', sourceName: 'Atom.app'}
+  {assetName: 'atom-mac-symbols.zip', sourceName: 'Atom.breakpad.syms'}
+]
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -18,39 +21,48 @@ defaultHeaders =

 module.exports = (gruntObject) ->
  grunt = gruntObject
+
  grunt.registerTask 'publish-build', 'Publish the built app', ->
    return unless process.platform is 'darwin'
    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'

    done = @async()
+    buildDir = grunt.config.get('atom.buildDir')

    createBuildRelease (error, release) ->
      return done(error) if error?
-      zipApp (error) ->
+
+      zipApps buildDir, assets, (error) ->
        return done(error) if error?
-        uploadAsset release, (error) ->
+        uploadAssets release, buildDir, assets, (error) ->
          return done(error) if error?
          publishRelease release, (error) ->
            return done(error) if error?
            getAtomDraftRelease (error, release) ->
              return done(error) if error?
-              deleteExistingAsset release, (error) ->
+              assetNames = (asset.assetName for asset in assets)
+              deleteExistingAssets release, assetNames, (error) ->
                return done(error) if error?
-                uploadAsset(release, done)
+                uploadAssets(release, buildDir, assets, done)

 logError = (message, error, details) ->
  grunt.log.error(message)
  grunt.log.error(error.message ? error) if error?
  grunt.log.error(details) if details

-zipApp = (callback) ->
-  fs.removeSync(assetPath)
+zipApps = (buildDir, assets, callback) ->
+  zip = (directory, sourceName, assetName, callback) ->
+    options = {cwd: directory, maxBuffer: Infinity}
+    child_process.exec "zip -r --symlinks #{assetName} #{sourceName}", options, (error, stdout, stderr) ->
+      if error?
+        logError("Zipping #{sourceName} failed", error, stderr)
+      callback(error)

-  options = {cwd: path.dirname(assetPath), maxBuffer: Infinity}
-  child_process.exec "zip -r --symlinks #{assetName} Atom.app", options, (error, stdout, stderr) ->
-    if error?
-      logError('Zipping Atom.app failed', error, stderr)
-    callback(error)
+  tasks = []
+  for {assetName, sourceName} in assets
+    fs.removeSync(path.join(buildDir, assetName))
+    tasks.push(zip.bind(this, buildDir, sourceName, assetName))
+  async.parallel(tasks, callback)

 getRelease = (callback) ->
  options =
@@ -93,10 +105,12 @@ deleteRelease = (release) ->
    if error? or response.statusCode isnt 204
      logError('Deleting release failed', error, body)

-deleteExistingAsset = (release, callback) ->
-  for asset in release.assets when asset.name is assetName
+deleteExistingAssets = (release, assetNames, callback) ->
+  [callback, assetNames] = [assetNames, callback] if not callback?
+
+  deleteAsset = (url, callback) ->
    options =
-      uri: asset.url
+      uri: url
      method: 'DELETE'
      headers: defaultHeaders
    request options, (error, response, body='') ->
@@ -106,9 +120,10 @@ deleteExistingAsset = (release, callback) ->
      else
        callback()

-    return
-
-  callback()
+  tasks = []
+  for asset in release.assets when not assetNames? or asset.name in assetNames
+    tasks.push(deleteAsset.bind(this, asset.url))
+  async.parallel(tasks, callback)

 createBuildRelease = (callback) ->
  getRelease (error, release) ->
@@ -117,7 +132,7 @@ createBuildRelease = (callback) ->
      return

    if release?
-      deleteExistingAsset release, (error) ->
+      deleteExistingAssets release, (error) ->
        callback(error, release)
      return

@@ -139,23 +154,30 @@ createBuildRelease = (callback) ->
      else
        callback(null, release)

-uploadAsset = (release, callback) ->
-  options =
-    uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
-    method: 'POST'
-    headers: _.extend({
-      'Content-Type': 'application/zip'
-      'Content-Length': fs.getSizeSync(assetPath)
-      }, defaultHeaders)
+uploadAssets = (release, buildDir, assets, callback) ->
+  upload = (release, assetName, assetPath, callback) ->
+    options =
+      uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
+      method: 'POST'
+      headers: _.extend({
+        'Content-Type': 'application/zip'
+        'Content-Length': fs.getSizeSync(assetPath)
+        }, defaultHeaders)

-  assetRequest = request options, (error, response, body='') ->
-    if error? or response.statusCode >= 400
-      logError('Upload release asset failed', error, body)
-      callback(error ? new Error(response.statusCode))
-    else
-      callback(null, release)
+    assetRequest = request options, (error, response, body='') ->
+      if error? or response.statusCode >= 400
+        logError("Upload release asset #{assetName} failed", error, body)
+        callback(error ? new Error(response.statusCode))
+      else
+        callback(null, release)

-  fs.createReadStream(assetPath).pipe(assetRequest)
+    fs.createReadStream(assetPath).pipe(assetRequest)
+
+  tasks = []
+  for {assetName, sourceName} in assets
+    assetPath = path.join(buildDir, assetName)
+    tasks.push(upload.bind(this, release, assetName, assetPath))
+  async.parallel(tasks, callback)

 publishRelease = (release, callback) ->
  options =
@@ -31,6 +31,7 @@ The classes available from `require 'atom'` are:
  * [SelectListView][SelectListView]
  * [View][View]
  * [WorkspaceView][WorkspaceView]
+  * [Workspace][Workspace]

 ### How do I create a package?

@@ -54,5 +55,6 @@ Atom ships with node 0.11.10 and the comprehensive node API docs are available
 [SelectListView]: ../classes/SelectListView.html
 [View]: ../classes/View.html
 [WorkspaceView]: ../classes/WorkspaceView.html
+[Workspace]: ../classes/Workspace.html
 [creating-a-package]: https://atom.io/docs/latest/creating-a-package
 [node-docs]: http://nodejs.org/docs/v0.11.10/api
@@ -1,34 +0,0 @@
-## Building Atom
-
-These guide is meant only for users who wish to help develop atom core,
-if you're just interested in using atom you should just [download
-atom][download].
-
-## OSX
-
-* Use OS X 10.8 or later
-* Install the latest node 0.10.x release (32bit preferable)
-* Clone [atom][atom-git] to `~/github/atom`
-* Run `~/github/atom/script/build`
-
-## Windows
-
-* Install [Visual C++ 2010 Express][win-vs2010]
-* Install the [latest 32bit Node 0.10.x][win-node]
-* Install the [latest Python 2.7.x][win-python]
-* Install [GitHub for Windows][win-github]
-* Clone [atom/atom][atom-git] to `C:\Users\<user>\github\atom\`
-* Add `C:\Python27;C:\Program Files\nodejs;C:\Users\<user>\github\atom\node_modules\`
-  to your PATH
-* Set ATOM_ACCESS_TOKEN to your oauth2 credentials (run `security -q
-  find-generic-password -ws 'GitHub API Token'` on OSX to get your
-  credentials).
-* Use the Windows GitHub shell and cd into `C:\Users\<user>\github\atom`
-* Run `script\bootstrap`
-
-[download]: https://github.com/atom/atom/releases/latest
-[win-node]: http://nodejs.org/download/
-[win-python]: http://www.python.org/download/
-[win-github]: http://windows.github.com/
-[win-vs2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
-[atom-git]: https://github.com/atom/atom/
@@ -40,7 +40,7 @@ the editor to see it in action!

 ### Further Reading

-* Check out [Publishing a Package](publish-a-package.html) for more information
+* Check out [Publishing a Package](publishing-a-package.html) for more information
  on publishing the package you just created to [atom.io][atomio].

 [atomio]: https://atom.io
@@ -57,7 +57,7 @@ __Syntax Theme__ dropdown menu to enable your new theme.

 ### Further Reading

-* Check out [Publishing a Package](publish-a-package.html) for more information
+* Check out [Publishing a Package](publishing-a-package.html) for more information
  on publishing the theme you just created to [atom.io][atomio].

 [atomio]: https://atom.io
@@ -24,6 +24,9 @@ Not every package will have (or need) all of these directories.

 We have [a tutorial on creating your first package][first-package].

+There are also guides for converting [TextMate bundles][convert-bundle] and
+[TextMate themes][convert-theme] so they work in Atom.
+
 ## package.json

 Similar to [npm packages][npm], Atom packages contain a _package.json_ file
@@ -322,27 +325,20 @@ Your package **should** have tests, and if they're placed in the _spec_
 directory, they can be run by Atom.

 Under the hood, [Jasmine] executes your tests, so you can assume that any DSL
-available there is available to your package as well.
-
-**FIXME: Explain the following**
-
-* jasmine
-* jasmine-focused
-* `spec/fixtures` and global.project
-* setTimeout
-* whatever else is different in spec-helper
+available there is also available to your package.

 ## Running Tests

-TODO: Probably use the menu option now.
+Once you've got your test suite written, you can run it by pressing
+`cmd-alt-ctrl-p` or via the _Developer > Run Package Specs_ menu.

-Once you've got your test suite written, the recommended way to run it is `apm
-test`. `apm test` prints its output to the console and returns the proper status
-code depending on whether tests passed or failed.
+You can also use the `apm test` command to run them from the command line. It
+prints the test output and results to the console and returns the proper status
+code depending on whether the tests passed or failed.

 ## Publishing

-Atom bundles a command line utility called [apm] which can be used to publish
+Atom bundles a command line utility called apm which can be used to publish
 Atom packages to the public registry.

 Once your package is written and ready for distribution you can run the
@@ -360,25 +356,11 @@ registry.
 Run `apm help publish` to see all the available options and `apm help` to see
 all the other available commands.

-## Included Libraries
-
-FIXME: Describe `require 'atom'
-
-In addition to core node.js modules, all packages can `require` the following
-popular libraries into their packages:
-
-* [SpacePen] (as `require 'space-pen'`)
-* [jQuery] (as `require 'jquery'`)
-* [Underscore] (as `require 'underscore'`)
-
-Additional libraries can be found by browsing Atom's *node_modules* folder.
-
 [file-tree]: https://github.com/atom/tree-view
 [status-bar]: https://github.com/atom/status-bar
 [cs-syntax]: https://github.com/atom/language-coffee-script
 [npm]: http://en.wikipedia.org/wiki/Npm_(software)
 [npm-keys]: https://npmjs.org/doc/json.html
-[apm]: https://github.com/atom/apm
 [git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
 [wrap-guide]: https://github.com/atom/wrap-guide/
 [keymaps]: advanced/keymaps.md
@@ -388,8 +370,10 @@ Additional libraries can be found by browsing Atom's *node_modules* folder.
 [path]: http://nodejs.org/docs/latest/api/path.html
 [jquery]: http://jquery.com/
 [underscore]: http://underscorejs.org/
-[jasmine]: https://github.com/pivotal/jasmine
+[jasmine]: http://jasmine.github.io
 [cson]: https://github.com/atom/season
 [less]: http://lesscss.org
 [ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
 [first-package]: your-first-package.html
+[convert-bundle]: converting-a-text-mate-bundle.html
+[convert-theme]: converting-a-text-mate-theme.html
@@ -32,14 +32,15 @@ Let's create your first theme.

 To get started, hit `cmd-shift-P`, and start typing "Generate Syntax Theme" to
 generate a new theme package. Select "Generate Syntax Theme," and you'll be
-asked for the path where your theme will be created. Let's call ours _motif_.
+asked for the path where your theme will be created. Let's call ours
+_motif-syntax_. __Tip:__ syntax themes should end with _-syntax_.

-Atom will pop open a new window, showing the _motif_ theme, with a default set
-of folders and files created for us. If you open the settings view (`cmd-,`)
-and navigate to the _Themes_ section on the left, you'll see the _Motif_ theme
-listed in the _Syntax Theme_ drop-down. Select it from the menu to activate it,
-now when you open an editor you should see that your new _motif_ theme in
-action.
+Atom will pop open a new window, showing the _motif-syntax_ theme, with a
+default set of folders and files created for us. If you open the settings view
+(`cmd-,`) and navigate to the _Themes_ section on the left, you'll see the
+_Motif_ theme listed in the _Syntax Theme_ drop-down. Select it from the menu to
+activate it, now when you open an editor you should see that your new
+_motif-syntax_ theme in action.

 Open up _stylesheets/colors.less_ to change the various colors variables which
 have been already been defined. For example, turn `@red` into `#f4c2c1`.
@@ -53,6 +54,11 @@ As an example, let's make the `.gutter` `background-color` into `@red`.
 Reload Atom by pressing `cmd-alt-option-L` to see the changes you made reflected
 in your Atom window. Pretty neat!

+__Tip:__ You can avoid reloading to see changes you make by opening an atom
+window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
+terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
+menu. When you edit your theme, changes will instantly be reflected!
+
 ## Creating an Interface Theme

 Interface themes **must** provide a `ui-variables.less` file which contains all
@@ -66,13 +72,14 @@ To create an interface UI theme, do the following:
 2. Clone the forked repository to the local filesystem
 3. Open a terminal in the forked theme's directory
 4. Open your new theme in a Dev Mode Atom window run `atom --dev .` in the
-   terminal or use the _View > Developer > Open in Dev Mode_ menu)
+   terminal or use the _View > Developer > Open in Dev Mode_ menu
 5. Change the name of the theme in the theme's `package.json` file
-6. Run `apm link` to symlink your repository to `~/.atom/packages`
-7. Reload Atom using `cmd-alt-ctrl-L`
-8. Enable the theme via _UI Theme_ drop-down in the _Themes_ section of the
+6. Name your theme end with a `-ui`. i.e. `super-white-ui`
+7. Run `apm link` to symlink your repository to `~/.atom/packages`
+8. Reload Atom using `cmd-alt-ctrl-L`
+9. Enable the theme via _UI Theme_ drop-down in the _Themes_ section of the
   settings view
-9. Make changes! Since you opened the theme in a Dev Mode window, changes will
+10. Make changes! Since you opened the theme in a Dev Mode window, changes will
   be instantly reflected in the editor without having to reload.

 ## Development workflow
@@ -1,7 +1,7 @@
 # Customizing Atom

 To change a setting, configure a theme, or install a package just open the
-Settings view in the current window by pressing `cmd+,`.
+Settings view in the current window by pressing `cmd-,`.

 ## Changing The Theme

@@ -63,9 +63,8 @@ built-in keymaps:
 '.editor':
  'enter': 'editor:newline'

-'body':
-  'ctrl-b': 'core:move-left'
-  'ctrl-f': 'core:move-right'
+'.mini.editor input':
+  'enter': 'core:confirm'
 ```

 This keymap defines the meaning of `enter` in two different contexts. In a
@@ -87,7 +86,7 @@ currently in use.
 ## Advanced Configuration

 Atom loads configuration settings from the `config.cson` file in your _~/.atom_
-directory, which contains CoffeeScript-style JSON:
+directory, which contains [CoffeeScript-style JSON][CSON] (CSON):

 ```coffee
 'core':
@@ -111,7 +110,6 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
  - `themes`: An array of theme names to load, in cascading order
 - `editor`
  - `autoIndent`: Enable/disable basic auto-indent (defaults to `true`)
-  - `autoIndentOnPaste`: Enable/disable auto-indented pasted text (defaults to `false`)
  - `nonWordCharacters`: A string of non-word characters to define word boundaries
  - `fontSize`: The editor font size
  - `fontFamily`: The editor font family
@@ -142,13 +140,21 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
 ### init.coffee

 When Atom finishes loading, it will evaluate _init.coffee_ in your _~/.atom_
-directory, giving you a chance to run arbitrary personal CoffeeScript code to
+directory, giving you a chance to run arbitrary personal [CoffeeScript][] code to
 make customizations. You have full access to Atom's API from code in this file.
-If customizations become extensive, consider [creating a package][create-a-package].
+If customizations become extensive, consider [creating a package][creating-a-package].

 You can open this file in an editor from the _Atom > Open Your Init Script_
 menu.

+For example, if you have the Audio Beep configuration setting enabled, you
+could add the following code to your _~/.atom/init.coffee_ file to have Atom
+greet you with an audio beep every time it loads:
+
+```coffee
+atom.beep()
+```
+
 This file can also be named _init.js_ and contain JavaScript code.

 ### styles.less
@@ -172,6 +178,8 @@ Unfamiliar with LESS? Read more about it [here][LESS].

 This file can also be named _styles.css_ and contain CSS.

-[create-a-package]: creating-packages.md
+[creating-a-package]: creating-a-package.md
 [create-theme]: creating-a-theme.md
 [LESS]: http://www.lesscss.org
+[CSON]: https://github.com/atom/season
+[CoffeeScript]: http://coffeescript.org/
@@ -74,7 +74,7 @@ You can split any editor pane horizontally or vertically by using `cmd-k right`
 or `cmd-k down`. Once you have a split pane, you can move focus between them
 with `cmd-k cmd-right` or `cmd-k cmd-down`. To close a pane, close all its
 editors with `meta-w`, then press `meta-w` one more time to close the pane. You
-can configure panes to auto-close with empty in the preferences.
+can configure panes to auto-close when empty in the Settings view.

 ### Folding

@@ -95,7 +95,7 @@ in preferences.

 ## Configuration

-Press `cmd-,` to open the Settings view. This is the place to change settings
+Press `cmd-,` to open the Settings view. This is the place to change settings,
 install packages, and change the theme.

 For more advanced configuration see the [customization guide][customization].
@@ -5,6 +5,8 @@
 * [Creating a Package](creating-a-package.md)
 * [Creating a Theme](creating-a-theme.md)
 * [Publishing a Package](publishing-a-package.md)
+* [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
+* [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)

 ### Advanced Topics
@@ -1,39 +0,0 @@
-# Setting up Travis CI
-
-Packages under the [atom org][atom-org] should use [Travis CI][travis-ci] for
-builds.
-
-Currently we have a [Travis Pro][travis-pro] account since the repositories
-are private.  This process will be simpler and have fewer steps once the
-package repos are made public.
-
-Each package builds using the [build-package][build-package] script, any
-changes to the build should be made in that script and will affect all
-package builds immediately.
-
-Each package builds against the latest successful build of atom@master. The
-master builds are stored in the [atom-master-builds][atom-master-builds] repo
-as releases named by the SHA-1 built.
-
-## Configuring a package
-
-* Run `cd ~/github/my-package` to navigate to the package repo locally
-* Run `apm test` to verify that the package currently builds via [apm][apm]
-* Add the package repo to the [Travis CI team][travis-ci-team]
-* Run `gem install travis` to install the [travis gem][travis-gem]
-* Run `travis login --pro` and log in using the [atom-build][atom-build] user
-  and the password from the *Shared-Developers* folder in LastPass
-* Run `apm ci` to add a `.travis.yml` file to the repo and to configure Travis
-* Log into [Travis][travis-ci] as the `atom-build` user and you should now see
-  the package listed and building
-  
-
-[apm]: https://github.com/atom/apm
-[build-package]: https://github.com/atom/apm/blob/master/script/build-package
-[atom-build]: https://github.com/atom-build
-[atom-master-builds]: https://github.com/atom/atom-master-builds/releases
-[atom-org]: https://github.com/atom
-[travis-ci]: https://magnum.travis-ci.com
-[travis-ci-team]: https://github.com/organizations/atom/teams/596636
-[travis-gem]: https://rubygems.org/gems/travis
-[travis-pro]: http://about.travis-ci.org/docs/user/travis-pro
@@ -20,7 +20,8 @@ The final package can be viewed at
 To begin, press `cmd-shift-P` to bring up the [Command
 Palette](https://github.com/atom/command-palette). Type "generate package" and
 select the "Package Generator: Generate Package" command. Now we need to name
-the package. Let's call it _ascii-art_.
+the package. Try to avoid naming your package with the *atom-* prefix, for
+example we are going to call this package _ascii-art_. 

 Atom will open a new window with the contents of our new _ascii-art_ package
 displayed in the Tree View. Because this window is opened **after** the package
@@ -21,3 +21,4 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
  module.exports.Task = require '../src/task'
  module.exports.View = View
  module.exports.WorkspaceView = require '../src/workspace-view'
+  module.exports.Workspace = require '../src/workspace'
@@ -133,8 +133,8 @@
  'ctrl-cmd-up': 'editor:move-line-up'
  'ctrl-cmd-down': 'editor:move-line-down'
  'cmd-/': 'editor:toggle-line-comments'
-  'cmd-j': 'editor:join-line'
-  'cmd-D': 'editor:duplicate-line'
+  'cmd-j': 'editor:join-lines'
+  'cmd-D': 'editor:duplicate-lines'
  'cmd-L': 'editor:split-selections-into-lines'

  'cmd-alt-[': 'editor:fold-current-row'
@@ -80,8 +80,8 @@
  'ctrl-up': 'editor:move-line-up'
  'ctrl-down': 'editor:move-line-down'
  'ctrl-/': 'editor:toggle-line-comments'
-  'ctrl-j': 'editor:join-line'
-  'ctrl-D': 'editor:duplicate-line'
+  'ctrl-j': 'editor:join-lines'
+  'ctrl-D': 'editor:duplicate-lines'

  'ctrl-alt-[': 'editor:fold-current-row'
  'ctrl-alt-]': 'editor:unfold-current-row'
@@ -7,6 +7,7 @@
      { label: "VERSION", enabled: false }
      { label: "Restart and Install Update", command: 'application:install-update', visible: false}
      { label: "Check for Update", command: 'application:check-for-update', visible: false}
+      { label: "Downloading Update", command: 'application:check-for-update', enabled: false, visible: false}
      { type: 'separator' }
      { label: 'Preferences...', command: 'application:show-settings' }
      { label: 'Open Your Config', command: 'application:open-your-config' }
@@ -64,9 +65,9 @@
          { type: 'separator' }
          { label: 'Move Line Up', command: 'editor:move-line-up' }
          { label: 'Move Line Down', command: 'editor:move-line-down' }
-          { label: 'Duplicate Line', command: 'editor:duplicate-line' }
+          { label: 'Duplicate Lines', command: 'editor:duplicate-lines' }
          { label: 'Delete Line', command: 'editor:delete-line' }
-          { label: 'Join Lines', command: 'editor:join-line' }
+          { label: 'Join Lines', command: 'editor:join-lines' }
        ]
      }
      {
@@ -43,9 +43,9 @@
          { type: 'separator' }
          { label: 'Move Line &Up', command: 'editor:move-line-up' }
          { label: 'Move Line &Down', command: 'editor:move-line-down' }
-          { label: 'Du&plicate Line', command: 'editor:duplicate-line' }
+          { label: 'Du&plicate Lines', command: 'editor:duplicate-lines' }
          { label: 'D&elete Line', command: 'editor:delete-line' }
-          { label: '&Join Lines', command: 'editor:join-line' }
+          { label: '&Join Lines', command: 'editor:join-lines' }
        ]
      }
      {
@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.54.0",
+  "version": "0.70.0",
  "main": "./src/browser/main.js",
  "repository": {
    "type": "git",
@@ -10,13 +10,8 @@
  "bugs": {
    "url": "https://github.com/atom/atom/issues"
  },
-  "licenses": [
-    {
-      "type": "Apache",
-      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
-    }
-  ],
-  "atomShellVersion": "0.10.1",
+  "license": "All Rights Reserved",
+  "atomShellVersion": "0.10.6",
  "dependencies": {
    "async": "0.2.6",
    "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
@@ -25,110 +20,112 @@
    "coffeestack": "0.7.0",
    "delegato": "1.x",
    "emissary": "1.x",
-    "first-mate": ">=1.1.5 <2.0",
+    "first-mate": ">=1.4 <2.0",
    "fs-plus": "2.x",
    "fstream": "0.1.24",
-    "fuzzaldrin": "1.x",
+    "fuzzaldrin": "~1.1",
    "git-utils": "1.x",
    "guid": "0.0.10",
    "jasmine-tagged": ">=1.1.1 <2.0",
    "mkdirp": "0.3.5",
    "keytar": "0.15.1",
    "less-cache": "0.12.0",
+    "loophole": "^0.3.0",
    "mixto": "1.x",
    "nslog": "0.5.0",
    "oniguruma": "1.x",
    "optimist": "0.4.0",
-    "pathwatcher": "0.16.0",
+    "pathwatcher": "0.17.0",
    "pegjs": "0.8.0",
    "property-accessors": "1.x",
    "q": "1.0.x",
    "random-words": "0.0.1",
    "runas": "0.5.x",
    "scandal": "0.15.0",
+    "scrollbar-style": "^0.1.0",
    "season": ">=1.0.2 <2.0",
    "semver": "1.1.4",
    "serializable": "1.x",
    "space-pen": "3.1.1",
    "temp": "0.5.0",
-    "text-buffer": ">=1.1.2 <2.0",
+    "text-buffer": "^1.4.2",
    "theorist": "1.x",
-    "underscore-plus": "1.x",
+    "underscore-plus": ">=1.0.2 <2.0",
    "vm-compatibility-layer": "0.1.0"
  },
  "packageDependencies": {
-    "atom-dark-syntax": "0.14.0",
+    "atom-dark-syntax": "0.15.0",
    "atom-dark-ui": "0.23.0",
-    "atom-light-syntax": "0.14.0",
+    "atom-light-syntax": "0.15.0",
    "atom-light-ui": "0.22.0",
-    "base16-tomorrow-dark-theme": "0.12.0",
-    "solarized-dark-syntax": "0.10.0",
-    "solarized-light-syntax": "0.6.0",
-    "archive-view": "0.24.0",
-    "autocomplete": "0.24.0",
+    "base16-tomorrow-dark-theme": "0.13.0",
+    "solarized-dark-syntax": "0.12.0",
+    "solarized-light-syntax": "0.7.0",
+    "archive-view": "0.26.0",
+    "autocomplete": "0.27.0",
    "autoflow": "0.15.0",
    "autosave": "0.12.0",
-    "background-tips": "0.8.0",
+    "background-tips": "0.9.0",
    "bookmarks": "0.21.0",
-    "bracket-matcher": "0.22.0",
-    "command-palette": "0.18.0",
+    "bracket-matcher": "0.25.0",
+    "command-palette": "0.19.0",
    "dev-live-reload": "0.28.0",
-    "exception-reporting": "0.15.0",
-    "feedback": "0.26.0",
-    "find-and-replace": "0.85.0",
-    "fuzzy-finder": "0.37.0",
+    "exception-reporting": "0.17.0",
+    "feedback": "0.28.0",
+    "find-and-replace": "0.89.1",
+    "fuzzy-finder": "0.39.0",
    "git-diff": "0.25.0",
-    "go-to-line": "0.17.0",
-    "grammar-selector": "0.21.0",
-    "image-view": "0.25.0",
+    "go-to-line": "0.18.0",
+    "grammar-selector": "0.23.0",
+    "image-view": "0.29.0",
    "keybinding-resolver": "0.11.0",
-    "link": "0.18.0",
-    "markdown-preview": "0.36.0",
-    "metrics": "0.28.0",
-    "open-on-github": "0.21.0",
-    "package-generator": "0.28.0",
-    "release-notes": "0.24.0",
-    "settings-view": "0.82.0",
-    "snippets": "0.32.0",
-    "spell-check": "0.26.0",
-    "status-bar": "0.33.0",
-    "styleguide": "0.25.0",
-    "symbols-view": "0.38.0",
-    "tabs": "0.24.0",
-    "timecop": "0.15.0",
-    "tree-view": "0.71.0",
-    "update-package-dependencies": "0.4.0",
-    "welcome": "0.6.0",
-    "whitespace": "0.15.0",
-    "wrap-guide": "0.15.0",
-    "language-c": "0.12.0",
-    "language-coffee-script": "0.12.0",
-    "language-css": "0.10.0",
-    "language-gfm": "0.18.0",
+    "link": "0.20.0",
+    "markdown-preview": "0.47.0",
+    "metrics": "0.30.0",
+    "open-on-github": "0.23.0",
+    "package-generator": "0.30.0",
+    "release-notes": "0.26.0",
+    "settings-view": "0.90.0",
+    "snippets": "0.36.0",
+    "spell-check": "0.28.0",
+    "status-bar": "0.36.0",
+    "styleguide": "0.26.0",
+    "symbols-view": "0.41.0",
+    "tabs": "0.29.0",
+    "timecop": "0.17.0",
+    "tree-view": "0.76.0",
+    "update-package-dependencies": "0.6.0",
+    "welcome": "0.11.0",
+    "whitespace": "0.18.0",
+    "wrap-guide": "0.17.0",
+    "language-c": "0.13.0",
+    "language-coffee-script": "0.15.0",
+    "language-css": "0.13.0",
+    "language-gfm": "0.19.0",
    "language-git": "0.9.0",
-    "language-go": "0.6.0",
-    "language-html": "0.8.0",
+    "language-go": "0.7.0",
+    "language-html": "0.11.0",
    "language-hyperlink": "0.8.0",
-    "language-java": "0.8.0",
-    "language-javascript": "0.11.0",
+    "language-java": "0.9.0",
+    "language-javascript": "0.17.0",
    "language-json": "0.8.0",
-    "language-less": "0.5.0",
-    "language-make": "0.8.0",
-    "language-objective-c": "0.9.0",
+    "language-less": "0.6.0",
+    "language-make": "0.9.0",
+    "language-objective-c": "0.10.0",
    "language-perl": "0.8.0",
-    "language-php": "0.8.0",
+    "language-php": "0.10.0",
    "language-property-list": "0.7.0",
-    "language-python": "0.8.0",
-    "language-ruby": "0.13.0",
-    "language-ruby-on-rails": "0.7.0",
+    "language-python": "0.12.0",
+    "language-ruby": "0.15.0",
+    "language-ruby-on-rails": "0.10.0",
    "language-sass": "0.8.0",
-    "language-shellscript": "0.7.0",
+    "language-shellscript": "0.8.0",
    "language-source": "0.7.0",
    "language-sql": "0.7.0",
    "language-text": "0.6.0",
    "language-todo": "0.6.0",
    "language-toml": "0.11.0",
-    "language-xml": "0.7.0",
+    "language-xml": "0.8.0",
    "language-yaml": "0.6.0"
  },
  "private": true,
@@ -25,7 +25,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
+	<string>10.8</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
@@ -3,11 +3,6 @@ var safeExec = require('./utils/child-process-wrapper.js').safeExec;
 var fs = require('fs');
 var path = require('path');

-// OAuth token for atom-bot
-// TODO Remove once all repositories are public
-if (!process.env.ATOM_ACCESS_TOKEN)
-  process.env.ATOM_ACCESS_TOKEN = '362295be4c5258d3f7b967bbabae662a455ca2a7';
-
 // Executes an array of commands one by one.
 function executeCommands(commands, done, index) {
  index = (index == undefined ? 0 : index);
@@ -30,21 +25,21 @@ if (!fs.existsSync(apmInstallPath))
 if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
  fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));

+var apmPath = 'apm/node_modules/atom-package-manager/bin/apm'
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season'];
+var npmCommand = 'npm --userconfig=' + path.resolve('.npmrc') + ' ';
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
  'git submodule --quiet sync',
  'git submodule --quiet update --recursive --init',
-  {command: 'npm install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
-  {command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
-  {command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
-  {command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
-  {command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
  echoNewLine,
-  'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
-  'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
-  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
+  apmPath + ' clean ' + apmFlags,
+  apmPath + ' install --quiet ' + apmFlags,
+  apmPath + ' dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
 ];

 process.chdir(path.dirname(__dirname));
@@ -22,6 +22,7 @@ var commands = [
  [__dirname, '..', 'atom-shell'],
  [home, '.atom', '.node-gyp'],
  [home, '.atom', 'storage'],
+  [home, '.atom', '.npm'],
  [tmpdir, 'atom-build'],
  [tmpdir, 'atom-cached-atom-shells'],
  [tmpdir, 'atom-compile-cache'],
@@ -37,7 +37,7 @@ describe "DisplayBuffer", ->
      expect(displayBuffer2.isFoldedAtBufferRow(3)).toBeTruthy()

      # can diverge from origin
-      displayBuffer2.destroyFoldsContainingBufferRow(3)
+      displayBuffer2.unfoldBufferRow(3)
      expect(displayBuffer2.isFoldedAtBufferRow(3)).not.toBe displayBuffer.isFoldedAtBufferRow(3)

  describe "when the buffer changes", ->
@@ -200,6 +200,12 @@ describe "DisplayBuffer", ->
        expect(tokensText displayBuffer.lineForRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
        expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 15, screenDelta: 3, bufferDelta: 0)

+      it "only allows positive widths to be assigned", ->
+        displayBuffer.setEditorWidthInChars(0)
+        expect(displayBuffer.editorWidthInChars).not.toBe 0
+        displayBuffer.setEditorWidthInChars(-1)
+        expect(displayBuffer.editorWidthInChars).not.toBe -1
+
  describe "primitive folding", ->
    beforeEach ->
      displayBuffer.destroy()
@@ -460,6 +466,12 @@ describe "DisplayBuffer", ->

          expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 3, screenDelta: 1, bufferDelta: 1)

+      describe "when the change starts at the beginning of a fold but does not extend to the end (regression)", ->
+        it "preserves a proper mapping between buffer and screen coordinates", ->
+          expect(displayBuffer.screenPositionForBufferPosition([8, 0])).toEqual [4, 0]
+          buffer.setTextInRange([[2, 0], [3, 0]], "\n")
+          expect(displayBuffer.screenPositionForBufferPosition([8, 0])).toEqual [4, 0]
+
    describe "position translation", ->
      it "translates positions to account for folded lines and characters and the placeholder", ->
        fold = displayBuffer.createFold(4, 7)
@@ -495,7 +507,7 @@ describe "DisplayBuffer", ->
        expect(displayBuffer.bufferPositionForScreenPosition([5, 0])).toEqual [5, 0]
        expect(displayBuffer.bufferPositionForScreenPosition([9, 2])).toEqual [9, 2]

-    describe ".destroyFoldsContainingBufferRow(row)", ->
+    describe ".unfoldBufferRow(row)", ->
      it "destroys all folds containing the given row", ->
        displayBuffer.createFold(2, 4)
        displayBuffer.createFold(2, 6)
@@ -506,13 +518,24 @@ describe "DisplayBuffer", ->
        expect(displayBuffer.lineForRow(1).text).toBe '1'
        expect(displayBuffer.lineForRow(2).text).toBe '10'

-        displayBuffer.destroyFoldsContainingBufferRow(2)
+        displayBuffer.unfoldBufferRow(2)
        expect(displayBuffer.lineForRow(1).text).toBe '1'
        expect(displayBuffer.lineForRow(2).text).toBe '2'
        expect(displayBuffer.lineForRow(7).fold).toBeDefined()
        expect(displayBuffer.lineForRow(8).text).toMatch /^9-+/
        expect(displayBuffer.lineForRow(10).fold).toBeDefined()

+    describe ".outermostFoldsInBufferRowRange(startRow, endRow)", ->
+      it "returns the outermost folds entirely contained in the given row range, exclusive of end row", ->
+        fold1 = displayBuffer.createFold(4, 7)
+        fold2 = displayBuffer.createFold(5, 6)
+        fold3 = displayBuffer.createFold(11, 15)
+        fold4 = displayBuffer.createFold(12, 13)
+        fold5 = displayBuffer.createFold(16, 17)
+
+        expect(displayBuffer.outermostFoldsInBufferRowRange(3, 18)).toEqual [fold1, fold3, fold5]
+        expect(displayBuffer.outermostFoldsInBufferRowRange(5, 16)).toEqual [fold3]
+
  describe ".clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
    beforeEach ->
      displayBuffer.setSoftWrap(true)
@@ -588,6 +611,13 @@ describe "DisplayBuffer", ->
      expect(displayBuffer.screenPositionForBufferPosition([0, 1])).toEqual [0, 2]
      expect(displayBuffer.bufferPositionForScreenPosition([0, 2])).toEqual [0, 1]

+    it "correctly translates positions on soft wrapped lines containing tabs", ->
+      buffer.setText('\t\taa  bb  cc  dd  ee  ff  gg')
+      displayBuffer.setSoftWrap(true)
+      displayBuffer.setEditorWidthInChars(10)
+      expect(displayBuffer.screenPositionForBufferPosition([0, 10], wrapAtSoftNewlines: true)).toEqual [1, 0]
+      expect(displayBuffer.bufferPositionForScreenPosition([1, 0])).toEqual [0, 10]
+
  describe ".getMaxLineLength()", ->
    it "returns the length of the longest screen line", ->
      expect(displayBuffer.getMaxLineLength()).toBe 65
@@ -684,7 +714,7 @@ describe "DisplayBuffer", ->
        }
        markerChangedHandler.reset()

-        displayBuffer.destroyFoldsContainingBufferRow(4)
+        displayBuffer.unfoldBufferRow(4)
        expect(markerChangedHandler).toHaveBeenCalled()
        expect(markerChangedHandler.argsForCall[0][0]).toEqual {
          oldHeadScreenPosition: [8, 23]
@@ -867,7 +897,7 @@ describe "DisplayBuffer", ->
          expect(marker.getHeadScreenPosition()).toEqual [8, 10]
          expect(marker.getTailScreenPosition()).toEqual [8, 4]

-        displayBuffer.destroyFoldsContainingBufferRow(4)
+        displayBuffer.unfoldBufferRow(4)

        expect(changeHandler).toHaveBeenCalled()
        expect(markerChangedHandler).toHaveBeenCalled()
@@ -1806,6 +1806,17 @@ describe "EditorView", ->
        runs ->
          expect(editor.getSoftWrapColumn()).toBeLessThan previousSoftWrapColumn

+      it "accounts for the width of the scrollbar if there is one", ->
+        # force the scrollbar to always be visible, regardless of OS visibility setting
+        $('#jasmine-content').prepend """
+          <style>
+            ::-webkit-scrollbar { width: 15px; }
+          </style>
+        """
+        setEditorHeightInLines(editorView, 5)
+        setEditorWidthInChars(editorView, 40)
+        expect(editor.lineForScreenRow(2).text.length).toBe 34
+
  describe "gutter rendering", ->
    beforeEach ->
      editorView.attachToDom(heightInLines: 5.5)
@@ -2419,51 +2430,11 @@ describe "EditorView", ->
      editorView.underlayer.trigger event
      expect(editor.getSelection().getScreenRange()).toEqual [[0,0], [12,2]]

-  # TODO: Move to editor-spec
-  describe ".reloadGrammar()", ->
-    [filePath] = []
-
-    beforeEach ->
-      tmpdir = fs.absolute(temp.dir)
-      filePath = path.join(tmpdir, "grammar-change.txt")
-      fs.writeFileSync(filePath, "var i;")
-
-    afterEach ->
-      fs.removeSync(filePath) if fs.existsSync(filePath)
-
-    it "updates all the rendered lines when the grammar changes", ->
-      editor = atom.project.openSync(filePath)
-      editorView.edit(editor)
-      expect(editor.getGrammar().name).toBe 'Plain Text'
-      atom.syntax.setGrammarOverrideForPath(filePath, 'source.js')
-      editor.reloadGrammar()
-      expect(editor.getGrammar().name).toBe 'JavaScript'
-
-      tokenizedBuffer = editorView.editor.displayBuffer.tokenizedBuffer
-      line0 = tokenizedBuffer.lineForScreenRow(0)
-      expect(line0.tokens.length).toBe 3
-      expect(line0.tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])
-
-    it "doesn't update the rendered lines when the grammar doesn't change", ->
-      expect(editor.getGrammar().name).toBe 'JavaScript'
-      spyOn(editorView, 'updateDisplay').andCallThrough()
-      editor.reloadGrammar()
-      expect(editor.reloadGrammar()).toBeFalsy()
-      expect(editorView.updateDisplay).not.toHaveBeenCalled()
-      expect(editor.getGrammar().name).toBe 'JavaScript'
-
-    it "emits an editor:grammar-changed event when updated", ->
-      editor = atom.project.openSync(filePath)
-      editorView.edit(editor)
-
+  describe "when the editor's grammar is changed", ->
+    it "emits an editor:grammar-changed event", ->
      eventHandler = jasmine.createSpy('eventHandler')
      editorView.on('editor:grammar-changed', eventHandler)
-      editor.reloadGrammar()
-
-      expect(eventHandler).not.toHaveBeenCalled()
-
-      atom.syntax.setGrammarOverrideForPath(filePath, 'source.js')
-      editor.reloadGrammar()
+      editor.setGrammar(atom.syntax.selectGrammar('.coffee'))
      expect(eventHandler).toHaveBeenCalled()

  describe ".replaceSelectedText()", ->
@@ -2810,61 +2781,6 @@ describe "EditorView", ->
          expect(buffer.lineForRow(1)).toBe '    if (items.length <= 1) return items;'
          expect(buffer.lineForRow(2)).toBe '  var sort = function(items) {'

-  describe "when editor:duplicate-line is triggered", ->
-    describe "where there is no selection", ->
-      describe "when the cursor isn't on a folded line", ->
-        it "duplicates the current line below and moves the cursor down one row", ->
-          editor.setCursorBufferPosition([0, 5])
-          editorView.trigger 'editor:duplicate-line'
-          expect(buffer.lineForRow(0)).toBe 'var quicksort = function () {'
-          expect(buffer.lineForRow(1)).toBe 'var quicksort = function () {'
-          expect(editor.getCursorBufferPosition()).toEqual [1, 5]
-
-      describe "when the cursor is on a folded line", ->
-        it "duplicates the entire fold before and moves the cursor to the new fold", ->
-          editor.setCursorBufferPosition([4])
-          editor.foldCurrentRow()
-          editorView.trigger 'editor:duplicate-line'
-          expect(editor.getCursorScreenPosition()).toEqual [5]
-          expect(editor.isFoldedAtScreenRow(4)).toBeTruthy()
-          expect(editor.isFoldedAtScreenRow(5)).toBeTruthy()
-          expect(buffer.lineForRow(8)).toBe '    while(items.length > 0) {'
-          expect(buffer.lineForRow(9)).toBe '      current = items.shift();'
-          expect(buffer.lineForRow(10)).toBe '      current < pivot ? left.push(current) : right.push(current);'
-          expect(buffer.lineForRow(11)).toBe '    }'
-
-      describe "when the cursor is on the last line and it doesn't have a trailing newline", ->
-        it "inserts a newline and the duplicated line", ->
-          editor.moveCursorToBottom()
-          editorView.trigger 'editor:duplicate-line'
-          expect(buffer.lineForRow(12)).toBe '};'
-          expect(buffer.lineForRow(13)).toBe '};'
-          expect(buffer.lineForRow(14)).toBeUndefined()
-          expect(editor.getCursorBufferPosition()).toEqual [13, 2]
-
-      describe "when the cursor in on the last line and it is only a newline", ->
-        it "duplicates the current line below and moves the cursor down one row", ->
-          editor.moveCursorToBottom()
-          editor.insertNewline()
-          editor.moveCursorToBottom()
-          editorView.trigger 'editor:duplicate-line'
-          expect(buffer.lineForRow(13)).toBe ''
-          expect(buffer.lineForRow(14)).toBe ''
-          expect(buffer.lineForRow(15)).toBeUndefined()
-          expect(editor.getCursorBufferPosition()).toEqual [14, 0]
-
-      describe "when the cursor is on the second to last line and the last line only a newline", ->
-        it "duplicates the current line below and moves the cursor down one row", ->
-          editor.moveCursorToBottom()
-          editor.insertNewline()
-          editor.setCursorBufferPosition([12])
-          editorView.trigger 'editor:duplicate-line'
-          expect(buffer.lineForRow(12)).toBe '};'
-          expect(buffer.lineForRow(13)).toBe '};'
-          expect(buffer.lineForRow(14)).toBe ''
-          expect(buffer.lineForRow(15)).toBeUndefined()
-          expect(editor.getCursorBufferPosition()).toEqual [13, 0]
-
  describe "when the escape key is pressed on the editor view", ->
    it "clears multiple selections if there are any, and otherwise allows other bindings to be handled", ->
      atom.keymap.bindKeys 'name', '.editor', {'escape': 'test-event'}
@@ -254,6 +254,30 @@ describe "Keymap", ->
        it "favors the more specific complete match", ->

  describe ".bindKeys(name, selector, bindings)", ->
+    it "normalizes bindings that use shift with lower case alpha char", ->
+      fooHandler = jasmine.createSpy('fooHandler')
+      fragment.on 'foo', fooHandler
+      keymap.bindKeys 'name', '*', 'ctrl-shift-l': 'foo'
+      result = keymap.handleKeyEvent(keydownEvent('l', ctrlKey: true, altKey: false, shiftKey: true, target: fragment[0]))
+      expect(result).toBe(false)
+      expect(fooHandler).toHaveBeenCalled()
+
+    it "normalizes bindings that use shift with upper case alpha char", ->
+      fooHandler = jasmine.createSpy('fooHandler')
+      fragment.on 'foo', fooHandler
+      keymap.bindKeys 'name', '*', 'ctrl-shift-L': 'foo'
+      result = keymap.handleKeyEvent(keydownEvent('l', ctrlKey: true, altKey: false, shiftKey: true, target: fragment[0]))
+      expect(result).toBe(false)
+      expect(fooHandler).toHaveBeenCalled()
+
+    it "normalizes bindings that use an upper case alpha char without shift", ->
+      fooHandler = jasmine.createSpy('fooHandler')
+      fragment.on 'foo', fooHandler
+      keymap.bindKeys 'name', '*', 'ctrl-L': 'foo'
+      result = keymap.handleKeyEvent(keydownEvent('l', ctrlKey: true, altKey: false, shiftKey: true, target: fragment[0]))
+      expect(result).toBe(false)
+      expect(fooHandler).toHaveBeenCalled()
+
    it "normalizes the key patterns in the hash to put the modifiers in alphabetical order", ->
      fooHandler = jasmine.createSpy('fooHandler')
      fragment.on 'foo', fooHandler
@@ -306,7 +330,7 @@ describe "Keymap", ->

    describe "when shift is pressed when a non-modifer key", ->
      it "returns a string that identifies the key pressed", ->
-        expect(keymap.keystrokeStringForEvent(keydownEvent('A', shiftKey: true))).toBe 'A'
+        expect(keymap.keystrokeStringForEvent(keydownEvent('A', shiftKey: true))).toBe 'shift-A'
        expect(keymap.keystrokeStringForEvent(keydownEvent('{', shiftKey: true))).toBe '{'
        expect(keymap.keystrokeStringForEvent(keydownEvent('left', shiftKey: true))).toBe 'shift-left'
        expect(keymap.keystrokeStringForEvent(keydownEvent('Left', shiftKey: true))).toBe 'shift-left'
@@ -285,21 +285,6 @@ describe "LanguageMode", ->
          expect(fold.getStartRow()).toBe 0
          expect(fold.getEndRow()).toBe 13

-    describe ".unfoldBufferRow(bufferRow)", ->
-      describe "when bufferRow can be unfolded", ->
-        it "destroys a fold based on the syntactic region starting at the given row", ->
-          languageMode.foldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeDefined()
-
-          languageMode.unfoldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-
-      describe "when bufferRow can't be unfolded", ->
-        it "does not throw an error", ->
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-          languageMode.unfoldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-
    describe ".isFoldableAtBufferRow(bufferRow)", ->
      it "returns true if the line starts a foldable row range", ->
        expect(languageMode.isFoldableAtBufferRow(0)).toBe true
@@ -491,6 +491,16 @@ describe "Project", ->
          expect(resultForA.matches).toHaveLength 1
          expect(resultForA.matches[0].matchText).toBe 'Elephant'

+      it "ignores buffers outside the project", ->
+        editor = atom.project.openSync(temp.openSync().path)
+        editor.setText("Elephant")
+        results = []
+        waitsForPromise ->
+          atom.project.scan /Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 0
+
  describe ".eachBuffer(callback)", ->
    beforeEach ->
      atom.project.bufferForPathSync('a')
@@ -90,11 +90,13 @@ describe "Window", ->
    it "saves the serialized state of the window so it can be deserialized after reload", ->
      workspaceState = atom.workspace.serialize()
      syntaxState = atom.syntax.serialize()
+      projectState = atom.project.serialize()

      atom.unloadEditorWindow()

      expect(atom.state.workspace).toEqual workspaceState
      expect(atom.state.syntax).toEqual syntaxState
+      expect(atom.state.project).toEqual projectState
      expect(atom.saveSync).toHaveBeenCalled()

    it "unsubscribes from all buffers", ->
@@ -14,14 +14,24 @@ describe "Workspace", ->
    describe "when the 'searchAllPanes' option is false (default)", ->
      describe "when called without a uri", ->
        it "adds and activates an empty editor on the active pane", ->
-          editor = null
+          [editor1, editor2] = []
+
          waitsForPromise ->
-            workspace.open().then (o) -> editor = o
+            workspace.open().then (editor) -> editor1 = editor

          runs ->
-            expect(editor.getPath()).toBeUndefined()
-            expect(workspace.activePane.items).toEqual [editor]
-            expect(workspace.activePaneItem).toBe editor
+            expect(editor1.getPath()).toBeUndefined()
+            expect(workspace.activePane.items).toEqual [editor1]
+            expect(workspace.activePaneItem).toBe editor1
+            expect(workspace.activePane.activate).toHaveBeenCalled()
+
+          waitsForPromise ->
+            workspace.open().then (editor) -> editor2 = editor
+
+          runs ->
+            expect(editor2.getPath()).toBeUndefined()
+            expect(workspace.activePane.items).toEqual [editor1, editor2]
+            expect(workspace.activePaneItem).toBe editor2
            expect(workspace.activePane.activate).toHaveBeenCalled()

      describe "when called with a uri", ->
@@ -241,3 +241,11 @@ describe "WorkspaceView", ->
      expect(atom.workspaceView.getActivePane().getItems()).toHaveLength 1
      atom.workspaceView.trigger('core:close')
      expect(atom.workspaceView.getActivePane().getItems()).toHaveLength 0
+
+  describe "the scrollbar visibility class", ->
+    it "has a class based on the style of the scrollbar", ->
+      scrollbarStyle = require 'scrollbar-style'
+      scrollbarStyle.emitValue 'legacy'
+      expect(atom.workspaceView).toHaveClass 'scrollbars-visible-always'
+      scrollbarStyle.emitValue 'overlay'
+      expect(atom.workspaceView).toHaveClass 'scrollbars-visible-when-scrolling'
@@ -11,6 +11,10 @@ _ = require 'underscore-plus'
 {Model} = require 'theorist'
 fs = require 'fs-plus'

+# this prevents CSP-related warnings for q's feature detection
+{allowUnsafeNewFunction} = require 'loophole'
+allowUnsafeNewFunction -> require 'q'
+
 {$} = require './space-pen-extensions'
 WindowEventHandler = require './window-event-handler'

@@ -229,7 +233,7 @@ class Atom extends Model

  deserializeProject: ->
    Project = require './project'
-    @project ?= @deserializers.deserialize(@project) ? new Project(path: @getLoadSettings().initialPath)
+    @project ?= @deserializers.deserialize(@state.project) ? new Project(path: @getLoadSettings().initialPath)

  deserializeWorkspaceView: ->
    Workspace = require './workspace'
@@ -280,6 +284,7 @@ class Atom extends Model
    return if not @project and not @workspaceView

    @state.syntax = @syntax.serialize()
+    @state.project = @project.serialize()
    @state.workspace = @workspace.serialize()
    @packages.deactivatePackages()
    @state.packageStates = @packages.packageStates
@@ -71,11 +71,28 @@ class ApplicationMenu

  # Toggles Install Update Item
  showInstallUpdateItem: (visible=true) ->
+    if visible
+      @showDownloadingUpdateItem(false)
+      @showCheckForUpdateItem(false)
+
    if (item = _.find(@flattenMenuItems(@menu), (i) -> i.label == 'Restart and Install Update'))
      item.visible = visible

+  # Toggles Downloading Update Item
+  showDownloadingUpdateItem: (visible=true) ->
+    if visible
+      @showInstallUpdateItem(false)
+      @showCheckForUpdateItem(false)
+
+    if (item = _.find(@flattenMenuItems(@menu), (i) -> i.label == 'Downloading Update'))
+      item.visible = visible
+
  # Toggles Check For Update Item
  showCheckForUpdateItem: (visible=true) ->
+    if visible
+      @showDownloadingUpdateItem(false)
+      @showInstallUpdateItem(false)
+
    if (item = _.find(@flattenMenuItems(@menu), (i) -> i.label == 'Check for Update'))
      item.visible = visible

@@ -30,7 +30,6 @@ socketPath =
 module.exports =
 class AtomApplication
  _.extend @prototype, EventEmitter.prototype
-  updateVersion: null

  # Public: The entry point into the Atom application.
  @open: (options) ->
@@ -130,51 +129,42 @@ class AtomApplication

  # Enable updates unless running from a local build of Atom.
  setupAutoUpdater: ->
+    return if /\w{7}/.test(@version) # Only released versions should check for updates.
+
    autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}"

    autoUpdater.on 'checking-for-update', =>
+      @applicationMenu.showDownloadingUpdateItem(false)
      @applicationMenu.showInstallUpdateItem(false)
      @applicationMenu.showCheckForUpdateItem(false)

    autoUpdater.on 'update-not-available', =>
-      @applicationMenu.showInstallUpdateItem(false)
      @applicationMenu.showCheckForUpdateItem(true)

-    autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseName, releaseDate, releaseURL) =>
-      atomWindow.sendCommand('window:update-available', releaseName) for atomWindow in @windows
+    autoUpdater.on 'update-available', =>
+      @applicationMenu.showDownloadingUpdateItem(true)
+
+    autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) =>
+      atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows
      @applicationMenu.showInstallUpdateItem(true)
-      @applicationMenu.showCheckForUpdateItem(false)
-      @updateVersion = releaseName

    autoUpdater.on 'error', (event, message) =>
-      @applicationMenu.showInstallUpdateItem(false)
      @applicationMenu.showCheckForUpdateItem(true)

    # Check for update after Atom has fully started and the menus are created
    setTimeout((-> autoUpdater.checkForUpdates()), 5000)

  checkForUpdate: ->
-    autoUpdater.once 'update-available', ->
-      dialog.showMessageBox
-        type: 'info'
-        buttons: ['OK']
-        message: 'Update available.'
-        detail: 'A new update is being downloaded.'
+    @onUpdateNotAvailable ?= =>
+      autoUpdater.removeListener 'error', @onUpdateError
+      dialog.showMessageBox type: 'info', buttons: ['OK'], message: 'No update available.', detail: "Version #{@version} is the latest version."

-    autoUpdater.once 'update-not-available', =>
-      dialog.showMessageBox
-        type: 'info'
-        buttons: ['OK']
-        message: 'No update available.'
-        detail: "Version #{@version} is the latest version."
-
-    autoUpdater.once 'error', (event, message)->
-      dialog.showMessageBox
-        type: 'warning'
-        buttons: ['OK']
-        message: 'There was an error checking for updates.'
-        detail: message
+    @onUpdateError ?= (event, message) =>
+      autoUpdater.removeListener 'update-not-available', @onUpdateNotAvailable
+      dialog.showMessageBox type: 'warning', buttons: ['OK'], message: 'There was an error checking for updates.', detail: message

+    autoUpdater.once 'update-not-available', @onUpdateNotAvailable
+    autoUpdater.once 'error', @onUpdateError
    autoUpdater.checkForUpdates()

  # Registers basic application commands, non-idempotent.
@@ -427,8 +417,3 @@ class AtomApplication
  promptForPath: ({devMode}={}) ->
    dialog.showOpenDialog title: 'Open', properties: ['openFile', 'openDirectory', 'multiSelections', 'createDirectory'], (pathsToOpen) =>
      @openPaths({pathsToOpen, devMode})
-
-  # Public: If an update is available, it returns the new version string
-  # otherwise it returns null.
-  getUpdateVersion: ->
-    @updateVersion
@@ -104,7 +104,7 @@ class AtomWindow
        type: 'warning'
        buttons: ['Close Window', 'Reload', 'Keep It Open']
        message: 'The editor has crashed'
-        detail: 'Please report this issue to https://github.com/atom/atom/issues'
+        detail: 'Please report this issue to atom@github.com'
      switch chosen
        when 0 then @browserWindow.destroy()
        when 1 then @browserWindow.restart()
@@ -121,7 +121,6 @@ class AtomWindow
    if @loaded
      @focus()
      @sendCommand('window:open-path', {pathToOpen, initialLine})
-      @sendCommand('window:update-available', global.atomApplication.getUpdateVersion()) if global.atomApplication.getUpdateVersion()
    else
      @browserWindow.once 'window:loaded', => @openPath(pathToOpen, initialLine)

@@ -146,7 +146,7 @@ class DisplayBufferMarker
    @bufferMarker.setAttributes(attributes)

  matchesAttributes: (attributes) ->
-    attributes = @displayBuffer.translateToBufferMarkerAttributes(attributes)
+    attributes = @displayBuffer.translateToBufferMarkerParams(attributes)
    @bufferMarker.matchesAttributes(attributes)

  # Destroys the marker
@@ -10,6 +10,11 @@ Fold = require './fold'
 Token = require './token'
 DisplayBufferMarker = require './display-buffer-marker'

+class BufferToScreenConversionError extends Error
+  constructor: (@message, @metadata) ->
+    super
+    Error.captureStackTrace(this, BufferToScreenConversionError)
+
 module.exports =
 class DisplayBuffer extends Model
  Serializable.includeInto(this)
@@ -94,10 +99,11 @@ class DisplayBuffer extends Model
  #
  # editorWidthInChars - A {Number} of characters.
  setEditorWidthInChars: (editorWidthInChars) ->
-    previousWidthInChars = @editorWidthInChars
-    @editorWidthInChars = editorWidthInChars
-    if editorWidthInChars isnt previousWidthInChars and @softWrap
-      @updateWrappedScreenLines()
+    if editorWidthInChars > 0
+      previousWidthInChars = @editorWidthInChars
+      @editorWidthInChars = editorWidthInChars
+      if editorWidthInChars isnt previousWidthInChars and @softWrap
+        @updateWrappedScreenLines()

  getSoftWrapColumn: ->
    if atom.config.get('editor.softWrapAtPreferredLineLength')
@@ -164,7 +170,7 @@ class DisplayBuffer extends Model
  # Removes any folds found that contain the given buffer row.
  #
  # bufferRow - The buffer row {Number} to check against
-  destroyFoldsContainingBufferRow: (bufferRow) ->
+  unfoldBufferRow: (bufferRow) ->
    fold.destroy() for fold in @foldsContainingBufferRow(bufferRow)

  # Given a buffer row, this returns the largest fold that starts there.
@@ -209,6 +215,13 @@ class DisplayBuffer extends Model
  largestFoldContainingBufferRow: (bufferRow) ->
    @foldsContainingBufferRow(bufferRow)[0]

+  # Returns the folds in the given row range (exclusive of end row) that are
+  # not contained by any other folds.
+  outermostFoldsInBufferRowRange: (startRow, endRow) ->
+    @findFoldMarkers(containedInRange: [[startRow, 0], [endRow, 0]])
+      .map (marker) => @foldForMarker(marker)
+      .filter (fold) -> not fold.isInsideLargerFold()
+
  # Public: Given a buffer row, this returns folds that include it.
  #
  #
@@ -291,13 +304,15 @@ class DisplayBuffer extends Model
    { row, column } = @buffer.clipPosition(bufferPosition)
    [startScreenRow, endScreenRow] = @rowMap.screenRowRangeForBufferRow(row)
    for screenRow in [startScreenRow...endScreenRow]
-      unless screenLine = @screenLines[screenRow]
-        throw new Error """
-          No screen line exists for screen row #{screenRow}, converted from buffer position (#{row}, #{column})
-          Soft wrap enabled: #{@getSoftWrap()}
-          Fold count: #{@findFoldMarkers().length}
-          Last buffer row: #{@getLastRow()}
-        """
+      screenLine = @screenLines[screenRow]
+
+      unless screenLine?
+        throw new BufferToScreenConversionError "No screen line exists when converting buffer row to screen row",
+          softWrapEnabled: @getSoftWrap()
+          foldCount: @findFoldMarkers().length
+          lastBufferRow: @buffer.getLastRow()
+          lastScreenRow: @getLastRow()
+
      maxBufferColumn = screenLine.getMaxBufferColumn()
      if screenLine.isSoftWrapped() and column > maxBufferColumn
        continue
@@ -511,24 +526,34 @@ class DisplayBuffer extends Model
  # Refer to {DisplayBuffer::findMarkers} for details.
  #
  # Returns a {DisplayBufferMarker} or null
-  findMarker: (attributes) ->
-    @findMarkers(attributes)[0]
+  findMarker: (params) ->
+    @findMarkers(params)[0]

-  # Finds all valid markers satisfying the given attributes
+  # Public: Find all markers satisfying a set of parameters.
  #
-  # attributes - The attributes against which to compare the markers' attributes
-  #   There are some reserved keys that match against derived marker properties:
-  #   startBufferRow - The buffer row at which the marker starts
-  #   endBufferRow - The buffer row at which the marker ends
+  # params - An {Object} containing parameters that all returned markers must
+  #   satisfy. Unreserved keys will be compared against the markers' custom
+  #   properties. There are also the following reserved keys with special
+  #   meaning for the query:
+  #   :startBufferRow - A {Number}. Only returns markers starting at this row in
+  #     buffer coordinates.
+  #   :endBufferRow - A {Number}. Only returns markers ending at this row in
+  #     buffer coordinates.
+  #   :containsBufferRange - A {Range} or range-compatible {Array}. Only returns
+  #     markers containing this range in buffer coordinates.
+  #   :containsBufferPosition - A {Point} or point-compatible {Array}. Only
+  #     returns markers containing this position in buffer coordinates.
+  #   :containedInBufferRange - A {Range} or range-compatible {Array}. Only
+  #     returns markers contained within this range.
  #
  # Returns an {Array} of {DisplayBufferMarker}s
-  findMarkers: (attributes) ->
-    attributes = @translateToBufferMarkerAttributes(attributes)
-    @buffer.findMarkers(attributes).map (stringMarker) => @getMarker(stringMarker.id)
+  findMarkers: (params) ->
+    params = @translateToBufferMarkerParams(params)
+    @buffer.findMarkers(params).map (stringMarker) => @getMarker(stringMarker.id)

-  translateToBufferMarkerAttributes: (attributes) ->
-    stringMarkerAttributes = {}
-    for key, value of attributes
+  translateToBufferMarkerParams: (params) ->
+    bufferMarkerParams = {}
+    for key, value of params
      switch key
        when 'startBufferRow'
          key = 'startRow'
@@ -538,8 +563,10 @@ class DisplayBuffer extends Model
          key = 'containsRange'
        when 'containsBufferPosition'
          key = 'containsPosition'
-      stringMarkerAttributes[key] = value
-    stringMarkerAttributes
+        when 'containedInBufferRange'
+          key = 'containedInRange'
+      bufferMarkerParams[key] = value
+    bufferMarkerParams

  findFoldMarker: (attributes) ->
    @findFoldMarkers(attributes)[0]
@@ -577,6 +604,7 @@ class DisplayBuffer extends Model

  updateScreenLines: (startBufferRow, endBufferRow, bufferDelta=0, options={}) ->
    startBufferRow = @rowMap.bufferRowRangeForBufferRow(startBufferRow)[0]
+    endBufferRow = @rowMap.bufferRowRangeForBufferRow(endBufferRow - 1)[1]
    startScreenRow = @rowMap.screenRowRangeForBufferRow(startBufferRow)[0]
    endScreenRow = @rowMap.screenRowRangeForBufferRow(endBufferRow - 1)[1]

@@ -27,7 +27,7 @@ class EditorView extends View
  @characterWidthCache: {}
  @configDefaults:
    fontFamily: ''
-    fontSize: 20
+    fontSize: 16
    showInvisibles: false
    showIndentGuide: false
    showLineNumbers: true
@@ -193,7 +193,7 @@ class EditorView extends View
        'editor:unfold-all': => @editor.unfoldAll()
        'editor:fold-current-row': => @editor.foldCurrentRow()
        'editor:unfold-current-row': => @editor.unfoldCurrentRow()
-        'editor:fold-selection': => @editor.foldSelection()
+        'editor:fold-selection': => @editor.foldSelectedLines()
        'editor:fold-at-indent-level-1': => @editor.foldAllAtIndentLevel(0)
        'editor:fold-at-indent-level-2': => @editor.foldAllAtIndentLevel(1)
        'editor:fold-at-indent-level-3': => @editor.foldAllAtIndentLevel(2)
@@ -209,8 +209,8 @@ class EditorView extends View
        'editor:copy-path': => @copyPathToClipboard()
        'editor:move-line-up': => @editor.moveLineUp()
        'editor:move-line-down': => @editor.moveLineDown()
-        'editor:duplicate-line': => @editor.duplicateLine()
-        'editor:join-line': => @editor.joinLine()
+        'editor:duplicate-lines': => @editor.duplicateLines()
+        'editor:join-lines': => @editor.joinLines()
        'editor:toggle-indent-guide': => atom.config.toggle('editor.showIndentGuide')
        'editor:toggle-line-numbers': =>  atom.config.toggle('editor.showLineNumbers')
        'editor:scroll-to-cursor': => @scrollToCursorPosition()
@@ -667,11 +667,15 @@ class EditorView extends View
    @editor.setSoftWrap(not @editor.getSoftWrap())

  calculateWidthInChars: ->
-    Math.floor(@scrollView.width() / @charWidth)
+    Math.floor((@scrollView.width() - @getScrollbarWidth()) / @charWidth)

  calculateHeightInLines: ->
    Math.ceil($(window).height() / @lineHeight)

+  getScrollbarWidth: ->
+    scrollbarElement = @verticalScrollbar[0]
+    scrollbarElement.offsetWidth - scrollbarElement.clientWidth
+
  # Public: Enables/disables soft wrap on the editor.
  #
  # softWrap - A {Boolean} which, if `true`, enables soft wrap
@@ -41,6 +41,10 @@ class Fold
      range.end.column = 0
    range

+  getBufferRowRange: ->
+    {start, end} = @getBufferRange()
+    [start.row, end.row]
+
  # Returns the fold's start row as a {Number}.
  getStartRow: ->
    @getBufferRange().start.row
@@ -21,7 +21,13 @@ class KeyBinding
      keys = @parseKeystroke(keystroke)
      modifiers = keys[0...-1]
      modifiers.sort()
-      [modifiers..., _.last(keys)].join('-')
+      key = _.last(keys)
+
+      modifiers.push 'shift' if /^[A-Z]$/.test(key) and 'shift' not in modifiers
+      key = key.toUpperCase() if /^[a-z]$/.test(key) and 'shift' in modifiers
+
+      [modifiers..., key].join('-')
+
    normalizedKeystroke.join(' ')

  @parseKeystroke: (keystroke) ->
@@ -29,9 +35,10 @@ class KeyBinding
      try
        @parser = require './keystroke-pattern'
      catch
+        {allowUnsafeEval} = require 'loophole'
        keystrokePattern = fs.readFileSync(require.resolve('./keystroke-pattern.pegjs'), 'utf8')
        PEG = require 'pegjs'
-        @parser = PEG.buildParser(keystrokePattern)
+        allowUnsafeEval => @parser = PEG.buildParser(keystrokePattern)

    @parser.parse(keystroke)

@@ -99,10 +99,12 @@ class Keymap
      modifiers.push 'cmd'
    if event.ctrlKey and key not in Modifiers
      modifiers.push 'ctrl'
-
    if event.shiftKey and key not in Modifiers
-      isNamedKey = key.length > 1
-      modifiers.push 'shift' if isNamedKey
+      # Don't push the shift modifier on single letter non-alpha keys (e.g. { or ')
+      modifiers.push 'shift' unless /^[^a-z]$/i.test(key)
+
+    if 'shift' in modifiers and /^[a-z]$/i.test(key)
+      key = key.toUpperCase()
    else
      key = key.toLowerCase()

@@ -121,12 +121,6 @@ class LanguageMode
      fold = @editor.displayBuffer.largestFoldStartingAtBufferRow(startRow)
      return @editor.createFold(startRow, endRow) unless fold

-  # Given a buffer row, this unfolds it.
-  #
-  # bufferRow - A {Number} indicating the buffer row
-  unfoldBufferRow: (bufferRow) ->
-    @editor.displayBuffer.largestFoldContainingBufferRow(bufferRow)?.destroy()
-
  # Find the row range for a fold at a given bufferRow. Will handle comments
  # and code.
  #
@@ -41,7 +41,7 @@ class PackageManager

  # Public: Get the path to the apm command
  getApmPath: ->
-    @apmPath ?= require.resolve('atom-package-manager/bin/apm')
+    @apmPath ?= path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')

  # Public: Get the paths being used to look for packages.
  #
@@ -189,8 +189,8 @@ class Project extends Model
  #
  # Returns a promise that resolves to the {TextBuffer}.
  buildBuffer: (absoluteFilePath) ->
-    if fs.getSizeSync(absoluteFilePath) >= 1048576 # 1MB
-      throw new Error("Atom can only handle files < 1MB, for now.")
+    if fs.getSizeSync(absoluteFilePath) >= 2 * 1048576 # 2MB
+      throw new Error("Atom can only handle files < 2MB, for now.")

    buffer = new TextBuffer({filePath: absoluteFilePath})
    @addBuffer(buffer)
@@ -251,6 +251,7 @@ class Project extends Model

    for buffer in @getBuffers() when buffer.isModified()
      filePath = buffer.getPath()
+      continue unless @contains(filePath)
      matches = []
      buffer.scan regex, (match) -> matches.push match
      iterator {filePath, matches} if matches.length > 0
@@ -56,6 +56,11 @@ class SelectListView extends View
    @filterEditorView.hiddenInput.on 'focusout', =>
      @cancel() unless @cancelling

+    # This prevents the focusout event from firing on the filter editor view
+    # when the list is scrolled by clicking the scrollbar and dragging.
+    @list.on 'mousedown', ({target}) =>
+      false if target is @list[0]
+
    @on 'core:move-up', =>
      @selectPreviousItemView()
    @on 'core:move-down', =>
@@ -282,7 +282,7 @@ class Selection
  #   :undo - if `skip`, skips the undo stack for this operation.
  insertText: (text, options={}) ->
    oldBufferRange = @getBufferRange()
-    @editor.destroyFoldsContainingBufferRow(oldBufferRange.end.row)
+    @editor.unfoldBufferRow(oldBufferRange.end.row)
    wasReversed = @isReversed()
    @clear()
    @cursor.needsAutoscroll = @cursor.isLastCursor()
@@ -334,11 +334,15 @@ class Selection

    normalizedLines.join('\n')

-  # Public: Indents the selection.
+  # Indent the current line(s).
+  #
+  # If the selection is empty, indents the current line if the cursor precedes
+  # non-whitespace characters, and otherwise inserts a tab. If the selection is
+  # non empty, calls {::indentSelectedRows}.
  #
  # options - A {Object} with the keys:
-  #   :autoIndent - If `true`, the indentation is performed appropriately.
-  #                 Otherwise, {Editor::getTabText} is used.
+  #   :autoIndent - If `true`, the line is indented to an automatically-inferred
+  #                 level. Otherwise, {Editor::getTabText} is inserted.
  indent: ({ autoIndent }={})->
    { row, column } = @cursor.getBufferPosition()

@@ -433,7 +437,7 @@ class Selection
  # Public: Joins the current line with the one below it.
  #
  # If there selection spans more than one line, all the lines are joined together.
-  joinLine: ->
+  joinLines: ->
    selectedRange = @getBufferRange()
    if selectedRange.isEmpty()
      return if selectedRange.start.row is @editor.buffer.getLastRow()
@@ -6,6 +6,7 @@ class TokenizedLine
    @tokens = @breakOutAtomicTokens(tokens, tabLength)
    @startBufferColumn ?= 0
    @text = _.pluck(@tokens, 'value').join('')
+    @bufferDelta = _.sum(_.pluck(@tokens, 'bufferDelta'))

  copy: ->
    new TokenizedLine({@tokens, @lineEnding, @ruleStack, @startBufferColumn, @fold})
@@ -55,7 +56,7 @@ class TokenizedLine
      @text.length

  getMaxBufferColumn: ->
-    @startBufferColumn + @getMaxScreenColumn()
+    @startBufferColumn + @bufferDelta

  softWrapAt: (column) ->
    return [new TokenizedLine([], '', [0, 0], [0, 0]), this] if column == 0
@@ -78,7 +79,7 @@ class TokenizedLine
    )
    rightFragment = new TokenizedLine(
      tokens: rightTokens
-      startBufferColumn: @startBufferColumn + column
+      startBufferColumn: @bufferColumnForScreenColumn(column)
      ruleStack: @ruleStack
      lineEnding: @lineEnding
    )
@@ -3,6 +3,7 @@ path = require 'path'
 Q = require 'q'
 _ = require 'underscore-plus'
 Delegator = require 'delegato'
+scrollbarStyle = require 'scrollbar-style'
 {$, $$, View} = require './space-pen-extensions'
 fs = require 'fs-plus'
 Workspace = require './workspace'
@@ -14,38 +15,42 @@ PaneRowView = require './pane-row-view'
 PaneContainerView = require './pane-container-view'
 Editor = require './editor'

-# Public: The container for the entire Atom application.
+# Public: The top-level view for the entire window. An instance of this class is
+# available via the `atom.workspaceView` global.
 #
-# An instance of this class is always available as the `atom.workspaceView`
-# global.
+# It is backed by a model object, an instance of {Workspace}, which is available
+# via the `atom.workspace` global or {::getModel}. You should prefer to interact
+# with the model object when possible, but it won't always be possible with the
+# current API.
 #
-# ## Commands
+# ## Adding Perimiter Panels
 #
-#  * `application:about` - Opens the about dialog.
-#  * `application:show-settings` - Opens the preference pane in the currently
-#    focused editor.
-#  * `application:quit` - Quits the entire application.
-#  * `application:hide` - Hides the entire application.
-#  * `application:hide-other-applications` - Hides other applications
-#    running on the system.
-#  * `application:unhide-other-applications` - Shows other applications
-#    that were previously hidden.
-#  * `application:new-window` - Opens a new {AtomWindow} with no {Project}
-#    path.
-#  * `application:new-file` - Creates a new file within the focused window.
-#    Note: only one new file may exist within an {AtomWindow} at a time.
-#  * `application:open` - Prompts the user for a path to open in a new {AtomWindow}
-#  * `application:minimize` - Minimizes the currently focused {AtomWindow}
-#  * `application:zoom` - Expands the window to fill the screen or returns it to
-#    it's original unzoomed size.
-#  * `application:bring-all-windows-to-front` - Brings all {AtomWindow}s to the
-#    the front.
+# Use the following methods if possible to attach panels to the perimiter of the
+# workspace rather than manipulating the DOM directly to better insulate you to
+# changes in the workspace markup:
+#
+# * {::prependToTop}
+# * {::appendToTop}
+# * {::prependToBottom}
+# * {::appendToBottom}
+# * {::prependToLeft}
+# * {::appendToLeft}
+# * {::prependToRight}
+# * {::appendToRight}
 #
 # ## Requiring in package specs
 #
+# If you need a `WorkspaceView` instance to test your package, require it via
+# the built-in `atom` module.
+#
 # ```coffee
 #   {WorkspaceView} = require 'atom'
 # ```
+#
+# You can assign it to the `atom.workspaceView` global in the spec or just use
+# it as a local, depending on what you're trying to accomplish. Building the
+# `WorkspaceView` is currently expensive, so you should try build a {Workspace}
+# instead if possible.
 module.exports =
 class WorkspaceView extends View
  Delegator.includeInto(this)
@@ -81,6 +86,14 @@ class WorkspaceView extends View

    @subscribe @model, 'uri-opened', => @trigger 'uri-opened'

+    @subscribe scrollbarStyle, (style) =>
+      @removeClass('scrollbars-visible-always scrollbars-visible-when-scrolling')
+      switch style
+        when 'legacy'
+          @addClass("scrollbars-visible-always")
+        when 'overlay'
+          @addClass("scrollbars-visible-when-scrolling")
+
    @updateTitle()

    @on 'focus', (e) => @handleFocus(e)
@@ -139,6 +152,12 @@ class WorkspaceView extends View
    @command 'core:save', => @saveActivePaneItem()
    @command 'core:save-as', => @saveActivePaneItemAs()

+  # Public: Get the underlying model object.
+  #
+  # Returns a {Workspace}.
+  getModel: -> @model
+
+  # Public: Install the Atom shell commands on the user's system.
  installShellCommands: ->
    showErrorDialog = (error) ->
      installDirectory = CommandInstaller.getInstallDirectory()
@@ -176,11 +195,11 @@ class WorkspaceView extends View
  afterAttach: (onDom) ->
    @focus() if onDom

-  # Public: Shows a dialog asking if the pane was _really_ meant to be closed.
+  # Prompts to save all unsaved items
  confirmClose: ->
    @panes.confirmClose()

-  # Public: Updates the application's title, based on whichever file is open.
+  # Updates the application's title, based on whichever file is open.
  updateTitle: ->
    if projectPath = atom.project.getPath()
      if item = @getActivePaneItem()
@@ -190,85 +209,119 @@ class WorkspaceView extends View
    else
      @setTitle('untitled')

-  # Public: Sets the application's title.
+  # Sets the application's title.
  setTitle: (title) ->
    document.title = title

-  # Returns an Array of  all of the application's {EditorView}s.
+  # Get all editor views.
+  #
+  # You should prefer {Workspace::getEditors} unless you absolutely need access
+  # to the view objects. Also consider using {::eachEditorView}, which will call
+  # a callback for all current and *future* editor views.
+  #
+  # Returns an {Array} of {EditorView}s.
  getEditorViews: ->
    @panes.find('.pane > .item-views > .editor').map(-> $(this).view()).toArray()

-  # Public: Prepends the element to the top of the window.
+  # Public: Prepend an element or view to the panels at the top of the
+  # workspace.
  prependToTop: (element) ->
    @vertical.prepend(element)

-  # Public: Appends the element to the top of the window.
+  # Public: Append an element or view to the panels at the top of the workspace.
  appendToTop: (element) ->
    @panes.before(element)

-  # Public: Prepends the element to the bottom of the window.
+  # Public: Prepend an element or view to the panels at the bottom of the
+  # workspace.
  prependToBottom: (element) ->
    @panes.after(element)

-  # Public: Appends the element to bottom of the window.
+  # Public: Append an element or view to the panels at the bottom of the
+  # workspace.
  appendToBottom: (element) ->
    @vertical.append(element)

-  # Public: Prepends the element to the left side of the window.
+  # Public: Prepend an element or view to the panels at the left of the
+  # workspace.
  prependToLeft: (element) ->
    @horizontal.prepend(element)

-  # Public: Appends the element to the left side of the window.
+  # Public: Append an element or view to the panels at the left of the
+  # workspace.
  appendToLeft: (element) ->
    @vertical.before(element)

-  # Public: Prepends the element to the right side of the window.
+  # Public: Prepend an element or view to the panels at the right of the
+  # workspace.
  prependToRight: (element) ->
    @vertical.after(element)

-  # Public: Appends the element to the right side of the window.
+  # Public: Append an element or view to the panels at the right of the
+  # workspace.
  appendToRight: (element) ->
    @horizontal.append(element)

-  # Public: Returns the currently focused {PaneView}.
+  # Public: Get the active pane view.
+  #
+  # Prefer {Workspace::getActivePane} if you don't actually need access to the
+  # view.
+  #
+  # Returns a {PaneView}.
  getActivePaneView: ->
    @panes.getActivePane()

-  # Public: Returns the currently focused item from within the focused {PaneView}
-  getActivePaneItem: ->
-    @model.activePaneItem
-
-  # Public: Returns the view of the currently focused item.
+  # Public: Get the view associated with the active pane item.
+  #
+  # Returns a view.
  getActiveView: ->
    @panes.getActiveView()

-  # Public: Focuses the previous pane by id.
+  # Focus the previous pane by id.
  focusPreviousPaneView: -> @model.activatePreviousPane()

-  # Public: Focuses the next pane by id.
+  # Focus the next pane by id.
  focusNextPaneView: -> @model.activateNextPane()

-  # Public: Focuses the pane directly above the active pane.
+  # Public: Focus the pane directly above the active pane.
  focusPaneViewAbove: -> @panes.focusPaneViewAbove()

-  # Public: Focuses the pane directly below the active pane.
+  # Public: Focus the pane directly below the active pane.
  focusPaneViewBelow: -> @panes.focusPaneViewBelow()

-  # Public: Focuses the pane directly to the left of the active pane.
+  # Public: Focus the pane directly to the left of the active pane.
  focusPaneViewOnLeft: -> @panes.focusPaneViewOnLeft()

-  # Public: Focuses the pane directly to the right of the active pane.
+  # Public: Focus the pane directly to the right of the active pane.
  focusPaneViewOnRight: -> @panes.focusPaneViewOnRight()

-  # Public: Fires a callback on each open {PaneView}.
+  # Public: Register a function to be called for every current and future
+  # pane view in the workspace.
+  #
+  # callback - A {Function} with a {PaneView} as its only argument.
+  #
+  # Returns a subscription object with an `.off` method that you can call to
+  # unregister the callback.
  eachPaneView: (callback) ->
    @panes.eachPaneView(callback)

+  # Public: Get all existing pane views.
+  #
+  # Prefer {Workspace::getPanes} if you don't need access to the view objects.
+  # Also consider using {::eachPaneView} if you want to register a callback for
+  # all current and *future* pane views.
+  #
  # Returns an Array of all open {PaneView}s.
  getPaneViews: ->
    @panes.getPanes()

-  # Public: Fires a callback on each open {EditorView}.
+  # Public: Register a function to be called for every current and future
+  # editor view in the workspace.
+  #
+  # callback - A {Function} with an {EditorView} as its only argument.
+  #
+  # Returns a subscription object with an `.off` method that you can call to
+  # unregister the callback.
  eachEditorView: (callback) ->
    callback(editor) for editor in @getEditorViews()
    attachedCallback = (e, editor) -> callback(editor)
@@ -290,3 +343,7 @@ class WorkspaceView extends View
  # Deprecated
  getActivePane: ->
    @getActivePaneView()
+
+  # Deprecated: Call {Workspace::getActivePaneItem} instead.
+  getActivePaneItem: ->
+    @model.activePaneItem
@@ -7,18 +7,18 @@ Delegator = require 'delegato'
 PaneContainer = require './pane-container'
 Pane = require './pane'

-# Public: Represents the view state of the entire window, including the panes at
-# the center and panels around the periphery.
+# Public: Represents the state of the user interface for the entire window.
+# An instance of this class is available via the `atom.workspace` global.
 #
-# An instance of this class is always available as the `atom.workspace` global.
+# Interact with this object to open files, be notified of current and future
+# editors, and manipulate panes. To add panels, you'll need to use the
+# {WorkspaceView} class for now until we establish APIs at the model layer.
 module.exports =
 class Workspace extends Model
  atom.deserializers.add(this)
  Serializable.includeInto(this)

  @delegatesProperty 'activePane', 'activePaneItem', toProperty: 'paneContainer'
-  @delegatesMethod 'getPanes', 'saveAll', 'activateNextPane', 'activatePreviousPane',
-    toProperty: 'paneContainer'

  @properties
    paneContainer: -> new PaneContainer
@@ -49,31 +49,41 @@ class Workspace extends Model
    paneContainer: @paneContainer.serialize()
    fullScreen: atom.isFullScreen()

-  # Public: Calls callback for every existing {Editor} and for all new {Editor}s.
-  # that are created.
+  # Public: Register a function to be called for every current and future
+  # {Editor} in the workspace.
  #
-  # callback - A {Function} with an {Editor} as its only argument
+  # callback - A {Function} with an {Editor} as its only argument.
+  #
+  # Returns a subscription object with an `.off` method that you can call to
+  # unregister the callback.
  eachEditor: (callback) ->
    atom.project.eachEditor(callback)

-  # Public: Returns an {Array} of all open {Editor}s.
+  # Public: Get all current editors in the workspace.
+  #
+  # Returns an {Array} of {Editor}s.
  getEditors: ->
    atom.project.getEditors()

-  # Public: Asynchronously opens a given a filepath in Atom.
+  # Public: Open a given a URI in Atom asynchronously.
  #
-  # uri - A {String} uri.
-  # options  - An options {Object} (default: {}).
-  #   :initialLine - A {Number} indicating which line number to open to.
-  #   :split - A {String} ('left' or 'right') that opens the filePath in a new
-  #            pane or an existing one if it exists.
-  #   :changeFocus - A {Boolean} that allows the filePath to be opened without
-  #                  changing focus.
-  #   :searchAllPanes - A {Boolean} that will open existing editors from any pane
-  #                     if the uri is already open (default: false)
+  # uri - A {String} containing a URI.
+  # options  - An optional options {Object}
+  #   :initialLine - A {Number} indicating which row to move the cursor to
+  #                  initially. Defaults to `0`.
+  #   :split - Either 'left' or 'right'. If 'left', the item will be opened in
+  #            leftmost pane of the current active pane's row. If 'right', the
+  #            item will be opened in the rightmost pane of the current active
+  #            pane's row.
+  #   :activatePane - A {Boolean} indicating whether to call {Pane::activate} on
+  #                   the containing pane. Defaults to `true`.
+  #   :searchAllPanes - A {Boolean}. If `true`, the workspace will attempt to
+  #                     activate an existing item for the given URI on any pane.
+  #                     If `false`, only the active pane will be searched for
+  #                     an existing item for the same URI. Defaults to `false`.
  #
  # Returns a promise that resolves to the {Editor} for the file URI.
-  open: (uri='', options={}) ->
+  open: (uri, options={}) ->
    searchAllPanes = options.searchAllPanes
    split = options.split
    uri = atom.project.resolve(uri)
@@ -89,10 +99,20 @@ class Workspace extends Model

    @openUriInPane(uri, pane, options)

+  # Public: Open Atom's license in the active pane.
  openLicense: ->
    @open(join(atom.getLoadSettings().resourcePath, 'LICENSE'))

-  # Only used in specs
+  # Synchronously open the given URI in the active pane. **Only use this method
+  # in specs. Calling this in production code will block the UI thread and
+  # everyone will be mad at you.**
+  #
+  # uri - A {String} containing a URI.
+  # options  - An optional options {Object}
+  #   :initialLine - A {Number} indicating which row to move the cursor to
+  #                  initially. Defaults to `0`.
+  #   :activatePane - A {Boolean} indicating whether to call {Pane::activate} on
+  #                   the containing pane. Defaults to `true`.
  openSync: (uri='', options={}) ->
    {initialLine} = options
    # TODO: Remove deprecated changeFocus option
@@ -112,8 +132,8 @@ class Workspace extends Model
  openUriInPane: (uri, pane, options={}) ->
    changeFocus = options.changeFocus ? true

-    item = pane.itemForUri(uri)
-    if uri
+    if uri?
+      item = pane.itemForUri(uri)
      item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
    item ?= atom.project.open(uri, options)

@@ -130,7 +150,8 @@ class Workspace extends Model
      .catch (error) ->
        console.error(error.stack ? error)

-  # Public: Reopens the last-closed item uri if it hasn't already been reopened.
+  # Public: Reopen the last-closed item's URI if it hasn't already been
+  # reopened.
  reopenItemSync: ->
    if uri = @destroyedItemUris.pop()
      @openSync(uri)
@@ -150,50 +171,88 @@ class Workspace extends Model
  registerOpener: (opener) ->
    atom.project.registerOpener(opener)

-  # Public: Remove a registered opener.
+  # Public: Unregister an opener registered with {::registerOpener}.
  unregisterOpener: (opener) ->
    atom.project.unregisterOpener(opener)

  getOpeners: ->
    atom.project.openers

-  # Public: Returns the active {Pane}.
+  # Public: Get the active {Pane}.
+  #
+  # Returns a {Pane}.
  getActivePane: ->
    @paneContainer.activePane

-  # Public: Returns the first pane {Pane} with an item for the given uri or
-  # undefined if none exists.
+  # Public: Get all {Pane}s.
+  #
+  # Returns an {Array} of {Pane}s.
+  getPanes: ->
+    @paneContainer.getPanes()
+
+  # Public: Save all pane items.
+  saveAll: ->
+    @paneContainer.saveAll()
+
+  # Public: Make the next pane active.
+  activateNextPane: ->
+    @paneContainer.activateNextPane()
+
+  # Public: Make the previous pane active.
+  activatePreviousPane: ->
+    @paneContainer.activatePreviousPane()
+
+  # Public: Get the first pane {Pane} with an item for the given URI.
+  #
+  # Returns a {Pane} or `undefined` if no pane exists for the given URI.
  paneForUri: (uri) ->
    @paneContainer.paneForUri(uri)

-  # Public: save the active item.
+  # Public: Save the active pane item.
+  #
+  # If the active pane item currently has a URI according to the item's
+  # `.getUri` method, calls `.save` on the item. Otherwise
+  # {::saveActivePaneItemAs} # will be called instead. This method does nothing
+  # if the active item does not implement a `.save` method.
  saveActivePaneItem: ->
    @activePane?.saveActiveItem()

-  # Public: save the active item as.
+  # Public: Prompt the user for a path and save the active pane item to it.
+  #
+  # Opens a native dialog where the user selects a path on disk, then calls
+  # `.saveAs` on the item with the selected path. This method does nothing if
+  # the active item does not implement a `.saveAs` method.
  saveActivePaneItemAs: ->
    @activePane?.saveActiveItemAs()

-  # Public: destroy/close the active item.
+  # Public: Destroy (close) the active pane item.
+  #
+  # Removes the active pane item and calls the `.destroy` method on it if one is
+  # defined.
  destroyActivePaneItem: ->
    @activePane?.destroyActiveItem()

-  # Public: destroy/close the active pane.
+  # Public: Destroy (close) the active pane.
  destroyActivePane: ->
    @activePane?.destroy()

-  # Public: Returns an {Editor} if the active pane item is an {Editor},
-  # or null otherwise.
+  # Public: Get the active item if it is an {Editor}.
+  #
+  # Returns an {Editor} or `undefined` if the current active item is not an
+  # {Editor}.
  getActiveEditor: ->
    @activePane?.getActiveEditor()

+  # Public: Increase the editor font size by 1px.
  increaseFontSize: ->
    atom.config.set("editor.fontSize", atom.config.get("editor.fontSize") + 1)

+  # Public: Decrease the editor font size by 1px.
  decreaseFontSize: ->
    fontSize = atom.config.get("editor.fontSize")
    atom.config.set("editor.fontSize", fontSize - 1) if fontSize > 1

+  # Public: Restore to a default editor font size.
  resetFontSize: ->
    atom.config.restoreDefault("editor.fontSize")

@@ -3,39 +3,9 @@
 <head>
  <title></title>

-  <script>
-    window.onload = function() {
-      var path = require('path');
-      var ipc = require('ipc');
-      try {
-        // Skip "?loadSettings=".
-        var loadSettings = JSON.parse(decodeURIComponent(location.search.substr(14)));
+  <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self'; style-src 'self' 'unsafe-inline';">

-        // Start the crash reporter before anything else.
-        require('crash-reporter').start({
-          productName: 'Atom',
-          companyName: 'GitHub',
-          // By explicitly passing the app version here, we could save the call
-          // of "require('remote').require('app').getVersion()".
-          extra: {_version: loadSettings.appVersion}
-        });
-
-        require('vm-compatibility-layer');
-        require('coffee-script').register();
-        require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
-        require(loadSettings.bootstrapScript);
-        ipc.sendChannel('window-command', 'window:loaded')
-      }
-      catch (error) {
-        var currentWindow = require('remote').getCurrentWindow();
-        currentWindow.setSize(800, 600);
-        currentWindow.center();
-        currentWindow.show();
-        currentWindow.openDevTools();
-        console.error(error.stack || error);
-      }
-    }
-  </script>
+  <script src="index.js"></script>
 </head>
 <body tabindex="-1">
 </body>
@@ -0,0 +1,31 @@
+window.onload = function() {
+  var path = require('path');
+  var ipc = require('ipc');
+  try {
+    // Skip "?loadSettings=".
+    var loadSettings = JSON.parse(decodeURIComponent(location.search.substr(14)));
+
+    // Start the crash reporter before anything else.
+    require('crash-reporter').start({
+      productName: 'Atom',
+      companyName: 'GitHub',
+      // By explicitly passing the app version here, we could save the call
+      // of "require('remote').require('app').getVersion()".
+      extra: {_version: loadSettings.appVersion}
+    });
+
+    require('vm-compatibility-layer');
+    require('coffee-script').register();
+    require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
+    require(loadSettings.bootstrapScript);
+    ipc.sendChannel('window-command', 'window:loaded')
+  }
+  catch (error) {
+    var currentWindow = require('remote').getCurrentWindow();
+    currentWindow.setSize(800, 600);
+    currentWindow.center();
+    currentWindow.show();
+    currentWindow.openDevTools();
+    console.error(error.stack || error);
+  }
+}
@@ -24,6 +24,7 @@
    display: -webkit-flex;
    -webkit-flex: 1;
    -webkit-flex-direction: column;
+    overflow: hidden;

    .item-views {
      -webkit-flex: 1;
@@ -1,8 +1,29 @@
-// This file has fallback variables. It specifies the syntax variables that
-// themes must implement.
+// This file has fallback variables. It specifies all syntax variables that
+// themes must implement if they include a syntax-variables.less file.

-// Colors
+// General colors
+@syntax-text-color: #333;
+@syntax-cursor-color: #333;
+@syntax-selection-color: #69c;
+@syntax-background-color: #fff;

-@syntax-color-added: #5293d8;
-@syntax-color-modified: #f78a46;
-@syntax-color-removed: #c00;
+// Guide colors
+@syntax-wrap-guide-color: #ccc;
+@syntax-indent-guide-color: #ccc;
+@syntax-invisible-character-color: #ccc;
+
+// For find and replace markers
+@syntax-result-marker-color: #444;
+@syntax-result-marker-color-selected: #000;
+
+// Gutter colors
+@syntax-gutter-text-color: #333;
+@syntax-gutter-text-color-selected: #000;
+@syntax-gutter-background-color: #ccc;
+@syntax-gutter-background-color-selected: #eee;
+
+// For git diff info. i.e. in the gutter
+@syntax-color-added: green;
+@syntax-color-modified: orange;
+@syntax-color-removed: red;
+@syntax-color-renamed: blue;