📝 Update return value docs

Both were needed to introduce disposables, but I mixed up the commit
message in the previous commit.

README.md

@@ -25,6 +25,17 @@ You can also download a `.zip` file from the [releases page](https://github.com/
 The Windows version does not currently automatically update so you will need to
 manually upgrade to future releases by re-downloading the `.zip` file.
 
+### Debian Linux (Ubuntu)
+
+Currently only a 64-bit version is available.
+
+1. Download `atom-amd64.deb` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
+2. Run `sudo dpkg --install atom-amd64.deb` on the downloaded package.
+3. Launch Atom using the installed `atom` command.
+
+The Linux version does not currently automatically update so you will need to
+repeat these steps to upgrade to future releases.
+
 ## Building
 
 * [Linux](docs/build-instructions/linux.md)

apm/package.json

@@ -1,11 +1,11 @@
 {
   "name": "atom-bundled-apm",
-  "description": "Atom's bundled APM",
+  "description": "Atom's bundled apm",
   "repository": {
     "type": "git",
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.93.2"
+    "atom-package-manager": "0.97.0"
   }
 }

atom.sh

@@ -50,7 +50,7 @@ if [ $OS == 'Mac' ]; then
 
   # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
   if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
+    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs dirname)
   fi
 
   # Exit if Atom can't be found

benchmark/benchmark-suite.coffee

@@ -7,7 +7,7 @@ describe "editorView.", ->
 
   beforeEach ->
     atom.workspaceViewParentSelector = '#jasmine-content'
-    atom.workspaceView = new WorkspaceView
+    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
     atom.workspaceView.attachToDom()
 
     atom.workspaceView.width(1024)

build/Gruntfile.coffee

@@ -39,6 +39,7 @@ module.exports = (grunt) ->
   tmpDir = os.tmpdir()
   appName = if process.platform is 'darwin' then 'Atom.app' else 'Atom'
   buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+  buildDir = path.resolve(buildDir)
   installDir = grunt.option('install-dir')
 
   home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
@@ -62,6 +63,8 @@ module.exports = (grunt) ->
     installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
     killCommand ='pkill -9 atom'
 
+  installDir = path.resolve(installDir)
+
   coffeeConfig =
     glob_to_multiple:
       expand: true
@@ -229,10 +232,11 @@ module.exports = (grunt) ->
 
   ciTasks = ['output-disk-space', 'download-atom-shell', 'build']
   ciTasks.push('dump-symbols') if process.platform isnt 'win32'
-  ciTasks.push('mkdeb') if process.platform is 'linux'
   ciTasks.push('set-version', 'check-licenses', 'lint')
-  ciTasks.push('test') if process.platform isnt 'linux'
-  ciTasks.push('codesign', 'publish-build')
+  ciTasks.push('mkdeb') if process.platform is 'linux'
+  ciTasks.push('test') if process.platform is 'darwin'
+  ciTasks.push('codesign')
+  ciTasks.push('publish-build')
   grunt.registerTask('ci', ciTasks)
 
   defaultTasks = ['download-atom-shell', 'build', 'set-version']

build/package.json

@@ -8,7 +8,6 @@
   "dependencies": {
     "async": "~0.2.9",
     "donna": "1.0.1",
-    "tello": "1.0.3",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
     "github-releases": "~0.2.0",
@@ -35,6 +34,8 @@
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
     "runas": "~1.0.1",
+    "tello": "1.0.3",
+    "temp": "~0.8.1",
     "underscore-plus": "1.x",
     "unzip": "~0.1.9",
     "vm-compatibility-layer": "~0.1.0"

build/tasks/codesign-task.coffee

@@ -1,4 +1,5 @@
 path = require 'path'
+fs = require 'fs-plus'
 
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
@@ -25,12 +26,21 @@ module.exports = (grunt) ->
     switch process.platform
       when 'darwin'
         cmd = 'codesign'
-        args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+        args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
         spawn {cmd, args}, (error) -> callback(error)
       when 'win32'
         spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
           cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
           args = [path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
-          spawn {cmd, args}, (error) -> callback(error)
+
+          spawn {cmd, args}, (error) ->
+            return callback(error) if error?
+
+            setupExePath = path.join(grunt.config.get('atom.shellAppDir'), '..', 'Releases', 'setup.exe')
+            if fs.isFileSync(setupExePath)
+              args = [setupExePath]
+              spawn {cmd, args}, (error) -> callback(error)
+            else
+              callback()
       else
         callback()

build/tasks/create-installer.coffee

@@ -0,0 +1,41 @@
+fs = require 'fs'
+path = require 'path'
+_ = require 'underscore-plus'
+
+module.exports = (grunt) ->
+  {spawn, rm} = require('./task-helpers')(grunt)
+
+  grunt.registerTask 'create-installer', 'Create the Windows installer', ->
+    return unless process.platform is 'win32'
+
+    done = @async()
+
+    buildDir = grunt.config.get('atom.buildDir')
+    atomDir = path.join(buildDir, 'Atom')
+
+    packageInfo = grunt.file.readJSON(path.join(atomDir, 'resources', 'app', 'package.json'))
+    inputTemplate = grunt.file.read(path.join('build', 'windows', 'atom.nuspec.erb'))
+
+    # NB: Build server has some sort of stamp on the version number
+    packageInfo.version = packageInfo.version.replace(/-.*$/, '')
+
+    targetNuspecPath = path.join(buildDir, 'atom.nuspec')
+    grunt.file.write(targetNuspecPath, _.template(inputTemplate, packageInfo))
+
+    cmd = 'build/windows/nuget.exe'
+    args = ['pack', targetNuspecPath, '-BasePath', atomDir, '-OutputDirectory', buildDir]
+
+    spawn {cmd, args}, (error, result, code) ->
+      return done(error) if error?
+
+      pkgs = pkg for pkg in fs.readdirSync(buildDir) when path.extname(pkg) is '.nupkg'
+
+      releasesDir = path.join(buildDir, 'Releases')
+
+      # NB: Gonna clear Releases for now, in the future we need to pull down
+      # the existing version
+      rm(releasesDir)
+
+      cmd = 'build/windows/update.com'
+      args = ['--releasify', path.join(buildDir, pkgs), '-r', releasesDir, '-g', 'build/windows/install-spinner.gif']
+      spawn {cmd, args}, (error, result, code) -> done(error)

build/tasks/install-task.coffee

@@ -3,6 +3,7 @@ path = require 'path'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 runas = null
+temp = require 'temp'
 
 module.exports = (grunt) ->
   {cp, mkdir, rm} = require('./task-helpers')(grunt)
@@ -22,7 +23,11 @@ module.exports = (grunt) ->
     else if process.platform is 'darwin'
       rm installDir
       mkdir path.dirname(installDir)
-      cp shellAppDir, installDir
+
+      tempFolder = temp.path()
+      mkdir tempFolder
+      cp shellAppDir, tempFolder
+      fs.renameSync(tempFolder, installDir)
     else
       binDir = path.join(installDir, 'bin')
       shareDir = path.join(installDir, 'share', 'atom')

build/tasks/publish-build-task.coffee

@@ -58,11 +58,12 @@ getAssets = ->
       ]
     when 'linux'
       buildDir = grunt.config.get('atom.buildDir')
-      sourcePath = fs.listSync(buildDir, ['.deb'])[0]
-      if process.arch is 'ia32g'
+      if process.arch is 'ia32'
         arch = 'i386'
       else
         arch = 'amd64'
+      {version} = grunt.file.readJSON('package.json')
+      sourcePath = "#{buildDir}/atom-#{version}-#{arch}.deb"
       assetName = "atom-#{arch}.deb"
 
       {cp} = require('./task-helpers')(grunt)

build/tasks/spec-task.coffee

@@ -109,7 +109,6 @@ module.exports = (grunt) ->
       grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
 
       if process.platform is 'win32' and process.env.JANKY_SHA1
-        # Package specs are still flaky on Windows CI
-        done(!coreSpecFailed)
+        done()
       else
         done(!coreSpecFailed and failedPackages.length == 0)

build/tasks/task-helpers.coffee

@@ -53,8 +53,9 @@ module.exports = (grunt) ->
     proc = childProcess.spawn(options.cmd, options.args, options.opts)
     proc.stdout.on 'data', (data) -> stdout.push(data.toString())
     proc.stderr.on 'data', (data) -> stderr.push(data.toString())
+    proc.on 'error', (processError) -> error ?= processError
     proc.on 'close', (exitCode, signal) ->
-      error = new Error(signal) if exitCode != 0
+      error ?= new Error(signal) if exitCode != 0
       results = {stderr: stderr.join(''), stdout: stdout.join(''), code: exitCode}
       grunt.log.error results.stderr if exitCode != 0
       callback(error, results, exitCode)

build/windows/atom.nuspec.erb

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id><%= name %></id>
+        <version><%= version %></version>
+        <authors>The Atom Community</authors>
+        <owners>The Atom Community</owners>
+        <iconUrl>https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description><%= description %></description>
+    </metadata>
+    <files>
+        <file src="locales\**" target="lib\net45\locales" />
+        <file src="resources\**" target="lib\net45\resources" />
+        <file src="*.pak" target="lib\net45" />
+
+        <file src="atom.exe" target="lib\net45\atom.exe" />
+        <file src="atom.exe.gui" target="lib\net45\atom.exe.gui" />
+        <file src="chromiumcontent.dll" target="lib\net45\chromiumcontent.dll" />
+        <file src="d3dcompiler_43.dll" target="lib\net45\d3dcompiler_43.dll" />
+        <file src="ffmpegsumo.dll" target="lib\net45\ffmpegsumo.dll" />
+        <file src="icudtl.dat" target="lib\net45\icudtl.dat" />
+        <file src="libEGL.dll" target="lib\net45\libEGL.dll" />
+        <file src="libGLESv2.dll" target="lib\net45\libGLESv2.dll" />
+        <file src="LICENSE" target="lib\net45\LICENSE" />
+        <file src="msvcp120.dll" target="lib\net45\msvcp120.dll" />
+        <file src="msvcr120.dll" target="lib\net45\msvcr120.dll" />
+        <file src="vccorlib120.dll" target="lib\net45\vccorlib120.dll" />
+        <file src="version" target="lib\net45\version" />
+        <file src="xinput1_3.dll" target="lib\net45\xinput1_3.dll" />
+    </files>
+</package>

docs/advanced/configuration.md

@@ -48,15 +48,6 @@ but you can programmatically write to it with `atom.config.set`:
 atom.config.set("core.showInvisibles", true)
 ```
 
-You should never mutate the value of a config key, because that would circumvent
-the notification of observers. You can however use methods like `pushAtKeyPath`,
-`unshiftAtKeyPath`, and `removeAtKeyPath` to manipulate mutable config values.
-
-```coffeescript
-atom.config.pushAtKeyPath("core.disabledPackages", "wrap-guide")
-atom.config.removeAtKeyPath("core.disabledPackages", "terminal")
-```
-
 You can also use `setDefaults`, which will assign default values for keys that
 are always overridden by values assigned with `set`. Defaults are not written
 out to the the `config.json` file to prevent it from becoming cluttered.

docs/creating-a-package.md

@@ -321,6 +321,29 @@ extensions your grammar supports:
 ]
 ```
 
+## Adding Configuration Settings
+
+You can support config settings in your package that are editable in the
+settings view. Specify a `config` key in your package main:
+
+```coffeescript
+module.exports =
+  # Your config schema!
+  config:
+    someInt:
+      type: 'integer'
+      default: 23
+      minimum: 1
+  activate: (state) -> # ...
+  # ...
+```
+
+To define the configuration, we use [json schema][json-schema] which allows you
+to indicate the type your value should be, its default, etc.
+
+See the [Config API Docs](https://atom.io/docs/api/latest/Config) for more
+details specifying your configuration.
+
 ## Bundle External Resources
 
 It's common to ship external resources like images and fonts in the package, to
@@ -392,3 +415,4 @@ all the other available commands.
 [first-package]: your-first-package.html
 [convert-bundle]: converting-a-text-mate-bundle.html
 [convert-theme]: converting-a-text-mate-theme.html
+[json-schema]: http://json-schema.org/

exports/atom.coffee

@@ -1,9 +1,10 @@
 {Point, Range} = require 'text-buffer'
+{deprecate} = require 'grim'
 
 module.exports =
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
-  Git: require '../src/git'
+  GitRepository: require '../src/git-repository'
   Point: Point
   Range: Range
 
@@ -15,7 +16,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.$ = $
   module.exports.$$ = $$
   module.exports.$$$ = $$$
-  module.exports.EditorView = require '../src/editor-view'
+  module.exports.TextEditorView = require '../src/text-editor-view'
   module.exports.ScrollView = require '../src/scroll-view'
   module.exports.SelectListView = require '../src/select-list-view'
   module.exports.Task = require '../src/task'
@@ -24,3 +25,11 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.Workspace = require '../src/workspace'
   module.exports.React = require 'react-atom-fork'
   module.exports.Reactionary = require 'reactionary-atom-fork'
+
+Object.defineProperty module.exports, 'Git', get: ->
+  deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"
+  module.exports.GitRepository
+
+Object.defineProperty module.exports, 'EditorView', get: ->
+  deprecate "Please require `TextEditorView` instead of `EditorView`: `{TextEditorView} = require 'atom'`"
+  module.exports.TextEditorView

keymaps/darwin.cson

@@ -143,6 +143,8 @@
   # Sublime Parity
   'cmd-enter': 'editor:newline-below'
   'cmd-shift-enter': 'editor:newline-above'
+  'alt-enter': 'editor:newline'
+  'shift-enter': 'editor:newline'
   'cmd-]': 'editor:indent-selected-rows'
   'cmd-[': 'editor:outdent-selected-rows'
   'ctrl-cmd-up': 'editor:move-line-up'

menus/darwin.cson

@@ -199,8 +199,15 @@
   '.overlayer':
     'Undo': 'core:undo'
     'Redo': 'core:redo'
+    'separator1': '-'
     'Cut': 'core:cut'
     'Copy': 'core:copy'
     'Paste': 'core:paste'
     'Delete': 'core:delete'
     'Select All': 'core:select-all'
+    'separator2': '-'
+    'Split Up': 'pane:split-up'
+    'Split Down': 'pane:split-down'
+    'Split Left': 'pane:split-left'
+    'Split Right': 'pane:split-right'
+    'separator3': '-'

menus/linux.cson

@@ -156,8 +156,15 @@
   '.overlayer':
     'Undo': 'core:undo'
     'Redo': 'core:redo'
+    'separator1': '-'
     'Cut': 'core:cut'
     'Copy': 'core:copy'
     'Paste': 'core:paste'
     'Delete': 'core:delete'
     'Select All': 'core:select-all'
+    'separator2': '-'
+    'Split Up': 'pane:split-up'
+    'Split Down': 'pane:split-down'
+    'Split Left': 'pane:split-left'
+    'Split Right': 'pane:split-right'
+    'separator3': '-'

menus/win32.cson

@@ -33,8 +33,8 @@
       { label: '&Undo', command: 'core:undo' }
       { label: '&Redo', command: 'core:redo' }
       { type: 'separator' }
-      { label: '&Cut', command: 'core:cut' }
-      { label: 'C&opy', command: 'core:copy' }
+      { label: 'Cu&t', command: 'core:cut' }
+      { label: '&Copy', command: 'core:copy' }
       { label: 'Copy Pat&h', command: 'editor:copy-path' }
       { label: '&Paste', command: 'core:paste' }
       { label: 'Select &All', command: 'core:select-all' }
@@ -174,8 +174,15 @@
   '.overlayer':
     'Undo': 'core:undo'
     'Redo': 'core:redo'
+    'separator1': '-'
     'Cut': 'core:cut'
     'Copy': 'core:copy'
     'Paste': 'core:paste'
     'Delete': 'core:delete'
     'Select All': 'core:select-all'
+    'separator2': '-'
+    'Split Up': 'pane:split-up'
+    'Split Down': 'pane:split-down'
+    'Split Left': 'pane:split-left'
+    'Split Right': 'pane:split-right'
+    'separator3': '-'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.128.0",
+  "version": "0.133.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -20,7 +20,7 @@
   "atomShellVersion": "0.16.2",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.1.1",
+    "atom-keymap": "^2.2.0",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
@@ -28,7 +28,7 @@
     "delegato": "^1",
     "emissary": "^1.3.1",
     "event-kit": "0.7.2",
-    "first-mate": "^2.1.1",
+    "first-mate": "^2.2.0",
     "fs-plus": "^2.2.6",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
@@ -36,20 +36,20 @@
     "grim": "0.12.0",
     "guid": "0.0.10",
     "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.14.0",
+    "less-cache": "0.15.0",
     "mixto": "^1",
     "mkdirp": "0.3.5",
     "nslog": "^1.0.1",
     "oniguruma": "^3.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.1.2",
+    "pathwatcher": "^2.1.3",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
     "react-atom-fork": "^0.11.1",
     "reactionary-atom-fork": "^1.0.0",
     "runas": "1.0.1",
-    "scandal": "1.0.0",
+    "scandal": "1.0.2",
     "scoped-property-store": "^0.9.0",
     "scrollbar-style": "^1.0.2",
     "season": "^1.0.2",
@@ -57,7 +57,7 @@
     "serializable": "^1",
     "space-pen": "3.4.7",
     "temp": "0.7.0",
-    "text-buffer": "^3.2.4",
+    "text-buffer": "^3.2.6",
     "theorist": "^1.0.2",
     "underscore-plus": "^1.5.1",
     "vm-compatibility-layer": "0.1.0"
@@ -75,43 +75,43 @@
     "autocomplete": "0.32.0",
     "autoflow": "0.18.0",
     "autosave": "0.17.0",
-    "background-tips": "0.16.0",
+    "background-tips": "0.17.0",
     "bookmarks": "0.28.0",
-    "bracket-matcher": "0.55.0",
-    "command-palette": "0.24.0",
+    "bracket-matcher": "0.61.0",
+    "command-palette": "0.26.0",
     "deprecation-cop": "0.10.0",
     "dev-live-reload": "0.34.0",
     "exception-reporting": "0.20.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.138.0",
+    "find-and-replace": "0.139.0",
     "fuzzy-finder": "0.58.0",
     "git-diff": "0.39.0",
     "go-to-line": "0.25.0",
-    "grammar-selector": "0.29.0",
+    "grammar-selector": "0.34.0",
     "image-view": "0.36.0",
     "incompatible-packages": "0.9.0",
     "keybinding-resolver": "0.20.0",
     "link": "0.25.0",
-    "markdown-preview": "0.102.0",
-    "metrics": "0.34.0",
+    "markdown-preview": "0.103.0",
+    "metrics": "0.36.0",
     "open-on-github": "0.30.0",
     "package-generator": "0.31.0",
     "release-notes": "0.36.0",
-    "settings-view": "0.142.0",
-    "snippets": "0.52.0",
+    "settings-view": "0.148.0",
+    "snippets": "0.53.0",
     "spell-check": "0.42.0",
-    "status-bar": "0.44.0",
+    "status-bar": "0.45.0",
     "styleguide": "0.30.0",
-    "symbols-view": "0.63.0",
-    "tabs": "0.50.0",
+    "symbols-view": "0.66.0",
+    "tabs": "0.54.0",
     "timecop": "0.22.0",
-    "tree-view": "0.124.0",
+    "tree-view": "0.127.0",
     "update-package-dependencies": "0.6.0",
     "welcome": "0.18.0",
     "whitespace": "0.25.0",
     "wrap-guide": "0.22.0",
     "language-c": "0.28.0",
-    "language-coffee-script": "0.30.0",
+    "language-coffee-script": "0.35.0",
     "language-css": "0.17.0",
     "language-gfm": "0.50.0",
     "language-git": "0.9.0",
@@ -119,7 +119,7 @@
     "language-html": "0.26.0",
     "language-hyperlink": "0.12.0",
     "language-java": "0.11.0",
-    "language-javascript": "0.39.0",
+    "language-javascript": "0.40.0",
     "language-json": "0.8.0",
     "language-less": "0.15.0",
     "language-make": "0.12.0",
@@ -129,16 +129,16 @@
     "language-php": "0.16.0",
     "language-property-list": "0.7.0",
     "language-python": "0.19.0",
-    "language-ruby": "0.37.0",
+    "language-ruby": "0.38.0",
     "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.21.0",
+    "language-sass": "0.22.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.8.0",
-    "language-sql": "0.10.0",
+    "language-sql": "0.11.0",
     "language-text": "0.6.0",
-    "language-todo": "0.11.0",
+    "language-todo": "0.12.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.20.0",
+    "language-xml": "0.21.0",
     "language-yaml": "0.17.0"
   },
   "private": true,

resources/linux/debian/control.in

@@ -1,8 +1,10 @@
 Package: <%= name %>
 Version: <%= version %>
+Depends: python (>= 2.6), libc6
 Section: <%= section %>
 Priority: optional
 Architecture: <%= arch %>
 Installed-Size: <%= installedSize %>
 Maintainer: <%= maintainer %>
 Description: <%= description %>
+ Atom is a free and open source text editor that is modern, approachable, and hackable to the core.

resources/linux/debian/lintian-overrides

@@ -0,0 +1,7 @@
+atom: arch-dependent-file-in-usr-share
+atom: changelog-file-missing-in-native-package
+atom: copyright-file-contains-full-apache-2-license
+atom: copyright-should-refer-to-common-license-file-for-apache-2
+atom: embedded-library
+atom: package-installs-python-bytecode
+atom: unstripped-binary-or-object

script/mkdeb

@@ -16,7 +16,7 @@ DEB_PATH="$6"
 FILE_MODE=755
 
 TARGET_ROOT="`mktemp -d`"
-chmod 755 "$TARGET_ROOT"
+chmod $FILE_MODE "$TARGET_ROOT"
 TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
 
 mkdir -m $FILE_MODE -p "$TARGET/usr"
@@ -31,6 +31,17 @@ cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"
 mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
 
-dpkg-deb -b "$TARGET"
+# Copy generated LICENSE.md to /usr/share/doc/atom/copyright
+mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/atom"
+cp "$TARGET/usr/share/atom/resources/app/LICENSE.md" "$TARGET/usr/share/doc/atom/copyright"
+
+# Add lintian overrides
+mkdir -m $FILE_MODE -p "$TARGET/usr/share/lintian/overrides"
+cp "$ROOT/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/atom"
+
+# Remove executable bit from .node files
+find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \;
+
+fakeroot dpkg-deb -b "$TARGET"
 mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
-rm -rf $TARGET_ROOT
+rm -rf "$TARGET_ROOT"

spec/atom-reporter.coffee

@@ -76,6 +76,9 @@ class AtomReporter extends View
     @addSpecs(specs)
     $(document.body).append this
 
+    @on 'click', '.stack-trace', ->
+      $(this).toggleClass('expanded')
+
   reportRunnerResults: (runner) ->
     @updateSpecCounts()
     @status.addClass('alert-success').removeClass('alert-info') if @failedCount is 0

spec/atom-spec.coffee

@@ -6,542 +6,24 @@ ThemeManager = require '../src/theme-manager'
 
 describe "the `atom` global", ->
   beforeEach ->
-    atom.workspaceView = new WorkspaceView
+    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
 
-  describe "package lifecycle methods", ->
-    describe ".loadPackage(name)", ->
-      it "continues if the package has an invalid package.json", ->
-        spyOn(console, 'warn')
-        atom.config.set("core.disabledPackages", [])
-        expect(-> atom.packages.loadPackage("package-with-broken-package-json")).not.toThrow()
-
-      it "continues if the package has an invalid keymap", ->
-        atom.config.set("core.disabledPackages", [])
-        expect(-> atom.packages.loadPackage("package-with-broken-keymap")).not.toThrow()
-
-    describe ".unloadPackage(name)", ->
-      describe "when the package is active", ->
-        it "throws an error", ->
-          pack = null
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-main').then (p) -> pack = p
-
-          runs ->
-            expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
-            expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
-            expect( -> atom.packages.unloadPackage(pack.name)).toThrow()
-            expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
-            expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
-
-      describe "when the package is not loaded", ->
-        it "throws an error", ->
-          expect(atom.packages.isPackageLoaded('unloaded')).toBeFalsy()
-          expect( -> atom.packages.unloadPackage('unloaded')).toThrow()
-          expect(atom.packages.isPackageLoaded('unloaded')).toBeFalsy()
-
-      describe "when the package is loaded", ->
-        it "no longers reports it as being loaded", ->
-          pack = atom.packages.loadPackage('package-with-main')
-          expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
-          atom.packages.unloadPackage(pack.name)
-          expect(atom.packages.isPackageLoaded(pack.name)).toBeFalsy()
-
-    describe ".activatePackage(id)", ->
-      describe "atom packages", ->
-        describe "when called multiple times", ->
-          it "it only calls activate on the package once", ->
-            spyOn(Package.prototype, 'activateNow').andCallThrough()
-            atom.packages.activatePackage('package-with-index')
-            atom.packages.activatePackage('package-with-index')
-
-            waitsForPromise ->
-              atom.packages.activatePackage('package-with-index')
-
-            runs ->
-              expect(Package.prototype.activateNow.callCount).toBe 1
-
-        describe "when the package has a main module", ->
-          describe "when the metadata specifies a main module path˜", ->
-            it "requires the module at the specified path", ->
-              mainModule = require('./fixtures/packages/package-with-main/main-module')
-              spyOn(mainModule, 'activate')
-              pack = null
-              waitsForPromise ->
-                atom.packages.activatePackage('package-with-main').then (p) -> pack = p
-
-              runs ->
-                expect(mainModule.activate).toHaveBeenCalled()
-                expect(pack.mainModule).toBe mainModule
-
-          describe "when the metadata does not specify a main module", ->
-            it "requires index.coffee", ->
-              indexModule = require('./fixtures/packages/package-with-index/index')
-              spyOn(indexModule, 'activate')
-              pack = null
-              waitsForPromise ->
-                atom.packages.activatePackage('package-with-index').then (p) -> pack = p
-
-              runs ->
-                expect(indexModule.activate).toHaveBeenCalled()
-                expect(pack.mainModule).toBe indexModule
-
-          it "assigns config defaults from the module", ->
-            expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()
-
-            waitsForPromise ->
-              atom.packages.activatePackage('package-with-config-defaults')
-
-            runs ->
-              expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
-              expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
-
-          describe "when the package metadata includes activation events", ->
-            [mainModule, promise] = []
-
-            beforeEach ->
-              mainModule = require './fixtures/packages/package-with-activation-events/index'
-              spyOn(mainModule, 'activate').andCallThrough()
-              spyOn(Package.prototype, 'requireMainModule').andCallThrough()
-
-              promise = atom.packages.activatePackage('package-with-activation-events')
-
-            it "defers requiring/activating the main module until an activation event bubbles to the root view", ->
-              expect(promise.isFulfilled()).not.toBeTruthy()
-              atom.workspaceView.trigger 'activation-event'
-
-              waitsForPromise ->
-                promise
-
-            it "triggers the activation event on all handlers registered during activation", ->
-              waitsForPromise ->
-                atom.workspaceView.open()
-
-              runs ->
-                editorView = atom.workspaceView.getActiveView()
-                eventHandler = jasmine.createSpy("activation-event")
-                editorView.command 'activation-event', eventHandler
-                editorView.trigger 'activation-event'
-                expect(mainModule.activate.callCount).toBe 1
-                expect(mainModule.activationEventCallCount).toBe 1
-                expect(eventHandler.callCount).toBe 1
-                editorView.trigger 'activation-event'
-                expect(mainModule.activationEventCallCount).toBe 2
-                expect(eventHandler.callCount).toBe 2
-                expect(mainModule.activate.callCount).toBe 1
-
-            it "activates the package immediately when the events are empty", ->
-              mainModule = require './fixtures/packages/package-with-empty-activation-events/index'
-              spyOn(mainModule, 'activate').andCallThrough()
-
-              waitsForPromise ->
-                atom.packages.activatePackage('package-with-empty-activation-events')
-
-              runs ->
-                expect(mainModule.activate.callCount).toBe 1
-
-        describe "when the package has no main module", ->
-          it "does not throw an exception", ->
-            spyOn(console, "error")
-            spyOn(console, "warn").andCallThrough()
-            expect(-> atom.packages.activatePackage('package-without-module')).not.toThrow()
-            expect(console.error).not.toHaveBeenCalled()
-            expect(console.warn).not.toHaveBeenCalled()
-
-        it "passes the activate method the package's previously serialized state if it exists", ->
-          pack = null
-          waitsForPromise ->
-            atom.packages.activatePackage("package-with-serialization").then (p) -> pack = p
-
-          runs ->
-            expect(pack.mainModule.someNumber).not.toBe 77
-            pack.mainModule.someNumber = 77
-            atom.packages.deactivatePackage("package-with-serialization")
-            spyOn(pack.mainModule, 'activate').andCallThrough()
-            atom.packages.activatePackage("package-with-serialization")
-            expect(pack.mainModule.activate).toHaveBeenCalledWith({someNumber: 77})
-
-        it "logs warning instead of throwing an exception if the package fails to load", ->
-          atom.config.set("core.disabledPackages", [])
-          spyOn(console, "warn")
-          expect(-> atom.packages.activatePackage("package-that-throws-an-exception")).not.toThrow()
-          expect(console.warn).toHaveBeenCalled()
-
-        describe "keymap loading", ->
-          describe "when the metadata does not contain a 'keymaps' manifest", ->
-            it "loads all the .cson/.json files in the keymaps directory", ->
-              element1 = $$ -> @div class: 'test-1'
-              element2 = $$ -> @div class: 'test-2'
-              element3 = $$ -> @div class: 'test-3'
-
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])).toHaveLength 0
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
-
-              atom.packages.activatePackage("package-with-keymaps")
-
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe "test-1"
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])[0].command).toBe "test-2"
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
-
-          describe "when the metadata contains a 'keymaps' manifest", ->
-            it "loads only the keymaps specified by the manifest, in the specified order", ->
-              element1 = $$ -> @div class: 'test-1'
-              element3 = $$ -> @div class: 'test-3'
-
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
-
-              atom.packages.activatePackage("package-with-keymaps-manifest")
-
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe 'keymap-1'
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-n', target:element1[0])[0].command).toBe 'keymap-2'
-              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-y', target:element3[0])).toHaveLength 0
-
-        describe "menu loading", ->
-          beforeEach ->
-            atom.contextMenu.definitions = []
-            atom.menu.template = []
-
-          describe "when the metadata does not contain a 'menus' manifest", ->
-            it "loads all the .cson/.json files in the menus directory", ->
-              element = ($$ -> @div class: 'test-1')[0]
-
-              expect(atom.contextMenu.definitionsForElement(element)).toEqual []
-
-              atom.packages.activatePackage("package-with-menus")
-
-              expect(atom.menu.template.length).toBe 2
-              expect(atom.menu.template[0].label).toBe "Second to Last"
-              expect(atom.menu.template[1].label).toBe "Last"
-              expect(atom.contextMenu.definitionsForElement(element)[0].label).toBe "Menu item 1"
-              expect(atom.contextMenu.definitionsForElement(element)[1].label).toBe "Menu item 2"
-              expect(atom.contextMenu.definitionsForElement(element)[2].label).toBe "Menu item 3"
-
-          describe "when the metadata contains a 'menus' manifest", ->
-            it "loads only the menus specified by the manifest, in the specified order", ->
-              element = ($$ -> @div class: 'test-1')[0]
-
-              expect(atom.contextMenu.definitionsForElement(element)).toEqual []
-
-              atom.packages.activatePackage("package-with-menus-manifest")
-
-              expect(atom.menu.template[0].label).toBe "Second to Last"
-              expect(atom.menu.template[1].label).toBe "Last"
-              expect(atom.contextMenu.definitionsForElement(element)[0].label).toBe "Menu item 2"
-              expect(atom.contextMenu.definitionsForElement(element)[1].label).toBe "Menu item 1"
-              expect(atom.contextMenu.definitionsForElement(element)[2]).toBeUndefined()
-
-        describe "stylesheet loading", ->
-          describe "when the metadata contains a 'stylesheets' manifest", ->
-            it "loads stylesheets from the stylesheets directory as specified by the manifest", ->
-              one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
-              two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
-              three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
-
-              one = atom.themes.stringToId(one)
-              two = atom.themes.stringToId(two)
-              three = atom.themes.stringToId(three)
-
-              expect(atom.themes.stylesheetElementForId(one)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
-
-              atom.packages.activatePackage("package-with-stylesheets-manifest")
-
-              expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
-              expect($('#jasmine-content').css('font-size')).toBe '1px'
-
-          describe "when the metadata does not contain a 'stylesheets' manifest", ->
-            it "loads all stylesheets from the stylesheets directory", ->
-              one = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/1.css")
-              two = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/2.less")
-              three = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/3.css")
-
-
-              one = atom.themes.stringToId(one)
-              two = atom.themes.stringToId(two)
-              three = atom.themes.stringToId(three)
-
-              expect(atom.themes.stylesheetElementForId(one)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
-
-              atom.packages.activatePackage("package-with-stylesheets")
-              expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).not.toBeNull()
-              expect($('#jasmine-content').css('font-size')).toBe '3px'
-
-        describe "grammar loading", ->
-          it "loads the package's grammars", ->
-            waitsForPromise ->
-              atom.packages.activatePackage('package-with-grammars')
-
-            runs ->
-              expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
-              expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'
-
-        describe "scoped-property loading", ->
-          it "loads the scoped properties", ->
-            waitsForPromise ->
-              atom.packages.activatePackage("package-with-scoped-properties")
-
-            runs ->
-              expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
-
-      describe "converted textmate packages", ->
-        it "loads the package's grammars", ->
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
-
-          waitsForPromise ->
-            atom.packages.activatePackage('language-ruby')
-
-          runs ->
-            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
-
-        it "loads the translated scoped properties", ->
-          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
-
-          waitsForPromise ->
-            atom.packages.activatePackage('language-ruby')
-
-          runs ->
-            expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBe '# '
-
-    describe ".deactivatePackage(id)", ->
-      describe "atom packages", ->
-        it "calls `deactivate` on the package's main module if activate was successful", ->
-          pack = null
-          waitsForPromise ->
-            atom.packages.activatePackage("package-with-deactivate").then (p) -> pack = p
-
-          runs ->
-            expect(atom.packages.isPackageActive("package-with-deactivate")).toBeTruthy()
-            spyOn(pack.mainModule, 'deactivate').andCallThrough()
-
-            atom.packages.deactivatePackage("package-with-deactivate")
-            expect(pack.mainModule.deactivate).toHaveBeenCalled()
-            expect(atom.packages.isPackageActive("package-with-module")).toBeFalsy()
-
-            spyOn(console, 'warn')
-
-          badPack = null
-          waitsForPromise ->
-            atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
-
-          runs ->
-            expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeTruthy()
-            spyOn(badPack.mainModule, 'deactivate').andCallThrough()
-
-            atom.packages.deactivatePackage("package-that-throws-on-activate")
-            expect(badPack.mainModule.deactivate).not.toHaveBeenCalled()
-            expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeFalsy()
-
-        it "does not serialize packages that have not been activated called on their main module", ->
-          spyOn(console, 'warn')
-          badPack = null
-          waitsForPromise ->
-            atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
-
-          runs ->
-            spyOn(badPack.mainModule, 'serialize').andCallThrough()
-
-            atom.packages.deactivatePackage("package-that-throws-on-activate")
-            expect(badPack.mainModule.serialize).not.toHaveBeenCalled()
-
-        it "absorbs exceptions that are thrown by the package module's serialize method", ->
-          spyOn(console, 'error')
-
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-serialize-error')
-
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-serialization')
-
-          runs ->
-            atom.packages.deactivatePackages()
-            expect(atom.packages.packageStates['package-with-serialize-error']).toBeUndefined()
-            expect(atom.packages.packageStates['package-with-serialization']).toEqual someNumber: 1
-            expect(console.error).toHaveBeenCalled()
-
-        it "absorbs exceptions that are thrown by the package module's deactivate method", ->
-          spyOn(console, 'error')
-
-          waitsForPromise ->
-            atom.packages.activatePackage("package-that-throws-on-deactivate")
-
-          runs ->
-            expect(-> atom.packages.deactivatePackage("package-that-throws-on-deactivate")).not.toThrow()
-            expect(console.error).toHaveBeenCalled()
-
-        it "removes the package's grammars", ->
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-grammars')
-
-          runs ->
-            atom.packages.deactivatePackage('package-with-grammars')
-            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
-            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'
-
-        it "removes the package's keymaps", ->
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-keymaps')
-
-          runs ->
-            atom.packages.deactivatePackage('package-with-keymaps')
-            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-1')[0])).toHaveLength 0
-            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-2')[0])).toHaveLength 0
-
-        it "removes the package's stylesheets", ->
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-stylesheets')
-
-          runs ->
-            atom.packages.deactivatePackage('package-with-stylesheets')
-            one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
-            two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
-            three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
-            expect(atom.themes.stylesheetElementForId(one)).not.toExist()
-            expect(atom.themes.stylesheetElementForId(two)).not.toExist()
-            expect(atom.themes.stylesheetElementForId(three)).not.toExist()
-
-        it "removes the package's scoped-properties", ->
-          waitsForPromise ->
-            atom.packages.activatePackage("package-with-scoped-properties")
-
-          runs ->
-            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
-            atom.packages.deactivatePackage("package-with-scoped-properties")
-            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
-
-      describe "textmate packages", ->
-        it "removes the package's grammars", ->
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
-
-          waitsForPromise ->
-            atom.packages.activatePackage('language-ruby')
-
-          runs ->
-            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
-            atom.packages.deactivatePackage('language-ruby')
-            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
-
-        it "removes the package's scoped properties", ->
-          waitsForPromise ->
-            atom.packages.activatePackage('language-ruby')
-
-          runs ->
-            atom.packages.deactivatePackage('language-ruby')
-            expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
-
-    describe ".activate()", ->
-      packageActivator = null
-      themeActivator = null
+  describe 'window sizing methods', ->
+    describe '::getPosition and ::setPosition', ->
+      it 'sets the position of the window, and can retrieve the position just set', ->
+        atom.setPosition(22, 45)
+        expect(atom.getPosition()).toEqual x: 22, y: 45
 
+    describe '::getSize and ::setSize', ->
+      originalSize = null
       beforeEach ->
-        spyOn(console, 'warn')
-        atom.packages.loadPackages()
-
-        loadedPackages = atom.packages.getLoadedPackages()
-        expect(loadedPackages.length).toBeGreaterThan 0
-
-        packageActivator = spyOn(atom.packages, 'activatePackages')
-        themeActivator = spyOn(atom.themes, 'activatePackages')
-
+        originalSize = atom.getSize()
       afterEach ->
-        atom.packages.unloadPackages()
+        atom.setSize(originalSize.width, originalSize.height)
 
-        Syntax = require '../src/syntax'
-        atom.syntax = window.syntax = new Syntax()
-
-      it "activates all the packages, and none of the themes", ->
-        atom.packages.activate()
-
-        expect(packageActivator).toHaveBeenCalled()
-        expect(themeActivator).toHaveBeenCalled()
-
-        packages = packageActivator.mostRecentCall.args[0]
-        expect(['atom', 'textmate']).toContain(pack.getType()) for pack in packages
-
-        themes = themeActivator.mostRecentCall.args[0]
-        expect(['theme']).toContain(theme.getType()) for theme in themes
-
-    describe ".enablePackage() and disablePackage()", ->
-      describe "with packages", ->
-        it ".enablePackage() enables a disabled package", ->
-          packageName = 'package-with-main'
-          atom.config.pushAtKeyPath('core.disabledPackages', packageName)
-          atom.packages.observeDisabledPackages()
-          expect(atom.config.get('core.disabledPackages')).toContain packageName
-
-          pack = atom.packages.enablePackage(packageName)
-          loadedPackages = atom.packages.getLoadedPackages()
-          activatedPackages = null
-          waitsFor ->
-            activatedPackages = atom.packages.getActivePackages()
-            activatedPackages.length > 0
-
-          runs ->
-            expect(loadedPackages).toContain(pack)
-            expect(activatedPackages).toContain(pack)
-            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
-
-        it ".disablePackage() disables an enabled package", ->
-          packageName = 'package-with-main'
-          waitsForPromise ->
-            atom.packages.activatePackage(packageName)
-
-          runs ->
-            atom.packages.observeDisabledPackages()
-            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
-
-            pack = atom.packages.disablePackage(packageName)
-
-            activatedPackages = atom.packages.getActivePackages()
-            expect(activatedPackages).not.toContain(pack)
-            expect(atom.config.get('core.disabledPackages')).toContain packageName
-
-      describe "with themes", ->
-        reloadedHandler = null
-
-        beforeEach ->
-          waitsForPromise ->
-            atom.themes.activateThemes()
-
-        afterEach ->
-          atom.themes.deactivateThemes()
-
-        it ".enablePackage() and .disablePackage() enables and disables a theme", ->
-          packageName = 'theme-with-package-file'
-
-          expect(atom.config.get('core.themes')).not.toContain packageName
-          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
-
-          # enabling of theme
-          pack = atom.packages.enablePackage(packageName)
-
-          waitsFor ->
-            pack in atom.packages.getActivePackages()
-
-          runs ->
-            expect(atom.config.get('core.themes')).toContain packageName
-            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
-
-            reloadedHandler = jasmine.createSpy('reloadedHandler')
-            reloadedHandler.reset()
-            atom.themes.onDidReloadAll reloadedHandler
-
-            pack = atom.packages.disablePackage(packageName)
-
-          waitsFor ->
-            reloadedHandler.callCount is 1
-
-          runs ->
-            expect(atom.packages.getActivePackages()).not.toContain pack
-            expect(atom.config.get('core.themes')).not.toContain packageName
-            expect(atom.config.get('core.themes')).not.toContain packageName
-            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+      it 'sets the size of the window, and can retrieve the size just set', ->
+        atom.setSize(100, 400)
+        expect(atom.getSize()).toEqual width: 100, height: 400
 
   describe ".isReleasedVersion()", ->
     it "returns false if the version is a SHA and true otherwise", ->
@@ -565,3 +47,8 @@ describe "the `atom` global", ->
         [event, version, notes] = updateAvailableHandler.mostRecentCall.args
         expect(notes).toBe 'notes'
         expect(version).toBe 'version'
+
+  describe "loading default config", ->
+    it 'loads the default core config', ->
+      expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
+      expect(atom.config.get('editor.showInvisibles')).toBe false

spec/command-registry-spec.coffee

@@ -0,0 +1,191 @@
+CommandRegistry = require '../src/command-registry'
+
+describe "CommandRegistry", ->
+  [registry, parent, child, grandchild] = []
+
+  beforeEach ->
+    parent = document.createElement("div")
+    child = document.createElement("div")
+    grandchild = document.createElement("div")
+    parent.classList.add('parent')
+    child.classList.add('child')
+    grandchild.classList.add('grandchild')
+    child.appendChild(grandchild)
+    parent.appendChild(child)
+    document.querySelector('#jasmine-content').appendChild(parent)
+
+    registry = new CommandRegistry(parent)
+
+  describe "command dispatch", ->
+    it "invokes callbacks with selectors matching the target", ->
+      called = false
+      registry.add '.grandchild', 'command', (event) ->
+        expect(this).toBe grandchild
+        expect(event.type).toBe 'command'
+        expect(event.eventPhase).toBe Event.BUBBLING_PHASE
+        expect(event.target).toBe grandchild
+        expect(event.currentTarget).toBe grandchild
+        called = true
+
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(called).toBe true
+
+    it "invokes callbacks with selectors matching ancestors of the target", ->
+      calls = []
+
+      registry.add '.child', 'command', (event) ->
+        expect(this).toBe child
+        expect(event.target).toBe grandchild
+        expect(event.currentTarget).toBe child
+        calls.push('child')
+
+      registry.add '.parent', 'command', (event) ->
+        expect(this).toBe parent
+        expect(event.target).toBe grandchild
+        expect(event.currentTarget).toBe parent
+        calls.push('parent')
+
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['child', 'parent']
+
+    it "orders multiple matching listeners for an element by selector specificity", ->
+      child.classList.add('foo', 'bar')
+      calls = []
+
+      registry.add '.foo.bar', 'command', -> calls.push('.foo.bar')
+      registry.add '.foo', 'command', -> calls.push('.foo')
+      registry.add '.bar', 'command', -> calls.push('.bar') # specificity ties favor commands added later, like CSS
+
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['.foo.bar', '.bar', '.foo']
+
+    it "stops bubbling through ancestors when .stopPropagation() is called on the event", ->
+      calls = []
+
+      registry.add '.parent', 'command', -> calls.push('parent')
+      registry.add '.child', 'command', -> calls.push('child-2')
+      registry.add '.child', 'command', (event) -> calls.push('child-1'); event.stopPropagation()
+
+      dispatchedEvent = new CustomEvent('command', bubbles: true)
+      spyOn(dispatchedEvent, 'stopPropagation')
+      grandchild.dispatchEvent(dispatchedEvent)
+      expect(calls).toEqual ['child-1', 'child-2']
+      expect(dispatchedEvent.stopPropagation).toHaveBeenCalled()
+
+    it "stops invoking callbacks when .stopImmediatePropagation() is called on the event", ->
+      calls = []
+
+      registry.add '.parent', 'command', -> calls.push('parent')
+      registry.add '.child', 'command', -> calls.push('child-2')
+      registry.add '.child', 'command', (event) -> calls.push('child-1'); event.stopImmediatePropagation()
+
+      dispatchedEvent = new CustomEvent('command', bubbles: true)
+      spyOn(dispatchedEvent, 'stopImmediatePropagation')
+      grandchild.dispatchEvent(dispatchedEvent)
+      expect(calls).toEqual ['child-1']
+      expect(dispatchedEvent.stopImmediatePropagation).toHaveBeenCalled()
+
+    it "forwards .preventDefault() calls from the synthetic event to the original", ->
+      calls = []
+
+      registry.add '.child', 'command', (event) -> event.preventDefault()
+
+      dispatchedEvent = new CustomEvent('command', bubbles: true)
+      spyOn(dispatchedEvent, 'preventDefault')
+      grandchild.dispatchEvent(dispatchedEvent)
+      expect(dispatchedEvent.preventDefault).toHaveBeenCalled()
+
+    it "allows listeners to be removed via a disposable returned by ::add", ->
+      calls = []
+
+      disposable1 = registry.add '.parent', 'command', -> calls.push('parent')
+      disposable2 = registry.add '.child', 'command', -> calls.push('child')
+
+      disposable1.dispose()
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['child']
+
+      calls = []
+      disposable2.dispose()
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual []
+
+    it "allows multiple commands to be registered under one selector when called with an object", ->
+      calls = []
+
+      disposable = registry.add '.child',
+        'command-1': -> calls.push('command-1')
+        'command-2': -> calls.push('command-2')
+
+      grandchild.dispatchEvent(new CustomEvent('command-1', bubbles: true))
+      grandchild.dispatchEvent(new CustomEvent('command-2', bubbles: true))
+
+      expect(calls).toEqual ['command-1', 'command-2']
+
+      calls = []
+      disposable.dispose()
+      grandchild.dispatchEvent(new CustomEvent('command-1', bubbles: true))
+      grandchild.dispatchEvent(new CustomEvent('command-2', bubbles: true))
+      expect(calls).toEqual []
+
+  describe "::findCommands({target})", ->
+    it "returns commands that can be invoked on the target or its ancestors", ->
+      registry.add '.parent', 'namespace:command-1', ->
+      registry.add '.child', 'namespace:command-2', ->
+      registry.add '.grandchild', 'namespace:command-3', ->
+      registry.add '.grandchild.no-match', 'namespace:command-4', ->
+
+      expect(registry.findCommands(target: grandchild)[0..2]).toEqual [
+        {name: 'namespace:command-3', displayName: 'Namespace: Command 3'}
+        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
+        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
+      ]
+
+  describe "::dispatch(target, commandName)", ->
+    it "simulates invocation of the given command ", ->
+      called = false
+      registry.add '.grandchild', 'command', (event) ->
+        expect(this).toBe grandchild
+        expect(event.type).toBe 'command'
+        expect(event.eventPhase).toBe Event.BUBBLING_PHASE
+        expect(event.target).toBe grandchild
+        expect(event.currentTarget).toBe grandchild
+        called = true
+
+      registry.dispatch(grandchild, 'command')
+      expect(called).toBe true
+
+    it "returns a boolean indicating whether any listeners matched the command", ->
+      registry.add '.grandchild', 'command', ->
+
+      expect(registry.dispatch(grandchild, 'command')).toBe true
+      expect(registry.dispatch(grandchild, 'bogus')).toBe false
+      expect(registry.dispatch(parent, 'command')).toBe false
+
+  describe "::getSnapshot and ::restoreSnapshot", ->
+    it "removes all command handlers except for those in the snapshot", ->
+      registry.add '.parent', 'namespace:command-1', ->
+      registry.add '.child', 'namespace:command-2', ->
+      snapshot = registry.getSnapshot()
+      registry.add '.grandchild', 'namespace:command-3', ->
+
+      expect(registry.findCommands(target: grandchild)[0..2]).toEqual [
+        {name: 'namespace:command-3', displayName: 'Namespace: Command 3'}
+        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
+        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
+      ]
+
+      registry.restoreSnapshot(snapshot)
+
+      expect(registry.findCommands(target: grandchild)[0..1]).toEqual [
+        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
+        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
+      ]
+
+      registry.add '.grandchild', 'namespace:command-3', ->
+      registry.restoreSnapshot(snapshot)
+
+      expect(registry.findCommands(target: grandchild)[0..1]).toEqual [
+        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
+        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
+      ]

spec/config-spec.coffee

@@ -12,7 +12,7 @@ describe "Config", ->
 
   describe ".get(keyPath)", ->
     it "allows a key path's value to be read", ->
-      expect(atom.config.set("foo.bar.baz", 42)).toBe 42
+      expect(atom.config.set("foo.bar.baz", 42)).toBe true
       expect(atom.config.get("foo.bar.baz")).toBe 42
       expect(atom.config.get("bogus.key.path")).toBeUndefined()
 
@@ -37,7 +37,7 @@ describe "Config", ->
 
   describe ".set(keyPath, value)", ->
     it "allows a key path's value to be written", ->
-      expect(atom.config.set("foo.bar.baz", 42)).toBe 42
+      expect(atom.config.set("foo.bar.baz", 42)).toBe true
       expect(atom.config.get("foo.bar.baz")).toBe 42
 
     it "updates observers and saves when a key path is set", ->
@@ -48,7 +48,7 @@ describe "Config", ->
       atom.config.set("foo.bar.baz", 42)
 
       expect(atom.config.save).toHaveBeenCalled()
-      expect(observeHandler).toHaveBeenCalledWith 42, {previous: undefined}
+      expect(observeHandler).toHaveBeenCalledWith 42
 
     describe "when the value equals the default value", ->
       it "does not store the value", ->
@@ -139,7 +139,7 @@ describe "Config", ->
 
       expect(atom.config.pushAtKeyPath("foo.bar.baz", "b")).toBe 2
       expect(atom.config.get("foo.bar.baz")).toEqual ["a", "b"]
-      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['a']}
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz")
 
   describe ".unshiftAtKeyPath(keyPath, value)", ->
     it "unshifts the given value to the array at the key path and updates observers", ->
@@ -150,7 +150,7 @@ describe "Config", ->
 
       expect(atom.config.unshiftAtKeyPath("foo.bar.baz", "a")).toBe 2
       expect(atom.config.get("foo.bar.baz")).toEqual ["a", "b"]
-      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['b']}
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz")
 
   describe ".removeAtKeyPath(keyPath, value)", ->
     it "removes the given value from the array at the key path and updates observers", ->
@@ -161,16 +161,22 @@ describe "Config", ->
 
       expect(atom.config.removeAtKeyPath("foo.bar.baz", "b")).toEqual ["a", "c"]
       expect(atom.config.get("foo.bar.baz")).toEqual ["a", "c"]
-      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['a', 'b', 'c']}
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz")
 
   describe ".getPositiveInt(keyPath, defaultValue)", ->
-    it "returns the proper current or default value", ->
+    it "returns the proper coerced value", ->
       atom.config.set('editor.preferredLineLength', 0)
-      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
+      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 1
+
+    it "returns the proper coerced value", ->
       atom.config.set('editor.preferredLineLength', -1234)
-      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
+      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 1
+
+    it "returns the default value when a string is passed in", ->
       atom.config.set('editor.preferredLineLength', 'abcd')
       expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
+
+    it "returns the default value when null is passed in", ->
       atom.config.set('editor.preferredLineLength', null)
       expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
 
@@ -226,11 +232,54 @@ describe "Config", ->
 
     it "emits an updated event", ->
       updatedCallback = jasmine.createSpy('updated')
-      atom.config.observe('foo.bar.baz.a', callNow: false, updatedCallback)
+      atom.config.onDidChange('foo.bar.baz.a', updatedCallback)
       expect(updatedCallback.callCount).toBe 0
       atom.config.setDefaults("foo.bar.baz", a: 2)
       expect(updatedCallback.callCount).toBe 1
 
+  describe ".onDidChange(keyPath)", ->
+    [observeHandler, observeSubscription] = []
+
+    describe 'when a keyPath is specified', ->
+      beforeEach ->
+        observeHandler = jasmine.createSpy("observeHandler")
+        atom.config.set("foo.bar.baz", "value 1")
+        observeSubscription = atom.config.onDidChange "foo.bar.baz", observeHandler
+
+      it "does not fire the given callback with the current value at the keypath", ->
+        expect(observeHandler).not.toHaveBeenCalled()
+
+      it "fires the callback every time the observed value changes", ->
+        observeHandler.reset() # clear the initial call
+        atom.config.set('foo.bar.baz', "value 2")
+        expect(observeHandler).toHaveBeenCalledWith({newValue: 'value 2', oldValue: 'value 1', keyPath: 'foo.bar.baz'})
+        observeHandler.reset()
+
+        atom.config.set('foo.bar.baz', "value 1")
+        expect(observeHandler).toHaveBeenCalledWith({newValue: 'value 1', oldValue: 'value 2', keyPath: 'foo.bar.baz'})
+
+    describe 'when a keyPath is not specified', ->
+      beforeEach ->
+        observeHandler = jasmine.createSpy("observeHandler")
+        atom.config.set("foo.bar.baz", "value 1")
+        observeSubscription = atom.config.onDidChange observeHandler
+
+      it "does not fire the given callback initially", ->
+        expect(observeHandler).not.toHaveBeenCalled()
+
+      it "fires the callback every time any value changes", ->
+        observeHandler.reset() # clear the initial call
+        atom.config.set('foo.bar.baz', "value 2")
+        expect(observeHandler).toHaveBeenCalledWith({newValue: 'value 2', oldValue: 'value 1', keyPath: 'foo.bar.baz'})
+
+        observeHandler.reset()
+        atom.config.set('foo.bar.baz', "value 1")
+        expect(observeHandler).toHaveBeenCalledWith({newValue: 'value 1', oldValue: 'value 2', keyPath: 'foo.bar.baz'})
+
+        observeHandler.reset()
+        atom.config.set('foo.bar.int', 1)
+        expect(observeHandler).toHaveBeenCalledWith({newValue: 1, oldValue: undefined, keyPath: 'foo.bar.int'})
+
   describe ".observe(keyPath)", ->
     [observeHandler, observeSubscription] = []
 
@@ -245,26 +294,25 @@ describe "Config", ->
     it "fires the callback every time the observed value changes", ->
       observeHandler.reset() # clear the initial call
       atom.config.set('foo.bar.baz', "value 2")
-      expect(observeHandler).toHaveBeenCalledWith("value 2", {previous: 'value 1'})
+      expect(observeHandler).toHaveBeenCalledWith("value 2")
       observeHandler.reset()
 
       atom.config.set('foo.bar.baz', "value 1")
-      expect(observeHandler).toHaveBeenCalledWith("value 1", {previous: 'value 2'})
+      expect(observeHandler).toHaveBeenCalledWith("value 1")
 
     it "fires the callback when the observed value is deleted", ->
       observeHandler.reset() # clear the initial call
       atom.config.set('foo.bar.baz', undefined)
-      expect(observeHandler).toHaveBeenCalledWith(undefined, {previous: 'value 1'})
+      expect(observeHandler).toHaveBeenCalledWith(undefined)
 
     it "fires the callback when the full key path goes into and out of existence", ->
       observeHandler.reset() # clear the initial call
       atom.config.set("foo.bar", undefined)
+      expect(observeHandler).toHaveBeenCalledWith(undefined)
 
-      expect(observeHandler).toHaveBeenCalledWith(undefined, {previous: 'value 1'})
       observeHandler.reset()
-
       atom.config.set("foo.bar.baz", "i'm back")
-      expect(observeHandler).toHaveBeenCalledWith("i'm back", {previous: undefined})
+      expect(observeHandler).toHaveBeenCalledWith("i'm back")
 
     it "does not fire the callback once the observe subscription is off'ed", ->
       observeHandler.reset() # clear the initial call
@@ -311,11 +359,19 @@ describe "Config", ->
     describe "when the config file contains valid cson", ->
       beforeEach ->
         fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
-        atom.config.loadUserConfig()
 
       it "updates the config data based on the file contents", ->
+        atom.config.loadUserConfig()
         expect(atom.config.get("foo.bar")).toBe 'baz'
 
+      it "notifies observers for updated keypaths on load", ->
+        observeHandler = jasmine.createSpy("observeHandler")
+        observeSubscription = atom.config.observe "foo.bar", observeHandler
+
+        atom.config.loadUserConfig()
+
+        expect(observeHandler).toHaveBeenCalledWith 'baz'
+
     describe "when the config file contains invalid cson", ->
       beforeEach ->
         spyOn(console, 'error')
@@ -334,10 +390,43 @@ describe "Config", ->
         expect(fs.existsSync(atom.config.configFilePath)).toBe true
         expect(CSON.readFileSync(atom.config.configFilePath)).toEqual {}
 
+    describe "when a schema is specified", ->
+      beforeEach ->
+        schema =
+          type: 'object'
+          properties:
+            bar:
+              type: 'string'
+              default: 'def'
+            int:
+              type: 'integer'
+              default: 12
+
+        atom.config.setSchema('foo', schema)
+
+      describe "when the config file contains values that do not adhere to the schema", ->
+        warnSpy = null
+        beforeEach ->
+          warnSpy = spyOn console, 'warn'
+          fs.writeFileSync atom.config.configFilePath, """
+            foo:
+              bar: 'baz'
+              int: 'bad value'
+          """
+          atom.config.loadUserConfig()
+
+        it "updates the only the settings that have values matching the schema", ->
+          expect(atom.config.get("foo.bar")).toBe 'baz'
+          expect(atom.config.get("foo.int")).toBe 12
+
+          expect(warnSpy).toHaveBeenCalled()
+          expect(warnSpy.mostRecentCall.args[0]).toContain "'foo.int' could not be set"
+
   describe ".observeUserConfig()", ->
     updatedHandler = null
 
     beforeEach ->
+      atom.config.setDefaults('foo', bar: 'def')
       atom.config.configDirPath = dotAtomPath
       atom.config.configFilePath = path.join(atom.config.configDirPath, "atom.config.cson")
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
@@ -345,7 +434,7 @@ describe "Config", ->
       atom.config.loadUserConfig()
       atom.config.observeUserConfig()
       updatedHandler = jasmine.createSpy("updatedHandler")
-      atom.config.on 'updated', updatedHandler
+      atom.config.onDidChange updatedHandler
 
     afterEach ->
       atom.config.unobserveUserConfig()
@@ -359,6 +448,34 @@ describe "Config", ->
           expect(atom.config.get('foo.bar')).toBe 'quux'
           expect(atom.config.get('foo.baz')).toBe 'bar'
 
+    describe "when the config file changes to omit a setting with a default", ->
+      it "resets the setting back to the default", ->
+        fs.writeFileSync(atom.config.configFilePath, "foo: { baz: 'new'}")
+        waitsFor 'update event', -> updatedHandler.callCount > 0
+        runs ->
+          expect(atom.config.get('foo.bar')).toBe 'def'
+          expect(atom.config.get('foo.baz')).toBe 'new'
+
+    describe "when the config file changes to be empty", ->
+      beforeEach ->
+        fs.writeFileSync(atom.config.configFilePath, "")
+        waitsFor 'update event', -> updatedHandler.callCount > 0
+
+      it "resets all settings back to the defaults", ->
+        expect(updatedHandler.callCount).toBe 1
+        expect(atom.config.get('foo.bar')).toBe 'def'
+        atom.config.set("hair", "blonde") # trigger a save
+        expect(atom.config.save).toHaveBeenCalled()
+
+      describe "when the config file subsequently changes again to contain configuration", ->
+        beforeEach ->
+          updatedHandler.reset()
+          fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'newVal'")
+          waitsFor 'update event', -> updatedHandler.callCount > 0
+
+        it "sets the setting to the value specified in the config file", ->
+          expect(atom.config.get('foo.bar')).toBe 'newVal'
+
     describe "when the config file changes to contain invalid cson", ->
       beforeEach ->
         spyOn(console, 'error')
@@ -373,9 +490,349 @@ describe "Config", ->
 
       describe "when the config file subsequently changes again to contain valid cson", ->
         beforeEach ->
-          fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
+          fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'newVal'")
           waitsFor 'update event', -> updatedHandler.callCount > 0
 
         it "updates the config data and resumes saving", ->
           atom.config.set("hair", "blonde")
           expect(atom.config.save).toHaveBeenCalled()
+
+  describe "when a schema is specified", ->
+    schema = null
+
+    describe '.setSchema(keyPath, schema)', ->
+      it 'creates a properly nested schema', ->
+        schema =
+          type: 'object'
+          properties:
+            anInt:
+              type: 'integer'
+              default: 12
+
+        atom.config.setSchema('foo.bar', schema)
+
+        expect(atom.config.getSchema('foo')).toEqual
+          type: 'object'
+          properties:
+            bar:
+              type: 'object'
+              properties:
+                anInt:
+                  type: 'integer'
+                  default: 12
+
+      it 'sets defaults specified by the schema', ->
+        schema =
+          type: 'object'
+          properties:
+            anInt:
+              type: 'integer'
+              default: 12
+            anObject:
+              type: 'object'
+              properties:
+                nestedInt:
+                  type: 'integer'
+                  default: 24
+                nestedObject:
+                  type: 'object'
+                  properties:
+                    superNestedInt:
+                      type: 'integer'
+                      default: 36
+
+        atom.config.setSchema('foo.bar', schema)
+        expect(atom.config.get("foo.bar.anInt")).toBe 12
+        expect(atom.config.get("foo.bar.anObject")).toEqual
+          nestedInt: 24
+          nestedObject:
+            superNestedInt: 36
+
+      it 'can set a non-object schema', ->
+        schema =
+          type: 'integer'
+          default: 12
+
+        atom.config.setSchema('foo.bar.anInt', schema)
+        expect(atom.config.get("foo.bar.anInt")).toBe 12
+        expect(atom.config.getSchema('foo.bar.anInt')).toEqual
+          type: 'integer'
+          default: 12
+
+    describe '.getSchema(keyPath)', ->
+      schema =
+        type: 'object'
+        properties:
+          anInt:
+            type: 'integer'
+            default: 12
+
+      atom.config.setSchema('foo.bar', schema)
+
+      expect(atom.config.getSchema('foo.bar')).toEqual
+        type: 'object'
+        properties:
+          anInt:
+            type: 'integer'
+            default: 12
+
+      expect(atom.config.getSchema('foo.bar.anInt')).toEqual
+        type: 'integer'
+        default: 12
+
+    describe 'when the value has an "integer" type', ->
+      beforeEach ->
+        schema =
+          type: 'integer'
+          default: 12
+        atom.config.setSchema('foo.bar.anInt', schema)
+
+      it 'coerces a string to an int', ->
+        atom.config.set('foo.bar.anInt', '123')
+        expect(atom.config.get('foo.bar.anInt')).toBe 123
+
+      it 'does not allow infinity', ->
+        atom.config.set('foo.bar.anInt', Infinity)
+        expect(atom.config.get('foo.bar.anInt')).toBe 12
+
+      it 'coerces a float to an int', ->
+        atom.config.set('foo.bar.anInt', 12.3)
+        expect(atom.config.get('foo.bar.anInt')).toBe 12
+
+      it 'will not set non-integers', ->
+        atom.config.set('foo.bar.anInt', null)
+        expect(atom.config.get('foo.bar.anInt')).toBe 12
+
+        atom.config.set('foo.bar.anInt', 'nope')
+        expect(atom.config.get('foo.bar.anInt')).toBe 12
+
+      describe 'when the minimum and maximum keys are used', ->
+        beforeEach ->
+          schema =
+            type: 'integer'
+            minimum: 10
+            maximum: 20
+            default: 12
+          atom.config.setSchema('foo.bar.anInt', schema)
+
+        it 'keeps the specified value within the specified range', ->
+          atom.config.set('foo.bar.anInt', '123')
+          expect(atom.config.get('foo.bar.anInt')).toBe 20
+
+          atom.config.set('foo.bar.anInt', '1')
+          expect(atom.config.get('foo.bar.anInt')).toBe 10
+
+    describe 'when the value has an "integer" and "string" type', ->
+      beforeEach ->
+        schema =
+          type: ['integer', 'string']
+          default: 12
+        atom.config.setSchema('foo.bar.anInt', schema)
+
+      it 'can coerce an int, and fallback to a string', ->
+        atom.config.set('foo.bar.anInt', '123')
+        expect(atom.config.get('foo.bar.anInt')).toBe 123
+
+        atom.config.set('foo.bar.anInt', 'cats')
+        expect(atom.config.get('foo.bar.anInt')).toBe 'cats'
+
+    describe 'when the value has an "string" and "boolean" type', ->
+      beforeEach ->
+        schema =
+          type: ['string', 'boolean']
+          default: 'def'
+        atom.config.setSchema('foo.bar', schema)
+
+      it 'can set a string, a boolean, and revert back to the default', ->
+        atom.config.set('foo.bar', 'ok')
+        expect(atom.config.get('foo.bar')).toBe 'ok'
+
+        atom.config.set('foo.bar', false)
+        expect(atom.config.get('foo.bar')).toBe false
+
+        atom.config.set('foo.bar', undefined)
+        expect(atom.config.get('foo.bar')).toBe 'def'
+
+    describe 'when the value has a "number" type', ->
+      beforeEach ->
+        schema =
+          type: 'number'
+          default: 12.1
+        atom.config.setSchema('foo.bar.aFloat', schema)
+
+      it 'coerces a string to a float', ->
+        atom.config.set('foo.bar.aFloat', '12.23')
+        expect(atom.config.get('foo.bar.aFloat')).toBe 12.23
+
+      it 'will not set non-numbers', ->
+        atom.config.set('foo.bar.aFloat', null)
+        expect(atom.config.get('foo.bar.aFloat')).toBe 12.1
+
+        atom.config.set('foo.bar.aFloat', 'nope')
+        expect(atom.config.get('foo.bar.aFloat')).toBe 12.1
+
+      describe 'when the minimum and maximum keys are used', ->
+        beforeEach ->
+          schema =
+            type: 'number'
+            minimum: 11.2
+            maximum: 25.4
+            default: 12.1
+          atom.config.setSchema('foo.bar.aFloat', schema)
+
+        it 'keeps the specified value within the specified range', ->
+          atom.config.set('foo.bar.aFloat', '123.2')
+          expect(atom.config.get('foo.bar.aFloat')).toBe 25.4
+
+          atom.config.set('foo.bar.aFloat', '1.0')
+          expect(atom.config.get('foo.bar.aFloat')).toBe 11.2
+
+    describe 'when the value has a "boolean" type', ->
+      beforeEach ->
+        schema =
+          type: 'boolean'
+          default: true
+        atom.config.setSchema('foo.bar.aBool', schema)
+
+      it 'coerces various types to a boolean', ->
+        atom.config.set('foo.bar.aBool', 'true')
+        expect(atom.config.get('foo.bar.aBool')).toBe true
+        atom.config.set('foo.bar.aBool', 'false')
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+        atom.config.set('foo.bar.aBool', 'TRUE')
+        expect(atom.config.get('foo.bar.aBool')).toBe true
+        atom.config.set('foo.bar.aBool', 'FALSE')
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+        atom.config.set('foo.bar.aBool', 1)
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+        atom.config.set('foo.bar.aBool', 0)
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+        atom.config.set('foo.bar.aBool', {})
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+        atom.config.set('foo.bar.aBool', null)
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+
+      it 'reverts back to the default value when undefined is passed to set', ->
+        atom.config.set('foo.bar.aBool', 'false')
+        expect(atom.config.get('foo.bar.aBool')).toBe false
+
+        atom.config.set('foo.bar.aBool', undefined)
+        expect(atom.config.get('foo.bar.aBool')).toBe true
+
+    describe 'when the value has an "string" type', ->
+      beforeEach ->
+        schema =
+          type: 'string'
+          default: 'ok'
+        atom.config.setSchema('foo.bar.aString', schema)
+
+      it 'allows strings', ->
+        atom.config.set('foo.bar.aString', 'yep')
+        expect(atom.config.get('foo.bar.aString')).toBe 'yep'
+
+      it 'will only set strings', ->
+        expect(atom.config.set('foo.bar.aString', 123)).toBe false
+        expect(atom.config.get('foo.bar.aString')).toBe 'ok'
+
+        expect(atom.config.set('foo.bar.aString', true)).toBe false
+        expect(atom.config.get('foo.bar.aString')).toBe 'ok'
+
+        expect(atom.config.set('foo.bar.aString', null)).toBe false
+        expect(atom.config.get('foo.bar.aString')).toBe 'ok'
+
+        expect(atom.config.set('foo.bar.aString', [])).toBe false
+        expect(atom.config.get('foo.bar.aString')).toBe 'ok'
+
+        expect(atom.config.set('foo.bar.aString', nope: 'nope')).toBe false
+        expect(atom.config.get('foo.bar.aString')).toBe 'ok'
+
+    describe 'when the value has an "object" type', ->
+      beforeEach ->
+        schema =
+          type: 'object'
+          properties:
+            anInt:
+              type: 'integer'
+              default: 12
+            nestedObject:
+              type: 'object'
+              properties:
+                nestedBool:
+                  type: 'boolean'
+                  default: false
+        atom.config.setSchema('foo.bar', schema)
+
+      it 'converts and validates all the children', ->
+        atom.config.set 'foo.bar',
+          anInt: '23'
+          nestedObject:
+            nestedBool: 'true'
+        expect(atom.config.get('foo.bar')).toEqual
+          anInt: 23
+          nestedObject:
+            nestedBool: true
+
+      it 'will set only the values that adhere to the schema', ->
+        expect(atom.config.set 'foo.bar',
+          anInt: 'nope'
+          nestedObject:
+            nestedBool: true
+        ).toBe true
+        expect(atom.config.get('foo.bar.anInt')).toEqual 12
+        expect(atom.config.get('foo.bar.nestedObject.nestedBool')).toEqual true
+
+    describe 'when the value has an "array" type', ->
+      beforeEach ->
+        schema =
+          type: 'array'
+          default: [1, 2, 3]
+          items:
+            type: 'integer'
+        atom.config.setSchema('foo.bar', schema)
+
+      it 'converts an array of strings to an array of ints', ->
+        atom.config.set 'foo.bar', ['2', '3', '4']
+        expect(atom.config.get('foo.bar')).toEqual  [2, 3, 4]
+
+    describe 'when the `enum` key is used', ->
+      beforeEach ->
+        schema =
+          type: 'object'
+          properties:
+            str:
+              type: 'string'
+              default: 'ok'
+              enum: ['ok', 'one', 'two']
+            int:
+              type: 'integer'
+              default: 2
+              enum: [2, 3, 5]
+            arr:
+              type: 'array'
+              default: ['one', 'two']
+              items:
+                type: 'string'
+                enum: ['one', 'two', 'three']
+
+        atom.config.setSchema('foo.bar', schema)
+
+      it 'will only set a string when the string is in the enum values', ->
+        expect(atom.config.set('foo.bar.str', 'nope')).toBe false
+        expect(atom.config.get('foo.bar.str')).toBe 'ok'
+
+        expect(atom.config.set('foo.bar.str', 'one')).toBe true
+        expect(atom.config.get('foo.bar.str')).toBe 'one'
+
+      it 'will only set an integer when the integer is in the enum values', ->
+        expect(atom.config.set('foo.bar.int', '400')).toBe false
+        expect(atom.config.get('foo.bar.int')).toBe 2
+
+        expect(atom.config.set('foo.bar.int', '3')).toBe true
+        expect(atom.config.get('foo.bar.int')).toBe 3
+
+      it 'will only set an array when the array values are in the enum values', ->
+        expect(atom.config.set('foo.bar.arr', ['one', 'five'])).toBe true
+        expect(atom.config.get('foo.bar.arr')).toEqual ['one']
+
+        expect(atom.config.set('foo.bar.arr', ['two', 'three'])).toBe true
+        expect(atom.config.get('foo.bar.arr')).toEqual ['two', 'three']

spec/deserializer-manager-spec.coffee

@@ -1,33 +1,44 @@
 DeserializerManager = require '../src/deserializer-manager'
 
-describe ".deserialize(state)", ->
-  deserializer = null
+describe "DeserializerManager", ->
+  manager = null
 
   class Foo
     @deserialize: ({name}) -> new Foo(name)
     constructor: (@name) ->
 
   beforeEach ->
-    deserializer = new DeserializerManager()
-    deserializer.add(Foo)
+    manager = new DeserializerManager
 
-  it "calls deserialize on the deserializer for the given state object, or returns undefined if one can't be found", ->
-    spyOn(console, 'warn')
-    object = deserializer.deserialize({ deserializer: 'Foo', name: 'Bar' })
-    expect(object.name).toBe 'Bar'
-    expect(deserializer.deserialize({ deserializer: 'Bogus' })).toBeUndefined()
+  describe "::add(deserializer)", ->
+    it "returns a disposable that can be used to remove the manager", ->
+      disposable = manager.add(Foo)
+      expect(manager.deserialize({deserializer: 'Foo', name: 'Bar'})).toBeDefined()
+      disposable.dispose()
+      spyOn(console, 'warn')
+      expect(manager.deserialize({deserializer: 'Foo', name: 'Bar'})).toBeUndefined()
 
-  describe "when the deserializer has a version", ->
+  describe "::deserialize(state)", ->
     beforeEach ->
-      Foo.version = 2
+      manager.add(Foo)
 
-    describe "when the deserialized state has a matching version", ->
-      it "attempts to deserialize the state", ->
-        object = deserializer.deserialize({ deserializer: 'Foo', version: 2, name: 'Bar' })
-        expect(object.name).toBe 'Bar'
+    it "calls deserialize on the manager for the given state object, or returns undefined if one can't be found", ->
+      spyOn(console, 'warn')
+      object = manager.deserialize({deserializer: 'Foo', name: 'Bar'})
+      expect(object.name).toBe 'Bar'
+      expect(manager.deserialize({deserializer: 'Bogus'})).toBeUndefined()
 
-    describe "when the deserialized state has a non-matching version", ->
-      it "returns undefined", ->
-        expect(deserializer.deserialize({ deserializer: 'Foo', version: 3, name: 'Bar' })).toBeUndefined()
-        expect(deserializer.deserialize({ deserializer: 'Foo', version: 1, name: 'Bar' })).toBeUndefined()
-        expect(deserializer.deserialize({ deserializer: 'Foo', name: 'Bar' })).toBeUndefined()
+    describe "when the manager has a version", ->
+      beforeEach ->
+        Foo.version = 2
+
+      describe "when the deserialized state has a matching version", ->
+        it "attempts to deserialize the state", ->
+          object = manager.deserialize({deserializer: 'Foo', version: 2, name: 'Bar'})
+          expect(object.name).toBe 'Bar'
+
+      describe "when the deserialized state has a non-matching version", ->
+        it "returns undefined", ->
+          expect(manager.deserialize({deserializer: 'Foo', version: 3, name: 'Bar'})).toBeUndefined()
+          expect(manager.deserialize({deserializer: 'Foo', version: 1, name: 'Bar'})).toBeUndefined()
+          expect(manager.deserialize({deserializer: 'Foo', name: 'Bar'})).toBeUndefined()

spec/display-buffer-spec.coffee

@@ -1011,7 +1011,7 @@ describe "DisplayBuffer", ->
         buffer.getMarker(marker2.id).destroy()
         expect(destroyedHandler).toHaveBeenCalled()
 
-    describe "DisplayBufferMarker::copy(attributes)", ->
+    describe "Marker::copy(attributes)", ->
       it "creates a copy of the marker with the given attributes merged in", ->
         initialMarkerCount = displayBuffer.getMarkerCount()
         marker1 = displayBuffer.markScreenRange([[5, 4], [5, 10]], a: 1, b: 2)
@@ -1020,10 +1020,10 @@ describe "DisplayBuffer", ->
         marker2 = marker1.copy(b: 3)
         expect(marker2.getBufferRange()).toEqual marker1.getBufferRange()
         expect(displayBuffer.getMarkerCount()).toBe initialMarkerCount + 2
-        expect(marker1.getAttributes()).toEqual a: 1, b: 2
-        expect(marker2.getAttributes()).toEqual a: 1, b: 3
+        expect(marker1.getProperties()).toEqual a: 1, b: 2
+        expect(marker2.getProperties()).toEqual a: 1, b: 3
 
-    describe "DisplayBufferMarker::getPixelRange()", ->
+    describe "Marker::getPixelRange()", ->
       it "returns the start and end positions of the marker based on the line height and character widths assigned to the DisplayBuffer", ->
         marker = displayBuffer.markScreenRange([[5, 10], [6, 4]])
 
@@ -1100,6 +1100,33 @@ describe "DisplayBuffer", ->
       expect(displayBuffer.setScrollTop(maxScrollTop + 50)).toBe maxScrollTop
       expect(displayBuffer.getScrollTop()).toBe maxScrollTop
 
+  describe "editor.scrollPastEnd", ->
+    describe "when editor.scrollPastEnd is false", ->
+      beforeEach ->
+        atom.config.set("editor.scrollPastEnd", false)
+        displayBuffer.manageScrollPosition = true
+        displayBuffer.setLineHeightInPixels(10)
+
+      it "does not add the height of the view to the scroll height", ->
+        lineHeight = displayBuffer.getLineHeightInPixels()
+        originalScrollHeight = displayBuffer.getScrollHeight()
+        displayBuffer.setHeight(50)
+
+        expect(displayBuffer.getScrollHeight()).toBe originalScrollHeight
+
+    describe "when editor.scrollPastEnd is true", ->
+      beforeEach ->
+        atom.config.set("editor.scrollPastEnd", true)
+        displayBuffer.manageScrollPosition = true
+        displayBuffer.setLineHeightInPixels(10)
+
+      it "adds the height of the view to the scroll height", ->
+        lineHeight = displayBuffer.getLineHeightInPixels()
+        originalScrollHeight = displayBuffer.getScrollHeight()
+        displayBuffer.setHeight(50)
+
+        expect(displayBuffer.getScrollHeight()).toEqual(originalScrollHeight + displayBuffer.height - (lineHeight * 3))
+
   describe "::setScrollLeft", ->
     beforeEach ->
       displayBuffer.manageScrollPosition = true

spec/fixtures/packages/package-with-activation-commands/index.coffee

@@ -0,0 +1,13 @@
+module.exports =
+  activateCallCount: 0
+  activationCommandCallCount: 0
+  legacyActivationCommandCallCount: 0
+
+  activate: ->
+    @activateCallCount++
+
+    atom.commands.add '.workspace', 'activation-command', =>
+      @activationCommandCallCount++
+
+    atom.workspaceView.getActiveView()?.command 'activation-command', =>
+      @legacyActivationCommandCallCount++

spec/fixtures/packages/package-with-activation-commands/package.cson

@@ -0,0 +1,2 @@
+'activationCommands':
+  '.workspace': 'activation-command'

spec/fixtures/packages/package-with-activation-events/index.coffee

@@ -1,13 +0,0 @@
-class Foo
-  atom.deserializers.add(this)
-  @deserialize: ({data}) -> new Foo(data)
-  constructor: (@data) ->
-
-module.exports =
-  activateCallCount: 0
-  activationEventCallCount: 0
-
-  activate: ->
-    @activateCallCount++
-    atom.workspaceView.getActiveView()?.command 'activation-event', =>
-      @activationEventCallCount++

spec/fixtures/packages/package-with-activation-events/package.cson

@@ -1 +0,0 @@
-'activationEvents': ['activation-event']

spec/fixtures/packages/package-with-config-schema/index.coffee

@@ -0,0 +1,13 @@
+module.exports =
+  config:
+    numbers:
+      type: 'object'
+      properties:
+        one:
+          type: 'integer'
+          default: 1
+        two:
+          type: 'integer'
+          default: 2
+
+  activate: -> # no-op

spec/fixtures/packages/package-with-empty-activation-commands/package.json

@@ -1,5 +1,5 @@
 {
   "name": "no events",
   "version": "0.1.0",
-  "activationEvents": []
+  "activationCommands": {".workspace": []}
 }

spec/git-spec.coffee

@@ -1,5 +1,5 @@
 temp = require 'temp'
-Git = require '../src/git'
+GitRepository = require '../src/git-repository'
 fs = require 'fs-plus'
 path = require 'path'
 Task = require '../src/task'
@@ -10,7 +10,7 @@ copyRepository = ->
   fs.renameSync(path.join(workingDirPath, 'git.git'), path.join(workingDirPath, '.git'))
   workingDirPath
 
-describe "Git", ->
+describe "GitRepository", ->
   repo = null
 
   beforeEach ->
@@ -22,28 +22,28 @@ describe "Git", ->
 
   describe "@open(path)", ->
     it "returns null when no repository is found", ->
-      expect(Git.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()
+      expect(GitRepository.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()
 
-  describe "new Git(path)", ->
+  describe "new GitRepository(path)", ->
     it "throws an exception when no repository is found", ->
-      expect(-> new Git(path.join(temp.dir, 'nogit.txt'))).toThrow()
+      expect(-> new GitRepository(path.join(temp.dir, 'nogit.txt'))).toThrow()
 
   describe ".getPath()", ->
     it "returns the repository path for a .git directory path", ->
-      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
+      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
       expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
 
     it "returns the repository path for a repository path", ->
-      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'master.git'))
+      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git'))
       expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
 
   describe ".isPathIgnored(path)", ->
     it "returns true for an ignored path", ->
-      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
       expect(repo.isPathIgnored('a.txt')).toBeTruthy()
 
     it "returns false for a non-ignored path", ->
-      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
       expect(repo.isPathIgnored('b.txt')).toBeFalsy()
 
   describe ".isPathModified(path)", ->
@@ -51,7 +51,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
+      repo = new GitRepository(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
       newPath = path.join(workingDirPath, 'new-path.txt')
 
@@ -75,7 +75,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
+      repo = new GitRepository(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
       newPath = path.join(workingDirPath, 'new-path.txt')
       fs.writeFileSync(newPath, "i'm new here")
@@ -92,7 +92,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
+      repo = new GitRepository(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
 
     it "no longer reports a path as modified after checkout", ->
@@ -124,7 +124,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
+      repo = new GitRepository(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
       fs.writeFileSync(filePath, 'ch ch changes')
 
@@ -153,7 +153,7 @@ describe "Git", ->
 
   describe ".destroy()", ->
     it "throws an exception when any method is called after it is called", ->
-      repo = new Git(require.resolve('./fixtures/git/master.git/HEAD'))
+      repo = new GitRepository(require.resolve('./fixtures/git/master.git/HEAD'))
       repo.destroy()
       expect(-> repo.getShortHead()).toThrow()
 
@@ -162,7 +162,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
+      repo = new GitRepository(workingDirectory)
       filePath = path.join(workingDirectory, 'file.txt')
 
     it "trigger a status-changed event when the new status differs from the last cached one", ->
@@ -182,7 +182,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
+      repo = new GitRepository(workingDirectory)
       directoryPath = path.join(workingDirectory, 'dir')
       filePath = path.join(directoryPath, 'b.txt')
 
@@ -197,7 +197,7 @@ describe "Git", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
+      repo = new GitRepository(workingDirectory)
       modifiedPath = path.join(workingDirectory, 'file.txt')
       newPath = path.join(workingDirectory, 'untracked.txt')
       cleanPath = path.join(workingDirectory, 'other.txt')

spec/jasmine-helper.coffee

@@ -7,6 +7,8 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
 
   {TerminalReporter} = require 'jasmine-tagged'
 
+  disableFocusMethods() if process.env.JANKY_SHA1
+
   TimeReporter = require './time-reporter'
   timeReporter = new TimeReporter()
 
@@ -38,3 +40,10 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
   $('body').append $$ -> @div id: 'jasmine-content'
 
   jasmineEnv.execute()
+
+disableFocusMethods = ->
+  ['fdescribe', 'ffdescribe', 'fffdescribe', 'fit', 'ffit', 'fffit'].forEach (methodName) ->
+    focusMethod = window[methodName]
+    window[methodName] = (description) ->
+      error = new Error('Focused spec is running on CI')
+      focusMethod description, -> throw error

spec/language-mode-spec.coffee

@@ -14,6 +14,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-javascript')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe ".minIndentLevelForRowRange(startRow, endRow)", ->
       it "returns the minimum indent level for the given row range", ->
         expect(languageMode.minIndentLevelForRowRange(4, 7)).toBe 2
@@ -70,6 +74,28 @@ describe "LanguageMode", ->
         expect(languageMode.rowRangeForCodeFoldAtBufferRow(2)).toBeNull()
         expect(languageMode.rowRangeForCodeFoldAtBufferRow(4)).toEqual [4, 7]
 
+    describe ".rowRangeForCommentAtBufferRow(bufferRow)", ->
+      it "returns the start/end rows of the foldable comment starting at the given row", ->
+        buffer.setText("//this is a multi line comment\n//another line")
+        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toEqual [0, 1]
+        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toEqual [0, 1]
+
+        buffer.setText("//this is a multi line comment\n//another line\n//and one more")
+        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toEqual [0, 2]
+        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toEqual [0, 2]
+
+        buffer.setText("//this is a multi line comment\n\n//with an empty line")
+        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
+        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toBeUndefined()
+        expect(languageMode.rowRangeForCommentAtBufferRow(2)).toBeUndefined()
+
+        buffer.setText("//this is a single line comment\n")
+        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
+        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toBeUndefined()
+
+        buffer.setText("//this is a single line comment")
+        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
+
     describe "suggestedIndentForBufferRow", ->
       it "returns the suggested indentation based on auto-indent/outdent rules", ->
         expect(languageMode.suggestedIndentForBufferRow(0)).toBe 0
@@ -127,6 +153,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-coffee-script')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe ".toggleLineCommentsForBufferRows(start, end)", ->
       it "comments/uncomments lines in the given range", ->
         languageMode.toggleLineCommentsForBufferRows(4, 6)
@@ -178,6 +208,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-css')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe ".toggleLineCommentsForBufferRows(start, end)", ->
       it "comments/uncomments lines in the given range", ->
         languageMode.toggleLineCommentsForBufferRows(0, 1)
@@ -226,6 +260,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-css')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe "when commenting lines", ->
       it "only uses the `commentEnd` pattern if it comes from the same grammar as the `commentStart`", ->
         languageMode.toggleLineCommentsForBufferRows(0, 0)
@@ -242,6 +280,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-xml')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe "when uncommenting lines", ->
       it "removes the leading whitespace from the comment end pattern match", ->
         languageMode.toggleLineCommentsForBufferRows(0, 0)
@@ -257,6 +299,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-javascript')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     it "maintains cursor buffer position when a folding/unfolding", ->
       editor.setCursorBufferPosition([5,5])
       languageMode.foldAll()
@@ -344,6 +390,10 @@ describe "LanguageMode", ->
       waitsForPromise ->
         atom.packages.activatePackage('language-javascript')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe ".unfoldAll()", ->
       it "unfolds every folded line", ->
         initialScreenLineCount = editor.getScreenLineCount()
@@ -413,6 +463,10 @@ describe "LanguageMode", ->
         atom.packages.activatePackage('language-source')
         atom.packages.activatePackage('language-css')
 
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     describe "suggestedIndentForBufferRow", ->
       it "does not return negative values (regression)", ->
         editor.setText('.test {\npadding: 0;\n}')

spec/menu-manager-spec.coffee

@@ -0,0 +1,48 @@
+MenuManager = require '../src/menu-manager'
+
+describe "MenuManager", ->
+  menu = null
+
+  beforeEach ->
+    menu = new MenuManager(resourcePath: atom.getLoadSettings().resourcePath)
+
+  describe "::add(items)", ->
+    it "can add new menus that can be removed with the returned disposable", ->
+      disposable = menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
+      expect(menu.template).toEqual [{label: "A", submenu: [{label: "B", command: "b"}]}]
+      disposable.dispose()
+      expect(menu.template).toEqual []
+
+    it "can add submenu items to existing menus that can be removed with the returned disposable", ->
+      disposable1 = menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
+      disposable2 = menu.add [{label: "A", submenu: [{label: "C", submenu: [{label: "D", command: 'd'}]}]}]
+      disposable3 = menu.add [{label: "A", submenu: [{label: "C", submenu: [{label: "E", command: 'e'}]}]}]
+
+      expect(menu.template).toEqual [{
+        label: "A",
+        submenu: [
+          {label: "B", command: "b"},
+          {label: "C", submenu: [{label: 'D', command: 'd'}, {label: 'E', command: 'e'}]}
+        ]
+      }]
+
+      disposable3.dispose()
+      expect(menu.template).toEqual [{
+        label: "A",
+        submenu: [
+          {label: "B", command: "b"},
+          {label: "C", submenu: [{label: 'D', command: 'd'}]}
+        ]
+      }]
+
+      disposable2.dispose()
+      expect(menu.template).toEqual [{label: "A", submenu: [{label: "B", command: "b"}]}]
+
+      disposable1.dispose()
+      expect(menu.template).toEqual []
+
+    it "does not add duplicate labels to the same menu", ->
+      originalItemCount = menu.template.length
+      menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
+      menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
+      expect(menu.template[originalItemCount]).toEqual {label: "A", submenu: [{label: "B", command: "b"}]}

spec/package-manager-spec.coffee

@@ -0,0 +1,570 @@
+{$, $$, WorkspaceView}  = require 'atom'
+Package = require '../src/package'
+
+describe "PackageManager", ->
+  beforeEach ->
+    atom.workspaceView = new WorkspaceView
+
+  describe "::loadPackage(name)", ->
+    it "continues if the package has an invalid package.json", ->
+      spyOn(console, 'warn')
+      atom.config.set("core.disabledPackages", [])
+      expect(-> atom.packages.loadPackage("package-with-broken-package-json")).not.toThrow()
+
+    it "continues if the package has an invalid keymap", ->
+      spyOn(console, 'warn')
+      atom.config.set("core.disabledPackages", [])
+      expect(-> atom.packages.loadPackage("package-with-broken-keymap")).not.toThrow()
+
+  describe "::unloadPackage(name)", ->
+    describe "when the package is active", ->
+      it "throws an error", ->
+        pack = null
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-main').then (p) -> pack = p
+
+        runs ->
+          expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
+          expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
+          expect( -> atom.packages.unloadPackage(pack.name)).toThrow()
+          expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
+          expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
+
+    describe "when the package is not loaded", ->
+      it "throws an error", ->
+        expect(atom.packages.isPackageLoaded('unloaded')).toBeFalsy()
+        expect( -> atom.packages.unloadPackage('unloaded')).toThrow()
+        expect(atom.packages.isPackageLoaded('unloaded')).toBeFalsy()
+
+    describe "when the package is loaded", ->
+      it "no longers reports it as being loaded", ->
+        pack = atom.packages.loadPackage('package-with-main')
+        expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
+        atom.packages.unloadPackage(pack.name)
+        expect(atom.packages.isPackageLoaded(pack.name)).toBeFalsy()
+
+  describe "::activatePackage(id)", ->
+    describe "atom packages", ->
+      describe "when called multiple times", ->
+        it "it only calls activate on the package once", ->
+          spyOn(Package.prototype, 'activateNow').andCallThrough()
+          atom.packages.activatePackage('package-with-index')
+          atom.packages.activatePackage('package-with-index')
+
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-index')
+
+          runs ->
+            expect(Package.prototype.activateNow.callCount).toBe 1
+
+      describe "when the package has a main module", ->
+        describe "when the metadata specifies a main module path˜", ->
+          it "requires the module at the specified path", ->
+            mainModule = require('./fixtures/packages/package-with-main/main-module')
+            spyOn(mainModule, 'activate')
+            pack = null
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-main').then (p) -> pack = p
+
+            runs ->
+              expect(mainModule.activate).toHaveBeenCalled()
+              expect(pack.mainModule).toBe mainModule
+
+        describe "when the metadata does not specify a main module", ->
+          it "requires index.coffee", ->
+            indexModule = require('./fixtures/packages/package-with-index/index')
+            spyOn(indexModule, 'activate')
+            pack = null
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-index').then (p) -> pack = p
+
+            runs ->
+              expect(indexModule.activate).toHaveBeenCalled()
+              expect(pack.mainModule).toBe indexModule
+
+        it "assigns config schema, including defaults when package contains a schema", ->
+          expect(atom.config.get('package-with-config-schema.numbers.one')).toBeUndefined()
+
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-config-schema')
+
+          runs ->
+            expect(atom.config.get('package-with-config-schema.numbers.one')).toBe 1
+            expect(atom.config.get('package-with-config-schema.numbers.two')).toBe 2
+
+            expect(atom.config.set('package-with-config-schema.numbers.one', 'nope')).toBe false
+            expect(atom.config.set('package-with-config-schema.numbers.one', '10')).toBe true
+            expect(atom.config.get('package-with-config-schema.numbers.one')).toBe 10
+
+        it "still assigns configDefaults from the module though deprecated", ->
+          expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()
+
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-config-defaults')
+
+          runs ->
+            expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
+            expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
+
+        describe "when the package metadata includes `activationCommands`", ->
+          [mainModule, promise, workspaceCommandListener] = []
+
+          beforeEach ->
+            atom.workspaceView.attachToDom()
+            mainModule = require './fixtures/packages/package-with-activation-commands/index'
+            mainModule.legacyActivationCommandCallCount = 0
+            mainModule.activationCommandCallCount = 0
+            spyOn(mainModule, 'activate').andCallThrough()
+            spyOn(Package.prototype, 'requireMainModule').andCallThrough()
+
+            workspaceCommandListener = jasmine.createSpy('workspaceCommandListener')
+            atom.commands.add '.workspace', 'activation-command', workspaceCommandListener
+
+            promise = atom.packages.activatePackage('package-with-activation-commands')
+
+          it "defers requiring/activating the main module until an activation event bubbles to the root view", ->
+            expect(promise.isFulfilled()).not.toBeTruthy()
+            atom.workspaceView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+
+            waitsForPromise ->
+              promise
+
+          it "triggers the activation event on all handlers registered during activation", ->
+            waitsForPromise ->
+              atom.workspaceView.open()
+
+            runs ->
+              editorView = atom.workspaceView.getActiveView()
+              legacyCommandListener = jasmine.createSpy("legacyCommandListener")
+              editorView.command 'activation-command', legacyCommandListener
+              editorCommandListener = jasmine.createSpy("editorCommandListener")
+              atom.commands.add '.editor', 'activation-command', editorCommandListener
+              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+              expect(mainModule.activate.callCount).toBe 1
+              expect(mainModule.legacyActivationCommandCallCount).toBe 1
+              expect(mainModule.activationCommandCallCount).toBe 1
+              expect(legacyCommandListener.callCount).toBe 1
+              expect(editorCommandListener.callCount).toBe 1
+              expect(workspaceCommandListener.callCount).toBe 1
+              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+              expect(mainModule.legacyActivationCommandCallCount).toBe 2
+              expect(mainModule.activationCommandCallCount).toBe 2
+              expect(legacyCommandListener.callCount).toBe 2
+              expect(editorCommandListener.callCount).toBe 2
+              expect(workspaceCommandListener.callCount).toBe 2
+              expect(mainModule.activate.callCount).toBe 1
+
+          it "activates the package immediately when the events are empty", ->
+            mainModule = require './fixtures/packages/package-with-empty-activation-commands/index'
+            spyOn(mainModule, 'activate').andCallThrough()
+
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-empty-activation-commands')
+
+            runs ->
+              expect(mainModule.activate.callCount).toBe 1
+
+      describe "when the package has no main module", ->
+        it "does not throw an exception", ->
+          spyOn(console, "error")
+          spyOn(console, "warn").andCallThrough()
+          expect(-> atom.packages.activatePackage('package-without-module')).not.toThrow()
+          expect(console.error).not.toHaveBeenCalled()
+          expect(console.warn).not.toHaveBeenCalled()
+
+      it "passes the activate method the package's previously serialized state if it exists", ->
+        pack = null
+        waitsForPromise ->
+          atom.packages.activatePackage("package-with-serialization").then (p) -> pack = p
+
+        runs ->
+          expect(pack.mainModule.someNumber).not.toBe 77
+          pack.mainModule.someNumber = 77
+          atom.packages.deactivatePackage("package-with-serialization")
+          spyOn(pack.mainModule, 'activate').andCallThrough()
+          atom.packages.activatePackage("package-with-serialization")
+          expect(pack.mainModule.activate).toHaveBeenCalledWith({someNumber: 77})
+
+      it "logs warning instead of throwing an exception if the package fails to load", ->
+        atom.config.set("core.disabledPackages", [])
+        spyOn(console, "warn")
+        expect(-> atom.packages.activatePackage("package-that-throws-an-exception")).not.toThrow()
+        expect(console.warn).toHaveBeenCalled()
+
+      describe "keymap loading", ->
+        describe "when the metadata does not contain a 'keymaps' manifest", ->
+          it "loads all the .cson/.json files in the keymaps directory", ->
+            element1 = $$ -> @div class: 'test-1'
+            element2 = $$ -> @div class: 'test-2'
+            element3 = $$ -> @div class: 'test-3'
+
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])).toHaveLength 0
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
+
+            atom.packages.activatePackage("package-with-keymaps")
+
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe "test-1"
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])[0].command).toBe "test-2"
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
+
+        describe "when the metadata contains a 'keymaps' manifest", ->
+          it "loads only the keymaps specified by the manifest, in the specified order", ->
+            element1 = $$ -> @div class: 'test-1'
+            element3 = $$ -> @div class: 'test-3'
+
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
+
+            atom.packages.activatePackage("package-with-keymaps-manifest")
+
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe 'keymap-1'
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-n', target:element1[0])[0].command).toBe 'keymap-2'
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-y', target:element3[0])).toHaveLength 0
+
+      describe "menu loading", ->
+        beforeEach ->
+          atom.contextMenu.definitions = []
+          atom.menu.template = []
+
+        describe "when the metadata does not contain a 'menus' manifest", ->
+          it "loads all the .cson/.json files in the menus directory", ->
+            element = ($$ -> @div class: 'test-1')[0]
+
+            expect(atom.contextMenu.definitionsForElement(element)).toEqual []
+
+            atom.packages.activatePackage("package-with-menus")
+
+            expect(atom.menu.template.length).toBe 2
+            expect(atom.menu.template[0].label).toBe "Second to Last"
+            expect(atom.menu.template[1].label).toBe "Last"
+            expect(atom.contextMenu.definitionsForElement(element)[0].label).toBe "Menu item 1"
+            expect(atom.contextMenu.definitionsForElement(element)[1].label).toBe "Menu item 2"
+            expect(atom.contextMenu.definitionsForElement(element)[2].label).toBe "Menu item 3"
+
+        describe "when the metadata contains a 'menus' manifest", ->
+          it "loads only the menus specified by the manifest, in the specified order", ->
+            element = ($$ -> @div class: 'test-1')[0]
+
+            expect(atom.contextMenu.definitionsForElement(element)).toEqual []
+
+            atom.packages.activatePackage("package-with-menus-manifest")
+
+            expect(atom.menu.template[0].label).toBe "Second to Last"
+            expect(atom.menu.template[1].label).toBe "Last"
+            expect(atom.contextMenu.definitionsForElement(element)[0].label).toBe "Menu item 2"
+            expect(atom.contextMenu.definitionsForElement(element)[1].label).toBe "Menu item 1"
+            expect(atom.contextMenu.definitionsForElement(element)[2]).toBeUndefined()
+
+      describe "stylesheet loading", ->
+        describe "when the metadata contains a 'stylesheets' manifest", ->
+          it "loads stylesheets from the stylesheets directory as specified by the manifest", ->
+            one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
+            two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
+            three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
+
+            one = atom.themes.stringToId(one)
+            two = atom.themes.stringToId(two)
+            three = atom.themes.stringToId(three)
+
+            expect(atom.themes.stylesheetElementForId(one)).toBeNull()
+            expect(atom.themes.stylesheetElementForId(two)).toBeNull()
+            expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+
+            atom.packages.activatePackage("package-with-stylesheets-manifest")
+
+            expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
+            expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
+            expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+            expect($('#jasmine-content').css('font-size')).toBe '1px'
+
+        describe "when the metadata does not contain a 'stylesheets' manifest", ->
+          it "loads all stylesheets from the stylesheets directory", ->
+            one = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/1.css")
+            two = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/2.less")
+            three = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/3.css")
+
+
+            one = atom.themes.stringToId(one)
+            two = atom.themes.stringToId(two)
+            three = atom.themes.stringToId(three)
+
+            expect(atom.themes.stylesheetElementForId(one)).toBeNull()
+            expect(atom.themes.stylesheetElementForId(two)).toBeNull()
+            expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+
+            atom.packages.activatePackage("package-with-stylesheets")
+            expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
+            expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
+            expect(atom.themes.stylesheetElementForId(three)).not.toBeNull()
+            expect($('#jasmine-content').css('font-size')).toBe '3px'
+
+      describe "grammar loading", ->
+        it "loads the package's grammars", ->
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-grammars')
+
+          runs ->
+            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
+            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'
+
+      describe "scoped-property loading", ->
+        it "loads the scoped properties", ->
+          waitsForPromise ->
+            atom.packages.activatePackage("package-with-scoped-properties")
+
+          runs ->
+            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
+
+    describe "converted textmate packages", ->
+      it "loads the package's grammars", ->
+        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+
+        waitsForPromise ->
+          atom.packages.activatePackage('language-ruby')
+
+        runs ->
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+
+      it "loads the translated scoped properties", ->
+        expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
+
+        waitsForPromise ->
+          atom.packages.activatePackage('language-ruby')
+
+        runs ->
+          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBe '# '
+
+  describe "::deactivatePackage(id)", ->
+    describe "atom packages", ->
+      it "calls `deactivate` on the package's main module if activate was successful", ->
+        pack = null
+        waitsForPromise ->
+          atom.packages.activatePackage("package-with-deactivate").then (p) -> pack = p
+
+        runs ->
+          expect(atom.packages.isPackageActive("package-with-deactivate")).toBeTruthy()
+          spyOn(pack.mainModule, 'deactivate').andCallThrough()
+
+          atom.packages.deactivatePackage("package-with-deactivate")
+          expect(pack.mainModule.deactivate).toHaveBeenCalled()
+          expect(atom.packages.isPackageActive("package-with-module")).toBeFalsy()
+
+          spyOn(console, 'warn')
+
+        badPack = null
+        waitsForPromise ->
+          atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
+
+        runs ->
+          expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeTruthy()
+          spyOn(badPack.mainModule, 'deactivate').andCallThrough()
+
+          atom.packages.deactivatePackage("package-that-throws-on-activate")
+          expect(badPack.mainModule.deactivate).not.toHaveBeenCalled()
+          expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeFalsy()
+
+      it "does not serialize packages that have not been activated called on their main module", ->
+        spyOn(console, 'warn')
+        badPack = null
+        waitsForPromise ->
+          atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
+
+        runs ->
+          spyOn(badPack.mainModule, 'serialize').andCallThrough()
+
+          atom.packages.deactivatePackage("package-that-throws-on-activate")
+          expect(badPack.mainModule.serialize).not.toHaveBeenCalled()
+
+      it "absorbs exceptions that are thrown by the package module's serialize method", ->
+        spyOn(console, 'error')
+
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-serialize-error')
+
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-serialization')
+
+        runs ->
+          atom.packages.deactivatePackages()
+          expect(atom.packages.packageStates['package-with-serialize-error']).toBeUndefined()
+          expect(atom.packages.packageStates['package-with-serialization']).toEqual someNumber: 1
+          expect(console.error).toHaveBeenCalled()
+
+      it "absorbs exceptions that are thrown by the package module's deactivate method", ->
+        spyOn(console, 'error')
+
+        waitsForPromise ->
+          atom.packages.activatePackage("package-that-throws-on-deactivate")
+
+        runs ->
+          expect(-> atom.packages.deactivatePackage("package-that-throws-on-deactivate")).not.toThrow()
+          expect(console.error).toHaveBeenCalled()
+
+      it "removes the package's grammars", ->
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-grammars')
+
+        runs ->
+          atom.packages.deactivatePackage('package-with-grammars')
+          expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
+          expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'
+
+      it "removes the package's keymaps", ->
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-keymaps')
+
+        runs ->
+          atom.packages.deactivatePackage('package-with-keymaps')
+          expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-1')[0])).toHaveLength 0
+          expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-2')[0])).toHaveLength 0
+
+      it "removes the package's stylesheets", ->
+        waitsForPromise ->
+          atom.packages.activatePackage('package-with-stylesheets')
+
+        runs ->
+          atom.packages.deactivatePackage('package-with-stylesheets')
+          one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
+          two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
+          three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
+          expect(atom.themes.stylesheetElementForId(one)).not.toExist()
+          expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+          expect(atom.themes.stylesheetElementForId(three)).not.toExist()
+
+      it "removes the package's scoped-properties", ->
+        waitsForPromise ->
+          atom.packages.activatePackage("package-with-scoped-properties")
+
+        runs ->
+          expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
+          atom.packages.deactivatePackage("package-with-scoped-properties")
+          expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
+
+    describe "textmate packages", ->
+      it "removes the package's grammars", ->
+        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+
+        waitsForPromise ->
+          atom.packages.activatePackage('language-ruby')
+
+        runs ->
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+          atom.packages.deactivatePackage('language-ruby')
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+
+      it "removes the package's scoped properties", ->
+        waitsForPromise ->
+          atom.packages.activatePackage('language-ruby')
+
+        runs ->
+          atom.packages.deactivatePackage('language-ruby')
+          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
+
+  describe "::activate()", ->
+    packageActivator = null
+    themeActivator = null
+
+    beforeEach ->
+      spyOn(console, 'warn')
+      atom.packages.loadPackages()
+
+      loadedPackages = atom.packages.getLoadedPackages()
+      expect(loadedPackages.length).toBeGreaterThan 0
+
+      packageActivator = spyOn(atom.packages, 'activatePackages')
+      themeActivator = spyOn(atom.themes, 'activatePackages')
+
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
+      Syntax = require '../src/syntax'
+      atom.syntax = window.syntax = new Syntax()
+
+    it "activates all the packages, and none of the themes", ->
+      atom.packages.activate()
+
+      expect(packageActivator).toHaveBeenCalled()
+      expect(themeActivator).toHaveBeenCalled()
+
+      packages = packageActivator.mostRecentCall.args[0]
+      expect(['atom', 'textmate']).toContain(pack.getType()) for pack in packages
+
+      themes = themeActivator.mostRecentCall.args[0]
+      expect(['theme']).toContain(theme.getType()) for theme in themes
+
+  describe "::enablePackage() and ::disablePackage()", ->
+    describe "with packages", ->
+      it ".enablePackage() enables a disabled package", ->
+        packageName = 'package-with-main'
+        atom.config.pushAtKeyPath('core.disabledPackages', packageName)
+        atom.packages.observeDisabledPackages()
+        expect(atom.config.get('core.disabledPackages')).toContain packageName
+
+        pack = atom.packages.enablePackage(packageName)
+        loadedPackages = atom.packages.getLoadedPackages()
+        activatedPackages = null
+        waitsFor ->
+          activatedPackages = atom.packages.getActivePackages()
+          activatedPackages.length > 0
+
+        runs ->
+          expect(loadedPackages).toContain(pack)
+          expect(activatedPackages).toContain(pack)
+          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+
+      it ".disablePackage() disables an enabled package", ->
+        packageName = 'package-with-main'
+        waitsForPromise ->
+          atom.packages.activatePackage(packageName)
+
+        runs ->
+          atom.packages.observeDisabledPackages()
+          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+
+          pack = atom.packages.disablePackage(packageName)
+
+          activatedPackages = atom.packages.getActivePackages()
+          expect(activatedPackages).not.toContain(pack)
+          expect(atom.config.get('core.disabledPackages')).toContain packageName
+
+    describe "with themes", ->
+      reloadedHandler = null
+
+      beforeEach ->
+        waitsForPromise ->
+          atom.themes.activateThemes()
+
+      afterEach ->
+        atom.themes.deactivateThemes()
+
+      it ".enablePackage() and .disablePackage() enables and disables a theme", ->
+        packageName = 'theme-with-package-file'
+
+        expect(atom.config.get('core.themes')).not.toContain packageName
+        expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+
+        # enabling of theme
+        pack = atom.packages.enablePackage(packageName)
+
+        waitsFor ->
+          pack in atom.packages.getActivePackages()
+
+        runs ->
+          expect(atom.config.get('core.themes')).toContain packageName
+          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+
+          reloadedHandler = jasmine.createSpy('reloadedHandler')
+          reloadedHandler.reset()
+          atom.themes.onDidReloadAll reloadedHandler
+
+          pack = atom.packages.disablePackage(packageName)
+
+        waitsFor ->
+          reloadedHandler.callCount is 1
+
+        runs ->
+          expect(atom.packages.getActivePackages()).not.toContain pack
+          expect(atom.config.get('core.themes')).not.toContain packageName
+          expect(atom.config.get('core.themes')).not.toContain packageName
+          expect(atom.config.get('core.disabledPackages')).not.toContain packageName

spec/pane-container-view-spec.coffee

@@ -5,11 +5,11 @@ PaneView = require '../src/pane-view'
 {$, View, $$} = require 'atom'
 
 describe "PaneContainerView", ->
-  [TestView, container, pane1, pane2, pane3] = []
+  [TestView, container, pane1, pane2, pane3, deserializerDisposable] = []
 
   beforeEach ->
     class TestView extends View
-      atom.deserializers.add(this)
+      deserializerDisposable = atom.deserializers.add(this)
       @deserialize: ({name}) -> new TestView(name)
       @content: -> @div tabindex: -1
       initialize: (@name) -> @text(@name)
@@ -25,7 +25,7 @@ describe "PaneContainerView", ->
     pane3 = pane2.splitDown(new TestView('3'))
 
   afterEach ->
-    atom.deserializers.remove(TestView)
+    deserializerDisposable.dispose()
 
   describe ".getActivePaneView()", ->
     it "returns the most-recently focused pane", ->

spec/pane-spec.coffee

@@ -4,6 +4,8 @@ PaneAxis = require '../src/pane-axis'
 PaneContainer = require '../src/pane-container'
 
 describe "Pane", ->
+  deserializerDisposable = null
+
   class Item extends Model
     @deserialize: ({name, uri}) -> new this(name, uri)
     constructor: (@name, @uri) ->
@@ -13,10 +15,10 @@ describe "Pane", ->
     isEqual: (other) -> @name is other?.name
 
   beforeEach ->
-    atom.deserializers.add(Item)
+    deserializerDisposable = atom.deserializers.add(Item)
 
   afterEach ->
-    atom.deserializers.remove(Item)
+    deserializerDisposable.dispose()
 
   describe "construction", ->
     it "sets the active item to the first item", ->
@@ -99,6 +101,13 @@ describe "Pane", ->
       pane.addItem(item, 1)
       expect(events).toEqual [{item, index: 1}]
 
+    it "throws an exception if the item is already present on a pane", ->
+      item = new Item("A")
+      pane1 = new Pane(items: [item])
+      container = new PaneContainer(root: pane1)
+      pane2 = pane1.splitRight()
+      expect(-> pane2.addItem(item)).toThrow()
+
   describe "::activateItem(item)", ->
     pane = null
 

spec/pane-view-spec.coffee

@@ -7,7 +7,7 @@ path = require 'path'
 temp = require 'temp'
 
 describe "PaneView", ->
-  [container, view1, view2, editor1, editor2, pane, paneModel] = []
+  [container, containerModel, view1, view2, editor1, editor2, pane, paneModel, deserializerDisposable] = []
 
   class TestView extends View
     @deserialize: ({id, text}) -> new TestView({id, text})
@@ -23,8 +23,9 @@ describe "PaneView", ->
       @emitter.on 'did-change-title', callback
 
   beforeEach ->
-    atom.deserializers.add(TestView)
+    deserializerDisposable = atom.deserializers.add(TestView)
     container = new PaneContainerView
+    containerModel = container.model
     view1 = new TestView(id: 'view-1', text: 'View 1')
     view2 = new TestView(id: 'view-2', text: 'View 2')
     waitsForPromise ->
@@ -39,7 +40,7 @@ describe "PaneView", ->
       paneModel.addItems([view1, editor1, view2, editor2])
 
   afterEach ->
-    atom.deserializers.remove(TestView)
+    deserializerDisposable.dispose()
 
   describe "when the active pane item changes", ->
     it "hides all item views except the active one", ->
@@ -216,7 +217,7 @@ describe "PaneView", ->
 
     beforeEach ->
       pane2Model = paneModel.splitRight() # Can't destroy the last pane, so we add another
-      pane2 = pane2Model._view
+      pane2 = containerModel.getView(pane2Model).__spacePenView
 
     it "triggers a 'pane:removed' event with the pane", ->
       removedHandler = jasmine.createSpy("removedHandler")
@@ -249,7 +250,7 @@ describe "PaneView", ->
 
     beforeEach ->
       pane2Model = paneModel.splitRight(items: [pane.copyActiveItem()])
-      pane2 = pane2Model._view
+      pane2 = containerModel.getView(pane2Model).__spacePenView
       expect(pane2Model.isActive()).toBe true
 
     it "adds or removes the .active class as appropriate", ->
@@ -296,7 +297,8 @@ describe "PaneView", ->
       pane2Model = pane1Model.splitRight(items: [pane1Model.copyActiveItem()])
       pane3Model = pane2Model.splitDown(items: [pane2Model.copyActiveItem()])
       pane2 = pane2Model._view
-      pane3 = pane3Model._view
+      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane3 = containerModel.getView(pane3Model).__spacePenView
 
       expect(container.find('> .pane-row > .pane').toArray()).toEqual [pane1[0]]
       expect(container.find('> .pane-row > .pane-column > .pane').toArray()).toEqual [pane2[0], pane3[0]]

spec/random-editor-spec.coffee

@@ -1,9 +1,9 @@
 {times, random} = require 'underscore-plus'
 randomWords = require 'random-words'
 TextBuffer = require 'text-buffer'
-Editor = require '../src/editor'
+TextEditor = require '../src/text-editor'
 
-describe "Editor", ->
+describe "TextEditor", ->
   [editor, tokenizedBuffer, buffer, steps, previousSteps] = []
 
   softWrapColumn = 80
@@ -17,7 +17,7 @@ describe "Editor", ->
 
     times 10, (i) ->
       buffer = new TextBuffer
-      editor = new Editor({buffer})
+      editor = new TextEditor({buffer})
       editor.setEditorWidthInChars(80)
       tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
       steps = []

spec/selection-spec.coffee

@@ -1,11 +1,11 @@
-Editor = require '../src/editor'
+TextEditor = require '../src/text-editor'
 
 describe "Selection", ->
   [buffer, editor, selection] = []
 
   beforeEach ->
     buffer = atom.project.bufferForPathSync('sample.js')
-    editor = new Editor(buffer: buffer, tabLength: 2)
+    editor = new TextEditor(buffer: buffer, tabLength: 2)
     selection = editor.getLastSelection()
 
   afterEach ->

spec/spec-helper.coffee

@@ -12,10 +12,10 @@ KeymapManager = require '../src/keymap-extensions'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
 Project = require '../src/project'
-Editor = require '../src/editor'
-EditorView = require '../src/editor-view'
+TextEditor = require '../src/text-editor'
+TextEditorView = require '../src/text-editor-view'
 TokenizedBuffer = require '../src/tokenized-buffer'
-EditorComponent = require '../src/editor-component'
+TextEditorComponent = require '../src/text-editor-component'
 pathwatcher = require 'pathwatcher'
 clipboard = require 'clipboard'
 
@@ -27,6 +27,7 @@ fixturePackagesPath = path.resolve(__dirname, './fixtures/packages')
 atom.packages.packageDirPaths.unshift(fixturePackagesPath)
 atom.keymaps.loadBundledKeymaps()
 keyBindingsToRestore = atom.keymaps.getKeyBindings()
+commandsToRestore = atom.commands.getSnapshot()
 
 $(window).on 'core:close', -> window.close()
 $(window).on 'beforeunload', ->
@@ -64,6 +65,8 @@ beforeEach ->
   atom.project = new Project(path: projectPath)
   atom.workspace = new Workspace()
   atom.keymaps.keyBindings = _.clone(keyBindingsToRestore)
+  atom.commands.setRootNode(document.body)
+  atom.commands.restoreSnapshot(commandsToRestore)
 
   window.resetTimeouts()
   atom.packages.packageStates = {}
@@ -88,26 +91,26 @@ beforeEach ->
   config = new Config({resourcePath, configDirPath: atom.getConfigDirPath()})
   spyOn(config, 'load')
   spyOn(config, 'save')
-  config.setDefaults('core', WorkspaceView.configDefaults)
-  config.setDefaults('editor', EditorView.configDefaults)
+  atom.config = config
+  atom.loadConfig()
   config.set "core.destroyEmptyPanes", false
   config.set "editor.fontFamily", "Courier"
   config.set "editor.fontSize", 16
   config.set "editor.autoIndent", false
   config.set "core.disabledPackages", ["package-that-throws-an-exception",
     "package-with-broken-package-json", "package-with-broken-keymap"]
+  config.load.reset()
   config.save.reset()
-  atom.config = config
 
   # make editor display updates synchronous
-  spyOn(EditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
-  EditorComponent.performSyncUpdates = true
+  spyOn(TextEditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
+  TextEditorComponent.performSyncUpdates = true
 
   spyOn(WorkspaceView.prototype, 'setTitle').andCallFake (@title) ->
   spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
   spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
   spyOn(pathwatcher.File.prototype, "detectResurrectionAfterDelay").andCallFake -> @detectResurrection()
-  spyOn(Editor.prototype, "shouldPromptToSave").andReturn false
+  spyOn(TextEditor.prototype, "shouldPromptToSave").andReturn false
 
   # make tokenization synchronous
   TokenizedBuffer.prototype.chunkSize = Infinity

spec/syntax-spec.coffee

@@ -4,7 +4,6 @@ temp = require 'temp'
 
 describe "the `syntax` global", ->
   beforeEach ->
-
     waitsForPromise ->
       atom.packages.activatePackage('language-text')
 
@@ -17,6 +16,10 @@ describe "the `syntax` global", ->
     waitsForPromise ->
       atom.packages.activatePackage('language-ruby')
 
+  afterEach ->
+    atom.packages.deactivatePackages()
+    atom.packages.unloadPackages()
+
   describe "serialization", ->
     it "remembers grammar overrides by path", ->
       filePath = '/foo/bar/file.js'

spec/text-editor-component-spec.coffee

@@ -1,11 +1,11 @@
 _ = require 'underscore-plus'
 {extend, flatten, toArray, last} = _
 
-EditorView = require '../src/editor-view'
-EditorComponent = require '../src/editor-component'
+TextEditorView = require '../src/text-editor-view'
+TextEditorComponent = require '../src/text-editor-component'
 nbsp = String.fromCharCode(160)
 
-describe "EditorComponent", ->
+describe "TextEditorComponent", ->
   [contentNode, editor, wrapperView, wrapperNode, component, componentNode, verticalScrollbarNode, horizontalScrollbarNode] = []
   [lineHeightInPixels, charWidth, nextAnimationFrame, noAnimationFrame, lineOverdrawMargin] = []
 
@@ -34,7 +34,7 @@ describe "EditorComponent", ->
       contentNode = document.querySelector('#jasmine-content')
       contentNode.style.width = '1000px'
 
-      wrapperView = new EditorView(editor, {lineOverdrawMargin})
+      wrapperView = new TextEditorView(editor, {lineOverdrawMargin})
       wrapperView.attachToDom()
       wrapperNode = wrapperView.element
 
@@ -197,6 +197,50 @@ describe "EditorComponent", ->
       nextAnimationFrame()
       expect(linesNode.style.backgroundColor).toBe 'rgb(255, 0, 0)'
 
+    it "applies .leading-whitespace for lines with leading spaces and/or tabs", ->
+      editor.setText(' a')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe false
+
+      editor.setText('\ta')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe false
+
+    it "applies .trailing-whitespace for lines with trailing spaces and/or tabs", ->
+      editor.setText(' ')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe false
+
+      editor.setText('\t')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe false
+
+      editor.setText('a ')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe false
+
+      editor.setText('a\t')
+      nextAnimationFrame()
+
+      leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
+      expect(leafNodes[0].classList.contains('trailing-whitespace')).toBe true
+      expect(leafNodes[0].classList.contains('leading-whitespace')).toBe false
+
     describe "when showInvisibles is enabled", ->
       invisibles = null
 
@@ -1690,11 +1734,11 @@ describe "EditorComponent", ->
         nextAnimationFrame()
         expect(verticalScrollbarNode.scrollTop).toBe 10
 
-      it "parses negative scrollSensitivity values as positive", ->
+      it "parses negative scrollSensitivity values at the minimum", ->
         atom.config.set('editor.scrollSensitivity', -50)
         componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -10))
         nextAnimationFrame()
-        expect(verticalScrollbarNode.scrollTop).toBe 5
+        expect(verticalScrollbarNode.scrollTop).toBe 1
 
     describe "when the mousewheel event's target is a line", ->
       it "keeps the line on the DOM if it is scrolled off-screen", ->
@@ -1955,7 +1999,7 @@ describe "EditorComponent", ->
         hiddenParent.style.display = 'none'
         contentNode.appendChild(hiddenParent)
 
-        wrapperView = new EditorView(editor, {lineOverdrawMargin})
+        wrapperView = new TextEditorView(editor, {lineOverdrawMargin})
         wrapperNode = wrapperView.element
         wrapperView.appendTo(hiddenParent)
 
@@ -2181,7 +2225,7 @@ describe "EditorComponent", ->
 
   describe "when placholderText is specified", ->
     it "renders the placeholder text when the buffer is empty", ->
-      component.setProps(placeholderText: 'Hello World')
+      editor.setPlaceholderText('Hello World')
       expect(componentNode.querySelector('.placeholder-text')).toBeNull()
       editor.setText('')
       nextAnimationFrame()
@@ -2195,7 +2239,7 @@ describe "EditorComponent", ->
       editor.setSoftWrapped(true)
 
       callingOrder = []
-      editor.onDidChangeScreenLines -> callingOrder.push 'screen-lines-changed'
+      editor.onDidChange -> callingOrder.push 'screen-lines-changed'
       wrapperView.on 'editor:display-updated', -> callingOrder.push 'editor:display-updated'
       editor.insertText("HELLO! HELLO!\n HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! HELLO! ")
       nextAnimationFrame()
@@ -2215,6 +2259,15 @@ describe "EditorComponent", ->
       editor.setGrammar(atom.syntax.nullGrammar)
       expect(wrapperNode.dataset.grammar).toBe 'text plain null-grammar'
 
+  describe "detaching and reattaching the editor (regression)", ->
+    it "does not throw an exception", ->
+      wrapperView.detach()
+      wrapperView.attachToDom()
+
+      wrapperView.trigger('core:move-right')
+
+      expect(editor.getCursorBufferPosition()).toEqual [0, 1]
+
   buildMouseEvent = (type, properties...) ->
     properties = extend({bubbles: true, cancelable: true}, properties...)
     properties.detail ?= 1

spec/text-editor-spec.coffee

@@ -1,7 +1,7 @@
 clipboard = require 'clipboard'
-Editor = require '../src/editor'
+TextEditor = require '../src/text-editor'
 
-describe "Editor", ->
+describe "TextEditor", ->
   [buffer, editor, lineLengths] = []
 
   convertToHardTabs = (buffer) ->
@@ -49,7 +49,7 @@ describe "Editor", ->
 
       state = editor.serialize()
       atom.config.set('editor.invisibles', eol: '?')
-      editor2 = Editor.deserialize(state)
+      editor2 = TextEditor.deserialize(state)
 
       expect(editor2.displayBuffer.invisibles.eol).toBe '?'
       expect(editor2.displayBuffer.tokenizedBuffer.invisibles.eol).toBe '?'
@@ -174,6 +174,20 @@ describe "Editor", ->
         editor.moveDown()
         expect(editor.getCursorBufferPosition()).toEqual [1, 1]
 
+      it "emits an event with the old position, new position, and the cursor that moved", ->
+        editor.onDidChangeCursorPosition positionChangedHandler = jasmine.createSpy()
+
+        editor.setCursorBufferPosition([2, 4])
+
+        expect(positionChangedHandler).toHaveBeenCalled()
+        eventObject = positionChangedHandler.mostRecentCall.args[0]
+
+        expect(eventObject.oldBufferPosition).toEqual [0, 0]
+        expect(eventObject.oldScreenPosition).toEqual [0, 0]
+        expect(eventObject.newBufferPosition).toEqual [2, 4]
+        expect(eventObject.newScreenPosition).toEqual [2, 4]
+        expect(eventObject.cursor).toBe editor.getLastCursor()
+
     describe ".setCursorScreenPosition(screenPosition)", ->
       it "clears a goal column established by vertical movement", ->
         # set a goal column by moving down
@@ -887,6 +901,22 @@ describe "Editor", ->
     beforeEach ->
       selection = editor.getLastSelection()
 
+    describe "when the selection range changes", ->
+      it "emits an event with the old range, new range, and the selection that moved", ->
+        editor.setSelectedBufferRange([[3, 0], [4, 5]])
+
+        editor.onDidChangeSelectionRange rangeChangedHandler = jasmine.createSpy()
+        editor.selectToBufferPosition([6, 2])
+
+        expect(rangeChangedHandler).toHaveBeenCalled()
+        eventObject = rangeChangedHandler.mostRecentCall.args[0]
+
+        expect(eventObject.oldBufferRange).toEqual [[3, 0], [4, 5]]
+        expect(eventObject.oldScreenRange).toEqual [[3, 0], [4, 5]]
+        expect(eventObject.newBufferRange).toEqual [[3, 0], [6, 2]]
+        expect(eventObject.newScreenRange).toEqual [[3, 0], [6, 2]]
+        expect(eventObject.selection).toBe selection
+
     describe ".selectUp/Down/Left/Right()", ->
       it "expands each selection to its cursor's new location", ->
         editor.setSelectedBufferRanges([[[0,9], [0,13]], [[3,16], [3,21]]])
@@ -2330,6 +2360,16 @@ describe "Editor", ->
                 expect(buffer.lineForRow(5)).toMatch /^\t\t\t$/
                 expect(editor.getCursorBufferPosition()).toEqual [5, 3]
 
+              describe "when the difference between the suggested level of indentation and the current level of indentation is greater than 0 but less than 1", ->
+                it "inserts one tab", ->
+                  editor.setSoftTabs(false)
+                  buffer.setText(" \ntest")
+                  editor.setCursorBufferPosition [1, 0]
+
+                  editor.indent(autoIndent: true)
+                  expect(buffer.lineForRow(1)).toBe '\ttest'
+                  expect(editor.getCursorBufferPosition()).toEqual [1, 1]
+
           describe "when the line's indent level is greater than the suggested level of indentation", ->
             describe "when 'softTabs' is true (the default)", ->
               it "moves the cursor to the end of the leading whitespace and inserts 'tabLength' spaces into the buffer", ->
@@ -3223,12 +3263,22 @@ describe "Editor", ->
       runs ->
         expect(editor.softTabs).toBe false
 
+        atom.packages.deactivatePackage('language-coffee-script')
+        atom.packages.unloadPackage('language-coffee-script')
+
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
       expect(buffer.getMarkerCount()).toBeGreaterThan 0
       editor.destroy()
       expect(buffer.getMarkerCount()).toBe 0
 
+    it "notifies ::onDidDestroy observers when the editor is destroyed", ->
+      destroyObserverCalled = false
+      editor.onDidDestroy -> destroyObserverCalled = true
+
+      editor.destroy()
+      expect(destroyObserverCalled).toBe true
+
   describe ".joinLines()", ->
     describe "when no text is selected", ->
       describe "when the line below isn't empty", ->
@@ -3343,7 +3393,7 @@ describe "Editor", ->
         editor2.destroy()
         expect(editor.shouldPromptToSave()).toBeTruthy()
 
-  describe "when the edit session contains surrogate pair characters", ->
+  describe "when the editor contains surrogate pair characters", ->
     it "correctly backspaces over them", ->
       editor.setText('\uD835\uDF97\uD835\uDF97\uD835\uDF97')
       editor.moveToBottom()
@@ -3384,6 +3434,47 @@ describe "Editor", ->
       editor.moveLeft()
       expect(editor.getCursorBufferPosition()).toEqual [0, 0]
 
+  describe "when the editor contains variation sequence character pairs", ->
+    it "correctly backspaces over them", ->
+      editor.setText('\u2714\uFE0E\u2714\uFE0E\u2714\uFE0E')
+      editor.moveToBottom()
+      editor.backspace()
+      expect(editor.getText()).toBe '\u2714\uFE0E\u2714\uFE0E'
+      editor.backspace()
+      expect(editor.getText()).toBe '\u2714\uFE0E'
+      editor.backspace()
+      expect(editor.getText()).toBe ''
+
+    it "correctly deletes over them", ->
+      editor.setText('\u2714\uFE0E\u2714\uFE0E\u2714\uFE0E')
+      editor.moveToTop()
+      editor.delete()
+      expect(editor.getText()).toBe '\u2714\uFE0E\u2714\uFE0E'
+      editor.delete()
+      expect(editor.getText()).toBe '\u2714\uFE0E'
+      editor.delete()
+      expect(editor.getText()).toBe ''
+
+    it "correctly moves over them", ->
+      editor.setText('\u2714\uFE0E\u2714\uFE0E\u2714\uFE0E\n')
+      editor.moveToTop()
+      editor.moveRight()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 2]
+      editor.moveRight()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 4]
+      editor.moveRight()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 6]
+      editor.moveRight()
+      expect(editor.getCursorBufferPosition()).toEqual [1, 0]
+      editor.moveLeft()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 6]
+      editor.moveLeft()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 4]
+      editor.moveLeft()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 2]
+      editor.moveLeft()
+      expect(editor.getCursorBufferPosition()).toEqual [0, 0]
+
   describe ".setIndentationForBufferRow", ->
     describe "when the editor uses soft tabs but the row has hard tabs", ->
       it "only replaces whitespace characters", ->
@@ -3577,3 +3668,21 @@ describe "Editor", ->
       editor.selectPageUp()
       expect(editor.getScrollTop()).toBe 0
       expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [12,2]]]
+
+  describe '.get/setPlaceholderText()', ->
+    it 'can be created with placeholderText', ->
+      TextBuffer = require 'text-buffer'
+      newEditor = new TextEditor
+        buffer: new TextBuffer
+        mini: true
+        placeholderText: 'yep'
+      expect(newEditor.getPlaceholderText()).toBe 'yep'
+
+    it 'models placeholderText and emits an event when changed', ->
+      editor.onDidChangePlaceholderText handler = jasmine.createSpy()
+
+      expect(editor.getPlaceholderText()).toBeUndefined()
+
+      editor.setPlaceholderText('OK')
+      expect(handler).toHaveBeenCalledWith 'OK'
+      expect(editor.getPlaceholderText()).toBe 'OK'

spec/text-utils-spec.coffee

@@ -1,30 +1,32 @@
 textUtils = require '../src/text-utils'
 
 describe 'text utilities', ->
-  describe '.getCharacterCount(string)', ->
-    it 'returns the number of full characters in the string', ->
-      expect(textUtils.getCharacterCount('abc')).toBe 3
-      expect(textUtils.getCharacterCount('a\uD835\uDF97b\uD835\uDF97c')).toBe 5
-      expect(textUtils.getCharacterCount('\uD835\uDF97')).toBe 1
-      expect(textUtils.getCharacterCount('\uD835')).toBe 1
-      expect(textUtils.getCharacterCount('\uDF97')).toBe 1
+  describe '.hasPairedCharacter(string)', ->
+    it 'returns true when the string contains a surrogate pair or variation sequence', ->
+      expect(textUtils.hasPairedCharacter('abc')).toBe false
+      expect(textUtils.hasPairedCharacter('a\uD835\uDF97b\uD835\uDF97c')).toBe true
+      expect(textUtils.hasPairedCharacter('\uD835\uDF97')).toBe true
+      expect(textUtils.hasPairedCharacter('\u2714\uFE0E')).toBe true
+      expect(textUtils.hasPairedCharacter('\uD835')).toBe false
+      expect(textUtils.hasPairedCharacter('\uDF97')).toBe false
+      expect(textUtils.hasPairedCharacter('\uFE0E')).toBe false
+      expect(textUtils.hasPairedCharacter('\uFE0E\uFE0E')).toBe false
 
-  describe '.hasSurrogatePair(string)', ->
-    it 'returns true when the string contains a surrogate pair', ->
-      expect(textUtils.hasSurrogatePair('abc')).toBe false
-      expect(textUtils.hasSurrogatePair('a\uD835\uDF97b\uD835\uDF97c')).toBe true
-      expect(textUtils.hasSurrogatePair('\uD835\uDF97')).toBe true
-      expect(textUtils.hasSurrogatePair('\uD835')).toBe false
-      expect(textUtils.hasSurrogatePair('\uDF97')).toBe false
-
-  describe '.isSurrogatePair(string, index)', ->
-    it 'returns true when the index is the start of a high/low surrogate pair', ->
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 0)).toBe false
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 1)).toBe true
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 2)).toBe false
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 3)).toBe false
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 4)).toBe true
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 5)).toBe false
-      expect(textUtils.isSurrogatePair('a\uD835\uDF97b\uD835\uDF97c', 6)).toBe false
-      expect(textUtils.isSurrogatePair('\uD835')).toBe false
-      expect(textUtils.isSurrogatePair('\uDF97')).toBe false
+  describe '.isPairedCharacter(string, index)', ->
+    it 'returns true when the index is the start of a high/low surrogate pair or variation sequence', ->
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 0)).toBe false
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 1)).toBe true
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 2)).toBe false
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 3)).toBe false
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 4)).toBe true
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 5)).toBe false
+      expect(textUtils.isPairedCharacter('a\uD835\uDF97b\uD835\uDF97c', 6)).toBe false
+      expect(textUtils.isPairedCharacter('a\u2714\uFE0E', 0)).toBe false
+      expect(textUtils.isPairedCharacter('a\u2714\uFE0E', 1)).toBe true
+      expect(textUtils.isPairedCharacter('a\u2714\uFE0E', 2)).toBe false
+      expect(textUtils.isPairedCharacter('a\u2714\uFE0E', 3)).toBe false
+      expect(textUtils.isPairedCharacter('\uD835')).toBe false
+      expect(textUtils.isPairedCharacter('\uDF97')).toBe false
+      expect(textUtils.isPairedCharacter('\uFE0E')).toBe false
+      expect(textUtils.isPairedCharacter('\uFE0E')).toBe false
+      expect(textUtils.isPairedCharacter('\uFE0E\uFE0E')).toBe false

spec/theme-manager-spec.coffee

@@ -52,7 +52,7 @@ describe "ThemeManager", ->
 
       expect(themeManager.getEnabledThemeNames()).toEqual ['atom-dark-ui', 'atom-light-ui']
 
-  describe "getImportPaths()", ->
+  describe "::getImportPaths()", ->
     it "returns the theme directories before the themes are loaded", ->
       atom.config.set('core.themes', ['theme-with-index-less', 'atom-dark-ui', 'atom-light-ui'])
 
@@ -129,7 +129,7 @@ describe "ThemeManager", ->
       spyOn(console, 'warn')
       expect(-> atom.packages.activatePackage('a-theme-that-will-not-be-found')).toThrow()
 
-  describe "requireStylesheet(path)", ->
+  describe "::requireStylesheet(path)", ->
     it "synchronously loads css at the given path and installs a style tag for it in the head", ->
       themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
       themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
@@ -185,18 +185,17 @@ describe "ThemeManager", ->
       $('head style[id*="css.css"]').remove()
       $('head style[id*="sample.less"]').remove()
 
-  describe ".removeStylesheet(path)", ->
-    it "removes styling applied by given stylesheet path", ->
+    it "returns a disposable allowing styles applied by the given path to be removed", ->
       cssPath = require.resolve('./fixtures/css.css')
 
       expect($(document.body).css('font-weight')).not.toBe("bold")
-      themeManager.requireStylesheet(cssPath)
+      disposable = themeManager.requireStylesheet(cssPath)
       expect($(document.body).css('font-weight')).toBe("bold")
 
       themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
       themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
 
-      themeManager.removeStylesheet(cssPath)
+      disposable.dispose()
 
       expect($(document.body).css('font-weight')).not.toBe("bold")
 
@@ -209,7 +208,7 @@ describe "ThemeManager", ->
 
   describe "base stylesheet loading", ->
     beforeEach ->
-      atom.workspaceView = new WorkspaceView
+      atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
       atom.workspaceView.append $$ -> @div class: 'editor'
       atom.workspaceView.attachToDom()
 

spec/tokenized-buffer-spec.coffee

@@ -586,7 +586,7 @@ describe "TokenizedBuffer", ->
       atom.config.set('editor.tabLength', 1)
       expect(tokenizedBuffer.tokenForPosition([0,0]).value).toBe ' '
       atom.config.set('editor.tabLength', 0)
-      expect(tokenizedBuffer.tokenForPosition([0,0]).value).toBe '  '
+      expect(tokenizedBuffer.tokenForPosition([0,0]).value).toBe ' '
 
   describe "when the invisibles value changes", ->
     beforeEach ->

spec/view-registry-spec.coffee

@@ -0,0 +1,107 @@
+ViewRegistry = require '../src/view-registry'
+{View} = require '../src/space-pen-extensions'
+
+describe "ViewRegistry", ->
+  registry = null
+
+  beforeEach ->
+    registry = new ViewRegistry
+
+  describe "::getView(object)", ->
+    describe "when passed a DOM node", ->
+      it "returns the given DOM node", ->
+        node = document.createElement('div')
+        expect(registry.getView(node)).toBe node
+
+    describe "when passed a SpacePen view", ->
+      it "returns the root node of the view with a __spacePenView property pointing at the SpacePen view", ->
+        class TestView extends View
+          @content: -> @div "Hello"
+
+        view = new TestView
+        node = registry.getView(view)
+        expect(node.textContent).toBe "Hello"
+        expect(node.__spacePenView).toBe view
+
+    describe "when passed a model object", ->
+      describe "when a view provider is registered matching the object's constructor", ->
+        describe "when the provider has a viewConstructor property", ->
+          it "constructs a view element and assigns the model on it", ->
+            class TestModel
+
+            class TestModelSubclass extends TestModel
+
+            class TestView
+              setModel: (@model) ->
+
+            model = new TestModel
+
+            registry.addViewProvider
+              modelConstructor: TestModel
+              viewConstructor: TestView
+
+            view = registry.getView(model)
+            expect(view instanceof TestView).toBe true
+            expect(view.model).toBe model
+
+            subclassModel = new TestModelSubclass
+            view2 = registry.getView(subclassModel)
+            expect(view2 instanceof TestView).toBe true
+            expect(view2.model).toBe subclassModel
+
+        describe "when the provider has a createView method", ->
+          it "constructs a view element by calling the createView method with the model", ->
+            class TestModel
+            class TestView
+              setModel: (@model) ->
+
+            registry.addViewProvider
+              modelConstructor: TestModel
+              createView: (model) ->
+                view = new TestView
+                view.setModel(model)
+                view
+
+            model = new TestModel
+            view = registry.getView(model)
+            expect(view instanceof TestView).toBe true
+            expect(view.model).toBe model
+
+      describe "when no view provider is registered for the object's constructor", ->
+        describe "when the object has a .getViewClass() method", ->
+          it "builds an instance of the view class with the model, then returns its root node with a __spacePenView property pointing at the view", ->
+            class TestView extends View
+              @content: (model) -> @div model.name
+              initialize: (@model) ->
+
+            class TestModel
+              constructor: (@name) ->
+              getViewClass: -> TestView
+
+            model = new TestModel("hello")
+            node = registry.getView(model)
+
+            expect(node.textContent).toBe "hello"
+            view = node.__spacePenView
+            expect(view instanceof TestView).toBe true
+            expect(view.model).toBe model
+
+            # returns the same DOM node for repeated calls
+            expect(registry.getView(model)).toBe node
+
+        describe "when the object has no .getViewClass() method", ->
+          it "throws an exception", ->
+            expect(-> registry.getView(new Object)).toThrow()
+
+  describe "::addViewProvider(providerSpec)", ->
+    it "returns a disposable that can be used to remove the provider", ->
+      class TestModel
+      class TestView
+        setModel: (@model) ->
+      disposable = registry.addViewProvider
+        modelConstructor: TestModel
+        viewConstructor: TestView
+
+      expect(registry.getView(new TestModel) instanceof TestView).toBe true
+      disposable.dispose()
+      expect(-> registry.getView(new TestModel)).toThrow()

spec/window-spec.coffee

@@ -1,6 +1,6 @@
 {$, $$} = require 'atom'
 path = require 'path'
-Editor = require '../src/editor'
+TextEditor = require '../src/text-editor'
 WindowEventHandler = require '../src/window-event-handler'
 
 describe "Window", ->
@@ -59,7 +59,7 @@ describe "Window", ->
     [beforeUnloadEvent] = []
 
     beforeEach ->
-      jasmine.unspy(Editor.prototype, "shouldPromptToSave")
+      jasmine.unspy(TextEditor.prototype, "shouldPromptToSave")
       beforeUnloadEvent = $.Event(new Event('beforeunload'))
 
     describe "when pane items are are modified", ->

spec/workspace-spec.coffee

@@ -1,4 +1,5 @@
 Workspace = require '../src/workspace'
+{View} = require '../src/space-pen-extensions'
 
 describe "Workspace", ->
   workspace = null

spec/workspace-view-spec.coffee

@@ -2,7 +2,7 @@
 Q = require 'q'
 path = require 'path'
 temp = require 'temp'
-EditorView = require '../src/editor-view'
+TextEditorView = require '../src/text-editor-view'
 PaneView = require '../src/pane-view'
 Workspace = require '../src/workspace'
 
@@ -13,7 +13,7 @@ describe "WorkspaceView", ->
     atom.project.setPath(atom.project.resolve('dir'))
     pathToOpen = atom.project.resolve('a')
     atom.workspace = new Workspace
-    atom.workspaceView = new WorkspaceView(atom.workspace)
+    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
     atom.workspaceView.enableKeymap()
     atom.workspaceView.focus()
 
@@ -29,7 +29,7 @@ describe "WorkspaceView", ->
       atom.workspaceView.remove()
       atom.project = atom.deserializers.deserialize(projectState)
       atom.workspace = Workspace.deserialize(workspaceState)
-      atom.workspaceView = new WorkspaceView(atom.workspace)
+      atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
       atom.workspaceView.attachToDom()
 
     describe "when the serialized WorkspaceView has an unsaved buffer", ->
@@ -61,7 +61,7 @@ describe "WorkspaceView", ->
 
         waitsForPromise ->
           atom.workspace.open('b').then (editor) ->
-            pane2.activateItem(editor)
+            pane2.activateItem(editor.copy())
 
         waitsForPromise ->
           atom.workspace.open('../sample.js').then (editor) ->
@@ -185,7 +185,8 @@ describe "WorkspaceView", ->
 
     describe "when the root view is deserialized", ->
       it "updates the title to contain the project's path", ->
-        workspaceView2 = new WorkspaceView(atom.workspace.testSerialization())
+        workspace2 = atom.workspace.testSerialization()
+        workspaceView2 = workspace2.getView(workspace2).__spacePenView
         item = atom.workspace.getActivePaneItem()
         expect(workspaceView2.title).toBe "#{item.getTitle()} - #{atom.project.getPath()}"
         workspaceView2.remove()
@@ -252,7 +253,7 @@ describe "WorkspaceView", ->
       editorViewCreatedHandler = jasmine.createSpy('editorViewCreatedHandler')
       atom.workspaceView.eachEditorView(editorViewCreatedHandler)
       editorViewCreatedHandler.reset()
-      miniEditor = new EditorView(mini: true)
+      miniEditor = new TextEditorView(mini: true)
       atom.workspaceView.append(miniEditor)
       expect(editorViewCreatedHandler).not.toHaveBeenCalled()
 

src/atom.coffee

@@ -7,21 +7,22 @@ screen = require 'screen'
 shell = require 'shell'
 
 _ = require 'underscore-plus'
-{deprecated} = require 'grim'
+{deprecate} = require 'grim'
+{Emitter} = require 'event-kit'
 {Model} = require 'theorist'
 fs = require 'fs-plus'
 
 {$} = require './space-pen-extensions'
 WindowEventHandler = require './window-event-handler'
 
-# Public: Atom global for dealing with packages, themes, menus, and the window.
+# Essential: Atom global for dealing with packages, themes, menus, and the window.
 #
 # An instance of this class is always available as the `atom` global.
 module.exports =
 class Atom extends Model
   @version: 1  # Increment this when the serialization format changes
 
-  # Public: Load or create the Atom environment in the given mode.
+  # Load or create the Atom environment in the given mode.
   #
   # * `mode` A {String} mode that is either 'editor' or 'spec' depending on the
   #   kind of environment you want to build.
@@ -98,26 +99,27 @@ class Atom extends Model
   workspaceViewParentSelector: 'body'
   lastUncaughtError: null
 
-  # Public: A {Clipboard} instance
-  clipboard: null
+  ###
+  Section: Properties
+  ###
+
+  # Experimental: A {CommandRegistry} instance
+  commands: null
 
   # Public: A {Config} instance
   config: null
 
+  # Public: A {Clipboard} instance
+  clipboard: null
+
   # Public: A {ContextMenuManager} instance
   contextMenu: null
 
-  # Public: A {DeserializerManager} instance
-  deserializers: null
-
-  # Public: A {KeymapManager} instance
-  keymaps: null
-
   # Public: A {MenuManager} instance
   menu: null
 
-  # Public: A {PackageManager} instance
-  packages: null
+  # Public: A {KeymapManager} instance
+  keymaps: null
 
   # Public: A {Project} instance
   project: null
@@ -125,26 +127,43 @@ class Atom extends Model
   # Public: A {Syntax} instance
   syntax: null
 
+  # Public: A {PackageManager} instance
+  packages: null
+
   # Public: A {ThemeManager} instance
   themes: null
 
+  # Public: A {DeserializerManager} instance
+  deserializers: null
+
   # Public: A {Workspace} instance
   workspace: null
 
   # Public: A {WorkspaceView} instance
   workspaceView: null
 
+  ###
+  Section: Construction and Destruction
+  ###
+
   # Call .loadOrCreate instead
   constructor: (@state) ->
+    @emitter = new Emitter
     {@mode} = @state
     DeserializerManager = require './deserializer-manager'
     @deserializers = new DeserializerManager()
 
-  # Public: Sets up the basic services that should be available in all modes
+  # Sets up the basic services that should be available in all modes
   # (both spec and application).
   #
   # Call after this instance has been assigned to the `atom` global.
   initialize: ->
+    # Disable deprecations unless in dev mode or spec mode so that regular
+    # editor performance isn't impacted by generating stack traces for
+    # deprecated calls.
+    unless @inDevMode() or @inSpecMode()
+      require('grim').deprecate = ->
+
     window.onerror = =>
       @openDevTools()
       @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
@@ -158,6 +177,7 @@ class Atom extends Model
 
     Config = require './config'
     KeymapManager = require './keymap-extensions'
+    CommandRegistry = require './command-registry'
     PackageManager = require './package-manager'
     Clipboard = require './clipboard'
     Syntax = require './syntax'
@@ -179,6 +199,7 @@ class Atom extends Model
     @config = new Config({configDirPath, resourcePath})
     @keymaps = new KeymapManager({configDirPath, resourcePath})
     @keymap = @keymaps # Deprecated
+    @commands = new CommandRegistry
     @packages = new PackageManager({devMode, configDirPath, resourcePath, safeMode})
     @themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath, safeMode})
     @contextMenu = new ContextMenuManager({resourcePath, devMode})
@@ -194,26 +215,176 @@ class Atom extends Model
     @deserializers.add(TextBuffer)
     TokenizedBuffer = require './tokenized-buffer'
     DisplayBuffer = require './display-buffer'
-    Editor = require './editor'
+    TextEditor = require './text-editor'
 
     @windowEventHandler = new WindowEventHandler
 
-  # Deprecated: Callers should be converted to use atom.deserializers
-  registerRepresentationClass: ->
-    deprecated("Callers should be converted to use atom.deserializers")
+  ###
+  Section: Event Subscription
+  ###
 
-  # Deprecated: Callers should be converted to use atom.deserializers
-  registerRepresentationClasses: ->
-    deprecated("Callers should be converted to use atom.deserializers")
+  # Extended: Invoke the given callback whenever {::beep} is called.
+  #
+  # * `callback` {Function} to be called whenever {::beep} is called.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  onDidBeep: (callback) ->
+    @emitter.on 'did-beep', callback
 
-  setBodyPlatformClass: ->
-    document.body.classList.add("platform-#{process.platform}")
+  ###
+  Section: Atom Details
+  ###
 
-  # Public: Get the current window
+  # Public: Is the current window in development mode?
+  inDevMode: ->
+    @getLoadSettings().devMode
+
+  # Public: Is the current window running specs?
+  inSpecMode: ->
+    @getLoadSettings().isSpec
+
+  # Public: Get the version of the Atom application.
+  #
+  # Returns the version text {String}.
+  getVersion: ->
+    @appVersion ?= @getLoadSettings().appVersion
+
+  # Public: Determine whether the current version is an official release.
+  isReleasedVersion: ->
+    not /\w{7}/.test(@getVersion()) # Check if the release is a 7-character SHA prefix
+
+  # Public: Get the directory path to Atom's configuration area.
+  #
+  # Returns the absolute path to `~/.atom`.
+  getConfigDirPath: ->
+    @constructor.getConfigDirPath()
+
+  # Public: Get the time taken to completely load the current window.
+  #
+  # This time include things like loading and activating packages, creating
+  # DOM elements for the editor, and reading the config.
+  #
+  # Returns the {Number} of milliseconds taken to load the window or null
+  # if the window hasn't finished loading yet.
+  getWindowLoadTime: ->
+    @loadTime
+
+  # Public: Get the load settings for the current window.
+  #
+  # Returns an {Object} containing all the load setting key/value pairs.
+  getLoadSettings: ->
+    @constructor.getLoadSettings()
+
+  ###
+  Section: Managing The Atom Window
+  ###
+
+  # Essential: Open a new Atom window using the given options.
+  #
+  # Calling this method without an options parameter will open a prompt to pick
+  # a file/folder to open in the new window.
+  #
+  # * `options` An {Object} with the following keys:
+  #   * `pathsToOpen`  An {Array} of {String} paths to open.
+  #   * `newWindow` A {Boolean}, true to always open a new window instead of
+  #     reusing existing windows depending on the paths to open.
+  #   * `devMode` A {Boolean}, true to open the window in development mode.
+  #     Development mode loads the Atom source from the locally cloned
+  #     repository and also loads all the packages in ~/.atom/dev/packages
+  #   * `safeMode` A {Boolean}, true to open the window in safe mode. Safe
+  #     mode prevents all packages installed to ~/.atom/packages from loading.
+  open: (options) ->
+    ipc.send('open', options)
+
+  # Essential: Close the current window.
+  close: ->
+    @getCurrentWindow().close()
+
+  # Essential: Get the size of current window.
+  #
+  # Returns an {Object} in the format `{width: 1000, height: 700}`
+  getSize: ->
+    [width, height] = @getCurrentWindow().getSize()
+    {width, height}
+
+  # Essential: Set the size of current window.
+  #
+  # * `width` The {Number} of pixels.
+  # * `height` The {Number} of pixels.
+  setSize: (width, height) ->
+    @getCurrentWindow().setSize(width, height)
+
+  # Essential: Get the position of current window.
+  #
+  # Returns an {Object} in the format `{x: 10, y: 20}`
+  getPosition: ->
+    [x, y] = @getCurrentWindow().getPosition()
+    {x, y}
+
+  # Essential: Set the position of current window.
+  #
+  # * `x` The {Number} of pixels.
+  # * `y` The {Number} of pixels.
+  setPosition: (x, y) ->
+    ipc.send('call-window-method', 'setPosition', x, y)
+
+  # Extended: Get the current window
   getCurrentWindow: ->
     @constructor.getCurrentWindow()
 
-  # Public: Get the dimensions of this window.
+  # Extended: Move current window to the center of the screen.
+  center: ->
+    ipc.send('call-window-method', 'center')
+
+  # Extended: Focus the current window.
+  focus: ->
+    ipc.send('call-window-method', 'focus')
+    $(window).focus()
+
+  # Extended: Show the current window.
+  show: ->
+    ipc.send('call-window-method', 'show')
+
+  # Extended: Hide the current window.
+  hide: ->
+    ipc.send('call-window-method', 'hide')
+
+  # Extended: Reload the current window.
+  reload: ->
+    ipc.send('call-window-method', 'restart')
+
+  # Extended: Returns a {Boolean} true when the current window is maximized.
+  isMaximixed: ->
+    @getCurrentWindow().isMaximized()
+
+  maximize: ->
+    ipc.send('call-window-method', 'maximize')
+
+  # Extended: Is the current window in full screen mode?
+  isFullScreen: ->
+    @getCurrentWindow().isFullScreen()
+
+  # Extended: Set the full screen state of the current window.
+  setFullScreen: (fullScreen=false) ->
+    ipc.send('call-window-method', 'setFullScreen', fullScreen)
+    if fullScreen then document.body.classList.add("fullscreen") else document.body.classList.remove("fullscreen")
+
+  # Extended: Toggle the full screen state of the current window.
+  toggleFullScreen: ->
+    @setFullScreen(!@isFullScreen())
+
+  # Schedule the window to be shown and focused on the next tick.
+  #
+  # This is done in a next tick to prevent a white flicker from occurring
+  # if called synchronously.
+  displayWindow: ({maximize}={}) ->
+    setImmediate =>
+      @show()
+      @focus()
+      @setFullScreen(true) if @workspace.fullScreen
+      @maximize() if maximize
+
+  # Get the dimensions of this window.
   #
   # Returns an {Object} with the following keys:
   #   * `x`      The window's x-position {Number}.
@@ -227,7 +398,7 @@ class Atom extends Model
     maximized = browserWindow.isMaximized()
     {x, y, width, height, maximized}
 
-  # Public: Set the dimensions of the window.
+  # Set the dimensions of the window.
   #
   # The window will be centered if either the x or y coordinate is not set
   # in the dimensions parameter. If x or y are omitted the window will be
@@ -284,41 +455,6 @@ class Atom extends Model
     dimensions = @getWindowDimensions()
     @state.windowDimensions = dimensions if @isValidDimensions(dimensions)
 
-  # Public: Get the load settings for the current window.
-  #
-  # Returns an {Object} containing all the load setting key/value pairs.
-  getLoadSettings: ->
-    @constructor.getLoadSettings()
-
-  deserializeProject: ->
-    Project = require './project'
-
-    startTime = Date.now()
-    @project ?= @deserializers.deserialize(@state.project) ? new Project(path: @getLoadSettings().initialPath)
-    @deserializeTimings.project = Date.now() - startTime
-
-  deserializeWorkspaceView: ->
-    Workspace = require './workspace'
-    WorkspaceView = require './workspace-view'
-
-    startTime = Date.now()
-    @workspace = Workspace.deserialize(@state.workspace) ? new Workspace
-    @workspaceView = new WorkspaceView(@workspace)
-    @deserializeTimings.workspace = Date.now() - startTime
-
-    @keymaps.defaultTarget = @workspaceView[0]
-    $(@workspaceViewParentSelector).append(@workspaceView)
-
-  deserializePackageStates: ->
-    @packages.packageStates = @state.packageStates ? {}
-    delete @state.packageStates
-
-  deserializeEditorWindow: ->
-    @deserializeTimings = {}
-    @deserializePackageStates()
-    @deserializeProject()
-    @deserializeWorkspaceView()
-
   # Call this method when establishing a real application window.
   startEditorWindow: ->
     {resourcePath, safeMode} = @getLoadSettings()
@@ -330,9 +466,7 @@ class Atom extends Model
       console.warn error.message if error?
 
     dimensions = @restoreWindowDimensions()
-    @config.load()
-    @config.setDefaults('core', require('./workspace-view').configDefaults)
-    @config.setDefaults('editor', require('./editor-view').configDefaults)
+    @loadConfig()
     @keymaps.loadBundledKeymaps()
     @themes.loadBaseStylesheets()
     @packages.loadPackages()
@@ -369,41 +503,17 @@ class Atom extends Model
 
     @windowEventHandler?.unsubscribe()
 
-  loadThemes: ->
-    @themes.load()
+  ###
+  Section: Messaging the User
+  ###
 
-  watchThemes: ->
-    @themes.onDidReloadAll =>
-      # Only reload stylesheets from non-theme packages
-      for pack in @packages.getActivePackages() when pack.getType() isnt 'theme'
-        pack.reloadStylesheets?()
-      null
+  # Essential: Visually and audibly trigger a beep.
+  beep: ->
+    shell.beep() if @config.get('core.audioBeep')
+    @workspaceView.trigger 'beep'
+    @emitter.emit 'did-beep'
 
-  # Notify the browser project of the window's current project path
-  watchProjectPath: ->
-    onProjectPathChanged = =>
-      ipc.send('window-command', 'project-path-changed', @project.getPath())
-    @subscribe @project, 'path-changed', onProjectPathChanged
-    onProjectPathChanged()
-
-  # Public: Open a new Atom window using the given options.
-  #
-  # Calling this method without an options parameter will open a prompt to pick
-  # a file/folder to open in the new window.
-  #
-  # * `options` An {Object} with the following keys:
-  #   * `pathsToOpen`  An {Array} of {String} paths to open.
-  #   * `newWindow` A {Boolean}, true to always open a new window instead of
-  #     reusing existing windows depending on the paths to open.
-  #   * `devMode` A {Boolean}, true to open the window in development mode.
-  #     Development mode loads the Atom source from the locally cloned
-  #     repository and also loads all the packages in ~/.atom/dev/packages
-  #   * `safeMode` A {Boolean}, true to open the window in safe mode. Safe
-  #     mode prevents all packages installed to ~/.atom/packages from loading.
-  open: (options) ->
-    ipc.send('open', options)
-
-  # Public: Open a confirm dialog.
+  # Essential: A flexible way to open a dialog akin to an alert dialog.
   #
   # ## Examples
   #
@@ -413,13 +523,13 @@ class Atom extends Model
   #   detailedMessage: 'Be honest.'
   #   buttons:
   #     Good: -> window.alert('good to hear')
-  #     Bad:  -> window.alert('bummer')
+  #     Bad: -> window.alert('bummer')
   # ```
   #
   # * `options` An {Object} with the following keys:
   #   * `message` The {String} message to display.
-  #   * `detailedMessage` The {String} detailed message to display.
-  #   * `buttons` Either an array of strings or an object where keys are
+  #   * `detailedMessage` (optional) The {String} detailed message to display.
+  #   * `buttons` (optional) Either an array of strings or an object where keys are
   #     button names and the values are callbacks to invoke when clicked.
   #
   # Returns the chosen button index {Number} if the buttons option was an array.
@@ -443,77 +553,75 @@ class Atom extends Model
       callback = buttons[buttonLabels[chosen]]
       callback?()
 
-  showSaveDialog: (callback) ->
-    callback(showSaveDialogSync())
+  ###
+  Section: Managing the Dev Tools
+  ###
 
-  showSaveDialogSync: (defaultPath) ->
-    defaultPath ?= @project?.getPath()
-    currentWindow = @getCurrentWindow()
-    dialog = remote.require('dialog')
-    dialog.showSaveDialog currentWindow, {title: 'Save File', defaultPath}
-
-  # Public: Open the dev tools for the current window.
+  # Extended: Open the dev tools for the current window.
   openDevTools: ->
     ipc.send('call-window-method', 'openDevTools')
 
-  # Public: Toggle the visibility of the dev tools for the current window.
+  # Extended: Toggle the visibility of the dev tools for the current window.
   toggleDevTools: ->
     ipc.send('call-window-method', 'toggleDevTools')
 
-  # Public: Execute code in dev tools.
+  # Extended: Execute code in dev tools.
   executeJavaScriptInDevTools: (code) ->
     ipc.send('call-window-method', 'executeJavaScriptInDevTools', code)
 
-  # Public: Reload the current window.
-  reload: ->
-    ipc.send('call-window-method', 'restart')
+  ###
+  Section: Private
+  ###
 
-  # Public: Focus the current window.
-  focus: ->
-    ipc.send('call-window-method', 'focus')
-    $(window).focus()
+  deserializeProject: ->
+    Project = require './project'
 
-  # Public: Show the current window.
-  show: ->
-    ipc.send('call-window-method', 'show')
+    startTime = Date.now()
+    @project ?= @deserializers.deserialize(@state.project) ? new Project(path: @getLoadSettings().initialPath)
+    @deserializeTimings.project = Date.now() - startTime
 
-  # Public: Hide the current window.
-  hide: ->
-    ipc.send('call-window-method', 'hide')
+  deserializeWorkspaceView: ->
+    Workspace = require './workspace'
+    WorkspaceView = require './workspace-view'
 
-  # Public: Set the size of current window.
-  #
-  # * `width` The {Number} of pixels.
-  # * `height` The {Number} of pixels.
-  setSize: (width, height) ->
-    @getCurrentWindow().setSize(width, height)
+    startTime = Date.now()
+    @workspace = Workspace.deserialize(@state.workspace) ? new Workspace
+    @workspaceView = @workspace.getView(@workspace).__spacePenView
+    @deserializeTimings.workspace = Date.now() - startTime
 
-  # Public: Set the position of current window.
-  #
-  # * `x` The {Number} of pixels.
-  # * `y` The {Number} of pixels.
-  setPosition: (x, y) ->
-    ipc.send('call-window-method', 'setPosition', x, y)
+    @keymaps.defaultTarget = @workspaceView[0]
+    $(@workspaceViewParentSelector).append(@workspaceView)
 
-  # Public: Move current window to the center of the screen.
-  center: ->
-    ipc.send('call-window-method', 'center')
+  deserializePackageStates: ->
+    @packages.packageStates = @state.packageStates ? {}
+    delete @state.packageStates
 
+  deserializeEditorWindow: ->
+    @deserializeTimings = {}
+    @deserializePackageStates()
+    @deserializeProject()
+    @deserializeWorkspaceView()
 
-  # Schedule the window to be shown and focused on the next tick.
-  #
-  # This is done in a next tick to prevent a white flicker from occurring
-  # if called synchronously.
-  displayWindow: ({maximize}={}) ->
-    setImmediate =>
-      @show()
-      @focus()
-      @setFullScreen(true) if @workspace.fullScreen
-      @maximize() if maximize
+  loadConfig: ->
+    @config.setSchema null, {type: 'object', properties: _.clone(require('./config-schema'))}
+    @config.load()
 
-  # Public: Close the current window.
-  close: ->
-    @getCurrentWindow().close()
+  loadThemes: ->
+    @themes.load()
+
+  watchThemes: ->
+    @themes.onDidReloadAll =>
+      # Only reload stylesheets from non-theme packages
+      for pack in @packages.getActivePackages() when pack.getType() isnt 'theme'
+        pack.reloadStylesheets?()
+      null
+
+  # Notify the browser project of the window's current project path
+  watchProjectPath: ->
+    onProjectPathChanged = =>
+      ipc.send('window-command', 'project-path-changed', @project.getPath())
+    @subscribe @project, 'path-changed', onProjectPathChanged
+    onProjectPathChanged()
 
   exit: (status) ->
     app = remote.require('app')
@@ -526,45 +634,14 @@ class Atom extends Model
   setRepresentedFilename: (filename) ->
     ipc.send('call-window-method', 'setRepresentedFilename', filename)
 
-  # Public: Is the current window in development mode?
-  inDevMode: ->
-    @getLoadSettings().devMode
+  showSaveDialog: (callback) ->
+    callback(showSaveDialogSync())
 
-  # Public: Is the current window running specs?
-  inSpecMode: ->
-    @getLoadSettings().isSpec
-
-  # Public: Toggle the full screen state of the current window.
-  toggleFullScreen: ->
-    @setFullScreen(!@isFullScreen())
-
-  # Public: Set the full screen state of the current window.
-  setFullScreen: (fullScreen=false) ->
-    ipc.send('call-window-method', 'setFullScreen', fullScreen)
-    if fullScreen then document.body.classList.add("fullscreen") else document.body.classList.remove("fullscreen")
-
-  # Public: Is the current window in full screen mode?
-  isFullScreen: ->
-    @getCurrentWindow().isFullScreen()
-
-  maximize: ->
-    ipc.send('call-window-method', 'maximize')
-
-  # Public: Get the version of the Atom application.
-  #
-  # Returns the version text {String}.
-  getVersion: ->
-    @appVersion ?= @getLoadSettings().appVersion
-
-  # Public: Determine whether the current version is an official release.
-  isReleasedVersion: ->
-    not /\w{7}/.test(@getVersion()) # Check if the release is a 7-character SHA prefix
-
-  # Public: Get the directory path to Atom's configuration area.
-  #
-  # Returns the absolute path to `~/.atom`.
-  getConfigDirPath: ->
-    @constructor.getConfigDirPath()
+  showSaveDialogSync: (defaultPath) ->
+    defaultPath ?= @project?.getPath()
+    currentWindow = @getCurrentWindow()
+    dialog = remote.require('dialog')
+    dialog.showSaveDialog currentWindow, {title: 'Save File', defaultPath}
 
   saveSync: ->
     stateString = JSON.stringify(@state)
@@ -573,27 +650,12 @@ class Atom extends Model
     else
       @getCurrentWindow().loadSettings.windowState = stateString
 
-  # Public: Get the time taken to completely load the current window.
-  #
-  # This time include things like loading and activating packages, creating
-  # DOM elements for the editor, and reading the config.
-  #
-  # Returns the {Number} of milliseconds taken to load the window or null
-  # if the window hasn't finished loading yet.
-  getWindowLoadTime: ->
-    @loadTime
-
   crashMainProcess: ->
     remote.process.crash()
 
   crashRenderProcess: ->
     process.crash()
 
-  # Public: Visually and audibly trigger a beep.
-  beep: ->
-    shell.beep() if @config.get('core.audioBeep')
-    @workspaceView.trigger 'beep'
-
   getUserInitScriptPath: ->
     initScriptPath = fs.resolve(@getConfigDirPath(), 'init', ['js', 'coffee'])
     initScriptPath ? path.join(@getConfigDirPath(), 'init.coffee')
@@ -605,7 +667,7 @@ class Atom extends Model
       catch error
         console.error "Failed to load `#{userInitScriptPath}`", error.stack, error
 
-  # Public: Require the module with the given globals.
+  # Require the module with the given globals.
   #
   # The globals will be set on the `window` object and removed after the
   # require completes.
@@ -625,3 +687,14 @@ class Atom extends Model
         delete window[key]
       else
         window[key] = value
+
+  # Deprecated: Callers should be converted to use atom.deserializers
+  registerRepresentationClass: ->
+    deprecate("Callers should be converted to use atom.deserializers")
+
+  # Deprecated: Callers should be converted to use atom.deserializers
+  registerRepresentationClasses: ->
+    deprecate("Callers should be converted to use atom.deserializers")
+
+  setBodyPlatformClass: ->
+    document.body.classList.add("platform-#{process.platform}")

src/browser/atom-application.coffee

@@ -492,6 +492,14 @@ class AtomApplication
       else
         BrowserWindow.getFocusedWindow()
 
+    openOptions =
+      properties: properties.concat(['multiSelections', 'createDirectory'])
+      title: 'Open'
+
+    if process.platform is 'linux'
+      if projectPath = @lastFocusedWindow?.projectPath
+        openOptions.defaultPath = projectPath
+
     dialog = require 'dialog'
-    dialog.showOpenDialog parentWindow, title: 'Open', properties: properties.concat(['multiSelections', 'createDirectory']), (pathsToOpen) =>
+    dialog.showOpenDialog parentWindow, openOptions, (pathsToOpen) =>
       @openPaths({pathsToOpen, devMode, safeMode, window})

src/buffered-node-process.coffee

@@ -1,7 +1,7 @@
 BufferedProcess = require './buffered-process'
 path = require 'path'
 
-# Public: Like {BufferedProcess}, but accepts a Node script as the command
+# Extended: Like {BufferedProcess}, but accepts a Node script as the command
 # to run.
 #
 # This is necessary on Windows since it doesn't support shebang `#!` lines.

src/buffered-process.coffee

@@ -1,7 +1,7 @@
 _ = require 'underscore-plus'
 ChildProcess = require 'child_process'
 
-# Public: A wrapper which provides standard error/output line buffering for
+# Extended: A wrapper which provides standard error/output line buffering for
 # Node's ChildProcess.
 #
 # ## Examples
@@ -44,13 +44,14 @@ class BufferedProcess
     if process.platform is "win32"
       # Quote all arguments and escapes inner quotes
       if args?
-        cmdArgs = args.map (arg) ->
+        cmdArgs = args.filter (arg) -> arg?
+        cmdArgs = cmdArgs.map (arg) ->
           if command in ['explorer.exe', 'explorer'] and /^\/[a-zA-Z]+,.*$/.test(arg)
             # Don't wrap /root,C:\folder style arguments to explorer calls in
             # quotes since they will not be interpreted correctly if they are
             arg
           else
-            "\"#{arg.replace(/"/g, '\\"')}\""
+            "\"#{arg.toString().replace(/"/g, '\\"')}\""
       else
         cmdArgs = []
       if /\s/.test(command)

src/clipboard.coffee

@@ -1,7 +1,7 @@
 clipboard = require 'clipboard'
 crypto = require 'crypto'
 
-# Public: Represents the clipboard used for copying and pasting in Atom.
+# Extended: Represents the clipboard used for copying and pasting in Atom.
 #
 # An instance of this class is always available as the `atom.clipboard` global.
 #

src/command-registry.coffee

@@ -0,0 +1,232 @@
+{Disposable, CompositeDisposable} = require 'event-kit'
+{specificity} = require 'clear-cut'
+_ = require 'underscore-plus'
+{$} = require './space-pen-extensions'
+
+SequenceCount = 0
+SpecificityCache = {}
+
+module.exports =
+
+# Experimental: Associates listener functions with commands in a
+# context-sensitive way using CSS selectors. You can access a global instance of
+# this class via `atom.commands`, and commands registered there will be
+# presented in the command palette.
+#
+# The global command registry facilitates a style of event handling known as
+# *event delegation* that was popularized by jQuery. Atom commands are expressed
+# as custom DOM events that can be invoked on the currently focused element via
+# a key binding or manually via the command palette. Rather than binding
+# listeners for command events directly to DOM nodes, you instead register
+# command event listeners globally on `atom.commands` and constrain them to
+# specific kinds of elements with CSS selectors.
+#
+# As the event bubbles upward through the DOM, all registered event listeners
+# with matching selectors are invoked in order of specificity. In the event of a
+# specificity tie, the most recently registered listener is invoked first. This
+# mirrors the "cascade" semantics of CSS. Event listeners are invoked in the
+# context of the current DOM node, meaning `this` always points at
+# `event.currentTarget`. As is normally the case with DOM events,
+# `stopPropagation` and `stopImmediatePropagation` can be used to terminate the
+# bubbling process and prevent invocation of additional listeners.
+#
+# ## Example
+#
+# Here is a command that inserts the current date in an editor:
+#
+# ```coffee
+# atom.commands.add '.editor',
+#   'user:insert-date': (event) ->
+#     editor = $(this).view().getModel()
+#     # soon the above above line will be:
+#     # editor = @getModel()
+#     editor.insertText(new Date().toLocaleString())
+# ```
+class CommandRegistry
+  constructor: (@rootNode) ->
+    @listenersByCommandName = {}
+
+  getRootNode: -> @rootNode
+
+  setRootNode: (newRootNode) ->
+    oldRootNode = @rootNode
+    @rootNode = newRootNode
+
+    for commandName of @listenersByCommandName
+      @removeCommandListener(oldRootNode, commandName)
+      @addCommandListener(newRootNode, commandName)
+
+  # Public: Add one or more command listeners associated with a selector.
+  #
+  # ## Arguments: Registering One Command
+  #
+  # * `selector` A {String} containing a CSS selector matching elements on which
+  #   you want to handle the commands. The `,` combinator is not currently
+  #   supported.
+  # * `commandName` A {String} containing the name of a command you want to
+  #   handle such as `user:insert-date`.
+  # * `callback` A {Function} to call when the given command is invoked on an
+  #   element matching the selector. It will be called with `this` referencing
+  #   the matching DOM node.
+  #   * `event` A standard DOM event instance. Call `stopPropagation` or
+  #     `stopImmediatePropagation` to terminate bubbling early.
+  #
+  # ## Arguments: Registering Multiple Commands
+  #
+  # * `selector` A {String} containing a CSS selector matching elements on which
+  #   you want to handle the commands. The `,` combinator is not currently
+  #   supported.
+  # * `commands` An {Object} mapping command names like `user:insert-date` to
+  #   listener {Function}s.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to remove the
+  # added command handler(s).
+  add: (selector, commandName, callback) ->
+    if typeof commandName is 'object'
+      commands = commandName
+      disposable = new CompositeDisposable
+      for commandName, callback of commands
+        disposable.add @add(selector, commandName, callback)
+      return disposable
+
+    unless @listenersByCommandName[commandName]?
+      @addCommandListener(@rootNode, commandName)
+      @listenersByCommandName[commandName] = []
+
+    listener = new CommandListener(selector, callback)
+    listenersForCommand = @listenersByCommandName[commandName]
+    listenersForCommand.push(listener)
+
+    new Disposable =>
+      listenersForCommand.splice(listenersForCommand.indexOf(listener), 1)
+      if listenersForCommand.length is 0
+        delete @listenersByCommandName[commandName]
+        @removeCommandListener(@rootNode, commandName)
+
+  # Public: Find all registered commands matching a query.
+  #
+  # * `params` An {Object} containing one or more of the following keys:
+  #   * `target` A DOM node that is the hypothetical target of a given command.
+  #
+  # Returns an {Array} of {Object}s containing the following keys:
+  #  * `name` The name of the command. For example, `user:insert-date`.
+  #  * `displayName` The display name of the command. For example,
+  #    `User: Insert Date`.
+  #  * `jQuery` Present if the command was registered with the legacy
+  #    `$::command` method.
+  findCommands: ({target}) ->
+    commands = []
+    target = @rootNode unless @rootNode.contains(target)
+    currentTarget = target
+    loop
+      for commandName, listeners of @listenersByCommandName
+        for listener in listeners
+          if currentTarget.webkitMatchesSelector(listener.selector)
+            commands.push
+              name: commandName
+              displayName: _.humanizeEventName(commandName)
+
+      break if currentTarget is @rootNode
+      currentTarget = currentTarget.parentNode
+      break unless currentTarget?
+
+    for name, displayName of $(target).events() when displayName
+      commands.push({name, displayName, jQuery: true})
+
+    for name, displayName of $(window).events() when displayName
+      commands.push({name, displayName, jQuery: true})
+
+    commands
+
+  # Public: Simulate the dispatch of a command on a DOM node.
+  #
+  # This can be useful for testing when you want to simulate the invocation of a
+  # command on a detached DOM node. Otherwise, the DOM node in question needs to
+  # be attached to the document so the event bubbles up to the root node to be
+  # processed.
+  #
+  # * `target` The DOM node at which to start bubbling the command event.
+  # * `commandName` {String} indicating the name of the command to dispatch.
+  dispatch: (target, commandName) ->
+    event = new CustomEvent(commandName, bubbles: true)
+    eventWithTarget = Object.create(event, target: value: target)
+    @handleCommandEvent(eventWithTarget)
+
+  getSnapshot: ->
+    snapshot = {}
+    for commandName, listeners of @listenersByCommandName
+      snapshot[commandName] = listeners.slice()
+    snapshot
+
+  restoreSnapshot: (snapshot) ->
+    rootNode = @getRootNode()
+    @setRootNode(null) # clear listeners for current commands
+    @listenersByCommandName = {}
+    for commandName, listeners of snapshot
+      @listenersByCommandName[commandName] = listeners.slice()
+    @setRootNode(rootNode) # restore listeners for commands in snapshot
+
+  handleCommandEvent: (originalEvent) =>
+    originalEvent.__handledByCommandRegistry = true
+
+    propagationStopped = false
+    immediatePropagationStopped = false
+    matched = false
+    currentTarget = originalEvent.target
+    invokedListeners = []
+
+    syntheticEvent = Object.create originalEvent,
+      eventPhase: value: Event.BUBBLING_PHASE
+      currentTarget: get: -> currentTarget
+      stopPropagation: value: ->
+        originalEvent.stopPropagation()
+        propagationStopped = true
+      stopImmediatePropagation: value: ->
+        originalEvent.stopImmediatePropagation()
+        propagationStopped = true
+        immediatePropagationStopped = true
+      disableInvokedListeners: value: ->
+        listener.enabled = false for listener in invokedListeners
+        -> listener.enabled = true for listener in invokedListeners
+
+    loop
+      matchingListeners =
+        (@listenersByCommandName[originalEvent.type] ? [])
+          .filter (listener) -> currentTarget.webkitMatchesSelector(listener.selector)
+          .sort (a, b) -> a.compare(b)
+
+      matched = true if matchingListeners.length > 0
+
+      for listener in matchingListeners when listener.enabled
+        break if immediatePropagationStopped
+        invokedListeners.push(listener)
+        listener.callback.call(currentTarget, syntheticEvent)
+
+      break if currentTarget is @rootNode
+      break if propagationStopped
+      currentTarget = currentTarget.parentNode
+      break unless currentTarget?
+
+    matched
+
+  handleJQueryCommandEvent: (event) =>
+    @handleCommandEvent(event) unless event.originalEvent?.__handledByCommandRegistry
+
+  addCommandListener: (node, commandName, listener) ->
+    node?.addEventListener(commandName, @handleCommandEvent, true)
+    $(node).on commandName, @handleJQueryCommandEvent
+
+  removeCommandListener: (node, commandName) ->
+    node?.removeEventListener(commandName, @handleCommandEvent, true)
+    $(node).off commandName, @handleJQueryCommandEvent
+
+class CommandListener
+  enabled: true
+
+  constructor: (@selector, @callback) ->
+    @specificity = (SpecificityCache[@selector] ?= specificity(@selector))
+    @sequenceNumber = SequenceCount++
+
+  compare: (other) ->
+    other.specificity - @specificity  or
+      other.sequenceNumber - @sequenceNumber

src/config-schema.coffee

@@ -0,0 +1,113 @@
+path = require 'path'
+fs = require 'fs-plus'
+
+# This is loaded by atom.coffee
+module.exports =
+  core:
+    type: 'object'
+    properties:
+      ignoredNames:
+        type: 'array'
+        default: [".git", ".hg", ".svn", ".DS_Store", "Thumbs.db"]
+        items:
+          type: 'string'
+      excludeVcsIgnoredPaths:
+        type: 'boolean'
+        default: true
+      disabledPackages:
+        type: 'array'
+        default: []
+        items:
+          type: 'string'
+      themes:
+        type: 'array'
+        default: ['atom-dark-ui', 'atom-dark-syntax']
+        items:
+          type: 'string'
+      projectHome:
+        type: 'string'
+        default: path.join(fs.getHomeDirectory(), 'github')
+      audioBeep:
+        type: 'boolean'
+        default: true
+      destroyEmptyPanes:
+        type: 'boolean'
+        default: true
+
+  editor:
+    type: 'object'
+    properties:
+      fontFamily:
+        type: 'string'
+        default: ''
+      fontSize:
+        type: 'integer'
+        default: 16
+        minimum: 1
+      lineHeight:
+        type: ['string', 'number']
+        default: 1.3
+      showInvisibles:
+        type: 'boolean'
+        default: false
+      showIndentGuide:
+        type: 'boolean'
+        default: false
+      showLineNumbers:
+        type: 'boolean'
+        default: true
+      autoIndent:
+        type: 'boolean'
+        default: true
+      normalizeIndentOnPaste:
+        type: 'boolean'
+        default: true
+      nonWordCharacters:
+        type: 'string'
+        default: "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-"
+      preferredLineLength:
+        type: 'integer'
+        default: 80
+        minimum: 1
+      tabLength:
+        type: 'integer'
+        default: 2
+        minimum: 1
+      softWrap:
+        type: 'boolean'
+        default: false
+      softTabs:
+        type: 'boolean'
+        default: true
+      softWrapAtPreferredLineLength:
+        type: 'boolean'
+        default: false
+      scrollSensitivity:
+        type: 'integer'
+        default: 40
+        minimum: 10
+        maximum: 200
+      scrollPastEnd:
+        type: 'boolean'
+        default: false
+      useHardwareAcceleration:
+        type: 'boolean'
+        default: true
+      confirmCheckoutHeadRevision:
+        type: 'boolean'
+        default: true
+      invisibles:
+        type: 'object'
+        properties:
+          eol:
+            type: ['boolean', 'string']
+            default: '\u00ac'
+          space:
+            type: ['boolean', 'string']
+            default: '\u00b7'
+          tab:
+            type: ['boolean', 'string']
+            default: '\u00bb'
+          cr:
+            type: ['boolean', 'string']
+            default: '\u00a4'

src/config.coffee

@@ -1,39 +1,510 @@
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
-{Emitter} = require 'emissary'
+EmitterMixin = require('emissary').Emitter
+{Emitter} = require 'event-kit'
 CSON = require 'season'
 path = require 'path'
 async = require 'async'
 pathWatcher = require 'pathwatcher'
+{deprecate} = require 'grim'
 
-# Public: Used to access all of Atom's configuration details.
+# Essential: Used to access all of Atom's configuration details.
 #
 # An instance of this class is always available as the `atom.config` global.
 #
-# ## Best practices
-#
-# * Create your own root keypath using your package's name.
-# * Don't depend on (or write to) configuration keys outside of your keypath.
-#
-# ## Examples
+# ## Getting and setting config settings. Note that with no value set, {::get}
+# returns the setting's default value.
 #
 # ```coffee
-# atom.config.set('my-package.key', 'value')
-# atom.config.observe 'my-package.key', ->
-#   console.log 'My configuration changed:', atom.config.get('my-package.key')
+# atom.config.get('my-package.myKey') # -> 'defaultValue'
+#
+# atom.config.set('my-package.myKey', 'value')
+# atom.config.get('my-package.myKey') # -> 'value'
 # ```
+#
+# You may want to watch for changes. Use {::observe} to catch changes to the setting.
+#
+# ```coffee
+# atom.config.set('my-package.myKey', 'value')
+# atom.config.observe 'my-package.myKey', (newValue) ->
+#   # `observe` calls immediately and every time the value is changed
+#   console.log 'My configuration changed:', newValue
+# ```
+#
+# If you want a notification only when the value changes, use {::onDidChange}.
+#
+# ```coffee
+# atom.config.onDidChange 'my-package.myKey', ({newValue, oldValue}) ->
+#   console.log 'My configuration changed:', newValue, oldValue
+# ```
+#
+# ### Value Coercion
+#
+# Config settings each have a type specified by way of a
+# [schema](json-schema.org). For example we might an integer setting that only
+# allows integers greater than `0`:
+#
+# ```coffee
+# # When no value has been set, `::get` returns the setting's default value
+# atom.config.get('my-package.anInt') # -> 12
+#
+# # The string will be coerced to the integer 123
+# atom.config.set('my-package.anInt', '123')
+# atom.config.get('my-package.anInt') # -> 123
+#
+# # The string will be coerced to an integer, but it must be greater than 0, so is set to 1
+# atom.config.set('my-package.anInt', '-20')
+# atom.config.get('my-package.anInt') # -> 1
+# ```
+#
+# ## Defining settings for your package
+#
+# Define a schema under a `config` key in your package main.
+#
+# ```coffee
+# module.exports =
+#   # Your config schema
+#   config:
+#     someInt:
+#       type: 'integer'
+#       default: 23
+#       minimum: 1
+#
+#   activate: (state) -> # ...
+#   # ...
+# ```
+#
+# See [Creating a Package](https://atom.io/docs/latest/creating-a-package) for
+# more info.
+#
+# ## Config Schemas
+#
+# We use [json schema](json-schema.org) which allows you to define your value's
+# default, the type it should be, etc. A simple example:
+#
+# ```coffee
+# # We want to provide an `enableThing`, and a `thingVolume`
+# config:
+#   enableThing:
+#     type: 'boolean'
+#     default: false
+#   thingVolume:
+#     type: 'integer'
+#     default: 5
+#     minimum: 1
+#     maximum: 11
+# ```
+#
+# The type keyword allows for type coercion and validation. If a `thingVolume` is
+# set to a string `'10'`, it will be coerced into an integer.
+#
+# ```coffee
+# atom.config.set('my-package.thingVolume', '10')
+# atom.config.get('my-package.thingVolume') # -> 10
+#
+# # It respects the min / max
+# atom.config.set('my-package.thingVolume', '400')
+# atom.config.get('my-package.thingVolume') # -> 11
+#
+# # If it cannot be coerced, the value will not be set
+# atom.config.set('my-package.thingVolume', 'cats')
+# atom.config.get('my-package.thingVolume') # -> 11
+# ```
+#
+# ### Supported Types
+#
+# The `type` keyword can be a string with any one of the following. You can also
+# chain them by specifying multiple in an an array. For example
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: ['boolean', 'integer']
+#     default: 5
+#
+# # Then
+# atom.config.set('my-package.someSetting', 'true')
+# atom.config.get('my-package.someSetting') # -> true
+#
+# atom.config.set('my-package.someSetting', '12')
+# atom.config.get('my-package.someSetting') # -> 12
+# ```
+#
+# #### string
+#
+# Values must be a string.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'string'
+#     default: 'hello'
+# ```
+#
+# #### integer
+#
+# Values will be coerced into integer. Supports the (optional) `minimum` and
+# `maximum` keys.
+#
+#   ```coffee
+#   config:
+#     someSetting:
+#       type: 'integer'
+#       default: 5
+#       minimum: 1
+#       maximum: 11
+#   ```
+#
+# #### number
+#
+# Values will be coerced into a number, including real numbers. Supports the
+# (optional) `minimum` and `maximum` keys.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'number'
+#     default: 5.3
+#     minimum: 1.5
+#     maximum: 11.5
+# ```
+#
+# #### boolean
+#
+# Values will be coerced into a Boolean. `'true'` and `'false'` will be coerced into
+# a boolean. Numbers, arrays, objects, and anything else will not be coerced.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'boolean'
+#     default: false
+# ```
+#
+# #### array
+#
+# Value must be an Array. The types of the values can be specified by a
+# subschema in the `items` key.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'array'
+#     default: [1, 2, 3]
+#     items:
+#       type: 'integer'
+#       minimum: 1.5
+#       maximum: 11.5
+# ```
+#
+# #### object
+#
+# Value must be an object. This allows you to nest config options. Sub options
+# must be under a `properties key`
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'object'
+#     properties:
+#       myChildIntOption:
+#         type: 'integer'
+#         minimum: 1.5
+#         maximum: 11.5
+# ```
+#
+# ### Other Supported Keys
+#
+# #### enum
+#
+# All types support an `enum` key. The enum key lets you specify all values
+# that the config setting can possibly be. `enum` _must_ be an array of values
+# of your specified type.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     type: 'integer'
+#     default: 4
+#     enum: [2, 4, 6, 8]
+# ```
+#
+# ```coffee
+# atom.config.set('my-package.someSetting', '2')
+# atom.config.get('my-package.someSetting') # -> 2
+#
+# # will not set values outside of the enum values
+# atom.config.set('my-package.someSetting', '3')
+# atom.config.get('my-package.someSetting') # -> 2
+#
+# # If it cannot be coerced, the value will not be set
+# atom.config.set('my-package.someSetting', '4')
+# atom.config.get('my-package.someSetting') # -> 4
+# ```
+#
+# #### title and description
+#
+# The settings view will use the `title` and `description` keys to display your
+# config setting in a readable way. By default the settings view humanizes your
+# config key, so `someSetting` becomes `Some Setting`. In some cases, this is
+# confusing for users, and a more descriptive title is useful.
+#
+# Descriptions will be displayed below the title in the settings view.
+#
+# ```coffee
+# config:
+#   someSetting:
+#     title: 'Setting Magnitude'
+#     description: 'This will affect the blah and the other blah'
+#     type: 'integer'
+#     default: 4
+# ```
+#
+# __Note__: You should strive to be so clear in your naming of the setting that
+# you do not need to specify a title or description!
+#
+# ## Best practices
+#
+# * Don't depend on (or write to) configuration keys outside of your keypath.
+#
 module.exports =
 class Config
-  Emitter.includeInto(this)
+  EmitterMixin.includeInto(this)
+  @schemaEnforcers = {}
+
+  @addSchemaEnforcer: (typeName, enforcerFunction) ->
+    @schemaEnforcers[typeName] ?= []
+    @schemaEnforcers[typeName].push(enforcerFunction)
+
+  @addSchemaEnforcers: (filters) ->
+    for typeName, functions of filters
+      for name, enforcerFunction of functions
+        @addSchemaEnforcer(typeName, enforcerFunction)
+
+  @executeSchemaEnforcers: (keyPath, value, schema) ->
+    error = null
+    types = schema.type
+    types = [types] unless Array.isArray(types)
+    for type in types
+      try
+        enforcerFunctions = @schemaEnforcers[type].concat(@schemaEnforcers['*'])
+        for enforcer in enforcerFunctions
+          # At some point in one's life, one must call upon an enforcer.
+          value = enforcer.call(this, keyPath, value, schema)
+        error = null
+        break
+      catch e
+        error = e
+
+    throw error if error?
+    value
 
   # Created during initialization, available as `atom.config`
   constructor: ({@configDirPath, @resourcePath}={}) ->
+    @emitter = new Emitter
+    @schema =
+      type: 'object'
+      properties: {}
     @defaultSettings = {}
     @settings = {}
     @configFileHasErrors = false
     @configFilePath = fs.resolve(@configDirPath, 'config', ['json', 'cson'])
     @configFilePath ?= path.join(@configDirPath, 'config.cson')
 
+  ###
+  Section: Config Subscription
+  ###
+
+  # Essential: Add a listener for changes to a given key path. This is different
+  # than {::onDidChange} in that it will immediately call your callback with the
+  # current value of the config entry.
+  #
+  # * `keyPath` {String} name of the key to observe
+  # * `callback` {Function} to call when the value of the key changes.
+  #   * `value` the new value of the key
+  #
+  # Returns a {Disposable} with the following keys on which you can call
+  # `.dispose()` to unsubscribe.
+  observe: (keyPath, options={}, callback) ->
+    if _.isFunction(options)
+      callback = options
+      options = {}
+    else
+      message = ""
+      message = "`callNow` was set to false. Use ::onDidChange instead. Note that ::onDidChange calls back with different arguments." if options.callNow == false
+      deprecate "Config::observe no longer supports options. #{message}"
+
+    callback(_.clone(@get(keyPath))) unless options.callNow == false
+    @emitter.on 'did-change', (event) =>
+      callback(event.newValue) if keyPath? and keyPath.indexOf(event?.keyPath) is 0
+
+  # Essential: Add a listener for changes to a given key path. If `keyPath` is
+  # not specified, your callback will be called on changes to any key.
+  #
+  # * `keyPath` (optional) {String} name of the key to observe
+  # * `callback` {Function} to call when the value of the key changes.
+  #   * `event` {Object}
+  #     * `newValue` the new value of the key
+  #     * `oldValue` the prior value of the key.
+  #     * `keyPath` the keyPath of the changed key
+  #
+  # Returns a {Disposable} with the following keys on which you can call
+  # `.dispose()` to unsubscribe.
+  onDidChange: (keyPath, callback) ->
+    if arguments.length is 1
+      callback = keyPath
+      keyPath = undefined
+
+    @emitter.on 'did-change', (event) =>
+      callback(event) if not keyPath? or (keyPath? and keyPath.indexOf(event?.keyPath) is 0)
+
+  ###
+  Section: Managing Settings
+  ###
+
+  # Essential: Retrieves the setting for the given key.
+  #
+  # * `keyPath` The {String} name of the key to retrieve.
+  #
+  # Returns the value from Atom's default settings, the user's configuration
+  # file in the type specified by the configuration schema.
+  get: (keyPath) ->
+    value = _.valueForKeyPath(@settings, keyPath)
+    defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
+
+    if value?
+      value = _.deepClone(value)
+      valueIsObject = _.isObject(value) and not _.isArray(value)
+      defaultValueIsObject = _.isObject(defaultValue) and not _.isArray(defaultValue)
+      if valueIsObject and defaultValueIsObject
+        _.defaults(value, defaultValue)
+    else
+      value = _.deepClone(defaultValue)
+
+    value
+
+  # Essential: Sets the value for a configuration setting.
+  #
+  # This value is stored in Atom's internal configuration file.
+  #
+  # * `keyPath` The {String} name of the key.
+  # * `value` The value of the setting. Passing `undefined` will revert the
+  #   setting to the default value.
+  #
+  # Returns a {Boolean}
+  # * `true` if the value was set.
+  # * `false` if the value was not able to be coerced to the type specified in the setting's schema.
+  set: (keyPath, value) ->
+    unless value == undefined
+      try
+        value = @makeValueConformToSchema(keyPath, value)
+      catch e
+        return false
+
+    @setRawValue(keyPath, value)
+    @save() unless @configFileHasErrors
+    true
+
+  # Extended: Restore the key path to its default value.
+  #
+  # * `keyPath` The {String} name of the key.
+  #
+  # Returns the new value.
+  restoreDefault: (keyPath) ->
+    @set(keyPath, _.valueForKeyPath(@defaultSettings, keyPath))
+    @get(keyPath)
+
+  # Extended: Get the default value of the key path. _Please note_ that in most
+  # cases calling this is not necessary! {::get} returns the default value when
+  # a custom value is not specified.
+  #
+  # * `keyPath` The {String} name of the key.
+  #
+  # Returns the default value.
+  getDefault: (keyPath) ->
+    defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
+    _.deepClone(defaultValue)
+
+  # Extended: Is the key path value its default value?
+  #
+  # * `keyPath` The {String} name of the key.
+  #
+  # Returns a {Boolean}, `true` if the current value is the default, `false`
+  # otherwise.
+  isDefault: (keyPath) ->
+    not _.valueForKeyPath(@settings, keyPath)?
+
+  # Extended: Retrieve the schema for a specific key path. The shema will tell
+  # you what type the keyPath expects, and other metadata about the config
+  # option.
+  #
+  # * `keyPath` The {String} name of the key.
+  #
+  # Returns an {Object} eg. `{type: 'integer', default: 23, minimum: 1}`.
+  # Returns `null` when the keyPath has no schema specified.
+  getSchema: (keyPath) ->
+    keys = keyPath.split('.')
+    schema = @schema
+    for key in keys
+      break unless schema?
+      schema = schema.properties[key]
+    schema
+
+  # Extended: Returns a new {Object} containing all of settings and defaults.
+  getSettings: ->
+    _.deepExtend(@settings, @defaultSettings)
+
+  # Extended: Get the {String} path to the config file being used.
+  getUserConfigPath: ->
+    @configFilePath
+
+  ###
+  Section: Deprecated
+  ###
+
+  getInt: (keyPath) ->
+    deprecate '''Config::getInt is no longer necessary. Use ::get instead.
+    Make sure the config option you are accessing has specified an `integer`
+    schema. See the schema section of
+    https://atom.io/docs/api/latest/Config for more info.'''
+    parseInt(@get(keyPath))
+
+  getPositiveInt: (keyPath, defaultValue=0) ->
+    deprecate '''Config::getPositiveInt is no longer necessary. Use ::get instead.
+    Make sure the config option you are accessing has specified an `integer`
+    schema with `minimum: 1`. See the schema section of
+    https://atom.io/docs/api/latest/Config for more info.'''
+    Math.max(@getInt(keyPath), 0) or defaultValue
+
+  toggle: (keyPath) ->
+    deprecate 'Config::toggle is no longer supported. Please remove from your code.'
+    @set(keyPath, !@get(keyPath))
+
+  unobserve: (keyPath) ->
+    deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.'
+
+  ###
+  Section: Private
+  ###
+
+  pushAtKeyPath: (keyPath, value) ->
+    arrayValue = @get(keyPath) ? []
+    result = arrayValue.push(value)
+    @set(keyPath, arrayValue)
+    result
+
+  unshiftAtKeyPath: (keyPath, value) ->
+    arrayValue = @get(keyPath) ? []
+    result = arrayValue.unshift(value)
+    @set(keyPath, arrayValue)
+    result
+
+  removeAtKeyPath: (keyPath, value) ->
+    arrayValue = @get(keyPath) ? []
+    result = _.remove(arrayValue, value)
+    @set(keyPath, arrayValue)
+    result
+
   initializeConfigDirectory: (done) ->
     return if fs.existsSync(@configDirPath)
 
@@ -62,210 +533,202 @@ class Config
 
     try
       userConfig = CSON.readFileSync(@configFilePath)
-      _.extend(@settings, userConfig)
+      @settings = {} # Reset to the defaults
+      if isPlainObject(userConfig)
+        @setRecursive(null, userConfig)
+      else
+        @emitter.emit 'did-change'
       @configFileHasErrors = false
-      @emit 'updated'
-    catch e
+    catch error
       @configFileHasErrors = true
-      console.error "Failed to load user config '#{@configFilePath}'", e.message
-      console.error e.stack
+      console.error "Failed to load user config '#{@configFilePath}'", error.message
+      console.error error.stack
 
   observeUserConfig: ->
-    @watchSubscription ?= pathWatcher.watch @configFilePath, (eventType) =>
-      @loadUserConfig() if eventType is 'change' and @watchSubscription?
+    try
+      @watchSubscription ?= pathWatcher.watch @configFilePath, (eventType) =>
+        @loadUserConfig() if eventType is 'change' and @watchSubscription?
+    catch error
+      console.error "Failed to watch user config '#{@configFilePath}'", error.message
+      console.error error.stack
 
   unobserveUserConfig: ->
     @watchSubscription?.close()
     @watchSubscription = null
 
-  setDefaults: (keyPath, defaults) ->
-    keys = keyPath.split('.')
-    hash = @defaultSettings
-    for key in keys
-      hash[key] ?= {}
-      hash = hash[key]
-
-    _.extend hash, defaults
-    @emit 'updated'
-
-  # Extended: Get the {String} path to the config file being used.
-  getUserConfigPath: ->
-    @configFilePath
-
-  # Extended: Returns a new {Object} containing all of settings and defaults.
-  getSettings: ->
-    _.deepExtend(@settings, @defaultSettings)
-
-  # Essential: Retrieves the setting for the given key.
-  #
-  # * `keyPath` The {String} name of the key to retrieve.
-  #
-  # Returns the value from Atom's default settings, the user's configuration
-  # file, or `null` if the key doesn't exist in either.
-  get: (keyPath) ->
-    value = _.valueForKeyPath(@settings, keyPath)
-    defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
-
-    if value?
-      value = _.deepClone(value)
-      valueIsObject = _.isObject(value) and not _.isArray(value)
-      defaultValueIsObject = _.isObject(defaultValue) and not _.isArray(defaultValue)
-      if valueIsObject and defaultValueIsObject
-        _.defaults(value, defaultValue)
-    else
-      value = _.deepClone(defaultValue)
-
-    value
-
-  # Extended: Retrieves the setting for the given key as an integer.
-  #
-  # * `keyPath` The {String} name of the key to retrieve
-  #
-  # Returns the value from Atom's default settings, the user's configuration
-  # file, or `NaN` if the key doesn't exist in either.
-  getInt: (keyPath) ->
-    parseInt(@get(keyPath))
-
-  # Extended: Retrieves the setting for the given key as a positive integer.
-  #
-  # * `keyPath` The {String} name of the key to retrieve
-  # * `defaultValue` The integer {Number} to fall back to if the value isn't
-  #                positive, defaults to 0.
-  #
-  # Returns the value from Atom's default settings, the user's configuration
-  # file, or `defaultValue` if the key value isn't greater than zero.
-  getPositiveInt: (keyPath, defaultValue=0) ->
-    Math.max(@getInt(keyPath), 0) or defaultValue
-
-  # Essential: Sets the value for a configuration setting.
-  #
-  # This value is stored in Atom's internal configuration file.
-  #
-  # * `keyPath` The {String} name of the key.
-  # * `value` The value of the setting.
-  #
-  # Returns the `value`.
-  set: (keyPath, value) ->
-    if @get(keyPath) isnt value
-      defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
-      value = undefined if _.isEqual(defaultValue, value)
-      _.setValueForKeyPath(@settings, keyPath, value)
-      @update()
-    value
-
-  # Extended: Toggle the value at the key path.
-  #
-  # The new value will be `true` if the value is currently falsy and will be
-  # `false` if the value is currently truthy.
-  #
-  # * `keyPath` The {String} name of the key.
-  #
-  # Returns the new value.
-  toggle: (keyPath) ->
-    @set(keyPath, !@get(keyPath))
-
-  # Extended: Restore the key path to its default value.
-  #
-  # * `keyPath` The {String} name of the key.
-  #
-  # Returns the new value.
-  restoreDefault: (keyPath) ->
-    @set(keyPath, _.valueForKeyPath(@defaultSettings, keyPath))
-
-  # Extended: Get the default value of the key path.
-  #
-  # * `keyPath` The {String} name of the key.
-  #
-  # Returns the default value.
-  getDefault: (keyPath) ->
-    defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
-    _.deepClone(defaultValue)
-
-  # Extended: Is the key path value its default value?
-  #
-  # * `keyPath` The {String} name of the key.
-  #
-  # Returns a {Boolean}, `true` if the current value is the default, `false`
-  # otherwise.
-  isDefault: (keyPath) ->
-    not _.valueForKeyPath(@settings, keyPath)?
-
-  # Extended: Push the value to the array at the key path.
-  #
-  # * `keyPath` The {String} key path.
-  # * `value` The value to push to the array.
-  #
-  # Returns the new array length {Number} of the setting.
-  pushAtKeyPath: (keyPath, value) ->
-    arrayValue = @get(keyPath) ? []
-    result = arrayValue.push(value)
-    @set(keyPath, arrayValue)
-    result
-
-  # Extended: Add the value to the beginning of the array at the key path.
-  #
-  # * `keyPath` The {String} key path.
-  # * `value` The value to shift onto the array.
-  #
-  # Returns the new array length {Number} of the setting.
-  unshiftAtKeyPath: (keyPath, value) ->
-    arrayValue = @get(keyPath) ? []
-    result = arrayValue.unshift(value)
-    @set(keyPath, arrayValue)
-    result
-
-  # Public: Remove the value from the array at the key path.
-  #
-  # * `keyPath` The {String} key path.
-  # * `value` The value to remove from the array.
-  #
-  # Returns the new array value of the setting.
-  removeAtKeyPath: (keyPath, value) ->
-    arrayValue = @get(keyPath) ? []
-    result = _.remove(arrayValue, value)
-    @set(keyPath, arrayValue)
-    result
-
-  # Essential: Add a listener for changes to a given key path.
-  #
-  # * `keyPath` The {String} name of the key to observe
-  # * `options` An optional {Object} containing the `callNow` key.
-  # * `callback` The {Function} to call when the value of the key changes.
-  #              The first argument will be the new value of the key and the
-  #              second argument will be an {Object} with a `previous` property
-  #              that is the prior value of the key.
-  #
-  # Returns an {Object} with the following keys:
-  #  * `off` A {Function} that unobserves the `keyPath` when called.
-  observe: (keyPath, options={}, callback) ->
-    if _.isFunction(options)
-      callback = options
-      options = {}
-
-    value = @get(keyPath)
-    previousValue = _.clone(value)
-    updateCallback = =>
-      value = @get(keyPath)
-      unless _.isEqual(value, previousValue)
-        previous = previousValue
-        previousValue = _.clone(value)
-        callback(value, {previous})
-
-    eventName = "updated.#{keyPath.replace(/\./, '-')}"
-    subscription = @on eventName, updateCallback
-    callback(value) if options.callNow ? true
-    subscription
-
-  # Unobserve all callbacks on a given key.
-  #
-  # * `keyPath` The {String} name of the key to unobserve.
-  unobserve: (keyPath) ->
-    @off("updated.#{keyPath.replace(/\./, '-')}")
-
-  update: ->
-    return if @configFileHasErrors
-    @save()
-    @emit 'updated'
-
   save: ->
     CSON.writeFileSync(@configFilePath, @settings)
+
+  setRawValue: (keyPath, value) ->
+    defaultValue = _.valueForKeyPath(@defaultSettings, keyPath)
+    value = undefined if _.isEqual(defaultValue, value)
+
+    oldValue = _.clone(@get(keyPath))
+    _.setValueForKeyPath(@settings, keyPath, value)
+    newValue = @get(keyPath)
+    @emitter.emit 'did-change', {oldValue, newValue, keyPath} if newValue isnt oldValue
+
+  setRawDefault: (keyPath, value) ->
+    oldValue = _.clone(@get(keyPath))
+    _.setValueForKeyPath(@defaultSettings, keyPath, value)
+    newValue = @get(keyPath)
+    @emitter.emit 'did-change', {oldValue, newValue, keyPath} if newValue isnt oldValue
+
+  setRecursive: (keyPath, value) ->
+    if value? and isPlainObject(value)
+      keys = if keyPath? then keyPath.split('.') else []
+      for key, childValue of value
+        continue unless value.hasOwnProperty(key)
+        @setRecursive(keys.concat([key]).join('.'), childValue)
+    else
+      try
+        value = @makeValueConformToSchema(keyPath, value)
+        @setRawValue(keyPath, value)
+      catch e
+        console.warn("'#{keyPath}' could not be set. Attempted value: #{JSON.stringify(value)}; Schema: #{JSON.stringify(@getSchema(keyPath))}")
+
+    return
+
+  setDefaults: (keyPath, defaults) ->
+    if defaults? and isPlainObject(defaults)
+      keys = if keyPath? then keyPath.split('.') else []
+      for key, childValue of defaults
+        continue unless defaults.hasOwnProperty(key)
+        @setDefaults(keys.concat([key]).join('.'), childValue)
+    else
+      try
+        defaults = @makeValueConformToSchema(keyPath, defaults)
+        @setRawDefault(keyPath, defaults)
+      catch e
+        console.warn("'#{keyPath}' could not set the default. Attempted default: #{JSON.stringify(defaults)}; Schema: #{JSON.stringify(@getSchema(keyPath))}")
+
+  setSchema: (keyPath, schema) ->
+    unless isPlainObject(schema)
+      throw new Error("Error loading schema for #{keyPath}: schemas can only be objects!")
+
+    unless typeof schema.type?
+      throw new Error("Error loading schema for #{keyPath}: schema objects must have a type attribute")
+
+    rootSchema = @schema
+    if keyPath
+      for key in keyPath.split('.')
+        rootSchema.type = 'object'
+        rootSchema.properties ?= {}
+        properties = rootSchema.properties
+        properties[key] ?= {}
+        rootSchema = properties[key]
+
+    _.extend rootSchema, schema
+    @setDefaults(keyPath, @extractDefaultsFromSchema(schema))
+
+  extractDefaultsFromSchema: (schema) ->
+    if schema.default?
+      schema.default
+    else if schema.type is 'object' and schema.properties? and isPlainObject(schema.properties)
+      defaults = {}
+      properties = schema.properties or {}
+      defaults[key] = @extractDefaultsFromSchema(value) for key, value of properties
+      defaults
+
+  makeValueConformToSchema: (keyPath, value) ->
+    value = @constructor.executeSchemaEnforcers(keyPath, value, schema) if schema = @getSchema(keyPath)
+    value
+
+# Base schema enforcers. These will coerce raw input into the specified type,
+# and will throw an error when the value cannot be coerced. Throwing the error
+# will indicate that the value should not be set.
+#
+# Enforcers are run from most specific to least. For a schema with type
+# `integer`, all the enforcers for the `integer` type will be run first, in
+# order of specification. Then the `*` enforcers will be run, in order of
+# specification.
+Config.addSchemaEnforcers
+  'integer':
+    coerce: (keyPath, value, schema) ->
+      value = parseInt(value)
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} cannot be coerced into an int") if isNaN(value) or not isFinite(value)
+      value
+
+  'number':
+    coerce: (keyPath, value, schema) ->
+      value = parseFloat(value)
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} cannot be coerced into a number") if isNaN(value) or not isFinite(value)
+      value
+
+  'boolean':
+    coerce: (keyPath, value, schema) ->
+      switch typeof value
+        when 'string'
+          if value.toLowerCase() is 'true'
+            true
+          else if value.toLowerCase() is 'false'
+            false
+          else
+            throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be a boolean or the string 'true' or 'false'")
+        when 'boolean'
+          value
+        else
+          throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be a boolean or the string 'true' or 'false'")
+
+  'string':
+    validate: (keyPath, value, schema) ->
+      unless typeof value is 'string'
+        throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be a string")
+      value
+
+  'null':
+    # null sort of isnt supported. It will just unset in this case
+    coerce: (keyPath, value, schema) ->
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be null") unless value == null
+      value
+
+  'object':
+    coerce: (keyPath, value, schema) ->
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be an object") unless isPlainObject(value)
+      return value unless schema.properties?
+
+      newValue = {}
+      for prop, childSchema of schema.properties
+        continue unless value.hasOwnProperty(prop)
+        try
+          newValue[prop] = @executeSchemaEnforcers("#{keyPath}.#{prop}", value[prop], childSchema)
+        catch error
+          console.warn "Error setting item in object: #{error.message}"
+      newValue
+
+  'array':
+    coerce: (keyPath, value, schema) ->
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} must be an array") unless Array.isArray(value)
+      itemSchema = schema.items
+      if itemSchema?
+        newValue = []
+        for item in value
+          try
+            newValue.push @executeSchemaEnforcers(keyPath, item, itemSchema)
+          catch error
+            console.warn "Error setting item in array: #{error.message}"
+        newValue
+      else
+        value
+
+  '*':
+    coerceMinimumAndMaximum: (keyPath, value, schema) ->
+      return value unless typeof value is 'number'
+      if schema.minimum? and typeof schema.minimum is 'number'
+        value = Math.max(value, schema.minimum)
+      if schema.maximum? and typeof schema.maximum is 'number'
+        value = Math.min(value, schema.maximum)
+      value
+
+    validateEnum: (keyPath, value, schema) ->
+      possibleValues = schema.enum
+      return value unless possibleValues? and Array.isArray(possibleValues) and possibleValues.length
+
+      for possibleValue in possibleValues
+        # Using `isEqual` for possibility of placing enums on array and object schemas
+        return value if _.isEqual(possibleValue, value)
+
+      throw new Error("Validation failed at #{keyPath}, #{JSON.stringify(value)} is not one of #{JSON.stringify(possibleValues)}")
+
+isPlainObject = (value) ->
+  _.isObject(value) and not _.isArray(value) and not _.isFunction(value) and not _.isString(value)

src/context-menu-manager.coffee

@@ -5,7 +5,7 @@ path = require 'path'
 CSON = require 'season'
 fs = require 'fs-plus'
 
-# Public: Provides a registry for commands that you'd like to appear in the
+# Extended: Provides a registry for commands that you'd like to appear in the
 # context menu.
 #
 # An instance of this class is always available as the `atom.contextMenu`

src/cursor.coffee

@@ -7,7 +7,7 @@ Grim = require 'grim'
 # Extended: The `Cursor` class represents the little blinking line identifying
 # where text can be inserted.
 #
-# Cursors belong to {Editor}s and have some metadata attached in the form
+# Cursors belong to {TextEditor}s and have some metadata attached in the form
 # of a {Marker}.
 module.exports =
 class Cursor extends Model
@@ -17,7 +17,7 @@ class Cursor extends Model
   visible: true
   needsAutoscroll: null
 
-  # Instantiated by an {Editor}
+  # Instantiated by an {TextEditor}
   constructor: ({@editor, @marker, id}) ->
     @emitter = new Emitter
 
@@ -42,10 +42,11 @@ class Cursor extends Model
         newBufferPosition: newHeadBufferPosition
         newScreenPosition: newHeadScreenPosition
         textChanged: textChanged
+        cursor: this
 
       @emit 'moved', movedEvent
       @emitter.emit 'did-change-position'
-      @editor.cursorMoved(this, movedEvent)
+      @editor.cursorMoved(movedEvent)
     @marker.onDidDestroy =>
       @destroyed = true
       @editor.removeCursor(this)
@@ -54,11 +55,14 @@ class Cursor extends Model
       @emitter.dispose()
     @needsAutoscroll = true
 
+  destroy: ->
+    @marker.destroy()
+
   ###
   Section: Event Subscription
   ###
 
-  # Essential: Calls your `callback` when the cursor has been moved.
+  # Public: Calls your `callback` when the cursor has been moved.
   #
   # * `callback` {Function}
   #   * `event` {Object}
@@ -67,12 +71,13 @@ class Cursor extends Model
   #     * `newBufferPosition` {Point}
   #     * `newScreenPosition` {Point}
   #     * `textChanged` {Boolean}
+  #     * `Cursor` {Cursor} that triggered the event
   #
   # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
   onDidChangePosition: (callback) ->
     @emitter.on 'did-change-position', callback
 
-  # Extended: Calls your `callback` when the cursor is destroyed
+  # Public: Calls your `callback` when the cursor is destroyed
   #
   # * `callback` {Function}
   #
@@ -80,7 +85,7 @@ class Cursor extends Model
   onDidDestroy: (callback) ->
     @emitter.on 'did-destroy', callback
 
-  # Extended: Calls your `callback` when the cursor's visibility has changed
+  # Public: Calls your `callback` when the cursor's visibility has changed
   #
   # * `callback` {Function}
   #   * `visibility` {Boolean}
@@ -102,28 +107,14 @@ class Cursor extends Model
     super
 
   ###
-  Section: Methods
+  Section: Managing Cursor Position
   ###
 
-  destroy: ->
-    @marker.destroy()
-
-  changePosition: (options, fn) ->
-    @clearSelection()
-    @needsAutoscroll = options.autoscroll ? @isLastCursor()
-    fn()
-    if @needsAutoscroll
-      @emit 'autoscrolled' # Support legacy editor
-      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition # Support react editor view
-
-  getPixelRect: ->
-    @editor.pixelRectForScreenRange(@getScreenRange())
-
   # Public: Moves a cursor to a given screen position.
   #
   # * `screenPosition` {Array} of two numbers: the screen row, and the screen column.
   # * `options` (optional) {Object} with the following keys:
-  #   * `autoscroll` A Boolean which, if `true`, scrolls the {Editor} to wherever
+  #   * `autoscroll` A Boolean which, if `true`, scrolls the {TextEditor} to wherever
   #     the cursor moves to.
   setScreenPosition: (screenPosition, options={}) ->
     @changePosition options, =>
@@ -133,15 +124,11 @@ class Cursor extends Model
   getScreenPosition: ->
     @marker.getHeadScreenPosition()
 
-  getScreenRange: ->
-    {row, column} = @getScreenPosition()
-    new Range(new Point(row, column), new Point(row, column + 1))
-
   # Public: Moves a cursor to a given buffer position.
   #
   # * `bufferPosition` {Array} of two numbers: the buffer row, and the buffer column.
   # * `options` (optional) {Object} with the following keys:
-  #   * `autoscroll` A Boolean which, if `true`, scrolls the {Editor} to wherever
+  #   * `autoscroll` A Boolean which, if `true`, scrolls the {TextEditor} to wherever
   #     the cursor moves to.
   setBufferPosition: (bufferPosition, options={}) ->
     @changePosition options, =>
@@ -151,47 +138,38 @@ class Cursor extends Model
   getBufferPosition: ->
     @marker.getHeadBufferPosition()
 
-  autoscroll: (options) ->
-    @editor.scrollToScreenRange(@getScreenRange(), options)
+  # Public: Returns the cursor's current screen row.
+  getScreenRow: ->
+    @getScreenPosition().row
 
-  # Public: If the marker range is empty, the cursor is marked as being visible.
-  updateVisibility: ->
-    @setVisible(@marker.getBufferRange().isEmpty())
+  # Public: Returns the cursor's current screen column.
+  getScreenColumn: ->
+    @getScreenPosition().column
 
-  # Public: Sets whether the cursor is visible.
-  setVisible: (visible) ->
-    if @visible != visible
-      @visible = visible
-      @needsAutoscroll ?= true if @visible and @isLastCursor()
-      @emit 'visibility-changed', @visible
-      @emitter.emit 'did-change-visibility', @visible
+  # Public: Retrieves the cursor's current buffer row.
+  getBufferRow: ->
+    @getBufferPosition().row
 
-  # Public: Returns the visibility of the cursor.
-  isVisible: -> @visible
+  # Public: Returns the cursor's current buffer column.
+  getBufferColumn: ->
+    @getBufferPosition().column
 
-  # Public: Get the RegExp used by the cursor to determine what a "word" is.
-  #
-  # * `options` (optional) {Object} with the following keys:
-  #   * `includeNonWordCharacters` A {Boolean} indicating whether to include
-  #     non-word characters in the regex. (default: true)
-  #
-  # Returns a {RegExp}.
-  wordRegExp: ({includeNonWordCharacters}={}) ->
-    includeNonWordCharacters ?= true
-    nonWordCharacters = atom.config.get('editor.nonWordCharacters')
-    segments = ["^[\t ]*$"]
-    segments.push("[^\\s#{_.escapeRegExp(nonWordCharacters)}]+")
-    if includeNonWordCharacters
-      segments.push("[#{_.escapeRegExp(nonWordCharacters)}]+")
-    new RegExp(segments.join("|"), "g")
+  # Public: Returns the cursor's current buffer row of text excluding its line
+  # ending.
+  getCurrentBufferLine: ->
+    @editor.lineTextForBufferRow(@getBufferRow())
 
-  # Public: Identifies if this cursor is the last in the {Editor}.
-  #
-  # "Last" is defined as the most recently added cursor.
-  #
-  # Returns a {Boolean}.
-  isLastCursor: ->
-    this == @editor.getLastCursor()
+  # Public: Returns whether the cursor is at the start of a line.
+  isAtBeginningOfLine: ->
+    @getBufferPosition().column == 0
+
+  # Public: Returns whether the cursor is on the line return character.
+  isAtEndOfLine: ->
+    @getBufferPosition().isEqual(@getCurrentLineBufferRange().end)
+
+  ###
+  Section: Cursor Position Details
+  ###
 
   # Public: Identifies if the cursor is surrounded by whitespace.
   #
@@ -229,34 +207,42 @@ class Cursor extends Model
     range = [[row, column], [row, Infinity]]
     @editor.getTextInBufferRange(range).search(@wordRegExp()) == 0
 
-  # Public: Prevents this cursor from causing scrolling.
-  clearAutoscroll: ->
-    @needsAutoscroll = null
+  # Public: Returns the indentation level of the current line.
+  getIndentLevel: ->
+    if @editor.getSoftTabs()
+      @getBufferColumn() / @editor.getTabLength()
+    else
+      @getBufferColumn()
 
-  # Public: Deselects the current selection.
-  clearSelection: ->
-    @selection?.clear()
+  # Public: Retrieves the grammar's token scopes for the line.
+  #
+  # Returns an {Array} of {String}s.
+  getScopes: ->
+    @editor.scopesForBufferPosition(@getBufferPosition())
 
-  # Public: Returns the cursor's current screen row.
-  getScreenRow: ->
-    @getScreenPosition().row
+  # Public: Returns true if this cursor has no non-whitespace characters before
+  # its current position.
+  hasPrecedingCharactersOnLine: ->
+    bufferPosition = @getBufferPosition()
+    line = @editor.lineTextForBufferRow(bufferPosition.row)
+    firstCharacterColumn = line.search(/\S/)
 
-  # Public: Returns the cursor's current screen column.
-  getScreenColumn: ->
-    @getScreenPosition().column
+    if firstCharacterColumn is -1
+      false
+    else
+      bufferPosition.column > firstCharacterColumn
 
-  # Public: Retrieves the cursor's current buffer row.
-  getBufferRow: ->
-    @getBufferPosition().row
+  # Public: Identifies if this cursor is the last in the {TextEditor}.
+  #
+  # "Last" is defined as the most recently added cursor.
+  #
+  # Returns a {Boolean}.
+  isLastCursor: ->
+    this == @editor.getLastCursor()
 
-  # Public: Returns the cursor's current buffer column.
-  getBufferColumn: ->
-    @getBufferPosition().column
-
-  # Public: Returns the cursor's current buffer row of text excluding its line
-  # ending.
-  getCurrentBufferLine: ->
-    @editor.lineTextForBufferRow(@getBufferRow())
+  ###
+  Section: Moving the Cursor
+  ###
 
   # Public: Moves the cursor up one screen row.
   #
@@ -417,6 +403,20 @@ class Cursor extends Model
 
     @setBufferPosition(endOfLeadingWhitespace) if endOfLeadingWhitespace.isGreaterThan(position)
 
+  # Public: Moves the cursor to the beginning of the next paragraph
+  moveToBeginningOfNextParagraph: ->
+    if position = @getBeginningOfNextParagraphBufferPosition()
+      @setBufferPosition(position)
+
+  # Public: Moves the cursor to the beginning of the previous paragraph
+  moveToBeginningOfPreviousParagraph: ->
+    if position = @getBeginningOfPreviousParagraphBufferPosition()
+      @setBufferPosition(position)
+
+  ###
+  Section: Local Positions and Ranges
+  ###
+
   # Public: Retrieves the buffer position of where the current word starts.
   #
   # * `options` (optional) An {Object} with the following keys:
@@ -553,15 +553,98 @@ class Cursor extends Model
   getCurrentLineBufferRange: (options) ->
     @editor.bufferRangeForBufferRow(@getBufferRow(), options)
 
-  # Public: Moves the cursor to the beginning of the next paragraph
-  moveToBeginningOfNextParagraph: ->
-    if position = @getBeginningOfNextParagraphBufferPosition()
-      @setBufferPosition(position)
+  # Public: Retrieves the range for the current paragraph.
+  #
+  # A paragraph is defined as a block of text surrounded by empty lines.
+  #
+  # Returns a {Range}.
+  getCurrentParagraphBufferRange: ->
+    @editor.languageMode.rowRangeForParagraphAtBufferRow(@getBufferRow())
 
-  # Public: Moves the cursor to the beginning of the previous paragraph
-  moveToBeginningOfPreviousParagraph: ->
-    if position = @getBeginningOfPreviousParagraphBufferPosition()
-      @setBufferPosition(position)
+  # Public: Returns the characters preceding the cursor in the current word.
+  getCurrentWordPrefix: ->
+    @editor.getTextInBufferRange([@getBeginningOfCurrentWordBufferPosition(), @getBufferPosition()])
+
+  ###
+  Section: Visibility
+  ###
+
+  # Public: If the marker range is empty, the cursor is marked as being visible.
+  updateVisibility: ->
+    @setVisible(@marker.getBufferRange().isEmpty())
+
+  # Public: Sets whether the cursor is visible.
+  setVisible: (visible) ->
+    if @visible != visible
+      @visible = visible
+      @needsAutoscroll ?= true if @visible and @isLastCursor()
+      @emit 'visibility-changed', @visible
+      @emitter.emit 'did-change-visibility', @visible
+
+  # Public: Returns the visibility of the cursor.
+  isVisible: -> @visible
+
+  ###
+  Section: Comparing to another cursor
+  ###
+
+  # Public: Compare this cursor's buffer position to another cursor's buffer position.
+  #
+  # See {Point::compare} for more details.
+  #
+  # * `otherCursor`{Cursor} to compare against
+  compare: (otherCursor) ->
+    @getBufferPosition().compare(otherCursor.getBufferPosition())
+
+  ###
+  Section: Utilities
+  ###
+
+  # Public: Prevents this cursor from causing scrolling.
+  clearAutoscroll: ->
+    @needsAutoscroll = null
+
+  # Public: Deselects the current selection.
+  clearSelection: ->
+    @selection?.clear()
+
+  # Public: Get the RegExp used by the cursor to determine what a "word" is.
+  #
+  # * `options` (optional) {Object} with the following keys:
+  #   * `includeNonWordCharacters` A {Boolean} indicating whether to include
+  #     non-word characters in the regex. (default: true)
+  #
+  # Returns a {RegExp}.
+  wordRegExp: ({includeNonWordCharacters}={}) ->
+    includeNonWordCharacters ?= true
+    nonWordCharacters = atom.config.get('editor.nonWordCharacters')
+    segments = ["^[\t ]*$"]
+    segments.push("[^\\s#{_.escapeRegExp(nonWordCharacters)}]+")
+    if includeNonWordCharacters
+      segments.push("[#{_.escapeRegExp(nonWordCharacters)}]+")
+    new RegExp(segments.join("|"), "g")
+
+  ###
+  Section: Private
+  ###
+
+  changePosition: (options, fn) ->
+    @clearSelection()
+    @needsAutoscroll = options.autoscroll ? @isLastCursor()
+    fn()
+    if @needsAutoscroll
+      @emit 'autoscrolled' # Support legacy editor
+      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition # Support react editor view
+
+  getPixelRect: ->
+    @editor.pixelRectForScreenRange(@getScreenRange())
+
+  getScreenRange: ->
+    {row, column} = @getScreenPosition()
+    new Range(new Point(row, column), new Point(row, column + 1))
+
+  autoscroll: (options) ->
+    @editor.scrollToScreenRange(@getScreenRange(), options)
 
   getBeginningOfNextParagraphBufferPosition: (editor) ->
     start = @getBufferPosition()
@@ -589,56 +672,3 @@ class Cursor extends Model
         position = range.start
         stop()
     @editor.screenPositionForBufferPosition(position)
-
-  # Public: Retrieves the range for the current paragraph.
-  #
-  # A paragraph is defined as a block of text surrounded by empty lines.
-  #
-  # Returns a {Range}.
-  getCurrentParagraphBufferRange: ->
-    @editor.languageMode.rowRangeForParagraphAtBufferRow(@getBufferRow())
-
-  # Public: Returns the characters preceding the cursor in the current word.
-  getCurrentWordPrefix: ->
-    @editor.getTextInBufferRange([@getBeginningOfCurrentWordBufferPosition(), @getBufferPosition()])
-
-  # Public: Returns whether the cursor is at the start of a line.
-  isAtBeginningOfLine: ->
-    @getBufferPosition().column == 0
-
-  # Public: Returns the indentation level of the current line.
-  getIndentLevel: ->
-    if @editor.getSoftTabs()
-      @getBufferColumn() / @editor.getTabLength()
-    else
-      @getBufferColumn()
-
-  # Public: Returns whether the cursor is on the line return character.
-  isAtEndOfLine: ->
-    @getBufferPosition().isEqual(@getCurrentLineBufferRange().end)
-
-  # Public: Retrieves the grammar's token scopes for the line.
-  #
-  # Returns an {Array} of {String}s.
-  getScopes: ->
-    @editor.scopesForBufferPosition(@getBufferPosition())
-
-  # Public: Returns true if this cursor has no non-whitespace characters before
-  # its current position.
-  hasPrecedingCharactersOnLine: ->
-    bufferPosition = @getBufferPosition()
-    line = @editor.lineTextForBufferRow(bufferPosition.row)
-    firstCharacterColumn = line.search(/\S/)
-
-    if firstCharacterColumn is -1
-      false
-    else
-      bufferPosition.column > firstCharacterColumn
-
-  # Public: Compare this cursor's buffer position to another cursor's buffer position.
-  #
-  # See {Point::compare} for more details.
-  #
-  # * `otherCursor`{Cursor} to compare against
-  compare: (otherCursor) ->
-    @getBufferPosition().compare(otherCursor.getBufferPosition())

src/decoration.coffee

@@ -12,7 +12,7 @@ nextId = -> idCounter++
 # around marked ranges of text.
 #
 # {Decoration} objects are not meant to be created directly, but created with
-# {Editor::decorateMarker}. eg.
+# {TextEditor::decorateMarker}. eg.
 #
 # ```coffee
 # range = editor.getSelectedBufferRange() # any range you like
@@ -32,7 +32,7 @@ module.exports =
 class Decoration
   EmitterMixin.includeInto(this)
 
-  # Extended: Check if the `decorationProperties.type` matches `type`
+  # Private: Check if the `decorationProperties.type` matches `type`
   #
   # * `decorationProperties` {Object} eg. `{type: 'gutter', class: 'my-new-class'}`
   # * `type` {String} type like `'gutter'`, `'line'`, etc. `type` can also
@@ -46,6 +46,10 @@ class Decoration
     else
       type is decorationProperties.type
 
+  ###
+  Section: Construction and Destruction
+  ###
+
   constructor: (@marker, @displayBuffer, @properties) ->
     @emitter = new Emitter
     @id = nextId()
@@ -55,6 +59,19 @@ class Decoration
 
     @markerDestroyDisposable = @marker.onDidDestroy => @destroy()
 
+  # Essential: Destroy this marker.
+  #
+  # If you own the marker, you should use {Marker::destroy} which will destroy
+  # this decoration.
+  destroy: ->
+    return if @destroyed
+    @markerDestroyDisposable.dispose()
+    @markerDestroyDisposable = null
+    @destroyed = true
+    @emit 'destroyed'
+    @emitter.emit 'did-destroy'
+    @emitter.dispose()
+
   ###
   Section: Event Subscription
   ###
@@ -79,7 +96,7 @@ class Decoration
     @emitter.on 'did-destroy', callback
 
   ###
-  Section: Methods
+  Section: Decoration Details
   ###
 
   # Essential: An id unique across all {Decoration} objects
@@ -98,6 +115,10 @@ class Decoration
   isType: (type) ->
     Decoration.isType(@properties, type)
 
+  ###
+  Section: Properties
+  ###
+
   # Essential: Returns the {Decoration}'s properties.
   getProperties: ->
     @properties
@@ -125,18 +146,9 @@ class Decoration
     Grim.deprecate 'Use Decoration::setProperties instead'
     @setProperties(newProperties)
 
-  # Essential: Destroy this marker.
-  #
-  # If you own the marker, you should use {Marker::destroy} which will destroy
-  # this decoration.
-  destroy: ->
-    return if @destroyed
-    @markerDestroyDisposable.dispose()
-    @markerDestroyDisposable = null
-    @destroyed = true
-    @emit 'destroyed'
-    @emitter.emit 'did-destroy'
-    @emitter.dispose()
+  ###
+  Section: Private methods
+  ###
 
   matchesPattern: (decorationPattern) ->
     return false unless decorationPattern?

src/deserializer-manager.coffee

@@ -1,4 +1,7 @@
-# Public: Manages the deserializers used for serialized state
+{Disposable} = require 'event-kit'
+Grim = require 'grim'
+
+# Extended: Manages the deserializers used for serialized state
 #
 # An instance of this class is always available as the `atom.deserializers`
 # global.
@@ -24,14 +27,17 @@ class DeserializerManager
 
   # Public: Register the given class(es) as deserializers.
   #
-  # * `classes` One or more classes to register.
-  add: (classes...) ->
-    @deserializers[klass.name] = klass for klass in classes
+  # * `deserializers` One or more deserializers to register. A deserializer can
+  #   be any object with a `.name` property and a `.deserialize()` method. A
+  #   common approach is to register a *constructor* as the deserializer for its
+  #   instances by adding a `.deserialize()` class method.
+  add: (deserializers...) ->
+    @deserializers[deserializer.name] = deserializer for deserializer in deserializers
+    new Disposable =>
+      delete @deserializers[deserializer.name] for deserializer in deserializers
 
-  # Public: Remove the given class(es) as deserializers.
-  #
-  # * `classes` One or more classes to remove.
   remove: (classes...) ->
+    Grim.deprecate("Call .dispose() on the Disposable return from ::add instead")
     delete @deserializers[name] for {name} in classes
 
   # Public: Deserialize the state and params.

src/display-buffer-marker.coffee

@@ -1,270 +0,0 @@
-{Range} = require 'text-buffer'
-_ = require 'underscore-plus'
-{Subscriber} = require 'emissary'
-EmitterMixin = require('emissary').Emitter
-{Emitter} = require 'event-kit'
-Grim = require 'grim'
-
-module.exports =
-class DisplayBufferMarker
-  EmitterMixin.includeInto(this)
-  Subscriber.includeInto(this)
-
-  bufferMarkerSubscription: null
-  oldHeadBufferPosition: null
-  oldHeadScreenPosition: null
-  oldTailBufferPosition: null
-  oldTailScreenPosition: null
-  wasValid: true
-  deferredChangeEvents: null
-
-  constructor: ({@bufferMarker, @displayBuffer}) ->
-    @emitter = new Emitter
-    @id = @bufferMarker.id
-    @oldHeadBufferPosition = @getHeadBufferPosition()
-    @oldHeadScreenPosition = @getHeadScreenPosition()
-    @oldTailBufferPosition = @getTailBufferPosition()
-    @oldTailScreenPosition = @getTailScreenPosition()
-    @wasValid = @isValid()
-
-    @subscribe @bufferMarker.onDidDestroy => @destroyed()
-    @subscribe @bufferMarker.onDidChange (event) => @notifyObservers(event)
-
-  onDidChange: (callback) ->
-    @emitter.on 'did-change', callback
-
-  onDidDestroy: (callback) ->
-    @emitter.on 'did-destroy', callback
-
-  on: (eventName) ->
-    switch eventName
-      when 'changed'
-        Grim.deprecate("Use DisplayBufferMarker::onDidChange instead")
-      when 'destroyed'
-        Grim.deprecate("Use DisplayBufferMarker::onDidDestroy instead")
-
-    EmitterMixin::on.apply(this, arguments)
-
-  copy: (attributes) ->
-    @displayBuffer.getMarker(@bufferMarker.copy(attributes).id)
-
-  # Gets the screen range of the display marker.
-  #
-  # Returns a {Range}.
-  getScreenRange: ->
-    @displayBuffer.screenRangeForBufferRange(@getBufferRange(), wrapAtSoftNewlines: true)
-
-  # Modifies the screen range of the display marker.
-  #
-  # screenRange - The new {Range} to use
-  # options - A hash of options matching those found in {Marker::setRange}
-  setScreenRange: (screenRange, options) ->
-    @setBufferRange(@displayBuffer.bufferRangeForScreenRange(screenRange), options)
-
-  # Gets the buffer range of the display marker.
-  #
-  # Returns a {Range}.
-  getBufferRange: ->
-    @bufferMarker.getRange()
-
-  # Modifies the buffer range of the display marker.
-  #
-  # screenRange - The new {Range} to use
-  # options - A hash of options matching those found in {Marker::setRange}
-  setBufferRange: (bufferRange, options) ->
-    @bufferMarker.setRange(bufferRange, options)
-
-  getPixelRange: ->
-    @displayBuffer.pixelRangeForScreenRange(@getScreenRange(), false)
-
-  # Retrieves the screen position of the marker's head.
-  #
-  # Returns a {Point}.
-  getHeadScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getHeadBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Sets the screen position of the marker's head.
-  #
-  # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
-  setHeadScreenPosition: (screenPosition, options) ->
-    screenPosition = @displayBuffer.clipScreenPosition(screenPosition, options)
-    @setHeadBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, options))
-
-  # Retrieves the buffer position of the marker's head.
-  #
-  # Returns a {Point}.
-  getHeadBufferPosition: ->
-    @bufferMarker.getHeadPosition()
-
-  # Sets the buffer position of the marker's head.
-  #
-  # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
-  setHeadBufferPosition: (bufferPosition) ->
-    @bufferMarker.setHeadPosition(bufferPosition)
-
-  # Retrieves the screen position of the marker's tail.
-  #
-  # Returns a {Point}.
-  getTailScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getTailBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Sets the screen position of the marker's tail.
-  #
-  # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
-  setTailScreenPosition: (screenPosition, options) ->
-    screenPosition = @displayBuffer.clipScreenPosition(screenPosition, options)
-    @setTailBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, options))
-
-  # Retrieves the buffer position of the marker's tail.
-  #
-  # Returns a {Point}.
-  getTailBufferPosition: ->
-    @bufferMarker.getTailPosition()
-
-  # Sets the buffer position of the marker's tail.
-  #
-  # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
-  setTailBufferPosition: (bufferPosition) ->
-    @bufferMarker.setTailPosition(bufferPosition)
-
-  # Retrieves the screen position of the marker's start. This will always be
-  # less than or equal to the result of {DisplayBufferMarker::getEndScreenPosition}.
-  #
-  # Returns a {Point}.
-  getStartScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getStartBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Retrieves the buffer position of the marker's start. This will always be
-  # less than or equal to the result of {DisplayBufferMarker::getEndBufferPosition}.
-  #
-  # Returns a {Point}.
-  getStartBufferPosition: ->
-    @bufferMarker.getStartPosition()
-
-  # Retrieves the screen position of the marker's end. This will always be
-  # greater than or equal to the result of {DisplayBufferMarker::getStartScreenPosition}.
-  #
-  # Returns a {Point}.
-  getEndScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getEndBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Retrieves the buffer position of the marker's end. This will always be
-  # greater than or equal to the result of {DisplayBufferMarker::getStartBufferPosition}.
-  #
-  # Returns a {Point}.
-  getEndBufferPosition: ->
-    @bufferMarker.getEndPosition()
-
-  # Sets the marker's tail to the same position as the marker's head.
-  #
-  # This only works if there isn't already a tail position.
-  #
-  # Returns a {Point} representing the new tail position.
-  plantTail: ->
-    @bufferMarker.plantTail()
-
-  # Removes the tail from the marker.
-  clearTail: ->
-    @bufferMarker.clearTail()
-
-  hasTail: ->
-    @bufferMarker.hasTail()
-
-  # Returns whether the head precedes the tail in the buffer
-  isReversed: ->
-    @bufferMarker.isReversed()
-
-  # Returns a {Boolean} indicating whether the marker is valid. Markers can be
-  # invalidated when a region surrounding them in the buffer is changed.
-  isValid: ->
-    @bufferMarker.isValid()
-
-  # Returns a {Boolean} indicating whether the marker has been destroyed. A marker
-  # can be invalid without being destroyed, in which case undoing the invalidating
-  # operation would restore the marker. Once a marker is destroyed by calling
-  # {Marker::destroy}, no undo/redo operation can ever bring it back.
-  isDestroyed: ->
-    @bufferMarker.isDestroyed()
-
-  getAttributes: ->
-    @bufferMarker.getProperties()
-
-  setAttributes: (attributes) ->
-    @bufferMarker.setProperties(attributes)
-
-  matchesAttributes: (attributes) ->
-    attributes = @displayBuffer.translateToBufferMarkerParams(attributes)
-    @bufferMarker.matchesAttributes(attributes)
-
-  # Destroys the marker
-  destroy: ->
-    @bufferMarker.destroy()
-    @unsubscribe()
-
-  isEqual: (other) ->
-    return false unless other instanceof @constructor
-    @bufferMarker.isEqual(other.bufferMarker)
-
-  compare: (other) ->
-    @bufferMarker.compare(other.bufferMarker)
-
-  # Returns a {String} representation of the marker
-  inspect: ->
-    "DisplayBufferMarker(id: #{@id}, bufferRange: #{@getBufferRange()})"
-
-  destroyed: ->
-    delete @displayBuffer.markers[@id]
-    @emit 'destroyed'
-    @emitter.emit 'did-destroy'
-    @emitter.dispose()
-
-  notifyObservers: ({textChanged}) ->
-    textChanged ?= false
-
-    newHeadBufferPosition = @getHeadBufferPosition()
-    newHeadScreenPosition = @getHeadScreenPosition()
-    newTailBufferPosition = @getTailBufferPosition()
-    newTailScreenPosition = @getTailScreenPosition()
-    isValid = @isValid()
-
-    return if _.isEqual(isValid, @wasValid) and
-      _.isEqual(newHeadBufferPosition, @oldHeadBufferPosition) and
-      _.isEqual(newHeadScreenPosition, @oldHeadScreenPosition) and
-      _.isEqual(newTailBufferPosition, @oldTailBufferPosition) and
-      _.isEqual(newTailScreenPosition, @oldTailScreenPosition)
-
-    changeEvent = {
-      @oldHeadScreenPosition, newHeadScreenPosition,
-      @oldTailScreenPosition, newTailScreenPosition,
-      @oldHeadBufferPosition, newHeadBufferPosition,
-      @oldTailBufferPosition, newTailBufferPosition,
-      textChanged,
-      isValid
-    }
-
-    if @deferredChangeEvents?
-      @deferredChangeEvents.push(changeEvent)
-    else
-      @emit 'changed', changeEvent
-      @emitter.emit 'did-change', changeEvent
-
-    @oldHeadBufferPosition = newHeadBufferPosition
-    @oldHeadScreenPosition = newHeadScreenPosition
-    @oldTailBufferPosition = newTailBufferPosition
-    @oldTailScreenPosition = newTailScreenPosition
-    @wasValid = isValid
-
-  pauseChangeEvents: ->
-    @deferredChangeEvents = []
-
-  resumeChangeEvents: ->
-    if deferredChangeEvents = @deferredChangeEvents
-      @deferredChangeEvents = null
-
-      for event in deferredChangeEvents
-        @emit 'changed', event
-        @emitter.emit 'did-change', event

src/display-buffer.coffee

@@ -10,7 +10,7 @@ RowMap = require './row-map'
 Fold = require './fold'
 Token = require './token'
 Decoration = require './decoration'
-DisplayBufferMarker = require './display-buffer-marker'
+Marker = require './marker'
 Grim = require 'grim'
 
 class BufferToScreenConversionError extends Error
@@ -59,10 +59,10 @@ class DisplayBuffer extends Model
     @subscribe @buffer.onDidUpdateMarkers @handleBufferMarkersUpdated
     @subscribe @buffer.onDidCreateMarker @handleBufferMarkerCreated
 
-    @subscribe atom.config.observe 'editor.preferredLineLength', callNow: false, =>
+    @subscribe atom.config.onDidChange 'editor.preferredLineLength', =>
       @updateWrappedScreenLines() if @isSoftWrapped() and atom.config.get('editor.softWrapAtPreferredLineLength')
 
-    @subscribe atom.config.observe 'editor.softWrapAtPreferredLineLength', callNow: false, =>
+    @subscribe atom.config.onDidChange 'editor.softWrapAtPreferredLineLength', =>
       @updateWrappedScreenLines() if @isSoftWrapped()
 
     @updateAllScreenLines()
@@ -315,9 +315,14 @@ class DisplayBuffer extends Model
     @charWidthsByScope = {}
 
   getScrollHeight: ->
-    return 0 unless @getLineHeightInPixels() > 0
+    lineHeight = @getLineHeightInPixels()
+    return 0 unless lineHeight > 0
 
-    @getLineCount() * @getLineHeightInPixels()
+    scrollHeight = @getLineCount() * lineHeight
+    if @height? and atom.config.get('editor.scrollPastEnd')
+      scrollHeight = scrollHeight + @height - (lineHeight * 3)
+
+    scrollHeight
 
   getScrollWidth: ->
     @scrollWidth
@@ -434,7 +439,7 @@ class DisplayBuffer extends Model
 
   getSoftWrapColumn: ->
     if atom.config.get('editor.softWrapAtPreferredLineLength')
-      Math.min(@getEditorWidthInChars(), atom.config.getPositiveInt('editor.preferredLineLength', @getEditorWidthInChars()))
+      Math.min(@getEditorWidthInChars(), atom.config.get('editor.preferredLineLength'))
     else
       @getEditorWidthInChars()
 
@@ -865,21 +870,21 @@ class DisplayBuffer extends Model
       @emitter.emit 'did-remove-decoration', decoration
       delete @decorationsByMarkerId[marker.id] if decorations.length is 0
 
-  # Retrieves a {DisplayBufferMarker} based on its id.
+  # Retrieves a {Marker} based on its id.
   #
   # id - A {Number} representing a marker id
   #
-  # Returns the {DisplayBufferMarker} (if it exists).
+  # Returns the {Marker} (if it exists).
   getMarker: (id) ->
     unless marker = @markers[id]
       if bufferMarker = @buffer.getMarker(id)
-        marker = new DisplayBufferMarker({bufferMarker, displayBuffer: this})
+        marker = new Marker({bufferMarker, displayBuffer: this})
         @markers[id] = marker
     marker
 
   # Retrieves the active markers in the buffer.
   #
-  # Returns an {Array} of existing {DisplayBufferMarker}s.
+  # Returns an {Array} of existing {Marker}s.
   getMarkers: ->
     @buffer.getMarkers().map ({id}) => @getMarker(id)
 
@@ -934,7 +939,7 @@ class DisplayBuffer extends Model
   #
   # Refer to {DisplayBuffer::findMarkers} for details.
   #
-  # Returns a {DisplayBufferMarker} or null
+  # Returns a {Marker} or null
   findMarker: (params) ->
     @findMarkers(params)[0]
 
@@ -955,7 +960,7 @@ class DisplayBuffer extends Model
   #   :containedInBufferRange - A {Range} or range-compatible {Array}. Only
   #     returns markers contained within this range.
   #
-  # Returns an {Array} of {DisplayBufferMarker}s
+  # Returns an {Array} of {Marker}s
   findMarkers: (params) ->
     params = @translateToBufferMarkerParams(params)
     @buffer.findMarkers(params).map (stringMarker) => @getMarker(stringMarker.id)
@@ -1138,13 +1143,13 @@ class DisplayBuffer extends Model
       @pendingChangeEvent = null
       @emitDidChange(event, false)
 
-  handleBufferMarkerCreated: (marker) =>
-    @createFoldForMarker(marker) if marker.matchesAttributes(@getFoldMarkerAttributes())
-    if displayBufferMarker = @getMarker(marker.id)
+  handleBufferMarkerCreated: (textBufferMarker) =>
+    @createFoldForMarker(textBufferMarker) if textBufferMarker.matchesParams(@getFoldMarkerAttributes())
+    if marker = @getMarker(textBufferMarker.id)
       # The marker might have been removed in some other handler called before
       # this one. Only emit when the marker still exists.
-      @emit 'marker-created', displayBufferMarker
-      @emitter.emit 'did-create-marker', displayBufferMarker
+      @emit 'marker-created', marker
+      @emitter.emit 'did-create-marker', marker
 
   createFoldForMarker: (marker) ->
     @decorateMarker(marker, type: 'gutter', class: 'folded')

src/git-repository.coffee

@@ -10,7 +10,7 @@ GitUtils = require 'git-utils'
 
 Task = require './task'
 
-# Public: Represents the underlying git operations performed by Atom.
+# Extended: Represents the underlying git operations performed by Atom.
 #
 # This class shouldn't be instantiated directly but instead by accessing the
 # `atom.project` global and calling `getRepo()`. Note that this will only be
@@ -40,32 +40,13 @@ Task = require './task'
 # ### Requiring in packages
 #
 # ```coffee
-# {Git} = require 'atom'
+# {GitRepository} = require 'atom'
 # ```
 module.exports =
-class Git
+class GitRepository
   EmitterMixin.includeInto(this)
   Subscriber.includeInto(this)
 
-  ###
-  Section: Class Methods
-  ###
-
-  # Public: Creates a new Git instance.
-  #
-  # * `path` The {String} path to the Git repository to open.
-  # * `options` An optinal {Object} with the following keys:
-  #   * `refreshOnWindowFocus` A {Boolean}, `true` to refresh the index and
-  #     statuses when the window is focused.
-  #
-  # Returns a {Git} instance or `null` if the repository could not be opened.
-  @open: (path, options) ->
-    return null unless path
-    try
-      new Git(path, options)
-    catch
-      null
-
   @exists: (path) ->
     if git = @open(path)
       git.destroy()
@@ -74,9 +55,24 @@ class Git
       false
 
   ###
-  Section: Construction
+  Section: Construction and Destruction
   ###
 
+  # Public: Creates a new GitRepository instance.
+  #
+  # * `path` The {String} path to the Git repository to open.
+  # * `options` An optinal {Object} with the following keys:
+  #   * `refreshOnWindowFocus` A {Boolean}, `true` to refresh the index and
+  #     statuses when the window is focused.
+  #
+  # Returns a {GitRepository} instance or `null` if the repository could not be opened.
+  @open: (path, options) ->
+    return null unless path
+    try
+      new GitRepository(path, options)
+    catch
+      null
+
   constructor: (path, options={}) ->
     @emitter = new Emitter
     @repo = GitUtils.open(path)
@@ -100,11 +96,26 @@ class Git
     if @project?
       @subscribe @project.eachBuffer (buffer) => @subscribeToBuffer(buffer)
 
+  # Public: Destroy this {GitRepository} object.
+  #
+  # This destroys any tasks and subscriptions and releases the underlying
+  # libgit2 repository handle.
+  destroy: ->
+    if @statusTask?
+      @statusTask.terminate()
+      @statusTask = null
+
+    if @repo?
+      @repo.release()
+      @repo = null
+
+    @unsubscribe()
+
   ###
   Section: Event Subscription
   ###
 
-  # Essential: Invoke the given callback when a specific file's status has
+  # Public: Invoke the given callback when a specific file's status has
   # changed. When a file is updated, reloaded, etc, and the status changes, this
   # will be fired.
   #
@@ -118,7 +129,7 @@ class Git
   onDidChangeStatus: (callback) ->
     @emitter.on 'did-change-status', callback
 
-  # Essential: Invoke the given callback when a multiple files' statuses have
+  # Public: Invoke the given callback when a multiple files' statuses have
   # changed. For example, on window focus, the status of all the paths in the
   # repo is checked. If any of them have changed, this will be fired. Call
   # {::getPathStatus(path)} to get the status for your path of choice.
@@ -132,15 +143,258 @@ class Git
   on: (eventName) ->
     switch eventName
       when 'status-changed'
-        deprecate 'Use Git::onDidChangeStatus instead'
+        deprecate 'Use GitRepository::onDidChangeStatus instead'
       when 'statuses-changed'
-        deprecate 'Use Git::onDidChangeStatuses instead'
+        deprecate 'Use GitRepository::onDidChangeStatuses instead'
       else
-        deprecate 'Git::on is deprecated. Use event subscription methods instead.'
+        deprecate 'GitRepository::on is deprecated. Use event subscription methods instead.'
     EmitterMixin::on.apply(this, arguments)
 
   ###
-  Section: Instance Methods
+  Section: Repository Details
+  ###
+
+  # Public: Returns the {String} path of the repository.
+  getPath: ->
+    @path ?= fs.absolute(@getRepo().getPath())
+
+  # Public: Returns the {String} working directory path of the repository.
+  getWorkingDirectory: -> @getRepo().getWorkingDirectory()
+
+  # Public: Returns true if at the root, false if in a subfolder of the
+  # repository.
+  isProjectAtRoot: ->
+    @projectAtRoot ?= @project?.relativize(@getWorkingDirectory()) is ''
+
+  # Public: Makes a path relative to the repository's working directory.
+  relativize: (path) -> @getRepo().relativize(path)
+
+  # Public: Returns true if the given branch exists.
+  hasBranch: (branch) -> @getReferenceTarget("refs/heads/#{branch}")?
+
+  # Public: Retrieves a shortened version of the HEAD reference value.
+  #
+  # This removes the leading segments of `refs/heads`, `refs/tags`, or
+  # `refs/remotes`.  It also shortens the SHA-1 of a detached `HEAD` to 7
+  # characters.
+  #
+  # * `path` An optional {String} path in the repository to get this information
+  #   for, only needed if the repository contains submodules.
+  #
+  # Returns a {String}.
+  getShortHead: (path) -> @getRepo(path).getShortHead()
+
+  # Public: Is the given path a submodule in the repository?
+  #
+  # * `path` The {String} path to check.
+  #
+  # Returns a {Boolean}.
+  isSubmodule: (path) ->
+    return false unless path
+
+    repo = @getRepo(path)
+    if repo.isSubmodule(repo.relativize(path))
+      true
+    else
+      # Check if the path is a working directory in a repo that isn't the root.
+      repo isnt @getRepo() and repo.relativize(join(path, 'dir')) is 'dir'
+
+  # Public: Returns the number of commits behind the current branch is from the
+  # its upstream remote branch.
+  #
+  # * `reference` The {String} branch reference name.
+  # * `path`      The {String} path in the repository to get this information for,
+  #   only needed if the repository contains submodules.
+  getAheadBehindCount: (reference, path) ->
+    @getRepo(path).getAheadBehindCount(reference)
+
+  # Public: Get the cached ahead/behind commit counts for the current branch's
+  # upstream branch.
+  #
+  # * `path` An optional {String} path in the repository to get this information
+  #   for, only needed if the repository has submodules.
+  #
+  # Returns an {Object} with the following keys:
+  #   * `ahead`  The {Number} of commits ahead.
+  #   * `behind` The {Number} of commits behind.
+  getCachedUpstreamAheadBehindCount: (path) ->
+    @getRepo(path).upstream ? @upstream
+
+  # Public: Returns the git configuration value specified by the key.
+  #
+  # * `path` An optional {String} path in the repository to get this information
+  #   for, only needed if the repository has submodules.
+  getConfigValue: (key, path) -> @getRepo(path).getConfigValue(key)
+
+  # Public: Returns the origin url of the repository.
+  #
+  # * `path` (optional) {String} path in the repository to get this information
+  #   for, only needed if the repository has submodules.
+  getOriginUrl: (path) -> @getConfigValue('remote.origin.url', path)
+
+  # Public: Returns the upstream branch for the current HEAD, or null if there
+  # is no upstream branch for the current HEAD.
+  #
+  # * `path` An optional {String} path in the repo to get this information for,
+  #   only needed if the repository contains submodules.
+  #
+  # Returns a {String} branch name such as `refs/remotes/origin/master`.
+  getUpstreamBranch: (path) -> @getRepo(path).getUpstreamBranch()
+
+  # Public: Gets all the local and remote references.
+  #
+  # * `path` An optional {String} path in the repository to get this information
+  #   for, only needed if the repository has submodules.
+  #
+  # Returns an {Object} with the following keys:
+  #  * `heads`   An {Array} of head reference names.
+  #  * `remotes` An {Array} of remote reference names.
+  #  * `tags`    An {Array} of tag reference names.
+  getReferences: (path) -> @getRepo(path).getReferences()
+
+  # Public: Returns the current {String} SHA for the given reference.
+  #
+  # * `reference` The {String} reference to get the target of.
+  # * `path` An optional {String} path in the repo to get the reference target
+  #   for. Only needed if the repository contains submodules.
+  getReferenceTarget: (reference, path) ->
+    @getRepo(path).getReferenceTarget(reference)
+
+  ###
+  Section: Reading Status
+  ###
+
+  # Public: Returns true if the given path is modified.
+  isPathModified: (path) -> @isStatusModified(@getPathStatus(path))
+
+  # Public: Returns true if the given path is new.
+  isPathNew: (path) -> @isStatusNew(@getPathStatus(path))
+
+  # Public: Is the given path ignored?
+  #
+  # Returns a {Boolean}.
+  isPathIgnored: (path) -> @getRepo().isIgnored(@relativize(path))
+
+  # Public: Get the status of a directory in the repository's working directory.
+  #
+  # * `path` The {String} path to check.
+  #
+  # Returns a {Number} representing the status. This value can be passed to
+  # {::isStatusModified} or {::isStatusNew} to get more information.
+  getDirectoryStatus: (directoryPath)  ->
+    directoryPath = "#{@relativize(directoryPath)}/"
+    directoryStatus = 0
+    for path, status of @statuses
+      directoryStatus |= status if path.indexOf(directoryPath) is 0
+    directoryStatus
+
+  # Public: Get the status of a single path in the repository.
+  #
+  # `path` A {String} repository-relative path.
+  #
+  # Returns a {Number} representing the status. This value can be passed to
+  # {::isStatusModified} or {::isStatusNew} to get more information.
+  getPathStatus: (path) ->
+    repo = @getRepo(path)
+    relativePath = @relativize(path)
+    currentPathStatus = @statuses[relativePath] ? 0
+    pathStatus = repo.getStatus(repo.relativize(path)) ? 0
+    pathStatus = 0 if repo.isStatusIgnored(pathStatus)
+    if pathStatus > 0
+      @statuses[relativePath] = pathStatus
+    else
+      delete @statuses[relativePath]
+    if currentPathStatus isnt pathStatus
+      @emit 'status-changed', path, pathStatus
+      @emitter.emit 'did-change-status', {path, pathStatus}
+
+    pathStatus
+
+  # Public: Get the cached status for the given path.
+  #
+  # * `path` A {String} path in the repository, relative or absolute.
+  #
+  # Returns a status {Number} or null if the path is not in the cache.
+  getCachedPathStatus: (path) ->
+    @statuses[@relativize(path)]
+
+  # Public: Returns true if the given status indicates modification.
+  isStatusModified: (status) -> @getRepo().isStatusModified(status)
+
+  # Public: Returns true if the given status indicates a new path.
+  isStatusNew: (status) -> @getRepo().isStatusNew(status)
+
+  ###
+  Section: Retrieving Diffs
+  ###
+
+  # Public: Retrieves the number of lines added and removed to a path.
+  #
+  # This compares the working directory contents of the path to the `HEAD`
+  # version.
+  #
+  # * `path` The {String} path to check.
+  #
+  # Returns an {Object} with the following keys:
+  #   * `added` The {Number} of added lines.
+  #   * `deleted` The {Number} of deleted lines.
+  getDiffStats: (path) ->
+    repo = @getRepo(path)
+    repo.getDiffStats(repo.relativize(path))
+
+  # Public: Retrieves the line diffs comparing the `HEAD` version of the given
+  # path and the given text.
+  #
+  # * `path` The {String} path relative to the repository.
+  # * `text` The {String} to compare against the `HEAD` contents
+  #
+  # Returns an {Array} of hunk {Object}s with the following keys:
+  #   * `oldStart` The line {Number} of the old hunk.
+  #   * `newStart` The line {Number} of the new hunk.
+  #   * `oldLines` The {Number} of lines in the old hunk.
+  #   * `newLines` The {Number} of lines in the new hunk
+  getLineDiffs: (path, text) ->
+    # Ignore eol of line differences on windows so that files checked in as
+    # LF don't report every line modified when the text contains CRLF endings.
+    options = ignoreEolWhitespace: process.platform is 'win32'
+    repo = @getRepo(path)
+    repo.getLineDiffs(repo.relativize(path), text, options)
+
+  ###
+  Section: Checking Out
+  ###
+
+  # Public: Restore the contents of a path in the working directory and index
+  # to the version at `HEAD`.
+  #
+  # This is essentially the same as running:
+  #
+  # ```sh
+  #   git reset HEAD -- <path>
+  #   git checkout HEAD -- <path>
+  # ```
+  #
+  # * `path` The {String} path to checkout.
+  #
+  # Returns a {Boolean} that's true if the method was successful.
+  checkoutHead: (path) ->
+    repo = @getRepo(path)
+    headCheckedOut = repo.checkoutHead(repo.relativize(path))
+    @getPathStatus(path) if headCheckedOut
+    headCheckedOut
+
+  # Public: Checks out a branch in your repository.
+  #
+  # * `reference` The {String} reference to checkout.
+  # * `create`    A {Boolean} value which, if true creates the new reference if
+  #   it doesn't exist.
+  #
+  # Returns a Boolean that's true if the method was successful.
+  checkoutReference: (reference, create) ->
+    @getRepo().checkoutReference(reference, create)
+
+  ###
+  Section: Private
   ###
 
   # Subscribes to buffer events.
@@ -175,21 +429,6 @@ class Git
     else
       checkoutHead()
 
-  # Public: Destroy this {Git} object.
-  #
-  # This destroys any tasks and subscriptions and releases the underlying
-  # libgit2 repository handle.
-  destroy: ->
-    if @statusTask?
-      @statusTask.terminate()
-      @statusTask = null
-
-    if @repo?
-      @repo.release()
-      @repo = null
-
-    @unsubscribe()
-
   # Returns the corresponding {Repository}
   getRepo: (path) ->
     if @repo?
@@ -201,233 +440,6 @@ class Git
   # last time the index was read.
   refreshIndex: -> @getRepo().refreshIndex()
 
-  # Public: Returns the {String} path of the repository.
-  getPath: ->
-    @path ?= fs.absolute(@getRepo().getPath())
-
-  # Public: Returns the {String} working directory path of the repository.
-  getWorkingDirectory: -> @getRepo().getWorkingDirectory()
-
-  # Public: Get the status of a single path in the repository.
-  #
-  # `path` A {String} repository-relative path.
-  #
-  # Returns a {Number} representing the status. This value can be passed to
-  # {::isStatusModified} or {::isStatusNew} to get more information.
-  getPathStatus: (path) ->
-    repo = @getRepo(path)
-    relativePath = @relativize(path)
-    currentPathStatus = @statuses[relativePath] ? 0
-    pathStatus = repo.getStatus(repo.relativize(path)) ? 0
-    pathStatus = 0 if repo.isStatusIgnored(pathStatus)
-    if pathStatus > 0
-      @statuses[relativePath] = pathStatus
-    else
-      delete @statuses[relativePath]
-    if currentPathStatus isnt pathStatus
-      @emit 'status-changed', path, pathStatus
-      @emitter.emit 'did-change-status', {path, pathStatus}
-
-    pathStatus
-
-  # Public: Is the given path ignored?
-  #
-  # Returns a {Boolean}.
-  isPathIgnored: (path) -> @getRepo().isIgnored(@relativize(path))
-
-  # Public: Returns true if the given status indicates modification.
-  isStatusModified: (status) -> @getRepo().isStatusModified(status)
-
-  # Public: Returns true if the given path is modified.
-  isPathModified: (path) -> @isStatusModified(@getPathStatus(path))
-
-  # Public: Returns true if the given status indicates a new path.
-  isStatusNew: (status) -> @getRepo().isStatusNew(status)
-
-  # Public: Returns true if the given path is new.
-  isPathNew: (path) -> @isStatusNew(@getPathStatus(path))
-
-  # Public: Returns true if at the root, false if in a subfolder of the
-  # repository.
-  isProjectAtRoot: ->
-    @projectAtRoot ?= @project?.relativize(@getWorkingDirectory()) is ''
-
-  # Public: Makes a path relative to the repository's working directory.
-  relativize: (path) -> @getRepo().relativize(path)
-
-  # Public: Retrieves a shortened version of the HEAD reference value.
-  #
-  # This removes the leading segments of `refs/heads`, `refs/tags`, or
-  # `refs/remotes`.  It also shortens the SHA-1 of a detached `HEAD` to 7
-  # characters.
-  #
-  # * `path` An optional {String} path in the repository to get this information
-  #   for, only needed if the repository contains submodules.
-  #
-  # Returns a {String}.
-  getShortHead: (path) -> @getRepo(path).getShortHead()
-
-  # Public: Restore the contents of a path in the working directory and index
-  # to the version at `HEAD`.
-  #
-  # This is essentially the same as running:
-  #
-  # ```sh
-  #   git reset HEAD -- <path>
-  #   git checkout HEAD -- <path>
-  # ```
-  #
-  # * `path` The {String} path to checkout.
-  #
-  # Returns a {Boolean} that's true if the method was successful.
-  checkoutHead: (path) ->
-    repo = @getRepo(path)
-    headCheckedOut = repo.checkoutHead(repo.relativize(path))
-    @getPathStatus(path) if headCheckedOut
-    headCheckedOut
-
-  # Public: Checks out a branch in your repository.
-  #
-  # * `reference` The {String} reference to checkout.
-  # * `create`    A {Boolean} value which, if true creates the new reference if
-  #   it doesn't exist.
-  #
-  # Returns a Boolean that's true if the method was successful.
-  checkoutReference: (reference, create) ->
-    @getRepo().checkoutReference(reference, create)
-
-  # Public: Retrieves the number of lines added and removed to a path.
-  #
-  # This compares the working directory contents of the path to the `HEAD`
-  # version.
-  #
-  # * `path` The {String} path to check.
-  #
-  # Returns an {Object} with the following keys:
-  #   * `added` The {Number} of added lines.
-  #   * `deleted` The {Number} of deleted lines.
-  getDiffStats: (path) ->
-    repo = @getRepo(path)
-    repo.getDiffStats(repo.relativize(path))
-
-  # Public: Is the given path a submodule in the repository?
-  #
-  # * `path` The {String} path to check.
-  #
-  # Returns a {Boolean}.
-  isSubmodule: (path) ->
-    return false unless path
-
-    repo = @getRepo(path)
-    if repo.isSubmodule(repo.relativize(path))
-      true
-    else
-      # Check if the path is a working directory in a repo that isn't the root.
-      repo isnt @getRepo() and repo.relativize(join(path, 'dir')) is 'dir'
-
-  # Public: Get the status of a directory in the repository's working directory.
-  #
-  # * `path` The {String} path to check.
-  #
-  # Returns a {Number} representing the status. This value can be passed to
-  # {::isStatusModified} or {::isStatusNew} to get more information.
-  getDirectoryStatus: (directoryPath)  ->
-    directoryPath = "#{@relativize(directoryPath)}/"
-    directoryStatus = 0
-    for path, status of @statuses
-      directoryStatus |= status if path.indexOf(directoryPath) is 0
-    directoryStatus
-
-  # Public: Retrieves the line diffs comparing the `HEAD` version of the given
-  # path and the given text.
-  #
-  # * `path` The {String} path relative to the repository.
-  # * `text` The {String} to compare against the `HEAD` contents
-  #
-  # Returns an {Array} of hunk {Object}s with the following keys:
-  #   * `oldStart` The line {Number} of the old hunk.
-  #   * `newStart` The line {Number} of the new hunk.
-  #   * `oldLines` The {Number} of lines in the old hunk.
-  #   * `newLines` The {Number} of lines in the new hunk
-  getLineDiffs: (path, text) ->
-    # Ignore eol of line differences on windows so that files checked in as
-    # LF don't report every line modified when the text contains CRLF endings.
-    options = ignoreEolWhitespace: process.platform is 'win32'
-    repo = @getRepo(path)
-    repo.getLineDiffs(repo.relativize(path), text, options)
-
-  # Public: Returns the git configuration value specified by the key.
-  #
-  # * `path` An optional {String} path in the repository to get this information
-  #   for, only needed if the repository has submodules.
-  getConfigValue: (key, path) -> @getRepo(path).getConfigValue(key)
-
-  # Public: Returns the origin url of the repository.
-  #
-  # * `path` An optional {String} path in the repository to get this information
-  #   for, only needed if the repository has submodules.
-  getOriginUrl: (path) -> @getConfigValue('remote.origin.url', path)
-
-  # Public: Returns the upstream branch for the current HEAD, or null if there
-  # is no upstream branch for the current HEAD.
-  #
-  # * `path` An optional {String} path in the repo to get this information for,
-  #   only needed if the repository contains submodules.
-  #
-  # Returns a {String} branch name such as `refs/remotes/origin/master`.
-  getUpstreamBranch: (path) -> @getRepo(path).getUpstreamBranch()
-
-  # Public: Returns the current {String} SHA for the given reference.
-  #
-  # * `reference` The {String} reference to get the target of.
-  # * `path` An optional {String} path in the repo to get the reference target
-  #   for. Only needed if the repository contains submodules.
-  getReferenceTarget: (reference, path) ->
-    @getRepo(path).getReferenceTarget(reference)
-
-  # Public: Gets all the local and remote references.
-  #
-  # * `path` An optional {String} path in the repository to get this information
-  #   for, only needed if the repository has submodules.
-  #
-  # Returns an {Object} with the following keys:
-  #  * `heads`   An {Array} of head reference names.
-  #  * `remotes` An {Array} of remote reference names.
-  #  * `tags`    An {Array} of tag reference names.
-  getReferences: (path) -> @getRepo(path).getReferences()
-
-  # Public: Returns the number of commits behind the current branch is from the
-  # its upstream remote branch.
-  #
-  # * `reference` The {String} branch reference name.
-  # * `path`      The {String} path in the repository to get this information for,
-  #   only needed if the repository contains submodules.
-  getAheadBehindCount: (reference, path) ->
-    @getRepo(path).getAheadBehindCount(reference)
-
-  # Public: Get the cached ahead/behind commit counts for the current branch's
-  # upstream branch.
-  #
-  # * `path` An optional {String} path in the repository to get this information
-  #   for, only needed if the repository has submodules.
-  #
-  # Returns an {Object} with the following keys:
-  #   * `ahead`  The {Number} of commits ahead.
-  #   * `behind` The {Number} of commits behind.
-  getCachedUpstreamAheadBehindCount: (path) ->
-    @getRepo(path).upstream ? @upstream
-
-  # Public: Get the cached status for the given path.
-  #
-  # * `path` A {String} path in the repository, relative or absolute.
-  #
-  # Returns a status {Number} or null if the path is not in the cache.
-  getCachedPathStatus: (path) ->
-    @statuses[@relativize(path)]
-
-  # Public: Returns true if the given branch exists.
-  hasBranch: (branch) -> @getReferenceTarget("refs/heads/#{branch}")?
-
   # Refreshes the current git status in an outside process and asynchronously
   # updates the relevant properties.
   refreshStatus: ->

src/item-registry.coffee

@@ -0,0 +1,15 @@
+module.exports =
+class ItemRegistry
+  constructor: ->
+    @items = new WeakSet
+
+  addItem: (item) ->
+    if @hasItem(item)
+      throw new Error("The workspace can only contain one instance of item #{item}")
+    @items.add(item)
+
+  removeItem: (item) ->
+    @items.delete(item)
+
+  hasItem: (item) ->
+    @items.has(item)

src/language-mode.coffee

@@ -8,9 +8,9 @@ class LanguageMode
   Emitter.includeInto(this)
   Subscriber.includeInto(this)
 
-  # Sets up a `LanguageMode` for the given {Editor}.
+  # Sets up a `LanguageMode` for the given {TextEditor}.
   #
-  # editor - The {Editor} to associate with
+  # editor - The {TextEditor} to associate with
   constructor: (@editor) ->
     {@buffer} = @editor
 
@@ -148,15 +148,20 @@ class LanguageMode
     return unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(bufferRow).isComment()
 
     startRow = bufferRow
-    for currentRow in [bufferRow-1..0]
-      break if @buffer.isRowBlank(currentRow)
-      break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
-      startRow = currentRow
     endRow = bufferRow
-    for currentRow in [bufferRow+1..@buffer.getLastRow()]
-      break if @buffer.isRowBlank(currentRow)
-      break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
-      endRow = currentRow
+
+    if bufferRow > 0
+      for currentRow in [bufferRow-1..0]
+        break if @buffer.isRowBlank(currentRow)
+        break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
+        startRow = currentRow
+
+    if bufferRow < @buffer.getLastRow()
+      for currentRow in [bufferRow+1..@buffer.getLastRow()]
+        break if @buffer.isRowBlank(currentRow)
+        break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
+        endRow = currentRow
+
     return [startRow, endRow] if startRow isnt endRow
 
   rowRangeForCodeFoldAtBufferRow: (bufferRow) ->
@@ -278,7 +283,7 @@ class LanguageMode
   # Given a buffer row, this indents it.
   #
   # bufferRow - The row {Number}.
-  # options - An options {Object} to pass through to {Editor::setIndentationForBufferRow}.
+  # options - An options {Object} to pass through to {TextEditor::setIndentationForBufferRow}.
   autoIndentBufferRow: (bufferRow, options) ->
     indentLevel = @suggestedIndentForBufferRow(bufferRow)
     @editor.setIndentationForBufferRow(bufferRow, indentLevel, options)

src/marker.coffee

@@ -0,0 +1,399 @@
+{Range} = require 'text-buffer'
+_ = require 'underscore-plus'
+{Subscriber} = require 'emissary'
+EmitterMixin = require('emissary').Emitter
+{Emitter} = require 'event-kit'
+Grim = require 'grim'
+
+# Essential: Represents a buffer annotation that remains logically stationary
+# even as the buffer changes. This is used to represent cursors, folds, snippet
+# targets, misspelled words, and anything else that needs to track a logical
+# location in the buffer over time.
+#
+# ### Marker Creation
+#
+# Use {TextEditor::markBufferRange} rather than creating Markers directly.
+#
+# ### Head and Tail
+#
+# Markers always have a *head* and sometimes have a *tail*. If you think of a
+# marker as an editor selection, the tail is the part that's stationary and the
+# head is the part that moves when the mouse is moved. A marker without a tail
+# always reports an empty range at the head position. A marker with a head position
+# greater than the tail is in a "normal" orientation. If the head precedes the
+# tail the marker is in a "reversed" orientation.
+#
+# ### Validity
+#
+# Markers are considered *valid* when they are first created. Depending on the
+# invalidation strategy you choose, certain changes to the buffer can cause a
+# marker to become invalid, for example if the text surrounding the marker is
+# deleted. The strategies, in order of descending fragility:
+#
+# * __never__: The marker is never marked as invalid. This is a good choice for
+#   markers representing selections in an editor.
+# * __surround__: The marker is invalidated by changes that completely surround it.
+# * __overlap__: The marker is invalidated by changes that surround the
+#   start or end of the marker. This is the default.
+# * __inside__: The marker is invalidated by changes that extend into the
+#   inside of the marker. Changes that end at the marker's start or
+#   start at the marker's end do not invalidate the marker.
+# * __touch__: The marker is invalidated by a change that touches the marked
+#   region in any way, including changes that end at the marker's
+#   start or start at the marker's end. This is the most fragile strategy.
+#
+# See {TextEditor::markBufferRange} for usage.
+module.exports =
+class Marker
+  EmitterMixin.includeInto(this)
+  Subscriber.includeInto(this)
+
+  bufferMarkerSubscription: null
+  oldHeadBufferPosition: null
+  oldHeadScreenPosition: null
+  oldTailBufferPosition: null
+  oldTailScreenPosition: null
+  wasValid: true
+  deferredChangeEvents: null
+
+  ###
+  Section: Construction and Destruction
+  ###
+
+  constructor: ({@bufferMarker, @displayBuffer}) ->
+    @emitter = new Emitter
+    @id = @bufferMarker.id
+    @oldHeadBufferPosition = @getHeadBufferPosition()
+    @oldHeadScreenPosition = @getHeadScreenPosition()
+    @oldTailBufferPosition = @getTailBufferPosition()
+    @oldTailScreenPosition = @getTailScreenPosition()
+    @wasValid = @isValid()
+
+    @subscribe @bufferMarker.onDidDestroy => @destroyed()
+    @subscribe @bufferMarker.onDidChange (event) => @notifyObservers(event)
+
+  # Essential: Destroys the marker, causing it to emit the 'destroyed' event. Once
+  # destroyed, a marker cannot be restored by undo/redo operations.
+  destroy: ->
+    @bufferMarker.destroy()
+    @unsubscribe()
+
+  # Essential: Creates and returns a new {Marker} with the same properties as this
+  # marker.
+  #
+  # * `properties` {Object}
+  copy: (properties) ->
+    @displayBuffer.getMarker(@bufferMarker.copy(properties).id)
+
+  ###
+  Section: Event Subscription
+  ###
+
+  # Essential: Invoke the given callback when the state of the marker changes.
+  #
+  # * `callback` {Function} to be called when the marker changes.
+  #   * `event` {Object} with the following keys:
+  #     * `oldHeadPosition` {Point} representing the former head position
+  #     * `newHeadPosition` {Point} representing the new head position
+  #     * `oldTailPosition` {Point} representing the former tail position
+  #     * `newTailPosition` {Point} representing the new tail position
+  #     * `wasValid` {Boolean} indicating whether the marker was valid before the change
+  #     * `isValid` {Boolean} indicating whether the marker is now valid
+  #     * `hadTail` {Boolean} indicating whether the marker had a tail before the change
+  #     * `hasTail` {Boolean} indicating whether the marker now has a tail
+  #     * `oldProperties` {Object} containing the marker's custom properties before the change.
+  #     * `newProperties` {Object} containing the marker's custom properties after the change.
+  #     * `textChanged` {Boolean} indicating whether this change was caused by a textual change
+  #       to the buffer or whether the marker was manipulated directly via its public API.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  onDidChange: (callback) ->
+    @emitter.on 'did-change', callback
+
+  # Essential: Invoke the given callback when the marker is destroyed.
+  #
+  # * `callback` {Function} to be called when the marker is destroyed.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  onDidDestroy: (callback) ->
+    @emitter.on 'did-destroy', callback
+
+  on: (eventName) ->
+    switch eventName
+      when 'changed'
+        Grim.deprecate("Use Marker::onDidChange instead")
+      when 'destroyed'
+        Grim.deprecate("Use Marker::onDidDestroy instead")
+
+    EmitterMixin::on.apply(this, arguments)
+
+  ###
+  Section: Marker Details
+  ###
+
+  # Essential: Returns a {Boolean} indicating whether the marker is valid. Markers can be
+  # invalidated when a region surrounding them in the buffer is changed.
+  isValid: ->
+    @bufferMarker.isValid()
+
+  # Essential: Returns a {Boolean} indicating whether the marker has been destroyed. A marker
+  # can be invalid without being destroyed, in which case undoing the invalidating
+  # operation would restore the marker. Once a marker is destroyed by calling
+  # {Marker::destroy}, no undo/redo operation can ever bring it back.
+  isDestroyed: ->
+    @bufferMarker.isDestroyed()
+
+  # Essential: Returns a {Boolean} indicating whether the head precedes the tail.
+  isReversed: ->
+    @bufferMarker.isReversed()
+
+  # Essential: Get the invalidation strategy for this marker.
+  #
+  # Valid values include: `never`, `surround`, `overlap`, `inside`, and `touch`.
+  #
+  # Returns a {String}.
+  getInvalidationStrategy: ->
+    @bufferMarker.getInvalidationStrategy()
+
+  # Essential: Returns an {Object} containing any custom properties associated with
+  # the marker.
+  getProperties: ->
+    @bufferMarker.getProperties()
+  getAttributes: ->
+    deprecate 'Use Marker::getProperties instead'
+    @getProperties()
+
+  # Essential: Merges an {Object} containing new properties into the marker's
+  # existing properties.
+  #
+  # * `properties` {Object}
+  setProperties: (properties) ->
+    @bufferMarker.setProperties(properties)
+  setAttributes: (properties) ->
+    deprecate 'Use Marker::getProperties instead'
+    @setProperties(properties)
+
+  matchesProperties: (attributes) ->
+    attributes = @displayBuffer.translateToBufferMarkerParams(attributes)
+    @bufferMarker.matchesParams(attributes)
+  matchesAttributes: (attributes) ->
+    deprecate 'Use Marker::matchesProperties instead'
+    @matchesProperties(attributes)
+
+  ###
+  Section: Comparing to other markers
+  ###
+
+  # Essential: Returns a {Boolean} indicating whether this marker is equivalent to
+  # another marker, meaning they have the same range and options.
+  #
+  # * `other` {Marker} other marker
+  isEqual: (other) ->
+    return false unless other instanceof @constructor
+    @bufferMarker.isEqual(other.bufferMarker)
+
+  # Essential: Compares this marker to another based on their ranges.
+  #
+  # * `other` {Marker}
+  #
+  # Returns a {Number}
+  compare: (other) ->
+    @bufferMarker.compare(other.bufferMarker)
+
+  ###
+  Section: Managing the marker's range
+  ###
+
+  # Essential: Gets the buffer range of the display marker.
+  #
+  # Returns a {Range}.
+  getBufferRange: ->
+    @bufferMarker.getRange()
+
+  # Essential: Modifies the buffer range of the display marker.
+  #
+  # * `bufferRange` The new {Range} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  #   * `reversed` {Boolean} If true, the marker will to be in a reversed orientation.
+  setBufferRange: (bufferRange, properties) ->
+    @bufferMarker.setRange(bufferRange, properties)
+
+  # Essential: Gets the screen range of the display marker.
+  #
+  # Returns a {Range}.
+  getScreenRange: ->
+    @displayBuffer.screenRangeForBufferRange(@getBufferRange(), wrapAtSoftNewlines: true)
+
+  # Essential: Modifies the screen range of the display marker.
+  #
+  # * `screenRange` The new {Range} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  #   * `reversed` {Boolean} If true, the marker will to be in a reversed orientation.
+  setScreenRange: (screenRange, options) ->
+    @setBufferRange(@displayBuffer.bufferRangeForScreenRange(screenRange), options)
+
+  # Essential: Retrieves the buffer position of the marker's start. This will always be
+  # less than or equal to the result of {Marker::getEndBufferPosition}.
+  #
+  # Returns a {Point}.
+  getStartBufferPosition: ->
+    @bufferMarker.getStartPosition()
+
+  # Essential: Retrieves the screen position of the marker's start. This will always be
+  # less than or equal to the result of {Marker::getEndScreenPosition}.
+  #
+  # Returns a {Point}.
+  getStartScreenPosition: ->
+    @displayBuffer.screenPositionForBufferPosition(@getStartBufferPosition(), wrapAtSoftNewlines: true)
+
+  # Essential: Retrieves the buffer position of the marker's end. This will always be
+  # greater than or equal to the result of {Marker::getStartBufferPosition}.
+  #
+  # Returns a {Point}.
+  getEndBufferPosition: ->
+    @bufferMarker.getEndPosition()
+
+  # Essential: Retrieves the screen position of the marker's end. This will always be
+  # greater than or equal to the result of {Marker::getStartScreenPosition}.
+  #
+  # Returns a {Point}.
+  getEndScreenPosition: ->
+    @displayBuffer.screenPositionForBufferPosition(@getEndBufferPosition(), wrapAtSoftNewlines: true)
+
+  # Extended: Retrieves the buffer position of the marker's head.
+  #
+  # Returns a {Point}.
+  getHeadBufferPosition: ->
+    @bufferMarker.getHeadPosition()
+
+  # Extended: Sets the buffer position of the marker's head.
+  #
+  # * `screenRange` The new {Point} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  setHeadBufferPosition: (bufferPosition, properties) ->
+    @bufferMarker.setHeadPosition(bufferPosition, properties)
+
+  # Extended: Retrieves the screen position of the marker's head.
+  #
+  # Returns a {Point}.
+  getHeadScreenPosition: ->
+    @displayBuffer.screenPositionForBufferPosition(@getHeadBufferPosition(), wrapAtSoftNewlines: true)
+
+  # Extended: Sets the screen position of the marker's head.
+  #
+  # * `screenRange` The new {Point} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  setHeadScreenPosition: (screenPosition, properties) ->
+    screenPosition = @displayBuffer.clipScreenPosition(screenPosition, properties)
+    @setHeadBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, properties))
+
+  # Extended: Retrieves the buffer position of the marker's tail.
+  #
+  # Returns a {Point}.
+  getTailBufferPosition: ->
+    @bufferMarker.getTailPosition()
+
+  # Extended: Sets the buffer position of the marker's tail.
+  #
+  # * `screenRange` The new {Point} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  setTailBufferPosition: (bufferPosition) ->
+    @bufferMarker.setTailPosition(bufferPosition)
+
+  # Extended: Retrieves the screen position of the marker's tail.
+  #
+  # Returns a {Point}.
+  getTailScreenPosition: ->
+    @displayBuffer.screenPositionForBufferPosition(@getTailBufferPosition(), wrapAtSoftNewlines: true)
+
+  # Extended: Sets the screen position of the marker's tail.
+  #
+  # * `screenRange` The new {Point} to use
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  setTailScreenPosition: (screenPosition, options) ->
+    screenPosition = @displayBuffer.clipScreenPosition(screenPosition, options)
+    @setTailBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, options))
+
+  # Extended: Returns a {Boolean} indicating whether the marker has a tail.
+  hasTail: ->
+    @bufferMarker.hasTail()
+
+  # Extended: Plants the marker's tail at the current head position. After calling
+  # the marker's tail position will be its head position at the time of the
+  # call, regardless of where the marker's head is moved.
+  #
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  plantTail: ->
+    @bufferMarker.plantTail()
+
+  # Extended: Removes the marker's tail. After calling the marker's head position
+  # will be reported as its current tail position until the tail is planted
+  # again.
+  #
+  # * `properties` (optional) {Object} properties to associate with the marker.
+  clearTail: (properties) ->
+    @bufferMarker.clearTail(properties)
+
+  ###
+  Section: Private utility methods
+  ###
+
+  # Returns a {String} representation of the marker
+  inspect: ->
+    "Marker(id: #{@id}, bufferRange: #{@getBufferRange()})"
+
+  destroyed: ->
+    delete @displayBuffer.markers[@id]
+    @emit 'destroyed'
+    @emitter.emit 'did-destroy'
+    @emitter.dispose()
+
+  notifyObservers: ({textChanged}) ->
+    textChanged ?= false
+
+    newHeadBufferPosition = @getHeadBufferPosition()
+    newHeadScreenPosition = @getHeadScreenPosition()
+    newTailBufferPosition = @getTailBufferPosition()
+    newTailScreenPosition = @getTailScreenPosition()
+    isValid = @isValid()
+
+    return if _.isEqual(isValid, @wasValid) and
+      _.isEqual(newHeadBufferPosition, @oldHeadBufferPosition) and
+      _.isEqual(newHeadScreenPosition, @oldHeadScreenPosition) and
+      _.isEqual(newTailBufferPosition, @oldTailBufferPosition) and
+      _.isEqual(newTailScreenPosition, @oldTailScreenPosition)
+
+    changeEvent = {
+      @oldHeadScreenPosition, newHeadScreenPosition,
+      @oldTailScreenPosition, newTailScreenPosition,
+      @oldHeadBufferPosition, newHeadBufferPosition,
+      @oldTailBufferPosition, newTailBufferPosition,
+      textChanged,
+      isValid
+    }
+
+    if @deferredChangeEvents?
+      @deferredChangeEvents.push(changeEvent)
+    else
+      @emit 'changed', changeEvent
+      @emitter.emit 'did-change', changeEvent
+
+    @oldHeadBufferPosition = newHeadBufferPosition
+    @oldHeadScreenPosition = newHeadScreenPosition
+    @oldTailBufferPosition = newTailBufferPosition
+    @oldTailScreenPosition = newTailScreenPosition
+    @wasValid = isValid
+
+  pauseChangeEvents: ->
+    @deferredChangeEvents = []
+
+  resumeChangeEvents: ->
+    if deferredChangeEvents = @deferredChangeEvents
+      @deferredChangeEvents = null
+
+      for event in deferredChangeEvents
+        @emit 'changed', event
+        @emitter.emit 'did-change', event
+
+  getPixelRange: ->
+    @displayBuffer.pixelRangeForScreenRange(@getScreenRange(), false)

src/menu-manager.coffee

@@ -4,8 +4,9 @@ _ = require 'underscore-plus'
 ipc = require 'ipc'
 CSON = require 'season'
 fs = require 'fs-plus'
+{Disposable} = require 'event-kit'
 
-# Public: Provides a registry for menu items that you'd like to appear in the
+# Extended: Provides a registry for menu items that you'd like to appear in the
 # application menu.
 #
 # An instance of this class is always available as the `atom.menu` global.
@@ -34,10 +35,17 @@ class MenuManager
   #   * `submenu` An optional {Array} of sub menu items.
   #   * `command` An optional {String} command to trigger when the item is
   #     clicked.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to remove the
+  # added menu items.
   add: (items) ->
     @merge(@template, item) for item in items
     @update()
-    undefined
+    new Disposable => @remove(items)
+
+  remove: (items) ->
+    @unmerge(@template, item) for item in items
+    @update()
 
   # Should the binding for the given selector be included in the menu
   # commands.
@@ -96,11 +104,29 @@ class MenuManager
   # appended to the bottom of existing menus where possible.
   merge: (menu, item) ->
     item = _.deepClone(item)
+    matchingItem = @findMatchingItem(menu, item)
 
-    if item.submenu? and match = _.find(menu, ({label, submenu}) => submenu? and label and @normalizeLabel(label) is @normalizeLabel(item.label))
-      @merge(match.submenu, i) for i in item.submenu
+    if matchingItem?
+      if item.submenu?
+        @merge(matchingItem.submenu, submenuItem) for submenuItem in item.submenu
     else
-      menu.push(item) unless _.find(menu, ({label}) => label and @normalizeLabel(label) is @normalizeLabel(item.label))
+      menu.push(item)
+
+  unmerge: (menu, item) ->
+    if matchingItem = @findMatchingItem(menu, item)
+      if item.submenu?
+        @unmerge(matchingItem.submenu, submenuItem) for submenuItem in item.submenu
+
+      unless matchingItem.submenu?.length > 0
+        menu.splice(menu.indexOf(matchingItem), 1)
+
+  # find an existing menu item matching the given item
+  findMatchingItem: (menu, {label, submenu}) ->
+    debugger unless menu?
+    for item in menu
+      if @normalizeLabel(item.label) is @normalizeLabel(label) and item.submenu? is submenu?
+        return item
+    null
 
   # OSX can't handle displaying accelerators for multiple keystrokes.
   # If they are sent across, it will stop processing accelerators for the rest

src/package-manager.coffee

@@ -48,7 +48,7 @@ class PackageManager
   Section: Event Subscription
   ###
 
-  # Essential: Invoke the given callback when all packages have been activated.
+  # Public: Invoke the given callback when all packages have been activated.
   #
   # * `callback` {Function}
   #
@@ -56,7 +56,7 @@ class PackageManager
   onDidLoadAll: (callback) ->
     @emitter.on 'did-load-all', callback
 
-  # Essential: Invoke the given callback when all packages have been activated.
+  # Public: Invoke the given callback when all packages have been activated.
   #
   # * `callback` {Function}
   #
@@ -75,10 +75,10 @@ class PackageManager
     EmitterMixin::on.apply(this, arguments)
 
   ###
-  Section: Instance Methods
+  Section: Package system data
   ###
 
-  # Extended: Get the path to the apm command.
+  # Public: Get the path to the apm command.
   #
   # Return a {String} file path to apm.
   getApmPath: ->
@@ -86,19 +86,43 @@ class PackageManager
     commandName += '.cmd' if process.platform is 'win32'
     @apmPath ?= path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', commandName)
 
-  # Extended: Get the paths being used to look for packages.
+  # Public: Get the paths being used to look for packages.
   #
   # Returns an {Array} of {String} directory paths.
   getPackageDirPaths: ->
     _.clone(@packageDirPaths)
 
-  getPackageState: (name) ->
-    @packageStates[name]
+  ###
+  Section: General package data
+  ###
 
-  setPackageState: (name, state) ->
-    @packageStates[name] = state
+  # Public: Resolve the given package name to a path on disk.
+  #
+  # * `name` - The {String} package name.
+  #
+  # Return a {String} folder path or undefined if it could not be resolved.
+  resolvePackagePath: (name) ->
+    return name if fs.isDirectorySync(name)
 
-  # Extended: Enable the package with the given name.
+    packagePath = fs.resolve(@packageDirPaths..., name)
+    return packagePath if fs.isDirectorySync(packagePath)
+
+    packagePath = path.join(@resourcePath, 'node_modules', name)
+    return packagePath if @hasAtomEngine(packagePath)
+
+  # Public: Is the package with the given name bundled with Atom?
+  #
+  # * `name` - The {String} package name.
+  #
+  # Returns a {Boolean}.
+  isBundledPackage: (name) ->
+    @getPackageDependencies().hasOwnProperty(name)
+
+  ###
+  Section: Enabling and disabling packages
+  ###
+
+  # Public: Enable the package with the given name.
   #
   # Returns the {Package} that was enabled or null if it isn't loaded.
   enablePackage: (name) ->
@@ -106,7 +130,7 @@ class PackageManager
     pack?.enable()
     pack
 
-  # Extended: Disable the package with the given name.
+  # Public: Disable the package with the given name.
   #
   # Returns the {Package} that was disabled or null if it isn't loaded.
   disablePackage: (name) ->
@@ -114,51 +138,23 @@ class PackageManager
     pack?.disable()
     pack
 
-  # Activate all the packages that should be activated.
-  activate: ->
-    for [activator, types] in @packageActivators
-      packages = @getLoadedPackagesForTypes(types)
-      activator.activatePackages(packages)
-    @emit 'activated'
-    @emitter.emit 'did-activate-all'
+  # Public: Is the package with the given name disabled?
+  #
+  # * `name` - The {String} package name.
+  #
+  # Returns a {Boolean}.
+  isPackageDisabled: (name) ->
+    _.include(atom.config.get('core.disabledPackages') ? [], name)
 
-  # another type of package manager can handle other package types.
-  # See ThemeManager
-  registerPackageActivator: (activator, types) ->
-    @packageActivators.push([activator, types])
+  ###
+  Section: Accessing active packages
+  ###
 
-  activatePackages: (packages) ->
-    @activatePackage(pack.name) for pack in packages
-    @observeDisabledPackages()
-
-  # Activate a single package by name
-  activatePackage: (name) ->
-    if pack = @getActivePackage(name)
-      Q(pack)
-    else
-      pack = @loadPackage(name)
-      pack.activate().then =>
-        @activePackages[pack.name] = pack
-        pack
-
-  # Deactivate all packages
-  deactivatePackages: ->
-    @deactivatePackage(pack.name) for pack in @getLoadedPackages()
-    @unobserveDisabledPackages()
-
-  # Deactivate the package with the given name
-  deactivatePackage: (name) ->
-    pack = @getLoadedPackage(name)
-    if @isPackageActive(name)
-      @setPackageState(pack.name, state) if state = pack.serialize?()
-    pack.deactivate()
-    delete @activePackages[pack.name]
-
-  # Essential: Get an {Array} of all the active {Package}s.
+  # Public: Get an {Array} of all the active {Package}s.
   getActivePackages: ->
     _.values(@activePackages)
 
-  # Essential: Get the active {Package} with the given name.
+  # Public: Get the active {Package} with the given name.
   #
   # * `name` - The {String} package name.
   #
@@ -174,14 +170,99 @@ class PackageManager
   isPackageActive: (name) ->
     @getActivePackage(name)?
 
+  ###
+  Section: Accessing loaded packages
+  ###
+
+  # Public: Get an {Array} of all the loaded {Package}s
+  getLoadedPackages: ->
+    _.values(@loadedPackages)
+
+  # Get packages for a certain package type
+  #
+  # * `types` an {Array} of {String}s like ['atom', 'textmate'].
+  getLoadedPackagesForTypes: (types) ->
+    pack for pack in @getLoadedPackages() when pack.getType() in types
+
+  # Public: Get the loaded {Package} with the given name.
+  #
+  # * `name` - The {String} package name.
+  #
+  # Returns a {Package} or undefined.
+  getLoadedPackage: (name) ->
+    @loadedPackages[name]
+
+  # Public: Is the package with the given name loaded?
+  #
+  # * `name` - The {String} package name.
+  #
+  # Returns a {Boolean}.
+  isPackageLoaded: (name) ->
+    @getLoadedPackage(name)?
+
+  ###
+  Section: Accessing available packages
+  ###
+
+  # Public: Get an {Array} of {String}s of all the available package paths.
+  getAvailablePackagePaths: ->
+    packagePaths = []
+
+    for packageDirPath in @packageDirPaths
+      for packagePath in fs.listSync(packageDirPath)
+        packagePaths.push(packagePath) if fs.isDirectorySync(packagePath)
+
+    packagesPath = path.join(@resourcePath, 'node_modules')
+    for packageName, packageVersion of @getPackageDependencies()
+      packagePath = path.join(packagesPath, packageName)
+      packagePaths.push(packagePath) if fs.isDirectorySync(packagePath)
+
+    _.uniq(packagePaths)
+
+  # Public: Get an {Array} of {String}s of all the available package names.
+  getAvailablePackageNames: ->
+    _.uniq _.map @getAvailablePackagePaths(), (packagePath) -> path.basename(packagePath)
+
+  # Public: Get an {Array} of {String}s of all the available package metadata.
+  getAvailablePackageMetadata: ->
+    packages = []
+    for packagePath in @getAvailablePackagePaths()
+      name = path.basename(packagePath)
+      metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, true)
+      packages.push(metadata)
+    packages
+
+  ###
+  Section: Private
+  ###
+
+  getPackageState: (name) ->
+    @packageStates[name]
+
+  setPackageState: (name, state) ->
+    @packageStates[name] = state
+
+  getPackageDependencies: ->
+    unless @packageDependencies?
+      try
+        metadataPath = path.join(@resourcePath, 'package.json')
+        {@packageDependencies} = JSON.parse(fs.readFileSync(metadataPath)) ? {}
+      @packageDependencies ?= {}
+
+    @packageDependencies
+
+  hasAtomEngine: (packagePath) ->
+    metadata = Package.loadMetadata(packagePath, true)
+    metadata?.engines?.atom?
+
   unobserveDisabledPackages: ->
     @disabledPackagesSubscription?.off()
     @disabledPackagesSubscription = null
 
   observeDisabledPackages: ->
-    @disabledPackagesSubscription ?= atom.config.observe 'core.disabledPackages', callNow: false, (disabledPackages, {previous}) =>
-      packagesToEnable = _.difference(previous, disabledPackages)
-      packagesToDisable = _.difference(disabledPackages, previous)
+    @disabledPackagesSubscription ?= atom.config.onDidChange 'core.disabledPackages', ({newValue, oldValue}) =>
+      packagesToEnable = _.difference(oldValue, newValue)
+      packagesToDisable = _.difference(newValue, oldValue)
 
       @deactivatePackage(packageName) for packageName in packagesToDisable when @getActivePackage(packageName)
       @activatePackage(packageName) for packageName in packagesToEnable
@@ -234,99 +315,42 @@ class PackageManager
     else
       throw new Error("No loaded package for name '#{name}'")
 
-  # Essential: Get the loaded {Package} with the given name.
-  #
-  # * `name` - The {String} package name.
-  #
-  # Returns a {Package} or undefined.
-  getLoadedPackage: (name) ->
-    @loadedPackages[name]
+  # Activate all the packages that should be activated.
+  activate: ->
+    for [activator, types] in @packageActivators
+      packages = @getLoadedPackagesForTypes(types)
+      activator.activatePackages(packages)
+    @emit 'activated'
+    @emitter.emit 'did-activate-all'
 
-  # Essential: Is the package with the given name loaded?
-  #
-  # * `name` - The {String} package name.
-  #
-  # Returns a {Boolean}.
-  isPackageLoaded: (name) ->
-    @getLoadedPackage(name)?
+  # another type of package manager can handle other package types.
+  # See ThemeManager
+  registerPackageActivator: (activator, types) ->
+    @packageActivators.push([activator, types])
 
-  # Essential: Get an {Array} of all the loaded {Package}s
-  getLoadedPackages: ->
-    _.values(@loadedPackages)
+  activatePackages: (packages) ->
+    @activatePackage(pack.name) for pack in packages
+    @observeDisabledPackages()
 
-  # Get packages for a certain package type
-  #
-  # * `types` an {Array} of {String}s like ['atom', 'textmate'].
-  getLoadedPackagesForTypes: (types) ->
-    pack for pack in @getLoadedPackages() when pack.getType() in types
+  # Activate a single package by name
+  activatePackage: (name) ->
+    if pack = @getActivePackage(name)
+      Q(pack)
+    else
+      pack = @loadPackage(name)
+      pack.activate().then =>
+        @activePackages[pack.name] = pack
+        pack
 
-  # Extended: Resolve the given package name to a path on disk.
-  #
-  # * `name` - The {String} package name.
-  #
-  # Return a {String} folder path or undefined if it could not be resolved.
-  resolvePackagePath: (name) ->
-    return name if fs.isDirectorySync(name)
+  # Deactivate all packages
+  deactivatePackages: ->
+    @deactivatePackage(pack.name) for pack in @getLoadedPackages()
+    @unobserveDisabledPackages()
 
-    packagePath = fs.resolve(@packageDirPaths..., name)
-    return packagePath if fs.isDirectorySync(packagePath)
-
-    packagePath = path.join(@resourcePath, 'node_modules', name)
-    return packagePath if @hasAtomEngine(packagePath)
-
-  # Essential: Is the package with the given name disabled?
-  #
-  # * `name` - The {String} package name.
-  #
-  # Returns a {Boolean}.
-  isPackageDisabled: (name) ->
-    _.include(atom.config.get('core.disabledPackages') ? [], name)
-
-  hasAtomEngine: (packagePath) ->
-    metadata = Package.loadMetadata(packagePath, true)
-    metadata?.engines?.atom?
-
-  # Extended: Is the package with the given name bundled with Atom?
-  #
-  # * `name` - The {String} package name.
-  #
-  # Returns a {Boolean}.
-  isBundledPackage: (name) ->
-    @getPackageDependencies().hasOwnProperty(name)
-
-  getPackageDependencies: ->
-    unless @packageDependencies?
-      try
-        metadataPath = path.join(@resourcePath, 'package.json')
-        {@packageDependencies} = JSON.parse(fs.readFileSync(metadataPath)) ? {}
-      @packageDependencies ?= {}
-
-    @packageDependencies
-
-  # Extended: Get an {Array} of {String}s of all the available package paths.
-  getAvailablePackagePaths: ->
-    packagePaths = []
-
-    for packageDirPath in @packageDirPaths
-      for packagePath in fs.listSync(packageDirPath)
-        packagePaths.push(packagePath) if fs.isDirectorySync(packagePath)
-
-    packagesPath = path.join(@resourcePath, 'node_modules')
-    for packageName, packageVersion of @getPackageDependencies()
-      packagePath = path.join(packagesPath, packageName)
-      packagePaths.push(packagePath) if fs.isDirectorySync(packagePath)
-
-    _.uniq(packagePaths)
-
-  # Extended: Get an {Array} of {String}s of all the available package names.
-  getAvailablePackageNames: ->
-    _.uniq _.map @getAvailablePackagePaths(), (packagePath) -> path.basename(packagePath)
-
-  # Extended: Get an {Array} of {String}s of all the available package metadata.
-  getAvailablePackageMetadata: ->
-    packages = []
-    for packagePath in @getAvailablePackagePaths()
-      name = path.basename(packagePath)
-      metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, true)
-      packages.push(metadata)
-    packages
+  # Deactivate the package with the given name
+  deactivatePackage: (name) ->
+    pack = @getLoadedPackage(name)
+    if @isPackageActive(name)
+      @setPackageState(pack.name, state) if state = pack.serialize?()
+    pack.deactivate()
+    delete @activePackages[pack.name]

src/package.coffee

@@ -5,7 +5,7 @@ async = require 'async'
 CSON = require 'season'
 fs = require 'fs-plus'
 EmitterMixin = require('emissary').Emitter
-{Emitter} = require 'event-kit'
+{Emitter, CompositeDisposable} = require 'event-kit'
 Q = require 'q'
 {deprecate} = require 'grim'
 
@@ -99,7 +99,7 @@ class Package
         @loadMenus()
         @loadStylesheets()
         @scopedPropertiesPromise = @loadScopedProperties()
-        @requireMainModule() unless @hasActivationEvents()
+        @requireMainModule() unless @hasActivationCommands()
 
       catch error
         console.warn "Failed to load package named '#{@name}'", error.stack ? error
@@ -119,8 +119,8 @@ class Package
       @activationDeferred = Q.defer()
       @measure 'activateTime', =>
         @activateResources()
-        if @hasActivationEvents()
-          @subscribeToActivationEvents()
+        if @hasActivationCommands()
+          @subscribeToActivationCommands()
         else
           @activateNow()
 
@@ -143,7 +143,13 @@ class Package
 
     @requireMainModule()
     if @mainModule?
-      atom.config.setDefaults(@name, @mainModule.configDefaults)
+      if @mainModule.config? and typeof @mainModule.config is 'object'
+        atom.config.setSchema @name, {type: 'object', properties: @mainModule.config}
+      else if @mainModule.configDefaults? and typeof @mainModule.configDefaults is 'object'
+        deprecate """Use a config schema instead. See the configuration section
+        of https://atom.io/docs/latest/creating-a-package and
+        https://atom.io/docs/api/latest/Config for more details"""
+        atom.config.setDefaults(@name, @mainModule.configDefaults)
       @mainModule.activateConfig?()
     @configActivated = true
 
@@ -270,7 +276,7 @@ class Package
   deactivate: ->
     @activationDeferred?.reject()
     @activationDeferred = null
-    @unsubscribeFromActivationEvents()
+    @activationCommandSubscriptions?.dispose()
     @deactivateResources()
     @deactivateConfig()
     if @mainActivated
@@ -319,64 +325,56 @@ class Package
         path.join(@path, 'index')
     @mainModulePath = fs.resolveExtension(mainModulePath, ["", _.keys(require.extensions)...])
 
-  hasActivationEvents: ->
-    if _.isArray(@metadata.activationEvents)
-      return @metadata.activationEvents.some (activationEvent) ->
-        activationEvent?.length > 0
-    else if _.isString(@metadata.activationEvents)
-      return @metadata.activationEvents.length > 0
-    else if _.isObject(@metadata.activationEvents)
-      for event, selector of @metadata.activationEvents
-        return true if event.length > 0 and selector.length > 0
-
+  hasActivationCommands: ->
+    for selector, commands of @getActivationCommands()
+      return true if commands.length > 0
     false
 
-  subscribeToActivationEvents: ->
-    return unless @metadata.activationEvents?
-    if _.isArray(@metadata.activationEvents)
-      atom.workspaceView.command(event, @handleActivationEvent) for event in @metadata.activationEvents
-    else if _.isString(@metadata.activationEvents)
-      atom.workspaceView.command(@metadata.activationEvents, @handleActivationEvent)
-    else
-      atom.workspaceView.command(event, selector, @handleActivationEvent) for event, selector of @metadata.activationEvents
+  subscribeToActivationCommands: ->
+    @activationCommandSubscriptions = new CompositeDisposable
+    for selector, commands of @getActivationCommands()
+      for command in commands
+        @activationCommandSubscriptions.add(
+          atom.commands.add(selector, command, @handleActivationCommand)
+        )
 
-  handleActivationEvent: (event) =>
-    bubblePathEventHandlers = @disableEventHandlersOnBubblePath(event)
+  getActivationCommands: ->
+    return @activationCommands if @activationCommands?
+
+    @activationCommands = {}
+
+    if @metadata.activationCommands?
+      for selector, commands of @metadata.activationCommands
+        @activationCommands[selector] ?= []
+        if _.isString(commands)
+          @activationCommands[selector].push(commands)
+        else if _.isArray(commands)
+          @activationCommands[selector].push(commands...)
+
+    if @metadata.activationEvents?
+      if _.isArray(@metadata.activationEvents)
+        for eventName in @metadata.activationEvents
+          @activationCommands['.workspace'] ?= []
+          @activationCommands['.workspace'].push(eventName)
+      else if _.isString(@metadata.activationEvents)
+        eventName = @metadata.activationEvents
+        @activationCommands['.workspace'] ?= []
+        @activationCommands['.workspace'].push(eventName)
+      else
+        for eventName, selector of @metadata.activationEvents
+          selector ?= '.workspace'
+          @activationCommands[selector] ?= []
+          @activationCommands[selector].push(eventName)
+
+    @activationCommands
+
+  handleActivationCommand: (event) =>
+    event.stopImmediatePropagation()
+    @activationCommandSubscriptions.dispose()
+    reenableInvokedListeners = event.disableInvokedListeners()
     @activateNow()
-    $ ?= require('./space-pen-extensions').$
-    $(event.target).trigger(event)
-    @restoreEventHandlersOnBubblePath(bubblePathEventHandlers)
-    @unsubscribeFromActivationEvents()
-    false
-
-  unsubscribeFromActivationEvents: ->
-    return unless atom.workspaceView?
-
-    if _.isArray(@metadata.activationEvents)
-      atom.workspaceView.off(event, @handleActivationEvent) for event in @metadata.activationEvents
-    else if _.isString(@metadata.activationEvents)
-      atom.workspaceView.off(@metadata.activationEvents, @handleActivationEvent)
-    else
-      atom.workspaceView.off(event, selector, @handleActivationEvent) for event, selector of @metadata.activationEvents
-
-  disableEventHandlersOnBubblePath: (event) ->
-    bubblePathEventHandlers = []
-    disabledHandler = ->
-    $ ?= require('./space-pen-extensions').$
-    element = $(event.target)
-    while element.length
-      if eventHandlers = element.handlers()?[event.type]
-        for eventHandler in eventHandlers
-          eventHandler.disabledHandler = eventHandler.handler
-          eventHandler.handler = disabledHandler
-          bubblePathEventHandlers.push(eventHandler)
-      element = element.parent()
-    bubblePathEventHandlers
-
-  restoreEventHandlersOnBubblePath: (eventHandlers) ->
-    for eventHandler in eventHandlers
-      eventHandler.handler = eventHandler.disabledHandler
-      delete eventHandler.disabledHandler
+    event.target.dispatchEvent(new CustomEvent(event.type, bubbles: true))
+    reenableInvokedListeners()
 
   # Does the given module path contain native code?
   isNativeModule: (modulePath) ->

src/pane-axis-view.coffee

@@ -16,10 +16,6 @@ class PaneAxisView extends View
   afterAttach: ->
     @container = @closest('.panes').view()
 
-  viewForModel: (model) ->
-    viewClass = model.getViewClass()
-    model._view ?= new viewClass(model)
-
   onChildReplaced:  ({index, oldChild, newChild}) =>
     focusedElement = document.activeElement if @hasFocus()
     @onChildRemoved({child: oldChild, index})
@@ -27,11 +23,11 @@ class PaneAxisView extends View
     focusedElement?.focus() if document.activeElement is document.body
 
   onChildAdded: ({child, index}) =>
-    view = @viewForModel(child)
+    view = @model.getView(child).__spacePenView
     @insertAt(index, view)
 
   onChildRemoved: ({child}) =>
-    view = @viewForModel(child)
+    view = @model.getView(child).__spacePenView
     view.detach()
     PaneView ?= require './pane-view'
     if view instanceof PaneView and view.model.isDestroyed()

src/pane-axis.coffee

@@ -46,6 +46,9 @@ class PaneAxis extends Model
     else
       PaneRowView ?= require './pane-row-view'
 
+  getView: (object) ->
+    @container.getView(object)
+
   getChildren: -> @children.slice()
 
   getPanes: ->

src/pane-container-view.coffee

@@ -26,11 +26,6 @@ class PaneContainerView extends View
     @subscriptions.add @model.observeRoot(@onRootChanged)
     @subscriptions.add @model.onDidChangeActivePaneItem(@onActivePaneItemChanged)
 
-  viewForModel: (model) ->
-    if model?
-      viewClass = model.getViewClass()
-      model._view ?= new viewClass(model)
-
   getRoot: ->
     @children().first().view()
 
@@ -42,7 +37,7 @@ class PaneContainerView extends View
       @trigger 'pane:removed', [oldRoot]
     oldRoot?.detach()
     if root?
-      view = @viewForModel(root)
+      view = @model.getView(root).__spacePenView
       @append(view)
       focusedElement?.focus()
     else
@@ -88,7 +83,7 @@ class PaneContainerView extends View
     @getActivePaneView()
 
   getActivePaneView: ->
-    @viewForModel(@model.activePane)
+    @model.getView(@model.getActivePane()).__spacePenView
 
   getActivePaneItem: ->
     @model.getActivePaneItem()
@@ -97,7 +92,7 @@ class PaneContainerView extends View
     @getActivePaneView()?.activeView
 
   paneForUri: (uri) ->
-    @viewForModel(@model.paneForUri(uri))
+    @model.getView(@model.paneForUri(uri)).__spacePenView
 
   focusNextPaneView: ->
     @model.activateNextPane()

src/pane-container.coffee

@@ -3,6 +3,9 @@
 {Emitter, CompositeDisposable} = require 'event-kit'
 Serializable = require 'serializable'
 Pane = require './pane'
+ViewRegistry = require './view-registry'
+ItemRegistry = require './item-registry'
+PaneContainerView = null
 
 module.exports =
 class PaneContainer extends Model
@@ -27,6 +30,8 @@ class PaneContainer extends Model
     @emitter = new Emitter
     @subscriptions = new CompositeDisposable
 
+    @viewRegistry = params?.viewRegistry ? new ViewRegistry
+    @itemRegistry = new ItemRegistry
     @setRoot(params?.root ? new Pane)
     @destroyEmptyPanes() if params?.destroyEmptyPanes
 
@@ -43,6 +48,12 @@ class PaneContainer extends Model
     root: @root?.serialize()
     activePaneId: @activePane.id
 
+  getViewClass: ->
+    PaneContainerView ?= require './pane-container-view'
+
+  getView: (object) ->
+    @viewRegistry.getView(object)
+
   onDidChangeRoot: (fn) ->
     @emitter.on 'did-change-root', fn
 
@@ -169,7 +180,17 @@ class PaneContainer extends Model
   monitorPaneItems: ->
     @subscriptions.add @observePanes (pane) =>
       for item, index in pane.getItems()
-        @emitter.emit 'did-add-pane-item', {item, pane, index}
+        @addedPaneItem(item, pane, index)
 
       pane.onDidAddItem ({item, index}) =>
-        @emitter.emit 'did-add-pane-item', {item, pane, index}
+        @addedPaneItem(item, pane, index)
+
+      pane.onDidRemoveItem ({item}) =>
+        @removedPaneItem(item)
+
+  addedPaneItem: (item, pane, index) ->
+    @itemRegistry.addItem(item)
+    @emitter.emit 'did-add-pane-item', {item, pane, index}
+
+  removedPaneItem: (item) ->
+    @itemRegistry.removeItem(item)

src/pane-view.coffee

@@ -6,9 +6,9 @@ PropertyAccessors = require 'property-accessors'
 
 Pane = require './pane'
 
-# Extended: A container which can contains multiple items to be switched between.
+# A container which can contains multiple items to be switched between.
 #
-# Items can be almost anything however most commonly they're {EditorView}s.
+# Items can be almost anything however most commonly they're {TextEditorView}s.
 #
 # Most packages won't need to use this class, unless you're interested in
 # building a package that deals with switching between panes or items.
@@ -33,17 +33,9 @@ class PaneView extends View
 
   previousActiveItem: null
 
-  initialize: (args...) ->
+  initialize: (@model) ->
     @subscriptions = new CompositeDisposable
-
-    if args[0] instanceof Pane
-      @model = args[0]
-    else
-      @model = new Pane(items: args)
-      @model._view = this
-
     @onItemAdded(item) for item in @items
-    @viewsByItem = new WeakMap()
     @handleEvents()
 
   handleEvents: ->
@@ -162,7 +154,7 @@ class PaneView extends View
       deprecate 'Please return a Disposable object from your ::onDidChangeTitle method!' unless disposable?.dispose?
       @activeItemDisposables.add(disposable) if disposable?.dispose?
     else if item.on?
-      deprecate '::on methods for items are no longer supported. If you would like your item to title change behavior, please implement a ::onDidChangeTitle() method.'
+      deprecate '::on methods for items are no longer supported. If you would like your item to support title change behavior, please implement a ::onDidChangeTitle() method.'
       disposable = item.on('title-changed', @activeItemTitleChanged)
       @activeItemDisposables.add(disposable) if disposable?.dispose?
 
@@ -175,7 +167,7 @@ class PaneView extends View
       item.on('modified-status-changed', @activeItemModifiedChanged)
       @activeItemDisposables.add(disposable) if disposable?.dispose?
 
-    view = @viewForItem(item)
+    view = @model.getView(item).__spacePenView
     otherView.hide() for otherView in @itemViews.children().not(view).views()
     @itemViews.append(view) unless view.parent().is(@itemViews)
     view.show() if @attached
@@ -189,8 +181,8 @@ class PaneView extends View
   onItemRemoved: ({item, index, destroyed}) =>
     if item instanceof $
       viewToRemove = item
-    else if viewToRemove = @viewsByItem.get(item)
-      @viewsByItem.delete(item)
+    else
+      viewToRemove = @model.getView(item).__spacePenView
 
     if viewToRemove?
       if destroyed
@@ -213,27 +205,15 @@ class PaneView extends View
   activeItemModifiedChanged: =>
     @trigger 'pane:active-item-modified-status-changed'
 
-  viewForItem: (item) ->
-    return unless item?
-    if item instanceof $
-      item
-    else if view = @viewsByItem.get(item)
-      view
-    else
-      viewClass = item.getViewClass()
-      view = new viewClass(item)
-      @viewsByItem.set(item, view)
-      view
+  @::accessor 'activeView', -> @model.getView(@activeItem)?.__spacePenView
 
-  @::accessor 'activeView', -> @viewForItem(@activeItem)
+  splitLeft: (items...) -> @model.getView(@model.splitLeft({items})).__spacePenView
 
-  splitLeft: (items...) -> @model.splitLeft({items})._view
+  splitRight: (items...) -> @model.getView(@model.splitRight({items})).__spacePenView
 
-  splitRight: (items...) -> @model.splitRight({items})._view
+  splitUp: (items...) -> @model.getView(@model.splitUp({items})).__spacePenView
 
-  splitUp: (items...) -> @model.splitUp({items})._view
-
-  splitDown: (items...) -> @model.splitDown({items})._view
+  splitDown: (items...) -> @model.getView(@model.splitDown({items})).__spacePenView
 
   # Public: Get the container view housing this pane.
   #

src/pane.coffee

@@ -4,7 +4,7 @@
 Serializable = require 'serializable'
 Grim = require 'grim'
 PaneAxis = require './pane-axis'
-Editor = require './editor'
+TextEditor = require './text-editor'
 PaneView = null
 
 # Extended: A container for presenting content in the center of the workspace.
@@ -56,6 +56,9 @@ class Pane extends Model
   # Called by the view layer to construct a view for this model.
   getViewClass: -> PaneView ?= require './pane-view'
 
+  getView: (object) ->
+    @container.getView(object)
+
   getParent: -> @parent
 
   setParent: (@parent) -> @parent
@@ -258,9 +261,9 @@ class Pane extends Model
       @emitter.emit 'did-change-active-item', @activeItem
     @activeItem
 
-  # Return an {Editor} if the pane item is an {Editor}, or null otherwise.
+  # Return an {TextEditor} if the pane item is an {TextEditor}, or null otherwise.
   getActiveEditor: ->
-    @activeItem if @activeItem instanceof Editor
+    @activeItem if @activeItem instanceof TextEditor
 
   # Public: Return the item at the given index.
   #
@@ -377,8 +380,8 @@ class Pane extends Model
   # * `index` {Number} indicating the index to which to move the item in the
   #   given pane.
   moveItemToPane: (item, pane, index) ->
-    pane.addItem(item, index)
     @removeItem(item)
+    pane.addItem(item, index)
 
   # Public: Destroy the active item and activate the next item.
   destroyActiveItem: ->
@@ -518,6 +521,7 @@ class Pane extends Model
   destroyed: ->
     @container.activateNextPane() if @isActive()
     @emitter.emit 'did-destroy'
+    @emitter.dispose()
     item.destroy?() for item in @items.slice()
 
   ###

src/project.coffee

@@ -11,9 +11,9 @@ Serializable = require 'serializable'
 TextBuffer = require 'text-buffer'
 {Directory} = require 'pathwatcher'
 
-Editor = require './editor'
+TextEditor = require './text-editor'
 Task = require './task'
-Git = require './git'
+GitRepository = require './git-repository'
 
 # Extended: Represents a project that's opened in Atom.
 #
@@ -23,14 +23,16 @@ class Project extends Model
   atom.deserializers.add(this)
   Serializable.includeInto(this)
 
-  # Public: Find the local path for the given repository URL.
-  #
-  # * `repoUrl` {String} url to a git repository
   @pathForRepositoryUrl: (repoUrl) ->
+    deprecate '::pathForRepositoryUrl will be removed. Please remove from your code.'
     [repoName] = url.parse(repoUrl).path.split('/')[-1..]
     repoName = repoName.replace(/\.git$/, '')
     path.join(atom.config.get('core.projectHome'), repoName)
 
+  ###
+  Section: Construction and Destruction
+  ###
+
   constructor: ({path, @buffers}={}) ->
     @buffers ?= []
 
@@ -40,14 +42,6 @@ class Project extends Model
 
     @setPath(path)
 
-  serializeParams: ->
-    path: @path
-    buffers: _.compact(@buffers.map (buffer) -> buffer.serialize() if buffer.isRetained())
-
-  deserializeParams: (params) ->
-    params.buffers = params.buffers.map (bufferState) -> atom.deserializers.deserialize(bufferState)
-    params
-
   destroyed: ->
     buffer.destroy() for buffer in @getBuffers()
     @destroyRepo()
@@ -60,9 +54,29 @@ class Project extends Model
   destroyUnretainedBuffers: ->
     buffer.destroy() for buffer in @getBuffers() when not buffer.isRetained()
 
-  # Public: Returns the {Git} repository if available.
+  ###
+  Section: Serialization
+  ###
+
+  serializeParams: ->
+    path: @path
+    buffers: _.compact(@buffers.map (buffer) -> buffer.serialize() if buffer.isRetained())
+
+  deserializeParams: (params) ->
+    params.buffers = params.buffers.map (bufferState) -> atom.deserializers.deserialize(bufferState)
+    params
+
+  ###
+  Section: Accessing the git repository
+  ###
+
+  # Public: Returns the {GitRepository} if available.
   getRepo: -> @repo
 
+  ###
+  Section: Managing Paths
+  ###
+
   # Public: Returns the project's {String} fullpath.
   getPath: ->
     @rootDirectory?.path
@@ -79,7 +93,7 @@ class Project extends Model
     if projectPath?
       directory = if fs.isDirectorySync(projectPath) then projectPath else path.dirname(projectPath)
       @rootDirectory = new Directory(directory)
-      if @repo = Git.open(directory, project: this)
+      if @repo = GitRepository.open(directory, project: this)
         @repo.refreshIndex()
         @repo.refreshStatus()
     else
@@ -124,13 +138,106 @@ class Project extends Model
   contains: (pathToCheck) ->
     @rootDirectory?.contains(pathToCheck) ? false
 
+  ###
+  Section: Searching and Replacing
+  ###
+
+  # Public: Performs a search across all the files in the project.
+  #
+  # * `regex` {RegExp} to search with.
+  # * `options` (optional) {Object} (default: {})
+  #   * `paths` An {Array} of glob patterns to search within
+  # * `iterator` {Function} callback on each file found
+  scan: (regex, options={}, iterator) ->
+    if _.isFunction(options)
+      iterator = options
+      options = {}
+
+    deferred = Q.defer()
+
+    searchOptions =
+      ignoreCase: regex.ignoreCase
+      inclusions: options.paths
+      includeHidden: true
+      excludeVcsIgnores: atom.config.get('core.excludeVcsIgnoredPaths')
+      exclusions: atom.config.get('core.ignoredNames')
+
+    task = Task.once require.resolve('./scan-handler'), @getPath(), regex.source, searchOptions, ->
+      deferred.resolve()
+
+    task.on 'scan:result-found', (result) =>
+      iterator(result) unless @isPathModified(result.filePath)
+
+    task.on 'scan:file-error', (error) ->
+      iterator(null, error)
+
+    if _.isFunction(options.onPathsSearched)
+      task.on 'scan:paths-searched', (numberOfPathsSearched) ->
+        options.onPathsSearched(numberOfPathsSearched)
+
+    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
+
+    promise = deferred.promise
+    promise.cancel = ->
+      task.terminate()
+      deferred.resolve('cancelled')
+    promise
+
+  # Public: Performs a replace across all the specified files in the project.
+  #
+  # * `regex` A {RegExp} to search with.
+  # * `replacementText` Text to replace all matches of regex with
+  # * `filePaths` List of file path strings to run the replace on.
+  # * `iterator` A {Function} callback on each file with replacements:
+  #   * `options` {Object} with keys `filePath` and `replacements`
+  replace: (regex, replacementText, filePaths, iterator) ->
+    deferred = Q.defer()
+
+    openPaths = (buffer.getPath() for buffer in @getBuffers())
+    outOfProcessPaths = _.difference(filePaths, openPaths)
+
+    inProcessFinished = !openPaths.length
+    outOfProcessFinished = !outOfProcessPaths.length
+    checkFinished = ->
+      deferred.resolve() if outOfProcessFinished and inProcessFinished
+
+    unless outOfProcessFinished.length
+      flags = 'g'
+      flags += 'i' if regex.ignoreCase
+
+      task = Task.once require.resolve('./replace-handler'), outOfProcessPaths, regex.source, flags, replacementText, ->
+        outOfProcessFinished = true
+        checkFinished()
+
+      task.on 'replace:path-replaced', iterator
+      task.on 'replace:file-error', (error) -> iterator(null, error)
+
+    for buffer in @getBuffers()
+      continue unless buffer.getPath() in filePaths
+      replacements = buffer.replace(regex, replacementText, iterator)
+      iterator({filePath: buffer.getPath(), replacements}) if replacements
+
+    inProcessFinished = true
+    checkFinished()
+
+    deferred.promise
+
+  ###
+  Section: Private
+  ###
+
   # Given a path to a file, this constructs and associates a new
-  # {Editor}, showing the file.
+  # {TextEditor}, showing the file.
   #
   # * `filePath` The {String} path of the file to associate with.
-  # * `options` Options that you can pass to the {Editor} constructor.
+  # * `options` Options that you can pass to the {TextEditor} constructor.
   #
-  # Returns a promise that resolves to an {Editor}.
+  # Returns a promise that resolves to an {TextEditor}.
   open: (filePath, options={}) ->
     filePath = @resolve(filePath)
     @bufferForPath(filePath).then (buffer) =>
@@ -222,93 +329,8 @@ class Project extends Model
     [buffer] = @buffers.splice(index, 1)
     buffer?.destroy()
 
-  # Public: Performs a search across all the files in the project.
-  #
-  # * `regex` {RegExp} to search with.
-  # * `options` (optional) {Object} (default: {})
-  #   * `paths` An {Array} of glob patterns to search within
-  # * `iterator` {Function} callback on each file found
-  scan: (regex, options={}, iterator) ->
-    if _.isFunction(options)
-      iterator = options
-      options = {}
-
-    deferred = Q.defer()
-
-    searchOptions =
-      ignoreCase: regex.ignoreCase
-      inclusions: options.paths
-      includeHidden: true
-      excludeVcsIgnores: atom.config.get('core.excludeVcsIgnoredPaths')
-      exclusions: atom.config.get('core.ignoredNames')
-
-    task = Task.once require.resolve('./scan-handler'), @getPath(), regex.source, searchOptions, ->
-      deferred.resolve()
-
-    task.on 'scan:result-found', (result) =>
-      iterator(result) unless @isPathModified(result.filePath)
-
-    task.on 'scan:file-error', (error) ->
-      iterator(null, error)
-
-    if _.isFunction(options.onPathsSearched)
-      task.on 'scan:paths-searched', (numberOfPathsSearched) ->
-        options.onPathsSearched(numberOfPathsSearched)
-
-    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
-
-    promise = deferred.promise
-    promise.cancel = ->
-      task.terminate()
-      deferred.resolve('cancelled')
-    promise
-
-  # Public: Performs a replace across all the specified files in the project.
-  #
-  # * `regex` A {RegExp} to search with.
-  # * `replacementText` Text to replace all matches of regex with
-  # * `filePaths` List of file path strings to run the replace on.
-  # * `iterator` A {Function} callback on each file with replacements:
-  #   * `options` {Object} with keys `filePath` and `replacements`
-  replace: (regex, replacementText, filePaths, iterator) ->
-    deferred = Q.defer()
-
-    openPaths = (buffer.getPath() for buffer in @getBuffers())
-    outOfProcessPaths = _.difference(filePaths, openPaths)
-
-    inProcessFinished = !openPaths.length
-    outOfProcessFinished = !outOfProcessPaths.length
-    checkFinished = ->
-      deferred.resolve() if outOfProcessFinished and inProcessFinished
-
-    unless outOfProcessFinished.length
-      flags = 'g'
-      flags += 'i' if regex.ignoreCase
-
-      task = Task.once require.resolve('./replace-handler'), outOfProcessPaths, regex.source, flags, replacementText, ->
-        outOfProcessFinished = true
-        checkFinished()
-
-      task.on 'replace:path-replaced', iterator
-      task.on 'replace:file-error', (error) -> iterator(null, error)
-
-    for buffer in @getBuffers()
-      continue unless buffer.getPath() in filePaths
-      replacements = buffer.replace(regex, replacementText, iterator)
-      iterator({filePath: buffer.getPath(), replacements}) if replacements
-
-    inProcessFinished = true
-    checkFinished()
-
-    deferred.promise
-
   buildEditorForBuffer: (buffer, editorOptions) ->
-    editor = new Editor(_.extend({buffer, registerEditor: true}, editorOptions))
+    editor = new TextEditor(_.extend({buffer, registerEditor: true}, editorOptions))
     editor
 
   eachBuffer: (args...) ->

src/scroll-view.coffee

@@ -1,6 +1,6 @@
 {View} = require './space-pen-extensions'
 
-# Public: Represents a view that scrolls.
+# Extended: Represents a view that scrolls.
 #
 # Handles several core events to update scroll position:
 #

src/scrollbar-component.coffee

@@ -9,9 +9,11 @@ ScrollbarComponent = React.createClass
   render: ->
     {orientation, className, scrollHeight, scrollWidth, visible} = @props
     {scrollableInOppositeDirection, horizontalScrollbarHeight, verticalScrollbarWidth} = @props
+    {useHardwareAcceleration} = @props
 
     style = {}
     style.display = 'none' unless visible
+    style.transform = 'translateZ(0)' if useHardwareAcceleration # See atom/atom#3559
     switch orientation
       when 'vertical'
         style.width = verticalScrollbarWidth

src/select-list-view.coffee

@@ -1,5 +1,5 @@
 {$, View} = require './space-pen-extensions'
-EditorView = require './editor-view'
+TextEditorView = require './text-editor-view'
 fuzzyFilter = require('fuzzaldrin').filter
 
 # Essential: Provides a view that renders a list of items with an editor that
@@ -34,7 +34,7 @@ module.exports =
 class SelectListView extends View
   @content: ->
     @div class: 'select-list', =>
-      @subview 'filterEditorView', new EditorView(mini: true)
+      @subview 'filterEditorView', new TextEditorView(mini: true)
       @div class: 'error-message', outlet: 'error'
       @div class: 'loading', outlet: 'loadingArea', =>
         @span class: 'loading-message', outlet: 'loading'
@@ -46,7 +46,11 @@ class SelectListView extends View
   inputThrottle: 50
   cancelling: false
 
-  # Public: Initialize the select list view.
+  ###
+  Section: Construction
+  ###
+
+  # Essential: Initialize the select list view.
   #
   # This method can be overridden by subclasses but `super` should always
   # be called.
@@ -85,13 +89,39 @@ class SelectListView extends View
       @confirmSelection() if $(e.target).closest('li').hasClass('selected')
       e.preventDefault()
 
-  schedulePopulateList: ->
-    clearTimeout(@scheduleTimeout)
-    populateCallback = =>
-      @populateList() if @isOnDom()
-    @scheduleTimeout = setTimeout(populateCallback,  @inputThrottle)
+  ###
+  Section: Methods that must be overridden
+  ###
 
-  # Public: Set the array of items to display in the list.
+  # Essential: Create a view for the given model item.
+  #
+  # This method must be overridden by subclasses.
+  #
+  # This is called when the item is about to appended to the list view.
+  #
+  # * `item` The model item being rendered. This will always be one of the items
+  #   previously passed to {::setItems}.
+  #
+  # Returns a String of HTML, DOM element, jQuery object, or View.
+  viewForItem: (item) ->
+    throw new Error("Subclass must implement a viewForItem(item) method")
+
+  # Essential: Callback function for when an item is selected.
+  #
+  # This method must be overridden by subclasses.
+  #
+  # * `item` The selected model item. This will always be one of the items
+  #   previously passed to {::setItems}.
+  #
+  # Returns a DOM element, jQuery object, or {View}.
+  confirmed: (item) ->
+    throw new Error("Subclass must implement a confirmed(item) method")
+
+  ###
+  Section: Managing the list of items
+  ###
+
+  # Essential: Set the array of items to display in the list.
   #
   # This should be model items not actual views. {::viewForItem} will be
   # called to render the item when it is being appended to the list view.
@@ -101,30 +131,26 @@ class SelectListView extends View
     @populateList()
     @setLoading()
 
-  # Public: Set the error message to display.
+  # Essential: Get the model item that is currently selected in the list view.
   #
-  # * `message` The {String} error message (default: '').
-  setError: (message='') ->
-    if message.length is 0
-      @error.text('').hide()
-    else
-      @setLoading()
-      @error.text(message).show()
+  # Returns a model item.
+  getSelectedItem: ->
+    @getSelectedItemView().data('select-list-item')
 
-  # Public: Set the loading message to display.
+  # Extended: Get the property name to use when filtering items.
   #
-  # * `message` The {String} loading message (default: '').
-  setLoading: (message='') ->
-    if message.length is 0
-      @loading.text("")
-      @loadingBadge.text("")
-      @loadingArea.hide()
-    else
-      @setError()
-      @loading.text(message)
-      @loadingArea.show()
+  # This method may be overridden by classes to allow fuzzy filtering based
+  # on a specific property of the item objects.
+  #
+  # For example if the objects you pass to {::setItems} are of the type
+  # `{"id": 3, "name": "Atom"}` then you would return `"name"` from this method
+  # to fuzzy filter by that property when text is entered into this view's
+  # editor.
+  #
+  # Returns the property name to fuzzy filter by.
+  getFilterKey: ->
 
-  # Public: Get the filter query to use when fuzzy filtering the visible
+  # Extended: Get the filter query to use when fuzzy filtering the visible
   # elements.
   #
   # By default this method returns the text in the mini editor but it can be
@@ -134,7 +160,12 @@ class SelectListView extends View
   getFilterQuery: ->
     @filterEditorView.getEditor().getText()
 
-  # Public: Populate the list view with the model items previously set by
+  # Extended: Set the maximum numbers of items to display in the list.
+  #
+  # * `maxItems` The maximum {Number} of items to display.
+  setMaxItems: (@maxItems) ->
+
+  # Extended: Populate the list view with the model items previously set by
   # calling {::setItems}.
   #
   # Subclasses may override this method but should always call `super`.
@@ -161,7 +192,34 @@ class SelectListView extends View
     else
       @setError(@getEmptyMessage(@items.length, filteredItems.length))
 
-  # Public: Get the message to display when there are no items.
+  ###
+  Section: Messages to the user
+  ###
+
+  # Essential: Set the error message to display.
+  #
+  # * `message` The {String} error message (default: '').
+  setError: (message='') ->
+    if message.length is 0
+      @error.text('').hide()
+    else
+      @setLoading()
+      @error.text(message).show()
+
+  # Essential: Set the loading message to display.
+  #
+  # * `message` The {String} loading message (default: '').
+  setLoading: (message='') ->
+    if message.length is 0
+      @loading.text("")
+      @loadingBadge.text("")
+      @loadingArea.hide()
+    else
+      @setError()
+      @loading.text(message)
+      @loadingArea.show()
+
+  # Extended: Get the message to display when there are no items.
   #
   # Subclasses may override this method to customize the message.
   #
@@ -171,10 +229,36 @@ class SelectListView extends View
   # Returns a {String} message (default: 'No matches found').
   getEmptyMessage: (itemCount, filteredItemCount) -> 'No matches found'
 
-  # Public: Set the maximum numbers of items to display in the list.
+  ###
+  Section: View Actions
+  ###
+
+  # Essential: Cancel and close this select list view.
   #
-  # * `maxItems` The maximum {Number} of items to display.
-  setMaxItems: (@maxItems) ->
+  # This restores focus to the previously focused element if
+  # {::storeFocusedElement} was called prior to this view being attached.
+  cancel: ->
+    @list.empty()
+    @cancelling = true
+    filterEditorViewFocused = @filterEditorView.isFocused
+    @cancelled()
+    @detach()
+    @restoreFocus() if filterEditorViewFocused
+    @cancelling = false
+    clearTimeout(@scheduleTimeout)
+
+  # Extended: Focus the fuzzy filter editor view.
+  focusFilterEditor: ->
+    @filterEditorView.focus()
+
+  # Extended: Store the currently focused element. This element will be given
+  # back focus when {::cancel} is called.
+  storeFocusedElement: ->
+    @previouslyFocusedElement = $(':focus')
+
+  ###
+  Section: Private
+  ###
 
   selectPreviousItemView: ->
     view = @getSelectedItemView().prev()
@@ -202,68 +286,6 @@ class SelectListView extends View
     else if desiredBottom > @list.scrollBottom()
       @list.scrollBottom(desiredBottom)
 
-  getSelectedItemView: ->
-    @list.find('li.selected')
-
-  # Public: Get the model item that is currently selected in the list view.
-  #
-  # Returns a model item.
-  getSelectedItem: ->
-    @getSelectedItemView().data('select-list-item')
-
-  confirmSelection: ->
-    item = @getSelectedItem()
-    if item?
-      @confirmed(item)
-    else
-      @cancel()
-
-  # Public: Create a view for the given model item.
-  #
-  # This method must be overridden by subclasses.
-  #
-  # This is called when the item is about to appended to the list view.
-  #
-  # * `item` The model item being rendered. This will always be one of the items
-  #   previously passed to {::setItems}.
-  #
-  # Returns a String of HTML, DOM element, jQuery object, or View.
-  viewForItem: (item) ->
-    throw new Error("Subclass must implement a viewForItem(item) method")
-
-  # Public: Callback function for when an item is selected.
-  #
-  # This method must be overridden by subclasses.
-  #
-  # * `item` The selected model item. This will always be one of the items
-  #   previously passed to {::setItems}.
-  #
-  # Returns a DOM element, jQuery object, or {View}.
-  confirmed: (item) ->
-    throw new Error("Subclass must implement a confirmed(item) method")
-
-  # Public: Get the property name to use when filtering items.
-  #
-  # This method may be overridden by classes to allow fuzzy filtering based
-  # on a specific property of the item objects.
-  #
-  # For example if the objects you pass to {::setItems} are of the type
-  # `{"id": 3, "name": "Atom"}` then you would return `"name"` from this method
-  # to fuzzy filter by that property when text is entered into this view's
-  # editor.
-  #
-  # Returns the property name to fuzzy filter by.
-  getFilterKey: ->
-
-  # Public: Focus the fuzzy filter editor view.
-  focusFilterEditor: ->
-    @filterEditorView.focus()
-
-  # Public: Store the currently focused element. This element will be given
-  # back focus when {::cancel} is called.
-  storeFocusedElement: ->
-    @previouslyFocusedElement = $(':focus')
-
   restoreFocus: ->
     if @previouslyFocusedElement?.isOnDom()
       @previouslyFocusedElement.focus()
@@ -273,16 +295,18 @@ class SelectListView extends View
   cancelled: ->
     @filterEditorView.getEditor().setText('')
 
-  # Public: Cancel and close this select list view.
-  #
-  # This restores focus to the previously focused element if
-  # {::storeFocusedElement} was called prior to this view being attached.
-  cancel: ->
-    @list.empty()
-    @cancelling = true
-    filterEditorViewFocused = @filterEditorView.isFocused
-    @cancelled()
-    @detach()
-    @restoreFocus() if filterEditorViewFocused
-    @cancelling = false
+  getSelectedItemView: ->
+    @list.find('li.selected')
+
+  confirmSelection: ->
+    item = @getSelectedItem()
+    if item?
+      @confirmed(item)
+    else
+      @cancel()
+
+  schedulePopulateList: ->
     clearTimeout(@scheduleTimeout)
+    populateCallback = =>
+      @populateList() if @isOnDom()
+    @scheduleTimeout = setTimeout(populateCallback,  @inputThrottle)

src/selection.coffee

@@ -4,7 +4,7 @@
 {Emitter} = require 'event-kit'
 Grim = require 'grim'
 
-# Extended: Represents a selection in the {Editor}.
+# Extended: Represents a selection in the {TextEditor}.
 module.exports =
 class Selection extends Model
   cursor: null
@@ -21,7 +21,7 @@ class Selection extends Model
     @cursor.selection = this
     @decoration = @editor.decorateMarker(@marker, type: 'highlight', class: 'selection')
 
-    @marker.onDidChange => @screenRangeChanged()
+    @marker.onDidChange (e) => @screenRangeChanged(e)
     @marker.onDidDestroy =>
       unless @editor.isDestroyed()
         @destroyed = true
@@ -30,6 +30,9 @@ class Selection extends Model
         @emitter.emit 'did-destroy'
         @emitter.dispose()
 
+  destroy: ->
+    @marker.destroy()
+
   ###
   Section: Event Subscription
   ###
@@ -37,7 +40,12 @@ class Selection extends Model
   # Extended: Calls your `callback` when the selection was moved.
   #
   # * `callback` {Function}
-  #   * `screenRange` {Range} indicating the new screenrange
+  #   * `event` {Object}
+  #     * `oldBufferRange` {Range}
+  #     * `oldScreenRange` {Range}
+  #     * `newBufferRange` {Range}
+  #     * `newScreenRange` {Range}
+  #     * `selection` {Selection} that triggered the event
   #
   # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
   onDidChangeRange: (callback) ->
@@ -60,37 +68,11 @@ class Selection extends Model
 
     super
 
+
   ###
-  Section: Methods
+  Section: Managing the selection range
   ###
 
-  destroy: ->
-    @marker.destroy()
-
-  finalize: ->
-    @initialScreenRange = null unless @initialScreenRange?.isEqual(@getScreenRange())
-    if @isEmpty()
-      @wordwise = false
-      @linewise = false
-
-  clearAutoscroll: ->
-    @needsAutoscroll = null
-
-  # Public: Determines if the selection contains anything.
-  isEmpty: ->
-    @getBufferRange().isEmpty()
-
-  # Public: Determines if the ending position of a marker is greater than the
-  # starting position.
-  #
-  # This can happen when, for example, you highlight text "up" in a {TextBuffer}.
-  isReversed: ->
-    @marker.isReversed()
-
-  # Public: Returns whether the selection is a single line or not.
-  isSingleScreenLine: ->
-    @getScreenRange().isSingleLine()
-
   # Public: Returns the screen {Range} for the selection.
   getScreenRange: ->
     @marker.getScreenRange()
@@ -111,7 +93,7 @@ class Selection extends Model
   # * `screenRange` The new {Range} to select.
   # * `options` (optional) {Object} with the keys:
   #   * `preserveFolds` if `true`, the fold settings are preserved after the selection moves.
-  #   * `autoscroll` if `true`, the {Editor} scrolls to the new selection.
+  #   * `autoscroll` if `true`, the {TextEditor} scrolls to the new selection.
   setBufferRange: (bufferRange, options={}) ->
     bufferRange = Range.fromObject(bufferRange)
     @needsAutoscroll = options.autoscroll
@@ -148,55 +130,61 @@ class Selection extends Model
   getHeadBufferPosition: ->
     @marker.getHeadBufferPosition()
 
-  autoscroll: ->
-    @editor.scrollToScreenRange(@getScreenRange())
+  ###
+  Section: Info about the selection
+  ###
+
+  # Public: Determines if the selection contains anything.
+  isEmpty: ->
+    @getBufferRange().isEmpty()
+
+  # Public: Determines if the ending position of a marker is greater than the
+  # starting position.
+  #
+  # This can happen when, for example, you highlight text "up" in a {TextBuffer}.
+  isReversed: ->
+    @marker.isReversed()
+
+  # Public: Returns whether the selection is a single line or not.
+  isSingleScreenLine: ->
+    @getScreenRange().isSingleLine()
 
   # Public: Returns the text in the selection.
   getText: ->
     @editor.buffer.getTextInRange(@getBufferRange())
 
+  # Public: Identifies if a selection intersects with a given buffer range.
+  #
+  # * `bufferRange` A {Range} to check against.
+  #
+  # Returns a {Boolean}
+  intersectsBufferRange: (bufferRange) ->
+    @getBufferRange().intersectsWith(bufferRange)
+
+  intersectsScreenRowRange: (startRow, endRow) ->
+    @getScreenRange().intersectsRowRange(startRow, endRow)
+
+  intersectsScreenRow: (screenRow) ->
+    @getScreenRange().intersectsRow(screenRow)
+
+  # Public: Identifies if a selection intersects with another selection.
+  #
+  # * `otherSelection` A {Selection} to check against.
+  #
+  # Returns a {Boolean}
+  intersectsWith: (otherSelection, exclusive) ->
+    @getBufferRange().intersectsWith(otherSelection.getBufferRange(), exclusive)
+
+  ###
+  Section: Modifying the selected range
+  ###
+
   # Public: Clears the selection, moving the marker to the head.
   clear: ->
-    @marker.setAttributes(goalBufferRange: null)
+    @marker.setProperties(goalBufferRange: null)
     @marker.clearTail() unless @retainSelection
     @finalize()
 
-  # Public: Modifies the selection to encompass the current word.
-  #
-  # Returns a {Range}.
-  selectWord: ->
-    options = {}
-    options.wordRegex = /[\t ]*/ if @cursor.isSurroundedByWhitespace()
-    if @cursor.isBetweenWordAndNonWord()
-      options.includeNonWordCharacters = false
-
-    @setBufferRange(@cursor.getCurrentWordBufferRange(options))
-    @wordwise = true
-    @initialScreenRange = @getScreenRange()
-
-  # Public: Expands the newest selection to include the entire word on which
-  # the cursors rests.
-  expandOverWord: ->
-    @setBufferRange(@getBufferRange().union(@cursor.getCurrentWordBufferRange()))
-
-  # Public: Selects an entire line in the buffer.
-  #
-  # * `row` The line {Number} to select (default: the row of the cursor).
-  selectLine: (row=@cursor.getBufferPosition().row) ->
-    range = @editor.bufferRangeForBufferRow(row, includeNewline: true)
-    @setBufferRange(@getBufferRange().union(range))
-    @linewise = true
-    @wordwise = false
-    @initialScreenRange = @getScreenRange()
-
-  # Public: Expands the newest selection to include the entire line on which
-  # the cursor currently rests.
-  #
-  # It also includes the newline character.
-  expandOverLine: ->
-    range = @getBufferRange().union(@cursor.getCurrentLineBufferRange(includeNewline: true))
-    @setBufferRange(range)
-
   # Public: Selects the text from the current cursor position to a given screen
   # position.
   #
@@ -311,46 +299,45 @@ class Selection extends Model
   selectToBeginningOfPreviousParagraph: ->
     @modifySelection => @cursor.moveToBeginningOfPreviousParagraph()
 
-  # Public: Moves the selection down one row.
-  addSelectionBelow: ->
-    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
-    nextRow = range.end.row + 1
+  # Public: Modifies the selection to encompass the current word.
+  #
+  # Returns a {Range}.
+  selectWord: ->
+    options = {}
+    options.wordRegex = /[\t ]*/ if @cursor.isSurroundedByWhitespace()
+    if @cursor.isBetweenWordAndNonWord()
+      options.includeNonWordCharacters = false
 
-    for row in [nextRow..@editor.getLastBufferRow()]
-      range.start.row = row
-      range.end.row = row
-      clippedRange = @editor.clipBufferRange(range)
+    @setBufferRange(@cursor.getCurrentWordBufferRange(options))
+    @wordwise = true
+    @initialScreenRange = @getScreenRange()
 
-      if range.isEmpty()
-        continue if range.end.column > 0 and clippedRange.end.column is 0
-      else
-        continue if clippedRange.isEmpty()
+  # Public: Expands the newest selection to include the entire word on which
+  # the cursors rests.
+  expandOverWord: ->
+    @setBufferRange(@getBufferRange().union(@cursor.getCurrentWordBufferRange()))
 
-      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
-      break
+  # Public: Selects an entire line in the buffer.
+  #
+  # * `row` The line {Number} to select (default: the row of the cursor).
+  selectLine: (row=@cursor.getBufferPosition().row) ->
+    range = @editor.bufferRangeForBufferRow(row, includeNewline: true)
+    @setBufferRange(@getBufferRange().union(range))
+    @linewise = true
+    @wordwise = false
+    @initialScreenRange = @getScreenRange()
 
-  # FIXME: I have no idea what this does.
-  getGoalBufferRange: ->
-    if goalBufferRange = @marker.getAttributes().goalBufferRange
-      Range.fromObject(goalBufferRange)
+  # Public: Expands the newest selection to include the entire line on which
+  # the cursor currently rests.
+  #
+  # It also includes the newline character.
+  expandOverLine: ->
+    range = @getBufferRange().union(@cursor.getCurrentLineBufferRange(includeNewline: true))
+    @setBufferRange(range)
 
-  # Public: Moves the selection up one row.
-  addSelectionAbove: ->
-    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
-    previousRow = range.end.row - 1
-
-    for row in [previousRow..0]
-      range.start.row = row
-      range.end.row = row
-      clippedRange = @editor.clipBufferRange(range)
-
-      if range.isEmpty()
-        continue if range.end.column > 0 and clippedRange.end.column is 0
-      else
-        continue if clippedRange.isEmpty()
-
-      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
-      break
+  ###
+  Section: Modifying the selected text
+  ###
 
   # Public: Replaces text at the current selection.
   #
@@ -391,71 +378,6 @@ class Selection extends Model
 
     newBufferRange
 
-  # Public: Indents the given text to the suggested level based on the grammar.
-  #
-  # * `text` The {String} to indent within the selection.
-  # * `indentBasis` The beginning indent level.
-  normalizeIndents: (text, indentBasis) ->
-    textPrecedingCursor = @cursor.getCurrentBufferLine()[0...@cursor.getBufferColumn()]
-    isCursorInsideExistingLine = /\S/.test(textPrecedingCursor)
-
-    lines = text.split('\n')
-    firstLineIndentLevel = @editor.indentLevelForLine(lines[0])
-    if isCursorInsideExistingLine
-      minimumIndentLevel = @editor.indentationForBufferRow(@cursor.getBufferRow())
-    else
-      minimumIndentLevel = @cursor.getIndentLevel()
-
-    normalizedLines = []
-    for line, i in lines
-      if i == 0
-        indentLevel = 0
-      else if line == '' # remove all indentation from empty lines
-        indentLevel = 0
-      else
-        lineIndentLevel = @editor.indentLevelForLine(lines[i])
-        indentLevel = minimumIndentLevel + (lineIndentLevel - indentBasis)
-
-      normalizedLines.push(@setIndentationForLine(line, indentLevel))
-
-    normalizedLines.join('\n')
-
-  # 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` (optional) {Object} with the keys:
-  #   * `autoIndent` If `true`, the line is indented to an automatically-inferred
-  #     level. Otherwise, {Editor::getTabText} is inserted.
-  indent: ({ autoIndent }={}) ->
-    { row, column } = @cursor.getBufferPosition()
-
-    if @isEmpty()
-      @cursor.skipLeadingWhitespace()
-      desiredIndent = @editor.suggestedIndentForBufferRow(row)
-      delta = desiredIndent - @cursor.getIndentLevel()
-
-      if autoIndent and delta > 0
-        @insertText(@editor.buildIndentString(delta))
-      else
-        @insertText(@editor.buildIndentString(1, @cursor.getBufferColumn()))
-    else
-      @indentSelectedRows()
-
-  # Public: If the selection spans multiple rows, indent all of them.
-  indentSelectedRows: ->
-    [start, end] = @getBufferRowRange()
-    for row in [start..end]
-      @editor.buffer.insert([row, 0], @editor.getTabText()) unless @editor.buffer.lineLengthForRow(row) == 0
-
-  # Public: ?
-  setIndentationForLine: (line, indentLevel) ->
-    desiredIndentLevel = Math.max(0, indentLevel)
-    desiredIndentString = @editor.buildIndentString(desiredIndentLevel)
-    line.replace(/^[\t ]*/, desiredIndentString)
-
   # Public: Removes the first character before the selection if the selection
   # is empty otherwise it deletes the selection.
   backspace: ->
@@ -632,41 +554,110 @@ class Selection extends Model
     @editor.createFold(range.start.row, range.end.row)
     @cursor.setBufferPosition([range.end.row + 1, 0])
 
-  modifySelection: (fn) ->
-    @retainSelection = true
-    @plantTail()
-    fn()
-    @retainSelection = false
+  # Public: Indents the given text to the suggested level based on the grammar.
+  #
+  # * `text` The {String} to indent within the selection.
+  # * `indentBasis` The beginning indent level.
+  normalizeIndents: (text, indentBasis) ->
+    textPrecedingCursor = @cursor.getCurrentBufferLine()[0...@cursor.getBufferColumn()]
+    isCursorInsideExistingLine = /\S/.test(textPrecedingCursor)
 
-  # Sets the marker's tail to the same position as the marker's head.
-  #
-  # This only works if there isn't already a tail position.
-  #
-  # Returns a {Point} representing the new tail position.
-  plantTail: ->
-    @marker.plantTail()
+    lines = text.split('\n')
+    firstLineIndentLevel = @editor.indentLevelForLine(lines[0])
+    if isCursorInsideExistingLine
+      minimumIndentLevel = @editor.indentationForBufferRow(@cursor.getBufferRow())
+    else
+      minimumIndentLevel = @cursor.getIndentLevel()
 
-  # Public: Identifies if a selection intersects with a given buffer range.
-  #
-  # * `bufferRange` A {Range} to check against.
-  #
-  # Returns a {Boolean}
-  intersectsBufferRange: (bufferRange) ->
-    @getBufferRange().intersectsWith(bufferRange)
+    normalizedLines = []
+    for line, i in lines
+      if i == 0
+        indentLevel = 0
+      else if line == '' # remove all indentation from empty lines
+        indentLevel = 0
+      else
+        lineIndentLevel = @editor.indentLevelForLine(lines[i])
+        indentLevel = minimumIndentLevel + (lineIndentLevel - indentBasis)
 
-  intersectsScreenRowRange: (startRow, endRow) ->
-    @getScreenRange().intersectsRowRange(startRow, endRow)
+      normalizedLines.push(@setIndentationForLine(line, indentLevel))
 
-  intersectsScreenRow: (screenRow) ->
-    @getScreenRange().intersectsRow(screenRow)
+    normalizedLines.join('\n')
 
-  # Public: Identifies if a selection intersects with another selection.
+  # Indent the current line(s).
   #
-  # * `otherSelection` A {Selection} to check against.
+  # 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}.
   #
-  # Returns a {Boolean}
-  intersectsWith: (otherSelection, exclusive) ->
-    @getBufferRange().intersectsWith(otherSelection.getBufferRange(), exclusive)
+  # * `options` (optional) {Object} with the keys:
+  #   * `autoIndent` If `true`, the line is indented to an automatically-inferred
+  #     level. Otherwise, {TextEditor::getTabText} is inserted.
+  indent: ({ autoIndent }={}) ->
+    { row, column } = @cursor.getBufferPosition()
+
+    if @isEmpty()
+      @cursor.skipLeadingWhitespace()
+      desiredIndent = @editor.suggestedIndentForBufferRow(row)
+      delta = desiredIndent - @cursor.getIndentLevel()
+
+      if autoIndent and delta > 0
+        delta = Math.max(delta, 1) unless @editor.getSoftTabs()
+        @insertText(@editor.buildIndentString(delta))
+      else
+        @insertText(@editor.buildIndentString(1, @cursor.getBufferColumn()))
+    else
+      @indentSelectedRows()
+
+  # Public: If the selection spans multiple rows, indent all of them.
+  indentSelectedRows: ->
+    [start, end] = @getBufferRowRange()
+    for row in [start..end]
+      @editor.buffer.insert([row, 0], @editor.getTabText()) unless @editor.buffer.lineLengthForRow(row) == 0
+
+  setIndentationForLine: (line, indentLevel) ->
+    desiredIndentLevel = Math.max(0, indentLevel)
+    desiredIndentString = @editor.buildIndentString(desiredIndentLevel)
+    line.replace(/^[\t ]*/, desiredIndentString)
+
+  ###
+  Section: Managing multiple selections
+  ###
+
+  # Public: Moves the selection down one row.
+  addSelectionBelow: ->
+    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
+    nextRow = range.end.row + 1
+
+    for row in [nextRow..@editor.getLastBufferRow()]
+      range.start.row = row
+      range.end.row = row
+      clippedRange = @editor.clipBufferRange(range)
+
+      if range.isEmpty()
+        continue if range.end.column > 0 and clippedRange.end.column is 0
+      else
+        continue if clippedRange.isEmpty()
+
+      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
+      break
+
+  # Public: Moves the selection up one row.
+  addSelectionAbove: ->
+    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
+    previousRow = range.end.row - 1
+
+    for row in [previousRow..0]
+      range.start.row = row
+      range.end.row = row
+      clippedRange = @editor.clipBufferRange(range)
+
+      if range.isEmpty()
+        continue if range.end.column > 0 and clippedRange.end.column is 0
+      else
+        continue if clippedRange.isEmpty()
+
+      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
+      break
 
   # Public: Combines the given selection into this selection and then destroys
   # the given selection.
@@ -683,6 +674,10 @@ class Selection extends Model
     @setBufferRange(@getBufferRange().union(otherSelection.getBufferRange()), options)
     otherSelection.destroy()
 
+  ###
+  Section: Comparing to other selections
+  ###
+
   # Public: Compare this selection's buffer range to another selection's buffer
   # range.
   #
@@ -692,7 +687,51 @@ class Selection extends Model
   compare: (otherSelection) ->
     @getBufferRange().compare(otherSelection.getBufferRange())
 
-  screenRangeChanged: ->
-    @emit 'screen-range-changed', @getScreenRange()
+  ###
+  Section: Private Utilities
+  ###
+
+  screenRangeChanged: (e) ->
+    {oldHeadBufferPosition, oldTailBufferPosition} = e
+    {oldHeadScreenPosition, oldTailScreenPosition} = e
+
+    eventObject =
+      oldBufferRange: new Range(oldHeadBufferPosition, oldTailBufferPosition)
+      oldScreenRange: new Range(oldHeadScreenPosition, oldTailScreenPosition)
+      newBufferRange: @getBufferRange()
+      newScreenRange: @getScreenRange()
+      selection: this
+
+    @emit 'screen-range-changed', @getScreenRange() # old event
     @emitter.emit 'did-change-range'
-    @editor.selectionRangeChanged(this)
+    @editor.selectionRangeChanged(eventObject)
+
+  finalize: ->
+    @initialScreenRange = null unless @initialScreenRange?.isEqual(@getScreenRange())
+    if @isEmpty()
+      @wordwise = false
+      @linewise = false
+
+  autoscroll: ->
+    @editor.scrollToScreenRange(@getScreenRange())
+
+  clearAutoscroll: ->
+    @needsAutoscroll = null
+
+  modifySelection: (fn) ->
+    @retainSelection = true
+    @plantTail()
+    fn()
+    @retainSelection = false
+
+  # Sets the marker's tail to the same position as the marker's head.
+  #
+  # This only works if there isn't already a tail position.
+  #
+  # Returns a {Point} representing the new tail position.
+  plantTail: ->
+    @marker.plantTail()
+
+  getGoalBufferRange: ->
+    if goalBufferRange = @marker.getProperties().goalBufferRange
+      Range.fromObject(goalBufferRange)

src/syntax.coffee

@@ -9,7 +9,7 @@ PropertyAccessors = require 'property-accessors'
 {$, $$} = require './space-pen-extensions'
 Token = require './token'
 
-# Public: Syntax class holding the grammars used for tokenizing.
+# Extended: Syntax class holding the grammars used for tokenizing.
 #
 # An instance of this class is always available as the `atom.syntax` global.
 #

src/task.coffee

@@ -2,14 +2,38 @@ _ = require 'underscore-plus'
 child_process = require 'child_process'
 {Emitter} = require 'emissary'
 
-# Public: Run a node script in a separate process.
+# Extended: Run a node script in a separate process.
 #
-# Used by the fuzzy-finder.
+# Used by the fuzzy-finder and [find in project](https://github.com/atom/atom/blob/master/src/scan-handler.coffee).
+#
+# For a real-world example, see the [scan-handler](https://github.com/atom/atom/blob/master/src/scan-handler.coffee)
+# and the [instantiation of the task](https://github.com/atom/atom/blob/4a20f13162f65afc816b512ad7201e528c3443d7/src/project.coffee#L245).
 #
 # ## Examples
 #
+# In your package code:
+#
 # ```coffee
 # {Task} = require 'atom'
+#
+# task = Task.once '/path/to/task-file.coffee', parameter1, parameter2, ->
+#   console.log 'task has finished'
+#
+# task.on 'some-event-from-the-task', (data) =>
+#   console.log data.someString # prints 'yep this is it'
+# ```
+#
+# In `'/path/to/task-file.coffee'`:
+#
+# ```coffee
+# module.exports = (parameter1, parameter2) ->
+#   # Indicates that this task will be async.
+#   # Call the `callback` to finish the task
+#   callback = @async()
+#
+#   emit('some-event-from-the-task', {someString: 'yep this is it'})
+#
+#   callback()
 # ```
 #
 # ## Events
@@ -55,7 +79,7 @@ class Task
   # receives a completion callback, this is overridden.
   callback: null
 
-  # Public: Creates a task.
+  # Public: Creates a task. You should probably use {.once}
   #
   # * `taskPath` The {String} path to the CoffeeScript/JavaScript file that
   #   exports a single {Function} to execute.

src/text-editor-component.coffee

@@ -14,8 +14,8 @@ ScrollbarCornerComponent = require './scrollbar-corner-component'
 SubscriberMixin = require './subscriber-mixin'
 
 module.exports =
-EditorComponent = React.createClass
-  displayName: 'EditorComponent'
+TextEditorComponent = React.createClass
+  displayName: 'TextEditorComponent'
   mixins: [SubscriberMixin]
 
   statics:
@@ -64,7 +64,7 @@ EditorComponent = React.createClass
       decorations = editor.decorationsForScreenRowRange(renderedStartRow, renderedEndRow)
       highlightDecorations = @getHighlightDecorations(decorations)
       lineDecorations = @getLineDecorations(decorations)
-      placeholderText = @props.placeholderText if @props.placeholderText? and editor.isEmpty()
+      placeholderText = editor.getPlaceholderText() if editor.isEmpty()
       visible = @isVisible()
 
       scrollHeight = editor.getScrollHeight()
@@ -128,6 +128,7 @@ EditorComponent = React.createClass
           scrollableInOppositeDirection: verticallyScrollable
           verticalScrollbarWidth: verticalScrollbarWidth
           horizontalScrollbarHeight: horizontalScrollbarHeight
+          useHardwareAcceleration: @useHardwareAcceleration
 
       ScrollbarComponent
         ref: 'verticalScrollbar'
@@ -140,6 +141,7 @@ EditorComponent = React.createClass
         scrollableInOppositeDirection: horizontallyScrollable
         verticalScrollbarWidth: verticalScrollbarWidth
         horizontalScrollbarHeight: horizontalScrollbarHeight
+        useHardwareAcceleration: @useHardwareAcceleration
 
       # Also used to measure the height/width of scrollbars after the initial render
       ScrollbarCornerComponent
@@ -234,7 +236,7 @@ EditorComponent = React.createClass
       @updateRequestedWhilePaused = true
       return
 
-    if @performSyncUpdates ? EditorComponent.performSyncUpdates
+    if @performSyncUpdates ? TextEditorComponent.performSyncUpdates
       @forceUpdate()
     else unless @updateRequested
       @updateRequested = true
@@ -350,12 +352,13 @@ EditorComponent = React.createClass
 
   observeEditor: ->
     {editor} = @props
-    @subscribe editor.onDidChangeScreenLines(@onScreenLinesChanged)
+    @subscribe editor.onDidChange(@onScreenLinesChanged)
     @subscribe editor.observeCursors(@onCursorAdded)
     @subscribe editor.observeSelections(@onSelectionAdded)
     @subscribe editor.observeDecorations(@onDecorationAdded)
     @subscribe editor.onDidRemoveDecoration(@onDecorationRemoved)
     @subscribe editor.onDidChangeCharacterWidths(@onCharacterWidthsChanged)
+    @subscribe editor.onDidChangePlaceholderText(@onPlaceholderTextChanged)
     @subscribe editor.$scrollTop.changes, @onScrollTopChanged
     @subscribe editor.$scrollLeft.changes, @requestUpdate
     @subscribe editor.$verticalScrollbarWidth.changes, @requestUpdate
@@ -503,16 +506,16 @@ EditorComponent = React.createClass
         'editor:move-line-down': -> editor.moveLineDown()
         '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:toggle-indent-guide': -> atom.config.set('editor.showIndentGuide', not atom.config.get('editor.showIndentGuide'))
+        'editor:toggle-line-numbers': ->  atom.config.set('editor.showLineNumbers', not atom.config.get('editor.showLineNumbers'))
         'editor:scroll-to-cursor': -> editor.scrollToCursorPosition()
         'benchmark:scroll': @runScrollBenchmark
 
   addCommandListeners: (listenersByCommandName) ->
     {parentView} = @props
 
-    addListener = (command, listener) ->
-      parentView.command command, (event) ->
+    addListener = (command, listener) =>
+      @subscribe parentView.command command, (event) ->
         event.stopPropagation()
         listener(event)
 
@@ -603,7 +606,7 @@ EditorComponent = React.createClass
 
   onScrollViewScroll: ->
     if @isMounted()
-      console.warn "EditorScrollView scrolled when it shouldn't have."
+      console.warn "TextEditorScrollView scrolled when it shouldn't have."
       scrollViewNode = @refs.scrollView.getDOMNode()
       scrollViewNode.scrollTop = 0
       scrollViewNode.scrollLeft = 0
@@ -778,6 +781,9 @@ EditorComponent = React.createClass
   onCharacterWidthsChanged: (@scopedCharacterWidthsChangeCount) ->
     @requestUpdate()
 
+  onPlaceholderTextChanged: ->
+    @requestUpdate()
+
   handleDragUntilMouseUp: (event, dragHandler) ->
     {editor} = @props
     dragging = false
@@ -954,7 +960,7 @@ EditorComponent = React.createClass
     {verticalScrollbar, horizontalScrollbar, scrollbarCorner} = @refs
 
     verticalNode = verticalScrollbar.getDOMNode()
-    horizontalNode = verticalScrollbar.getDOMNode()
+    horizontalNode = horizontalScrollbar.getDOMNode()
     cornerNode = scrollbarCorner.getDOMNode()
 
     originalVerticalDisplayValue = verticalNode.style.display