Add method organization docs

Changes based on feedback
Initial API guidelines doc
2014-08-19 19:09:56 -06:00 · 2014-08-01 11:03:13 -07:00 · 2014-07-31 12:33:59 -07:00
@@ -1 +0,0 @@
-v0.10.21
@@ -25,17 +25,6 @@ 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)
@@ -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.98.0"
+    "atom-package-manager": "0.87.0"
  }
 }
@@ -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'" | grep -v ShipIt | head -1 | xargs dirname)
+    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
  fi

  # Exit if Atom can't be found
@@ -1,6 +1,6 @@
 require '../src/window'
 Atom = require '../src/atom'
-window.atom = Atom.loadOrCreate('spec')
+atom = new Atom()
 atom.show() unless atom.getLoadSettings().exitWhenDone
 window.atom = atom

@@ -9,4 +9,5 @@ window.atom = atom
 atom.openDevTools()

 document.title = "Benchmark Suite"
-runSpecSuite('../benchmark/benchmark-suite', atom.getLoadSettings().logFile)
+benchmarkSuite = require.resolve('./benchmark-suite')
+runSpecSuite(benchmarkSuite, true)
@@ -1,9 +1,7 @@
 require '../spec/spec-helper'

 path = require 'path'
-{$, Point} = require 'atom'
-_ = require 'underscore-plus'
-fs = require 'fs-plus'
+{$, _, Point, fs} = require 'atom'
 Project = require '../src/project'
 TokenizedBuffer = require '../src/tokenized-buffer'

@@ -103,7 +101,7 @@ $.fn.resultOfTrigger = (type) ->
  event.result

 $.fn.enableKeymap = ->
-  @on 'keydown', (e) -> window.keymap.handleKeyEvent(e)
+  @on 'keydown', (e) => window.keymap.handleKeyEvent(e)

 $.fn.attachToDom = ->
  $('#jasmine-content').append(this)
@@ -7,7 +7,7 @@ describe "editorView.", ->

  beforeEach ->
    atom.workspaceViewParentSelector = '#jasmine-content'
-    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
+    atom.workspaceView = new WorkspaceView
    atom.workspaceView.attachToDom()

    atom.workspaceView.width(1024)
@@ -53,7 +53,7 @@ describe "editorView.", ->

    describe "at-end.", ->
      beforeEach ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()

      benchmark "insert-delete", ->
        editorView.insertText('"')
@@ -62,8 +62,8 @@ describe "editorView.", ->
    describe "empty-vs-set-innerHTML.", ->
      [firstRow, lastRow] = []
      beforeEach ->
-        firstRow = editorView.getModel().getFirstVisibleScreenRow()
-        lastRow = editorView.getModel().getLastVisibleScreenRow()
+        firstRow = editorView.getFirstVisibleScreenRow()
+        lastRow = editorView.getLastVisibleScreenRow()

      benchmark "build-gutter-html.", 1000, ->
        editorView.gutter.renderLineNumbers(null, firstRow, lastRow)
@@ -97,13 +97,13 @@ describe "editorView.", ->
      describe "multiple-lines.", ->
        [firstRow, lastRow] = []
        beforeEach ->
-          firstRow = editorView.getModel().getFirstVisibleScreenRow()
-          lastRow = editorView.getModel().getLastVisibleScreenRow()
+          firstRow = editorView.getFirstVisibleScreenRow()
+          lastRow = editorView.getLastVisibleScreenRow()

        benchmark "cache-entire-visible-area", 100, ->
          for i in [firstRow..lastRow]
            line = editorView.lineElementForScreenRow(i)[0]
-            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.getModel().lineTextForBufferRow(i).length))
+            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.lineLengthForBufferRow(i)))

    describe "text-rendering.", ->
      beforeEach ->
@@ -178,7 +178,7 @@ describe "editorView.", ->
        atom.workspaceView.openSync('huge.js')

      benchmark "moving-to-eof.", 1, ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()

      describe "on-first-line.", ->
        benchmark "inserting-newline", 5, ->
@@ -195,11 +195,11 @@ describe "editorView.", ->
        endPosition = null

        beforeEach ->
-          editorView.moveToBottom()
+          editorView.moveCursorToBottom()
          endPosition = editorView.getCursorScreenPosition()

        benchmark "move-to-beginning-of-word", ->
-          editorView.moveToBeginningOfWord()
+          editorView.moveCursorToBeginningOfWord()
          editorView.setCursorScreenPosition(endPosition)

        benchmark "insert", ->
@@ -1,56 +0,0 @@
-#!/usr/bin/env coffee
-
-{spawn, exec} = require 'child_process'
-fs = require 'fs'
-os = require 'os'
-path = require 'path'
-_ = require 'underscore-plus'
-temp = require 'temp'
-
-directoryToOpen = temp.mkdirSync('browser-process-startup-')
-socketPath = path.join(os.tmpdir(), 'atom.sock')
-numberOfRuns = 10
-
-deleteSocketFile = ->
-  try
-    fs.unlinkSync(socketPath) if fs.existsSync(socketPath)
-  catch error
-    console.error(error)
-
-launchAtom = (callback) ->
-  deleteSocketFile()
-
-  cmd = 'atom'
-  args = ['--safe', '--new-window', '--foreground', directoryToOpen]
-  atomProcess = spawn(cmd, args)
-
-  output = ''
-  startupTimes = []
-  dataListener = (data) ->
-    output += data
-    if match = /App load time: (\d+)/.exec(output)
-      startupTime = parseInt(match[1])
-      atomProcess.stderr.removeListener 'data', dataListener
-      atomProcess.kill()
-      exec 'pkill -9 Atom', (error) ->
-        console.error(error) if error?
-        callback(startupTime)
-
-  atomProcess.stderr.on 'data', dataListener
-
-startupTimes = []
-collector = (startupTime) ->
-  startupTimes.push(startupTime)
-  if startupTimes.length < numberOfRuns
-    launchAtom(collector)
-  else
-    maxTime = _.max(startupTimes)
-    minTime = _.min(startupTimes)
-    totalTime = startupTimes.reduce (previousValue=0, currentValue) -> previousValue + currentValue
-    console.log "Startup Runs: #{startupTimes.length}"
-    console.log "First run time: #{startupTimes[0]}ms"
-    console.log "Max time: #{maxTime}ms"
-    console.log "Min time: #{minTime}ms"
-    console.log "Average time: #{Math.round(totalTime/startupTimes.length)}ms"
-
-launchAtom(collector)
@@ -39,7 +39,6 @@ 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
@@ -61,9 +60,7 @@ module.exports = (grunt) ->
    contentsDir = shellAppDir
    appDir = path.join(shellAppDir, 'resources', 'app')
    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
-    killCommand ='pkill -9 atom'
-
-  installDir = path.resolve(installDir)
+    killCommand ='pkill -9 Atom'

  coffeeConfig =
    glob_to_multiple:
@@ -133,7 +130,7 @@ module.exports = (grunt) ->

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

-    docsOutputDir: 'docs/output'
+    docsOutputDir: 'docs/output/api'

    coffee: coffeeConfig

@@ -147,7 +144,12 @@ module.exports = (grunt) ->

    coffeelint:
      options:
-        configFile: 'coffeelint.json'
+        no_empty_param_list:
+          level: 'error'
+        max_line_length:
+          level: 'ignore'
+        indentation:
+          level: 'ignore'
      src: [
        'dot-atom/**/*.coffee'
        'exports/**/*.coffee'
@@ -228,17 +230,9 @@ module.exports = (grunt) ->
  grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg'])
  grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
  grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'dump-symbols', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
  grunt.registerTask('docs', ['markdown:guides', 'build-docs'])

-  ciTasks = ['output-disk-space', 'download-atom-shell', 'build']
-  ciTasks.push('dump-symbols') if process.platform isnt 'win32'
-  ciTasks.push('set-version', 'check-licenses', 'lint')
-  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']
  defaultTasks.push 'install' unless process.platform is 'linux'
  grunt.registerTask('default', defaultTasks)
@@ -7,13 +7,13 @@
  },
  "dependencies": {
    "async": "~0.2.9",
-    "donna": "1.0.1",
+    "biscotto": ">=2.1.1 <3.0",
    "formidable": "~1.0.14",
    "fs-plus": "2.x",
    "github-releases": "~0.2.0",
    "grunt": "~0.4.1",
    "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
+    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
    "grunt-contrib-coffee": "~0.9.0",
    "grunt-contrib-csslint": "~0.1.2",
    "grunt-contrib-less": "~0.8.0",
@@ -26,7 +26,7 @@
    "harmony-collections": "~0.3.8",
    "json-front-matter": "~0.1.3",
    "legal-eagle": "~0.4.0",
-    "minidump": "~0.8",
+    "minidump": "~0.7",
    "normalize-package-data": "0.2.12",
    "npm": "~1.4.5",
    "rcedit": "~0.1.2",
@@ -34,8 +34,6 @@
    "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"
@@ -148,6 +148,9 @@ module.exports = (grunt) ->
          grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))

    if process.platform is 'win32'
+      cp path.join('resources', 'win', 'msvcp100.dll'), path.join(shellAppDir, 'msvcp100.dll')
+      cp path.join('resources', 'win', 'msvcr100.dll'), path.join(shellAppDir, 'msvcr100.dll')
+
      # Set up chocolatey ignore and gui files
      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
@@ -1,5 +1,4 @@
 path = require 'path'
-fs = require 'fs-plus'

 module.exports = (grunt) ->
  {spawn} = require('./task-helpers')(grunt)
@@ -26,21 +25,12 @@ module.exports = (grunt) ->
    switch process.platform
      when 'darwin'
        cmd = 'codesign'
-        args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+        args = ['-f', '-v', '-s', '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) ->
-            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()
+          spawn {cmd, args}, (error) -> callback(error)
      else
        callback()
@@ -1,41 +0,0 @@
-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)
@@ -1,40 +1,162 @@
 path = require 'path'

+async = require 'async'
 fs = require 'fs-plus'
-_ = require 'underscore-plus'
-
-donna = require 'donna'
-tello = require 'tello'
+request = require 'request'

 module.exports = (grunt) ->
-  getClassesToInclude = ->
-    modulesPath = path.resolve(__dirname, '..', '..', 'node_modules')
-    classes = {}
-    fs.traverseTreeSync modulesPath, (modulePath) ->
-      return false if modulePath.match(/node_modules/g).length > 1 # dont need the dependencies of the dependencies
-      return true unless path.basename(modulePath) is 'package.json'
-      return true unless fs.isFileSync(modulePath)
+  {rm} = require('./task-helpers')(grunt)

-      apiPath = path.join(path.dirname(modulePath), 'api.json')
-      if fs.isFileSync(apiPath)
-        _.extend(classes, grunt.file.readJSON(apiPath).classes)
-      true
-    classes
-
-  sortClasses = (classes) ->
-    sortedClasses = {}
-    for className in Object.keys(classes).sort()
-      sortedClasses[className] = classes[className]
-    sortedClasses
+  cmd = path.join('node_modules', '.bin', 'coffee')
+  commonArgs = [path.join('build', 'node_modules', '.bin', 'biscotto'), '--']
+  opts =
+    stdio: 'inherit'

  grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
+    done = @async()
+
    docsOutputDir = grunt.config.get('docsOutputDir')

-    metadata = donna.generateMetadata(['.'])
-    api = tello.digest(metadata)
-    _.extend(api.classes, getClassesToInclude())
-    api.classes = sortClasses(api.classes)
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        rm(docsOutputDir)
+        args = [
+          commonArgs...
+          '--title', 'Atom API Documentation'
+          '-o', docsOutputDir
+          '-r', 'docs/README.md'
+          '--stability', '1'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)

-    apiJson = JSON.stringify(api, null, 2)
-    apiJsonPath = path.join(docsOutputDir, 'api.json')
-    grunt.file.write(apiJsonPath, apiJson)
+  grunt.registerTask 'lint-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'missing-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          '--missing'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'copy-docs', 'Copies over latest API docs to atom-docs', ->
+    done = @async()
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    copyDocs = (tag, callback) ->
+      cmd = 'cp'
+      args = ['-r', 'docs/output/', "../atom.io/public/docs/api/#{tag}/"]
+
+      fs.exists "../atom.io/public/docs/api/", (exists) ->
+        if exists
+          grunt.util.spawn {cmd, args}, (error, result) ->
+            if error?
+              callback(error)
+            else
+              callback(null, tag)
+        else
+          grunt.log.error "../atom.io/public/docs/api/ doesn't exist"
+          return false
+
+    grunt.util.async.waterfall [fetchTag, copyDocs], done
+
+  grunt.registerTask 'deploy-docs', 'Publishes latest API docs to atom-docs.githubapp.com', ->
+    done = @async()
+    docsRepoArgs = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/']
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim().split('.')[0..1].join('.'))
+
+    stageDocs = (tag, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'add', "public/#{tag}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    fetchSha = (args..., callback) ->
+      cmd = 'git'
+      args = ['rev-parse', 'HEAD']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    commitChanges = (sha, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'commit', "-m Update API docs to #{sha}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushOrigin = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'origin', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushHeroku = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'heroku', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    grunt.util.async.waterfall [fetchTag, stageDocs, fetchSha, commitChanges, pushOrigin, pushHeroku], done
+
+downloadFileFromRepo = ({repo, file}, callback) ->
+  uri = "https://raw.github.com/atom/#{repo}/master/#{file}"
+  request uri, (error, response, contents) ->
+    return callback(error) if error?
+    downloadPath = path.join('docs', 'includes', repo, file)
+    fs.writeFile downloadPath, contents, (error) ->
+      callback(error, downloadPath)
+
+downloadIncludes = (callback) ->
+  includes = [
+    {repo: 'atom-keymap', file: 'src/keymap-manager.coffee'}
+    {repo: 'atom-keymap', file: 'src/key-binding.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar-registry.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/directory.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/file.coffee'}
+    {repo: 'space-pen',   file: 'src/space-pen.coffee'}
+    {repo: 'text-buffer', file: 'src/marker.coffee'}
+    {repo: 'text-buffer', file: 'src/point.coffee'}
+    {repo: 'text-buffer', file: 'src/range.coffee'}
+    {repo: 'text-buffer', file: 'src/text-buffer.coffee'}
+    {repo: 'theorist',    file: 'src/model.coffee'}
+  ]
+
+  async.map(includes, downloadFileFromRepo, callback)
@@ -3,7 +3,6 @@ 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)
@@ -23,11 +22,7 @@ module.exports = (grunt) ->
    else if process.platform is 'darwin'
      rm installDir
      mkdir path.dirname(installDir)
-
-      tempFolder = temp.path()
-      mkdir tempFolder
-      cp shellAppDir, tempFolder
-      fs.renameSync(tempFolder, installDir)
+      cp shellAppDir, installDir
    else
      binDir = path.join(installDir, 'bin')
      shareDir = path.join(installDir, 'share', 'atom')
@@ -13,16 +13,8 @@ module.exports = (grunt) ->
    grunt.file.write(outputPath, filled)
    outputPath

-  getInstalledSize = (buildDir, callback) ->
-    cmd = 'du'
-    args = ['-sk', path.join(buildDir, 'Atom')]
-    spawn {cmd, args}, (error, {stdout}) ->
-      installedSize = stdout.split(/\s+/)?[0] or '200000' # default to 200MB
-      callback(null, installedSize)
-
  grunt.registerTask 'mkdeb', 'Create debian package', ->
    done = @async()
-    buildDir = grunt.config.get('atom.buildDir')

    if process.arch is 'ia32'
      arch = 'i386'
@@ -36,17 +28,13 @@ module.exports = (grunt) ->
    maintainer = 'GitHub <atom@github.com>'
    installDir = '/usr'
    iconName = 'atom'
-    getInstalledSize buildDir, (error, installedSize) ->
-      data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize}
-      controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
-      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
-      icon = path.join('resources', 'atom.png')
+    data = {name, version, description, section, arch, maintainer, installDir, iconName}

-      cmd = path.join('script', 'mkdeb')
-      args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
-      spawn {cmd, args}, (error) ->
-        if error?
-          done(error)
-        else
-          grunt.log.ok "Created #{buildDir}/atom-#{version}-#{arch}.deb"
-          done()
+    controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
+    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
+    spawn({cmd, args}, done)
@@ -17,7 +17,6 @@ defaultHeaders =

 module.exports = (gruntObject) ->
  grunt = gruntObject
-  {cp} = require('./task-helpers')(grunt)

  grunt.registerTask 'publish-build', 'Publish the built app', ->
    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
@@ -25,10 +24,8 @@ module.exports = (gruntObject) ->
    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
    grunt.task.run(tasks)

-  grunt.registerTask 'prepare-docs', 'Move api.json to atom-api.json', ->
-    docsOutputDir = grunt.config.get('docsOutputDir')
-    buildDir = grunt.config.get('atom.buildDir')
-    cp path.join(docsOutputDir, 'api.json'), path.join(buildDir, 'atom-api.json')
+  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
+    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))

  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
    done = @async()
@@ -45,33 +42,16 @@ module.exports = (gruntObject) ->
          uploadAssets(release, buildDir, assets, done)

 getAssets = ->
-  switch process.platform
-    when 'darwin'
-      [
-        {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
-        {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
-        {assetName: 'atom-api.json', sourcePath: 'atom-api.json'}
-      ]
-    when 'win32'
-      [
-        {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
-      ]
-    when 'linux'
-      buildDir = grunt.config.get('atom.buildDir')
-      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)
-      cp sourcePath, path.join(buildDir, assetName)
-
-      [
-        {assetName, sourcePath}
-      ]
+  if process.platform is 'darwin'
+    [
+      {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
+      {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
+      {assetName: 'atom-docs.zip', sourcePath: 'atom-docs'}
+    ]
+  else
+    [
+      {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
+    ]

 logError = (message, error, details) ->
  grunt.log.error(message)
@@ -90,7 +70,7 @@ zipAssets = (buildDir, assets, callback) ->
      callback(error)

  tasks = []
-  for {assetName, sourcePath} in assets when path.extname(assetName) is '.zip'
+  for {assetName, sourcePath} in assets
    fs.removeSync(path.join(buildDir, assetName))
    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
  async.parallel(tasks, callback)
@@ -45,8 +45,8 @@ module.exports = (grunt) ->

        strings =
          CompanyName: 'GitHub, Inc.'
-          FileDescription: 'Atom'
-          LegalCopyright: 'Copyright (C) 2014 GitHub, Inc. All rights reserved'
+          FileDescription: 'The hackable editor'
+          LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
          ProductName: 'Atom'
          ProductVersion: version

@@ -2,6 +2,7 @@ fs = require 'fs'
 path = require 'path'

 _ = require 'underscore-plus'
+
 async = require 'async'

 module.exports = (grunt) ->
@@ -9,27 +10,18 @@ module.exports = (grunt) ->

  packageSpecQueue = null

-  getAppPath = ->
-    contentsDir = grunt.config.get('atom.contentsDir')
-    switch process.platform
-      when 'darwin'
-        path.join(contentsDir, 'MacOS', 'Atom')
-      when 'linux'
-        path.join(contentsDir, 'atom')
-      when 'win32'
-        path.join(contentsDir, 'atom.exe')
-
  runPackageSpecs = (callback) ->
    failedPackages = []
    rootDir = grunt.config.get('atom.shellAppDir')
+    contentsDir = grunt.config.get('atom.contentsDir')
    resourcePath = process.cwd()
-    appPath = getAppPath()
-
-    # Ensure application is executable on Linux
-    fs.chmodSync(appPath, '755') if process.platform is 'linux'
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')

    packageSpecQueue = async.queue (packagePath, callback) ->
-      if process.platform in ['darwin', 'linux']
+      if process.platform is 'darwin'
        options =
          cmd: appPath
          args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}"]
@@ -65,11 +57,15 @@ module.exports = (grunt) ->
    packageSpecQueue.drain = -> callback(null, failedPackages)

  runCoreSpecs = (callback) ->
-    appPath = getAppPath()
+    contentsDir = grunt.config.get('atom.contentsDir')
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')
    resourcePath = process.cwd()
    coreSpecsPath = path.resolve('spec')

-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
      options =
        cmd: appPath
        args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}"]
@@ -94,7 +90,7 @@ module.exports = (grunt) ->

    # TODO: This should really be parallel on both platforms, however our
    # fixtures step on each others toes currently.
-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
      method = async.parallel
    else if process.platform is 'win32'
      method = async.series
@@ -109,6 +105,7 @@ 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
-        done()
+        # Package specs are still flaky on Windows CI
+        done(!coreSpecFailed)
      else
        done(!coreSpecFailed and failedPackages.length == 0)
@@ -53,9 +53,8 @@ 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)
@@ -1,32 +0,0 @@
-<?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>
@@ -1,17 +0,0 @@
-{
-  "max_line_length": {
-    "level": "ignore"
-  },
-  "no_empty_param_list": {
-    "level": "error"
-  },
-  "arrow_spacing": {
-    "level": "error"
-  },
-  "no_interpolation_in_single_quotes": {
-    "level": "error"
-  },
-  "no_debugger": {
-    "level": "error"
-  }
-}
@@ -48,6 +48,15 @@ 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.
@@ -56,7 +56,7 @@ character of the current line:
 class EditorView
  listenForEvents: ->
    @command 'editor:move-to-first-character-of-line', =>
-      @editor.moveToFirstCharacterOfLine()
+      @editor.moveCursorToFirstCharacterOfLine()
 ```

 The `::command` method is basically an enhanced version of jQuery's `::on`
@@ -0,0 +1,112 @@
+# API Guidelines
+
+__Note__: These are not all in practice yet. We are still sorting this out, and plan to move the entire API this way.
+
+## General Guidelines
+
+We should strive to have only one way to do something, and make it clear what that way is.
+
+__Bad__
+* Several ways to get the `Editor` model from the view.
+  * `EditorView.editor`
+  * `EditorView.getModel()`
+  * `EditorView.getEditor()`
+* Delegated methods on the views when there is a model counterpart
+  * `Editor.toggleSoftTabs()`
+  * `EditorView.toggleSoftTabs()`
+
+__Good__
+* One way to get the `Editor` model from the view
+  * `EditorView.getModel()`
+* Use the method on the model
+  * `Editor.toggleSoftTabs()`
+* One clear way to subscribe to events
+  * `subscription = @subscribe thing, 'event', -> ...`
+* One clear way to unsubscribe to events
+  * `subscription.off()` only; not `thing.off 'event', -> ...`
+
+## Essential vs Extended
+
+There are two groups of classes / methods. We break them up to facilitate a gentle introduction into the API and help authors build a knowledge foundation more quickly.
+
+### Essential
+
+These are classes, methods, and concepts nearly every package author will need to know about. Need to create commands? Subscribe to atom events? Get a reference to all the editors? Highlight a line in the editor? Patterns and methods for these things will be explained in the essential API.
+
+We want to keep the essential API minimal and focused.
+
+### Extended
+
+The extended API contains The Power. Need to move one cursor independent of the others? Want to do some processing on the markers? You can do it with the extended API.
+
+## View / Model
+
+Operations on Views should be limited to DOM manipulation only. A package author should only need access to, say, the `EditorView` when it needs to directly modify the `EditorView`'s DOM.
+
+## Properties
+
+No public properties. Use methods instead.
+
+## Methods
+
+### Naming
+
+We strive to fit the [Objective C][naming] naming conventions for the sake of readability.
+
+* Be descriptive, always write out the whole word. `selection` not `sel`, `cursor` not `cur`.
+* Describe the arguments names in the method name eg. `decorationsForMarker(marker)`, `objectAtIndex(index)`
+* Use `get` prefix only when there are no arguments `getCursors()`, `getLastCursor()`, `cursorForMarker(marker)`
+* Prefix bool methods with `is` eg. `isDefault()`
+
+Array accessor methods would be written as follows
+
+```coffee
+getObjects()
+addObject(object)
+removeObject(object)
+removeObjectAtIndex(index)
+objectAtIndex(index)
+objectsForThing(thing)
+objectForThing(thing)
+```
+
+## Events
+
+There will be no `off()` method on objects. `on()` will return a subscription object which contains the `off()` method.
+
+* Events should be emitted with one event object as an argument, rather than a bunch of arguments.
+* If an event is cancelable, it will provide a `cancel` function in the event object.
+
+### Naming
+
+Past tense. ???
+
+## Documentation
+
+Comment doc strings on methods, events, etc
+
+* how to doc sections?
+* events?
+* props?
+* callback args?
+* option hashes?
+
+### Method organization
+
+* All methods in classes should be grouped into sections by usage pattern.
+* Methods within a section should be ordered with the most commonly used methods at the top. `Essential` methods always go above `Extended` methods.
+* Sections should be ordered in the class with the most commonly used sections at the top.
+
+A section:
+
+```coffee
+###
+Section: Reading Text
+###
+
+# Essential: Returns a {String} representing the entire contents of the editor.
+getText: -> @buffer.getText()
+```
+
+
+[naming]:https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CodingGuidelines/Articles/NamingMethods.html
@@ -6,26 +6,23 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

  * OS with 64-bit or 32-bit architecture
  * C++ toolchain
-  * [Git](http://git-scm.com/)
-  * [Node.js](http://nodejs.org/download/) v0.10.x
-  * [npm](http://www.npmjs.org/) v1.4.x (bundled with Node.js)
+  * git
+  * [node.js](http://nodejs.org/download/) v0.10.x
+  * [npm](http://www.npmjs.org/) v1.4.x (bundled with node.js)
    * `npm -v` to check the version.
    * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2.
      * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
-  * development headers for [GNOME Keyring](https://wiki.gnome.org/Projects/GnomeKeyring)
+  * libgnome-keyring-dev

 ### Ubuntu / Debian
-
 * `sudo apt-get install build-essential git libgnome-keyring-dev`
-* Instructions for  [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
+* Instructions for  [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).

 ### Fedora
-
 * `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel`
-* Instructions for [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).
+* Instructions for [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).

 ### Arch
-
 * `sudo pacman -S base-devel git nodejs libgnome-keyring`
 * `export PYTHON=/usr/bin/python2` before building Atom.

@@ -33,56 +30,26 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

 If you have problems with permissions don't forget to prefix with `sudo`

-1. Clone the Atom repository:
-
-  ```sh
-  git clone https://github.com/atom/atom
-  cd atom
-  ```
-
-2. Checkout the latest Atom release:
-
-  ```sh
-  git fetch
-  git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-  ```
-
-3. Build Atom:
-
-  ```sh
-  script/build
-  ```
-
-  This will create the atom application at `$TMPDIR/atom-build/Atom`.
-
-4. Install the `atom` and `apm` commands to `/usr/local/bin` by executing:
-
-  ```sh
-  sudo script/grunt install
-  ```
-
-5. *Optionally*, you may generate a `.deb` package at `$TMPDIR/atom-build`:
-
-  ```sh
-  script/grunt mkdeb
-  ```
-
-Use the newly installed Atom by fully quitting Atom and then reopening.
-
-## Advanced Options
-
-### Custom install directory
+Create the atom application at `$TMPDIR/atom-build/Atom`:

 ```sh
-sudo script/grunt install --install-dir /install/atom/here
+script/build
 ```

-### Custom build directory
+Install the `atom` and `apm` commands to `/usr/local/bin`:

 ```sh
-script/build --build-dir /build/atom/here
+sudo script/grunt install
 ```

+Generate a `.deb` package at `$TMPDIR/atom-build`: (*optional*)
+
+```sh
+script/grunt mkdeb
+```
+
+Use the newly installed atom by restarting any running atom instances.
+
 ## Troubleshooting

 ### Exception: "TypeError: Unable to watch path"
@@ -103,7 +70,7 @@ this is the reason for this error you can issue
 and restart Atom.  If Atom now works fine, you can make this setting permanent:

  ```sh
-  echo 32768 | sudo tee -a /proc/sys/fs/inotify/max_user_watches
+  echo 32768 > /proc/sys/fs/inotify/max_user_watches
  ```

 See also https://github.com/atom/atom/issues/2082.
@@ -111,19 +78,10 @@ See also https://github.com/atom/atom/issues/2082.
 ### /usr/bin/env: node: No such file or directory

 If you get this notice when attempting to `script/build`, you either do not
-have Node.js installed, or node isn't identified as Node.js on your machine.
+have nodejs installed, or node isn't identified as nodejs on your machine.
 If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
 your terminal may fix the issue.

-#### You can also use Alternatives
-
-On some variants (mostly Debian based distros) it's preferable for you to use
-Alternatives so that changes to the binary paths can be fixed or altered easily:
-
-```sh
-sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave /usr/bin/js js /usr/bin/nodejs
-```
-
 ### Linux build error reports in atom/atom
 * Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Alinux&type=Issues)
  to get a list of reports about build errors on Linux.
@@ -66,19 +66,6 @@ If none of this works, do install Github for Windows and use its Git shell. Make
    * https://github.com/TooTallNate/node-gyp/issues/297
    * https://code.google.com/p/gyp/issues/detail?id=393

-* `script/build` stops at installing runas with 'Failed at the runas@0.5.4 install script.'
-  
-  See the next item.
-
-* `error MSB8020: The build tools for Visual Studio 2010 (Platform Toolset = 'v100') cannot be found.`
-   
-  * If you're building atom with Visual Studio 2013 try executing the following
-    command in your Git shell and then re-run `script/build`:
-
-    ```
-    $env:GYP_MSVS_VERSION=2013
-    ```
-
 * Other `node-gyp` errors on first build attempt, even though the right node and python versions are installed.
  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.

@@ -207,44 +207,37 @@ specific parts of the interface, like adding a file in the tree-view:

 ```coffeescript
 'context-menu':
-  '.tree-view': [
-    {label: 'Add file', command: 'tree-view:add-file'}
-  ]
-  '.workspace': [
-    {label: 'Inspect Element', command: 'core:inspect'}
-  ]
+  '.tree-view':
+    'Add file': 'tree-view:add-file'
+  '.workspace':
+    'Inspect Element': 'core:inspect'
 ```

 To add your own item to the application menu simply create a top level
 `context-menu` key in any menu configuration file in _menus_. This can be a
 JSON or [CSON] file.

-Context menus are created by determining which element was selected and then
-adding all of the menu items whose selectors match that element (in the order
-which they were loaded). The process is then repeated for the elements until
-reaching the top of the DOM tree.
+Context menus are created by determining which element was selected and
+then adding all of the menu items whose selectors match that element (in
+the order which they were loaded). The process is then repeated for the
+elements until reaching the top of the DOM tree.

 In the example above, the `Add file` item will only appear when the focused item
 or one of its parents has the `tree-view` class applied to it.

 You can also add separators and submenus to your context menus. To add a
-submenu, provide a `submenu` key instead of a command. To add a separator, add
-an item with a single `type: 'separator'` key/value pair.
+submenu, pass in another object instead of a command. To add a separator, use
+`-` for the command of the item.

 ```coffeescript
 'context-menu':
-  '.workspace': [
-    {
-      label: 'Text'
-      submenu: [
-        {label: 'Inspect Element', command: 'core:inspect'}
-        {type: 'separator'}
-        {label: 'Selector All', command: 'core:select-all'}
-        {type: 'separator'}
-        {label: 'Deleted Selected Text', command: 'core:delete'}
-      ]
-    }
-  ]
+  '.workspace':
+    'Inspect Element': 'core:inspect'
+    'Separator': '-'
+    'Text':
+      'Select All': 'core:select-all'
+      'Another Separator': '-'
+      'Deleted Selected Text': 'core:delete'
 ```

 ## Snippets
@@ -328,29 +321,6 @@ 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
@@ -422,4 +392,3 @@ 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/
@@ -53,7 +53,7 @@ module.exports =

  convert: ->
    # This assumes the active pane item is an editor
-    editor = atom.workspace.getActivePaneItem()
+    editor = atom.workspace.activePaneItem
    editor.insertText('Hello, World!')
 ```

@@ -131,8 +131,8 @@ inserting 'Hello, World!' convert the selected text to ASCII art.
 ```coffeescript
 convert: ->
  # This assumes the active pane item is an editor
-  editor = atom.workspace.getActivePaneItem()
-  selection = editor.getLastSelection()
+  editor = atom.workspace.activePaneItem
+  selection = editor.getSelection()

  figlet = require 'figlet'
  figlet selection.getText(), {font: "Larry 3D 2"}, (error, asciiArt) ->
@@ -11,4 +11,4 @@
 # atom.workspaceView.eachEditorView (editorView) ->
 #   editor = editorView.getEditor()
 #   if path.extname(editor.getPath()) is '.md'
-#     editor.setSoftWrapped(true)
+#     editor.setSoftWrap(true)
@@ -13,9 +13,6 @@
 #   'enter': 'editor:newline'
 #
 # '.workspace':
-#   'ctrl-shift-p': 'core:move-up'
+#   'ctrl-P': 'core:move-up'
 #   'ctrl-p': 'core:move-down'
 #
-# You can find more information about keymaps in these guides:
-# * https://atom.io/docs/latest/customizing-atom#customizing-key-bindings
-# * https://atom.io/docs/latest/advanced/keymaps
@@ -1,10 +1,9 @@
 {Point, Range} = require 'text-buffer'
-{deprecate} = require 'grim'

 module.exports =
  BufferedNodeProcess: require '../src/buffered-node-process'
  BufferedProcess: require '../src/buffered-process'
-  GitRepository: require '../src/git-repository'
+  Git: require '../src/git'
  Point: Point
  Range: Range

@@ -16,7 +15,10 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
  module.exports.$ = $
  module.exports.$$ = $$
  module.exports.$$$ = $$$
-  module.exports.TextEditorView = require '../src/text-editor-view'
+  if atom.config.get('core.useReactMiniEditors')
+    module.exports.EditorView = require '../src/react-editor-view'
+  else
+    module.exports.EditorView = require '../src/editor-view'
  module.exports.ScrollView = require '../src/scroll-view'
  module.exports.SelectListView = require '../src/select-list-view'
  module.exports.Task = require '../src/task'
@@ -25,11 +27,3 @@ 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
@@ -12,6 +12,7 @@
  # Sublime Parity
  'tab': 'editor:indent'
  'enter': 'editor:newline'
+  'num-enter': 'editor:newline'
  'shift-tab': 'editor:outdent-selected-rows'
  'ctrl-K': 'editor:delete-line'

@@ -26,6 +27,7 @@
  'tab': 'core:focus-next'
  'shift-tab': 'core:focus-previous'
  'enter': 'native!'
+  'num-enter': 'native!'
  'backspace': 'native!'
  'shift-backspace': 'native!'
  'delete': 'native!'
@@ -21,6 +21,7 @@
  'cmd-O': 'application:open-dev'
  'cmd-alt-ctrl-s': 'application:run-all-specs'
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -119,7 +120,7 @@
  'cmd-shift-right': 'editor:select-to-end-of-line'
  'alt-backspace': 'editor:delete-to-beginning-of-word'
  'alt-delete': 'editor:delete-to-end-of-word'
-  'ctrl-a': 'editor:move-to-first-character-of-line'
+  'ctrl-a': 'editor:move-to-beginning-of-line'
  'ctrl-e': 'editor:move-to-end-of-line'
  'ctrl-k': 'editor:cut-to-end-of-line'

@@ -143,8 +144,6 @@
  # 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'
@@ -1,6 +1,7 @@
 'body':
  # Atom Specific
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -10,12 +11,10 @@
  'ctrl-shift-i': 'window:toggle-dev-tools'
  'ctrl-alt-p': 'window:run-package-specs'
  'ctrl-alt-s': 'application:run-all-specs'
-  'ctrl-alt-o': 'application:open-dev'
-  'ctrl-shift-o': 'application:open-folder'
+  'ctrl-shift-o': 'application:open-dev'
  'F11': 'window:toggle-full-screen'

  # Sublime Parity
-  'ctrl-,': 'application:show-settings'
  'ctrl-N': 'application:new-window'
  'ctrl-W': 'window:close'
  'ctrl-o': 'application:open-file'
@@ -5,6 +5,7 @@

  # Atom Specific
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -25,8 +26,8 @@
  'ctrl-n': 'application:new-file'
  'ctrl-s': 'core:save'
  'ctrl-S': 'core:save-as'
-  'ctrl-f4': 'core:close'
  'ctrl-w': 'core:close'
+  'ctrl-f4': 'core:close'
  'ctrl-z': 'core:undo'
  'ctrl-shift-z': 'core:redo'
  'ctrl-y': 'core:redo'
@@ -18,8 +18,6 @@
      { type: 'separator' }
      { label: 'Install Shell Commands', command: 'window:install-shell-commands' }
      { type: 'separator' }
-      { label: 'Services', submenu: [] }
-      { type: 'separator' }
      { label: 'Hide Atom', command: 'application:hide' }
      { label: 'Hide Others', command: 'application:hide-other-applications' }
      { label: 'Show All', command: 'application:unhide-all-applications' }
@@ -194,29 +192,3 @@
    ]
  }
 ]
-
-'context-menu':
-  '.overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  '.pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -8,6 +8,8 @@
      { label: 'Open Folder...', command: 'application:open-folder' }
      { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
      { type: 'separator' }
+      { label: '&Preferences...', command: 'application:show-settings' }
+      { type: 'separator' }
      { label: '&Save', command: 'core:save' }
      { label: 'Save &As...', command: 'core:save-as' }
      { label: 'Save A&ll', command: 'window:save-all' }
@@ -78,14 +80,6 @@
          { label: 'Fold Level 9', command: 'editor:fold-at-indent-level-9' }
        ]
      }
-      { type: 'separator' }
-      { label: '&Preferences', command: 'application:show-settings' }
-      { label: 'Open Your Config', command: 'application:open-your-config' }
-      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
-      { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
-      { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
-      { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
-      { type: 'separator' }
    ]
  }

@@ -139,6 +133,16 @@
    submenu: []
  }

+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
  {
    label: '&Help'
    submenu: [
@@ -151,29 +155,3 @@
    ]
  }
 ]
-
-'context-menu':
-  '.overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  '.pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -33,8 +33,8 @@
      { label: '&Undo', command: 'core:undo' }
      { label: '&Redo', command: 'core:redo' }
      { type: 'separator' }
-      { label: 'Cu&t', command: 'core:cut' }
-      { label: '&Copy', command: 'core:copy' }
+      { label: '&Cut', command: 'core:cut' }
+      { label: 'C&opy', command: 'core:copy' }
      { label: 'Copy Pat&h', command: 'editor:copy-path' }
      { label: '&Paste', command: 'core:paste' }
      { label: 'Select &All', command: 'core:select-all' }
@@ -157,6 +157,16 @@
    submenu: []
  }

+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
  {
    label: '&Help'
    submenu: [
@@ -169,29 +179,3 @@
    ]
  }
 ]
-
-'context-menu':
-  '.overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  '.pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.135.0",
+  "version": "0.121.0",
  "description": "A hackable text editor for the 21st Century.",
  "main": "./src/browser/main.js",
  "repository": {
@@ -17,129 +17,128 @@
      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
    }
  ],
-  "atomShellVersion": "0.17.1",
+  "atomShellVersion": "0.15.0",
  "dependencies": {
    "async": "0.2.6",
-    "atom-keymap": "^2.2.0",
+    "atom-keymap": "^1.0.0",
    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
    "clear-cut": "0.4.0",
    "coffee-script": "1.7.0",
    "coffeestack": "0.7.0",
    "delegato": "^1",
-    "emissary": "^1.3.1",
-    "event-kit": "0.7.2",
-    "first-mate": "^2.2.0",
-    "fs-plus": "^2.3.1",
+    "emissary": "^1.2.1",
+    "first-mate": "^2.0.1",
+    "fs-plus": "^2.2.6",
    "fstream": "0.1.24",
-    "fuzzaldrin": "^2.1",
-    "git-utils": "^2.1.5",
-    "grim": "0.12.0",
+    "fuzzaldrin": "^1.1",
+    "git-utils": "^2.1.3",
+    "grim": "0.11.0",
    "guid": "0.0.10",
    "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.15.0",
+    "less-cache": "0.13.0",
    "mixto": "^1",
    "mkdirp": "0.3.5",
    "nslog": "^1.0.1",
-    "oniguruma": "^3.0.4",
+    "oniguruma": "^3.0.3",
    "optimist": "0.4.0",
-    "pathwatcher": "^2.1.3",
+    "pathwatcher": "^2.0.6",
    "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.2",
+    "scandal": "1.0.0",
    "scoped-property-store": "^0.9.0",
-    "scrollbar-style": "^1.0.2",
+    "scrollbar-style": "^1.0.1",
    "season": "^1.0.2",
    "semver": "1.1.4",
    "serializable": "^1",
-    "space-pen": "3.4.7",
+    "space-pen": "3.2.0",
    "temp": "0.7.0",
-    "text-buffer": "^3.2.6",
-    "theorist": "^1.0.2",
+    "text-buffer": "^3.0.0",
+    "theorist": "^1",
    "underscore-plus": "^1.5.1",
    "vm-compatibility-layer": "0.1.0"
  },
  "packageDependencies": {
    "atom-dark-syntax": "0.19.0",
-    "atom-dark-ui": "0.35.0",
+    "atom-dark-ui": "0.33.0",
    "atom-light-syntax": "0.20.0",
-    "atom-light-ui": "0.30.0",
-    "base16-tomorrow-dark-theme": "0.21.0",
+    "atom-light-ui": "0.29.0",
+    "base16-tomorrow-dark-theme": "0.20.0",
    "base16-tomorrow-light-theme": "0.4.0",
    "solarized-dark-syntax": "0.22.0",
    "solarized-light-syntax": "0.12.0",
-    "archive-view": "0.37.0",
-    "autocomplete": "0.32.0",
-    "autoflow": "0.18.0",
-    "autosave": "0.17.0",
-    "background-tips": "0.17.0",
-    "bookmarks": "0.28.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",
+    "archive-view": "0.35.0",
+    "autocomplete": "0.29.0",
+    "autoflow": "0.17.0",
+    "autosave": "0.14.0",
+    "background-tips": "0.15.0",
+    "bookmarks": "0.27.0",
+    "bracket-matcher": "0.51.0",
+    "command-palette": "0.24.0",
+    "deprecation-cop": "0.7.0",
+    "dev-live-reload": "0.33.0",
+    "exception-reporting": "0.19.0",
    "feedback": "0.33.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.34.0",
-    "image-view": "0.37.0",
-    "incompatible-packages": "0.9.0",
-    "keybinding-resolver": "0.20.0",
+    "find-and-replace": "0.127.0",
+    "fuzzy-finder": "0.57.0",
+    "git-diff": "0.37.0",
+    "go-to-line": "0.23.0",
+    "grammar-selector": "0.27.0",
+    "image-view": "0.36.0",
+    "incompatible-packages": "0.3.0",
+    "keybinding-resolver": "0.18.0",
    "link": "0.25.0",
-    "markdown-preview": "0.103.0",
-    "metrics": "0.36.0",
-    "open-on-github": "0.30.0",
+    "markdown-preview": "0.94.0",
+    "metrics": "0.33.0",
+    "open-on-github": "0.29.0",
    "package-generator": "0.31.0",
    "release-notes": "0.36.0",
-    "settings-view": "0.149.0",
-    "snippets": "0.53.0",
-    "spell-check": "0.42.0",
-    "status-bar": "0.45.0",
-    "styleguide": "0.30.0",
-    "symbols-view": "0.66.0",
-    "tabs": "0.54.0",
+    "settings-view": "0.137.0",
+    "snippets": "0.50.0",
+    "spell-check": "0.40.0",
+    "status-bar": "0.41.0",
+    "styleguide": "0.29.0",
+    "symbols-view": "0.63.0",
+    "tabs": "0.48.0",
    "timecop": "0.22.0",
-    "tree-view": "0.127.0",
+    "tree-view": "0.112.0",
    "update-package-dependencies": "0.6.0",
-    "welcome": "0.18.0",
+    "welcome": "0.17.0",
    "whitespace": "0.25.0",
-    "wrap-guide": "0.22.0",
-    "language-c": "0.28.0",
-    "language-coffee-script": "0.35.0",
+    "wrap-guide": "0.21.0",
+
+    "language-c": "0.26.0",
+    "language-coffee-script": "0.28.0",
    "language-css": "0.17.0",
-    "language-gfm": "0.50.0",
+    "language-gfm": "0.44.0",
    "language-git": "0.9.0",
-    "language-go": "0.17.0",
-    "language-html": "0.26.0",
-    "language-hyperlink": "0.12.0",
+    "language-go": "0.16.0",
+    "language-html": "0.22.0",
+    "language-hyperlink": "0.10.0",
    "language-java": "0.11.0",
-    "language-javascript": "0.40.0",
+    "language-javascript": "0.39.0",
    "language-json": "0.8.0",
-    "language-less": "0.15.0",
-    "language-make": "0.12.0",
-    "language-mustache": "0.10.0",
+    "language-less": "0.13.0",
+    "language-make": "0.10.0",
    "language-objective-c": "0.11.0",
    "language-perl": "0.9.0",
-    "language-php": "0.16.0",
+    "language-php": "0.15.0",
    "language-property-list": "0.7.0",
-    "language-python": "0.19.0",
-    "language-ruby": "0.38.0",
-    "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.22.0",
+    "language-python": "0.18.0",
+    "language-ruby": "0.33.0",
+    "language-ruby-on-rails": "0.15.0",
+    "language-sass": "0.14.0",
    "language-shellscript": "0.8.0",
    "language-source": "0.8.0",
-    "language-sql": "0.11.0",
+    "language-sql": "0.9.0",
    "language-text": "0.6.0",
-    "language-todo": "0.12.0",
+    "language-todo": "0.10.0",
    "language-toml": "0.12.0",
-    "language-xml": "0.22.0",
-    "language-yaml": "0.17.0"
+    "language-xml": "0.17.0",
+    "language-yaml": "0.13.0"
  },
  "private": true,
  "scripts": {
@@ -5,5 +5,4 @@ Exec=<%= installDir %>/share/atom/atom %U
 Icon=<%= iconName %>
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Utility;TextEditor;Development;
-MimeType=text/plain;
+Categories=GNOME;GTK;Utility;TextEditor;
@@ -1,10 +1,8 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: python (>= 2.6), libc6
 Section: <%= section %>
 Priority: optional
 Architecture: <%= arch %>
-Installed-Size: <%= installedSize %>
+Installed-Size: `du -ks usr|cut -f 1`
 Maintainer: <%= maintainer %>
 Description: <%= description %>
- Atom is a free and open source text editor that is modern, approachable, and hackable to the core.
@@ -1,7 +0,0 @@
-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
@@ -5,6 +5,9 @@ var path = require('path');

 process.chdir(path.dirname(__dirname));

+if (process.platform == 'linux')
+  throw new Error('cibuild can not run on linux yet!');
+
 var homeDir = process.platform == 'win32' ? process.env.USERPROFILE : process.env.HOME;

 function loadEnvironmentVariables(filePath) {
@@ -24,7 +27,7 @@ function loadEnvironmentVariables(filePath) {
 function readEnvironmentVariables() {
  if (process.platform === 'win32')
    loadEnvironmentVariables(path.resolve('/jenkins/config/atomcredentials'));
-  else if (process.platform === 'darwin') {
+  else {
    loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials');
    loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain');
  }
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export ATOM_ACCESS_TOKEN=$BUILD_ATOM_LINUX_ACCESS_TOKEN
-
-if [ -d /usr/local/share/nodenv ]; then
-  export NODENV_ROOT=/usr/local/share/nodenv
-  export PATH=/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:$PATH
-  export NODENV_VERSION="v0.10.21"
-fi
-
-script/cibuild
@@ -13,35 +13,23 @@ CONTROL_FILE="$3"
 DESKTOP_FILE="$4"
 ICON_FILE="$5"
 DEB_PATH="$6"
-FILE_MODE=755

 TARGET_ROOT="`mktemp -d`"
-chmod $FILE_MODE "$TARGET_ROOT"
+chmod 755 "$TARGET_ROOT"
 TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"

-mkdir -m $FILE_MODE -p "$TARGET/usr"
+mkdir -p "$TARGET/usr"
 env INSTALL_PREFIX="$TARGET/usr" script/grunt install

-mkdir -m $FILE_MODE -p "$TARGET/DEBIAN"
+mkdir -p "$TARGET/DEBIAN"
 cp "$CONTROL_FILE" "$TARGET/DEBIAN/control"

-mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
+mkdir -p "$TARGET/usr/share/applications"
 cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"

-mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps"
+mkdir -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"

-# 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"
+dpkg-deb -b "$TARGET"
 mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
-rm -rf "$TARGET_ROOT"
+rm -rf $TARGET_ROOT
@@ -31,7 +31,7 @@ function verifyNode(cb) {
  var nodeMajorVersion = +versionArray[0];
  var nodeMinorVersion = +versionArray[1];
  if (nodeMajorVersion === 0 && nodeMinorVersion < 10) {
-    error = "node v0.10 is required to build Atom, node " + nodeVersion + " is installed.";
+    error = "node v0.10 is required to build Atom.";
    cb(error);
  }
  else {
@@ -76,9 +76,6 @@ 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
@@ -122,14 +119,14 @@ class AtomReporter extends View
    grim.clearDeprecations()

  handleEvents: ->
-    $(document).on "click", ".spec-toggle", ({currentTarget}) ->
+    $(document).on "click", ".spec-toggle", ({currentTarget}) =>
      element = $(currentTarget)
      specFailures = element.parent().find('.spec-failures')
      specFailures.toggle()
      element.toggleClass('folded')
      false

-    $(document).on "click", ".deprecation-toggle", ({currentTarget}) ->
+    $(document).on "click", ".deprecation-toggle", ({currentTarget}) =>
      element = $(currentTarget)
      deprecationList = $(document).find('.deprecation-list')
      deprecationList.toggle()
@@ -6,24 +6,527 @@ ThemeManager = require '../src/theme-manager'

 describe "the `atom` global", ->
  beforeEach ->
-    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
+    atom.workspaceView = new WorkspaceView

-  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 "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)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
+
+              atom.packages.activatePackage("package-with-stylesheets-manifest")
+
+              expect(atom.themes.stylesheetElementForId(one)).toExist()
+              expect(atom.themes.stylesheetElementForId(two)).toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
+              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)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
+
+              atom.packages.activatePackage("package-with-stylesheets")
+              expect(atom.themes.stylesheetElementForId(one)).toExist()
+              expect(atom.themes.stylesheetElementForId(two)).toExist()
+              expect(atom.themes.stylesheetElementForId(three)).toExist()
+              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 methods", ->
+          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 "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 '::getSize and ::setSize', ->
-      originalSize = null
      beforeEach ->
-        originalSize = atom.getSize()
-      afterEach ->
-        atom.setSize(originalSize.width, originalSize.height)
+        spyOn(console, 'warn')
+        atom.packages.loadPackages()

-      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
+        loadedPackages = atom.packages.getLoadedPackages()
+        expect(loadedPackages.length).toBeGreaterThan 0
+
+        packageActivator = spyOn(atom.packages, 'activatePackages')
+        themeActivator = spyOn(atom.themes, 'activatePackages')
+
+      afterEach ->
+        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", ->
+        beforeEach ->
+          waitsForPromise ->
+            atom.themes.activateThemes()
+
+        afterEach ->
+          atom.themes.deactivateThemes()
+          atom.config.unobserve('core.themes')
+
+        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
+
+            # disabling of theme
+            pack = atom.packages.disablePackage(packageName)
+
+          waitsFor ->
+            not (pack in atom.packages.getActivePackages())
+
+          runs ->
+            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

  describe ".isReleasedVersion()", ->
    it "returns false if the version is a SHA and true otherwise", ->
@@ -47,8 +550,3 @@ 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
@@ -1,191 +0,0 @@
-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'}
-      ]
@@ -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 true
+      expect(atom.config.set("foo.bar.baz", 42)).toBe 42
      expect(atom.config.get("foo.bar.baz")).toBe 42
      expect(atom.config.get("bogus.key.path")).toBeUndefined()

@@ -23,21 +23,9 @@ describe "Config", ->
      retrievedValue.array[1].b = 2.1
      expect(atom.config.get('value')).toEqual(array: [1, b: 2, 3])

-    it "merges defaults into the returned value if both the assigned value and the default value are objects", ->
-      atom.config.setDefaults("foo", a: 1, b: 2)
-      atom.config.set("foo", a: 3)
-      expect(atom.config.get("foo")).toEqual {a: 3, b: 2}
-
-      atom.config.set("foo", 7)
-      expect(atom.config.get("foo")).toBe 7
-
-      atom.config.set("bar.baz", a: 3)
-      atom.config.setDefaults("bar", baz: 7)
-      expect(atom.config.get("bar.baz")).toEqual {a: 3}
-
  describe ".set(keyPath, value)", ->
    it "allows a key path's value to be written", ->
-      expect(atom.config.set("foo.bar.baz", 42)).toBe true
+      expect(atom.config.set("foo.bar.baz", 42)).toBe 42
      expect(atom.config.get("foo.bar.baz")).toBe 42

    it "updates observers and saves when a key path is set", ->
@@ -48,7 +36,7 @@ describe "Config", ->
      atom.config.set("foo.bar.baz", 42)

      expect(atom.config.save).toHaveBeenCalled()
-      expect(observeHandler).toHaveBeenCalledWith 42
+      expect(observeHandler).toHaveBeenCalledWith 42, {previous: undefined}

    describe "when the value equals the default value", ->
      it "does not store the value", ->
@@ -139,7 +127,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")
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['a']}

  describe ".unshiftAtKeyPath(keyPath, value)", ->
    it "unshifts the given value to the array at the key path and updates observers", ->
@@ -150,7 +138,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")
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['b']}

  describe ".removeAtKeyPath(keyPath, value)", ->
    it "removes the given value from the array at the key path and updates observers", ->
@@ -161,22 +149,16 @@ 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")
+      expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz"), {previous: ['a', 'b', 'c']}

  describe ".getPositiveInt(keyPath, defaultValue)", ->
-    it "returns the proper coerced value", ->
+    it "returns the proper current or default value", ->
      atom.config.set('editor.preferredLineLength', 0)
-      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 1
-
-    it "returns the proper coerced value", ->
+      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
      atom.config.set('editor.preferredLineLength', -1234)
-      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 1
-
-    it "returns the default value when a string is passed in", ->
+      expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 80
      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

@@ -232,54 +214,11 @@ describe "Config", ->

    it "emits an updated event", ->
      updatedCallback = jasmine.createSpy('updated')
-      atom.config.onDidChange('foo.bar.baz.a', updatedCallback)
+      atom.config.observe('foo.bar.baz.a', callNow: false, 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] = []

@@ -294,25 +233,26 @@ 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")
+      expect(observeHandler).toHaveBeenCalledWith("value 2", {previous: 'value 1'})
      observeHandler.reset()

      atom.config.set('foo.bar.baz', "value 1")
-      expect(observeHandler).toHaveBeenCalledWith("value 1")
+      expect(observeHandler).toHaveBeenCalledWith("value 1", {previous: 'value 2'})

    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)
+      expect(observeHandler).toHaveBeenCalledWith(undefined, {previous: 'value 1'})

    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")
+      expect(observeHandler).toHaveBeenCalledWith("i'm back", {previous: undefined})

    it "does not fire the callback once the observe subscription is off'ed", ->
      observeHandler.reset() # clear the initial call
@@ -359,19 +299,11 @@ 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')
@@ -390,43 +322,10 @@ 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()
@@ -434,7 +333,7 @@ describe "Config", ->
      atom.config.loadUserConfig()
      atom.config.observeUserConfig()
      updatedHandler = jasmine.createSpy("updatedHandler")
-      atom.config.onDidChange updatedHandler
+      atom.config.on 'updated', updatedHandler

    afterEach ->
      atom.config.unobserveUserConfig()
@@ -448,60 +347,6 @@ describe "Config", ->
          expect(atom.config.get('foo.bar')).toBe 'quux'
          expect(atom.config.get('foo.baz')).toBe 'bar'

-      it "does not fire a change event for paths that did not change", ->
-        atom.config.onDidChange 'foo.bar', noChangeSpy = jasmine.createSpy()
-
-        fs.writeFileSync(atom.config.configFilePath, "foo: { bar: 'baz', omg: 'ok'}")
-        waitsFor 'update event', -> updatedHandler.callCount > 0
-        runs ->
-          expect(noChangeSpy).not.toHaveBeenCalled()
-          expect(atom.config.get('foo.bar')).toBe 'baz'
-          expect(atom.config.get('foo.omg')).toBe 'ok'
-
-      describe 'when the default value is a complex value', ->
-        beforeEach ->
-          fs.writeFileSync(atom.config.configFilePath, "foo: { bar: ['baz', 'ok']}")
-          waitsFor 'update event', -> updatedHandler.callCount > 0
-          runs -> updatedHandler.reset()
-
-        it "does not fire a change event for paths that did not change", ->
-          atom.config.onDidChange 'foo.bar', noChangeSpy = jasmine.createSpy()
-
-          fs.writeFileSync(atom.config.configFilePath, "foo: { bar: ['baz', 'ok'], omg: 'another'}")
-          waitsFor 'update event', -> updatedHandler.callCount > 0
-          runs ->
-            expect(noChangeSpy).not.toHaveBeenCalled()
-            expect(atom.config.get('foo.bar')).toEqual ['baz', 'ok']
-            expect(atom.config.get('foo.omg')).toBe 'another'
-
-    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')
@@ -516,349 +361,9 @@ describe "Config", ->

      describe "when the config file subsequently changes again to contain valid cson", ->
        beforeEach ->
-          fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'newVal'")
+          fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
          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']
@@ -3,172 +3,172 @@
 ContextMenuManager = require '../src/context-menu-manager'

 describe "ContextMenuManager", ->
-  [contextMenu, parent, child, grandchild] = []
+  [contextMenu] = []

  beforeEach ->
-    {resourcePath} = atom.getLoadSettings()
-    contextMenu = new ContextMenuManager({resourcePath})
+    contextMenu = new ContextMenuManager

-    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)
+  describe "adding definitions", ->
+    it 'loads',  ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'

-  describe "::add(itemsBySelector)", ->
-    it "can add top-level menu items that can be removed with the returned disposable", ->
-      disposable = contextMenu.add
-        '.parent': [{label: 'A', command: 'a'}]
-        '.child': [{label: 'B', command: 'b'}]
-        '.grandchild': [{label: 'C', command: 'c'}]
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
+      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'

-      expect(contextMenu.templateForElement(grandchild)).toEqual [
-        {label: 'C', command: 'c'}
-        {label: 'B', command: 'b'}
-        {label: 'A', command: 'a'}
-      ]
+    it 'does not add duplicate menu items',  ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'

-      disposable.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual []
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'

-    it "can add submenu items to existing menus that can be removed with the returned disposable", ->
-      disposable1 = contextMenu.add
-        '.grandchild': [{label: 'A', submenu: [{label: 'B', command: 'b'}]}]
-      disposable2 = contextMenu.add
-        '.grandchild': [{label: 'A', submenu: [{label: 'C', command: 'c'}]}]
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
+      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
+      expect(contextMenu.definitions['.selector'].length).toBe 1

-      expect(contextMenu.templateForElement(grandchild)).toEqual [{
-        label: 'A',
-        submenu: [
-          {label: 'B', command: 'b'}
-          {label: 'C', command: 'c'}
+    it 'allows multiple separators', ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'separator1': '-'
+          'separator2': '-'
+
+      expect(contextMenu.definitions['.selector'].length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].type).toEqual 'separator'
+      expect(contextMenu.definitions['.selector'][1].type).toEqual 'separator'
+
+    it 'allows duplicate commands with different labels',  ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'
+
+      contextMenu.add 'file-path',
+        '.selector':
+          'another label': 'command'
+
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
+      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
+      expect(contextMenu.definitions['.selector'][1].label).toEqual 'another label'
+      expect(contextMenu.definitions['.selector'][1].command).toEqual 'command'
+
+    it "loads submenus", ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'parent':
+            'child-1': 'child-1:trigger'
+            'child-2': 'child-2:trigger'
+          'parent-2': 'parent-2:trigger'
+
+      expect(contextMenu.definitions['.selector'].length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'parent'
+      expect(contextMenu.definitions['.selector'][0].submenu.length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].submenu[0].label).toBe 'child-1'
+      expect(contextMenu.definitions['.selector'][0].submenu[0].command).toBe 'child-1:trigger'
+      expect(contextMenu.definitions['.selector'][0].submenu[1].label).toBe 'child-2'
+      expect(contextMenu.definitions['.selector'][0].submenu[1].command).toBe 'child-2:trigger'
+
+    describe 'dev mode', ->
+      it 'loads',  ->
+        contextMenu.add 'file-path',
+          '.selector':
+            'label': 'command'
+        , devMode: true
+
+        expect(contextMenu.devModeDefinitions['.selector'][0].label).toEqual 'label'
+        expect(contextMenu.devModeDefinitions['.selector'][0].command).toEqual 'command'
+
+  describe "building a menu template", ->
+    beforeEach ->
+      contextMenu.definitions = {
+        '.parent':[
+          label: 'parent'
+          command: 'command-p'
+         ]
+        '.child': [
+          label: 'child'
+          command: 'command-c'
        ]
-      }]
-
-      disposable2.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{
-        label: 'A',
-        submenu: [
-          {label: 'B', command: 'b'}
-        ]
-      }]
-
-      disposable1.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual []
-
-    it "favors the most specific / recently added item in the case of a duplicate label", ->
-      grandchild.classList.add('foo')
-
-      disposable1 = contextMenu.add
-        '.grandchild': [{label: 'A', command: 'a'}]
-      disposable2 = contextMenu.add
-        '.grandchild.foo': [{label: 'A', command: 'b'}]
-      disposable3 = contextMenu.add
-        '.grandchild': [{label: 'A', command: 'c'}]
-      disposable4 = contextMenu.add
-        '.child': [{label: 'A', command: 'd'}]
-
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'A', command: 'b'}]
-
-      disposable2.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'A', command: 'c'}]
-
-      disposable3.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'A', command: 'a'}]
-
-      disposable1.dispose()
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'A', command: 'd'}]
-
-    it "allows multiple separators, but not adjacent to each other", ->
-      contextMenu.add
-        '.grandchild': [
-          {label: 'A', command: 'a'},
-          {type: 'separator'},
-          {type: 'separator'},
-          {label: 'B', command: 'b'},
-          {type: 'separator'},
-          {type: 'separator'},
-          {label: 'C', command: 'c'}
-        ]
-
-      expect(contextMenu.templateForElement(grandchild)).toEqual [
-        {label: 'A', command: 'a'},
-        {type: 'separator'},
-        {label: 'B', command: 'b'},
-        {type: 'separator'},
-        {label: 'C', command: 'c'}
-      ]
-
-    it "excludes items marked for display in devMode unless in dev mode", ->
-      disposable1 = contextMenu.add
-        '.grandchild': [{label: 'A', command: 'a', devMode: true}, {label: 'B', command: 'b', devMode: false}]
-
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'B', command: 'b'}]
-
-      contextMenu.devMode = true
-      expect(contextMenu.templateForElement(grandchild)).toEqual [{label: 'A', command: 'a'}, {label: 'B', command: 'b'}]
-
-    it "allows items to be associated with `created` hooks which are invoked on template construction with the item and event", ->
-      createdEvent = null
-
-      item = {
-        label: 'A',
-        command: 'a',
-        created: (event) ->
-          @command = 'b'
-          createdEvent = event
      }

-      contextMenu.add('.grandchild': [item])
+      contextMenu.devModeDefinitions =
+        '.parent': [
+          label: 'dev-label'
+          command: 'dev-command'
+        ]

-      dispatchedEvent = {target: grandchild}
-      expect(contextMenu.templateForEvent(dispatchedEvent)).toEqual [{label: 'A', command: 'b'}]
-      expect(item.command).toBe 'a' # doesn't modify original item template
-      expect(createdEvent).toBe dispatchedEvent
+    describe "on a single element", ->
+      [element] = []

-    it "allows items to be associated with `shouldDisplay` hooks which are invoked on construction to determine whether the item should be included", ->
-      shouldDisplayEvent = null
-      shouldDisplay = true
+      beforeEach ->
+        element = ($$ -> @div class: 'parent')[0]

-      item = {
-        label: 'A',
-        command: 'a',
-        shouldDisplay: (event) ->
-          @foo = 'bar'
-          shouldDisplayEvent = event
-          shouldDisplay
-      }
-      contextMenu.add('.grandchild': [item])
+      it "creates a menu with a single item", ->
+        menu = contextMenu.combinedMenuTemplateForElement(element)

-      dispatchedEvent = {target: grandchild}
-      expect(contextMenu.templateForEvent(dispatchedEvent)).toEqual [{label: 'A', command: 'a'}]
-      expect(item.foo).toBeUndefined() # doesn't modify original item template
-      expect(shouldDisplayEvent).toBe dispatchedEvent
+        expect(menu[0].label).toEqual 'parent'
+        expect(menu[0].command).toEqual 'command-p'
+        expect(menu[1]).toBeUndefined()

-      shouldDisplay = false
-      expect(contextMenu.templateForEvent(dispatchedEvent)).toEqual []
+      describe "in devMode", ->
+        beforeEach -> contextMenu.devMode = true

-    it "allows items to be specified in the legacy format for now", ->
-      contextMenu.add '.parent':
-        'A': 'a'
-        'Separator 1': '-'
-        'B':
-          'C': 'c'
-          'Separator 2': '-'
-          'D': 'd'
+        it "creates a menu with development items", ->
+          menu = contextMenu.combinedMenuTemplateForElement(element)

-      expect(contextMenu.templateForElement(parent)).toEqual [
-        {label: 'A', command: 'a'}
-        {type: 'separator'}
-        {
-          label: 'B'
-          submenu: [
-            {label: 'C', command: 'c'}
-            {type: 'separator'}
-            {label: 'D', command: 'd'}
-          ]
-        }
+          expect(menu[0].label).toEqual 'parent'
+          expect(menu[0].command).toEqual 'command-p'
+          expect(menu[1].type).toEqual 'separator'
+          expect(menu[2].label).toEqual 'dev-label'
+          expect(menu[2].command).toEqual 'dev-command'
+
+
+    describe "on multiple elements", ->
+      [element] = []
+
+      beforeEach ->
+        element = $$ ->
+          @div class: 'parent', =>
+            @div class: 'child'
+
+        element = element.find('.child')[0]
+
+      it "creates a menu with a two items", ->
+        menu = contextMenu.combinedMenuTemplateForElement(element)
+
+        expect(menu[0].label).toEqual 'child'
+        expect(menu[0].command).toEqual 'command-c'
+        expect(menu[1].label).toEqual 'parent'
+        expect(menu[1].command).toEqual 'command-p'
+        expect(menu[2]).toBeUndefined()
+
+      describe "in devMode", ->
+        beforeEach -> contextMenu.devMode = true
+
+        xit "creates a menu with development items", ->
+          menu = contextMenu.combinedMenuTemplateForElement(element)
+
+          expect(menu[0].label).toEqual 'child'
+          expect(menu[0].command).toEqual 'command-c'
+          expect(menu[1].label).toEqual 'parent'
+          expect(menu[1].command).toEqual 'command-p'
+          expect(menu[2].label).toEqual 'dev-label'
+          expect(menu[2].command).toEqual 'dev-command'
+          expect(menu[3]).toBeUndefined()
+
+  describe "executeBuildHandlers", ->
+    menuTemplate = [
+        label: 'label'
+        executeAtBuild: ->
      ]
+    event =
+      target: null
+
+    it 'should invoke the executeAtBuild fn', ->
+      buildFn = spyOn(menuTemplate[0], 'executeAtBuild')
+      contextMenu.executeBuildHandlers(event, menuTemplate)
+
+      expect(buildFn).toHaveBeenCalled()
+      expect(buildFn.mostRecentCall.args[0]).toBe event
@@ -1,44 +1,33 @@
 DeserializerManager = require '../src/deserializer-manager'

-describe "DeserializerManager", ->
-  manager = null
+describe ".deserialize(state)", ->
+  deserializer = null

  class Foo
    @deserialize: ({name}) -> new Foo(name)
    constructor: (@name) ->

  beforeEach ->
-    manager = new DeserializerManager
+    deserializer = new DeserializerManager()
+    deserializer.add(Foo)

-  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()
+  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 "::deserialize(state)", ->
+  describe "when the deserializer has a version", ->
    beforeEach ->
-      manager.add(Foo)
+      Foo.version = 2

-    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 matching version", ->
+      it "attempts to deserialize the state", ->
+        object = deserializer.deserialize({ deserializer: 'Foo', version: 2, name: 'Bar' })
+        expect(object.name).toBe 'Bar'

-    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()
+    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()
@@ -9,7 +9,7 @@ describe "DisplayBuffer", ->
    buffer = atom.project.bufferForPathSync('sample.js')
    displayBuffer = new DisplayBuffer({buffer, tabLength})
    changeHandler = jasmine.createSpy 'changeHandler'
-    displayBuffer.onDidChange changeHandler
+    displayBuffer.on 'changed', changeHandler

    waitsForPromise ->
      atom.packages.activatePackage('language-javascript')
@@ -58,7 +58,7 @@ describe "DisplayBuffer", ->

  describe "soft wrapping", ->
    beforeEach ->
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
      displayBuffer.setEditorWidthInChars(50)
      changeHandler.reset()

@@ -67,48 +67,48 @@ describe "DisplayBuffer", ->
        it "uses the preferred line length as the soft wrap column when it is less than the configured soft wrap column", ->
          atom.config.set('editor.preferredLineLength', 100)
          atom.config.set('editor.softWrapAtPreferredLineLength', true)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
+          expect(displayBuffer.lineForRow(10).text).toBe '    return '

          atom.config.set('editor.preferredLineLength', 5)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe 'funct'
+          expect(displayBuffer.lineForRow(10).text).toBe 'funct'

          atom.config.set('editor.softWrapAtPreferredLineLength', false)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
+          expect(displayBuffer.lineForRow(10).text).toBe '    return '

      describe "when the line is shorter than the max line length", ->
        it "renders the line unchanged", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe buffer.lineForRow(0)
+          expect(displayBuffer.lineForRow(0).text).toBe buffer.lineForRow(0)

      describe "when the line is empty", ->
        it "renders the empty line", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(13).text).toBe ''
+          expect(displayBuffer.lineForRow(13).text).toBe ''

      describe "when there is a non-whitespace character at the max length boundary", ->
        describe "when there is whitespace before the boundary", ->
          it "wraps the line at the end of the first whitespace preceding the boundary", ->
-            expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
-            expect(displayBuffer.tokenizedLineForScreenRow(11).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
+            expect(displayBuffer.lineForRow(10).text).toBe '    return '
+            expect(displayBuffer.lineForRow(11).text).toBe 'sort(left).concat(pivot).concat(sort(right));'

        describe "when there is no whitespace before the boundary", ->
          it "wraps the line exactly at the boundary since there's no more graceful place to wrap it", ->
            buffer.setTextInRange([[0, 0], [1, 0]], 'abcdefghijklmnopqrstuvwxyz\n')
            displayBuffer.setEditorWidthInChars(10)
-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe 'abcdefghij'
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe 'klmnopqrst'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe 'uvwxyz'
+            expect(displayBuffer.lineForRow(0).text).toBe 'abcdefghij'
+            expect(displayBuffer.lineForRow(1).text).toBe 'klmnopqrst'
+            expect(displayBuffer.lineForRow(2).text).toBe 'uvwxyz'

      describe "when there is a whitespace character at the max length boundary", ->
        it "wraps the line at the first non-whitespace character following the boundary", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '    var pivot = items.shift(), current, left = [], '
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe 'right = [];'
+          expect(displayBuffer.lineForRow(3).text).toBe '    var pivot = items.shift(), current, left = [], '
+          expect(displayBuffer.lineForRow(4).text).toBe 'right = [];'

      describe "when there are hard tabs", ->
        beforeEach ->
          buffer.setText(buffer.getText().replace(new RegExp('  ', 'g'), '\t'))

        it "correctly tokenizes the hard tabs", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(3).tokens[0].isHardTab).toBeTruthy()
-          expect(displayBuffer.tokenizedLineForScreenRow(3).tokens[1].isHardTab).toBeTruthy()
+          expect(displayBuffer.lineForRow(3).tokens[0].isHardTab).toBeTruthy()
+          expect(displayBuffer.lineForRow(3).tokens[1].isHardTab).toBeTruthy()

    describe "when the buffer changes", ->
      describe "when buffer lines are updated", ->
@@ -121,57 +121,57 @@ describe "DisplayBuffer", ->
        describe "when the update makes a soft-wrapped line shorter than the max line length", ->
          it "rewraps the line and emits a change event", ->
            buffer.delete([[6, 24], [6, 42]])
-            expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot ?  : right.push(current);'
-            expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe '    }'
+            expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot ?  : right.push(current);'
+            expect(displayBuffer.lineForRow(8).text).toBe '    }'

            expect(changeHandler).toHaveBeenCalled()
            [[event]]= changeHandler.argsForCall

            expect(event).toEqual(start: 7, end: 8, screenDelta: -1, bufferDelta: 0)

-        describe "when the update causes a line to soft wrap an additional time", ->
+        describe "when the update causes a line to softwrap an additional time", ->
          it "rewraps the line and emits a change event", ->
            buffer.insert([6, 28], '1234567890')
-            expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot ? '
-            expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe 'left1234567890.push(current) : '
-            expect(displayBuffer.tokenizedLineForScreenRow(9).text).toBe 'right.push(current);'
-            expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    }'
+            expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot ? '
+            expect(displayBuffer.lineForRow(8).text).toBe 'left1234567890.push(current) : '
+            expect(displayBuffer.lineForRow(9).text).toBe 'right.push(current);'
+            expect(displayBuffer.lineForRow(10).text).toBe '    }'

            expect(changeHandler).toHaveBeenCalledWith(start: 7, end: 8, screenDelta: 1, bufferDelta: 0)

      describe "when buffer lines are inserted", ->
        it "inserts / updates wrapped lines and emits a change event", ->
          buffer.insert([6, 21], '1234567890 abcdefghij 1234567890\nabcdefghij')
-          expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot1234567890 abcdefghij '
-          expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe '1234567890'
-          expect(displayBuffer.tokenizedLineForScreenRow(9).text).toBe 'abcdefghij ? left.push(current) : '
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe 'right.push(current);'
+          expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot1234567890 abcdefghij '
+          expect(displayBuffer.lineForRow(8).text).toBe '1234567890'
+          expect(displayBuffer.lineForRow(9).text).toBe 'abcdefghij ? left.push(current) : '
+          expect(displayBuffer.lineForRow(10).text).toBe 'right.push(current);'

          expect(changeHandler).toHaveBeenCalledWith(start: 7, end: 8, screenDelta: 2, bufferDelta: 1)

      describe "when buffer lines are removed", ->
        it "removes lines and emits a change event", ->
          buffer.setTextInRange([[3, 21], [7, 5]], ';')
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '    var pivot = items;'
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe '    return '
-          expect(displayBuffer.tokenizedLineForScreenRow(5).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
-          expect(displayBuffer.tokenizedLineForScreenRow(6).text).toBe '  };'
+          expect(displayBuffer.lineForRow(3).text).toBe '    var pivot = items;'
+          expect(displayBuffer.lineForRow(4).text).toBe '    return '
+          expect(displayBuffer.lineForRow(5).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
+          expect(displayBuffer.lineForRow(6).text).toBe '  };'

          expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 9, screenDelta: -6, bufferDelta: -4)

      describe "when a newline is inserted, deleted, and re-inserted at the end of a wrapped line (regression)", ->
        it "correctly renders the original wrapped line", ->
          buffer = atom.project.buildBufferSync(null, '')
-          displayBuffer = new DisplayBuffer({buffer, tabLength, editorWidthInChars: 30, softWrapped: true})
+          displayBuffer = new DisplayBuffer({buffer, tabLength, editorWidthInChars: 30, softWrap: true})

          buffer.insert([0, 0], "the quick brown fox jumps over the lazy dog.")
          buffer.insert([0, Infinity], '\n')
          buffer.delete([[0, Infinity], [1, 0]])
          buffer.insert([0, Infinity], '\n')

-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "the quick brown fox jumps over "
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "the lazy dog."
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe ""
+          expect(displayBuffer.lineForRow(0).text).toBe "the quick brown fox jumps over "
+          expect(displayBuffer.lineForRow(1).text).toBe "the lazy dog."
+          expect(displayBuffer.lineForRow(2).text).toBe ""

    describe "position translation", ->
      it "translates positions accounting for wrapped lines", ->
@@ -204,9 +204,9 @@ describe "DisplayBuffer", ->
    describe ".setEditorWidthInChars(length)", ->
      it "changes the length at which lines are wrapped and emits a change event for all screen lines", ->
        displayBuffer.setEditorWidthInChars(40)
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(4).tokens).toBe 'left = [], right = [];'
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(5).tokens).toBe '    while(items.length > 0) {'
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
+        expect(tokensText displayBuffer.lineForRow(4).tokens).toBe 'left = [], right = [];'
+        expect(tokensText displayBuffer.lineForRow(5).tokens).toBe '    while(items.length > 0) {'
+        expect(tokensText displayBuffer.lineForRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
        expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 15, screenDelta: 3, bufferDelta: 0)

      it "only allows positive widths to be assigned", ->
@@ -220,10 +220,10 @@ describe "DisplayBuffer", ->
      displayBuffer.setWidth(50)
      displayBuffer.manageScrollPosition = true

-      displayBuffer.setSoftWrapped(false)
+      displayBuffer.setSoftWrap(false)
      displayBuffer.setScrollLeft(Infinity)
      expect(displayBuffer.getScrollLeft()).toBeGreaterThan 0
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
      expect(displayBuffer.getScrollLeft()).toBe 0
      displayBuffer.setScrollLeft(10)
      expect(displayBuffer.getScrollLeft()).toBe 0
@@ -234,7 +234,7 @@ describe "DisplayBuffer", ->
      buffer.release()
      buffer = atom.project.bufferForPathSync('two-hundred.txt')
      displayBuffer = new DisplayBuffer({buffer, tabLength})
-      displayBuffer.onDidChange changeHandler
+      displayBuffer.on 'changed', changeHandler

    describe "when folds are created and destroyed", ->
      describe "when a fold spans multiple lines", ->
@@ -242,7 +242,7 @@ describe "DisplayBuffer", ->
          fold = displayBuffer.createFold(4, 7)
          expect(fold).toBeDefined()

-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBe fold
          expect(line4.text).toMatch /^4-+/
          expect(line5.text).toBe '8'
@@ -251,7 +251,7 @@ describe "DisplayBuffer", ->
          changeHandler.reset()

          fold.destroy()
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBeUndefined()
          expect(line4.text).toMatch /^4-+/
          expect(line5.text).toBe '5'
@@ -262,7 +262,7 @@ describe "DisplayBuffer", ->
        it "renders a fold placeholder for the folded line but does not skip any lines", ->
          fold = displayBuffer.createFold(4, 4)

-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBe fold
          expect(line4.text).toMatch /^4-+/
          expect(line5.text).toBe '5'
@@ -275,7 +275,7 @@ describe "DisplayBuffer", ->

          fold.destroy()

-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBeUndefined()
          expect(line4.text).toMatch /^4-+/
          expect(line5.text).toBe '5'
@@ -287,13 +287,13 @@ describe "DisplayBuffer", ->
          innerFold = displayBuffer.createFold(6, 7)
          outerFold = displayBuffer.createFold(4, 8)

-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBe outerFold
          expect(line4.text).toMatch /4-+/
          expect(line5.text).toMatch /9-+/

          outerFold.destroy()
-          [line4, line5, line6, line7] = displayBuffer.tokenizedLinesForScreenRows(4, 7)
+          [line4, line5, line6, line7] = displayBuffer.linesForRows(4, 7)
          expect(line4.fold).toBeUndefined()
          expect(line4.text).toMatch /^4-+/
          expect(line5.text).toBe '5'
@@ -305,7 +305,7 @@ describe "DisplayBuffer", ->
          innerFold = displayBuffer.createFold(4, 6)
          outerFold = displayBuffer.createFold(4, 8)

-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
          expect(line4.fold).toBe outerFold
          expect(line4.text).toMatch /4-+/
          expect(line5.text).toMatch /9-+/
@@ -326,14 +326,14 @@ describe "DisplayBuffer", ->

          innerFold = displayBuffer.createFold(2, 5)
          expect(changeHandler).not.toHaveBeenCalled()
-          [line0, line1] = displayBuffer.tokenizedLinesForScreenRows(0, 1)
+          [line0, line1] = displayBuffer.linesForRows(0, 1)
          expect(line0.fold).toBe outerFold
          expect(line1.fold).toBeUndefined()

          changeHandler.reset()
          innerFold.destroy()
          expect(changeHandler).not.toHaveBeenCalled()
-          [line0, line1] = displayBuffer.tokenizedLinesForScreenRows(0, 1)
+          [line0, line1] = displayBuffer.linesForRows(0, 1)
          expect(line0.fold).toBe outerFold
          expect(line1.fold).toBeUndefined()

@@ -342,8 +342,8 @@ describe "DisplayBuffer", ->
          fold2 = displayBuffer.createFold(4, 9)
          fold1 = displayBuffer.createFold(0, 4)

-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toMatch /^0/
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toMatch /^10/
+          expect(displayBuffer.lineForRow(0).text).toMatch /^0/
+          expect(displayBuffer.lineForRow(1).text).toMatch /^10/

      describe "when there is another display buffer pointing to the same buffer", ->
        it "does not create folds in the other display buffer", ->
@@ -363,19 +363,19 @@ describe "DisplayBuffer", ->
          buffer.setTextInRange([[1, 0], [5, 1]], 'party!')

        it "removes the fold and replaces the selection with the new text", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "0"
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "party!"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(0).text).toBe "0"
+          expect(displayBuffer.lineForRow(1).text).toBe "party!"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold2
+          expect(displayBuffer.lineForRow(3).text).toMatch /^9-+/

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

        describe "when the changes is subsequently undone", ->
          xit "restores destroyed folds", ->
            buffer.undo()
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '5'
+            expect(displayBuffer.lineForRow(2).text).toBe '2'
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toBe '5'

      describe "when the old range surrounds two nested folds", ->
        it "removes both folds and replaces the selection with the new text", ->
@@ -384,9 +384,9 @@ describe "DisplayBuffer", ->

          buffer.setTextInRange([[1, 0], [10, 0]], 'goodbye')

-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "0"
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "goodbye10"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "11"
+          expect(displayBuffer.lineForRow(0).text).toBe "0"
+          expect(displayBuffer.lineForRow(1).text).toBe "goodbye10"
+          expect(displayBuffer.lineForRow(2).text).toBe "11"

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

@@ -403,42 +403,42 @@ describe "DisplayBuffer", ->
          it "updates the buffer and re-positions subsequent folds", ->
            buffer.setTextInRange([[0, 0], [1, 1]], 'abc')

-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "abc"
-            expect(displayBuffer.tokenizedLineForScreenRow(1).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(3).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(0).text).toBe "abc"
+            expect(displayBuffer.lineForRow(1).fold).toBe fold1
+            expect(displayBuffer.lineForRow(2).text).toBe "5"
+            expect(displayBuffer.lineForRow(3).fold).toBe fold2
+            expect(displayBuffer.lineForRow(4).text).toMatch /^9-+/

            expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 1, screenDelta: -1, bufferDelta: -1)
            changeHandler.reset()

            fold1.destroy()
-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "abc"
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch /^4-+/
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(5).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(6).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(0).text).toBe "abc"
+            expect(displayBuffer.lineForRow(1).text).toBe "2"
+            expect(displayBuffer.lineForRow(3).text).toMatch /^4-+/
+            expect(displayBuffer.lineForRow(4).text).toBe "5"
+            expect(displayBuffer.lineForRow(5).fold).toBe fold2
+            expect(displayBuffer.lineForRow(6).text).toMatch /^9-+/

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

      describe "when the old range straddles the beginning of a fold", ->
        it "destroys the fold", ->
          buffer.setTextInRange([[1, 1], [3, 0]], "a\nb\nc\nd\n")
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe '1a'
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe 'b'
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBeUndefined()
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe 'c'
+          expect(displayBuffer.lineForRow(1).text).toBe '1a'
+          expect(displayBuffer.lineForRow(2).text).toBe 'b'
+          expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
+          expect(displayBuffer.lineForRow(3).text).toBe 'c'

      describe "when the old range follows a fold", ->
        it "re-positions the screen ranges for the change event based on the preceding fold", ->
          buffer.setTextInRange([[10, 0], [11, 0]], 'abc')

-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe "5"
-          expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(1).text).toBe "1"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold1
+          expect(displayBuffer.lineForRow(3).text).toBe "5"
+          expect(displayBuffer.lineForRow(4).fold).toBe fold2
+          expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/

          expect(changeHandler).toHaveBeenCalledWith(start: 6, end: 7, screenDelta: -1, bufferDelta: -1)

@@ -449,12 +449,12 @@ describe "DisplayBuffer", ->
            expect(fold1.getStartRow()).toBe 2
            expect(fold1.getEndRow()).toBe 5

-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(1).text).toBe "1"
+            expect(displayBuffer.lineForRow(2).text).toBe "2"
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toMatch "5"
+            expect(displayBuffer.lineForRow(4).fold).toBe fold2
+            expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/

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

@@ -464,12 +464,12 @@ describe "DisplayBuffer", ->
            expect(fold1.getStartRow()).toBe 2
            expect(fold1.getEndRow()).toBe 7

-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(1).text).toBe "1"
+            expect(displayBuffer.lineForRow(2).text).toBe "2"
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toMatch "5"
+            expect(displayBuffer.lineForRow(4).fold).toBe fold2
+            expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/

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

@@ -478,21 +478,21 @@ describe "DisplayBuffer", ->
          it "destroys the fold", ->
            fold2.destroy()
            buffer.setTextInRange([[3, 0], [6, 0]], 'a\n')
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBeUndefined()
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe 'a'
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe '6'
+            expect(displayBuffer.lineForRow(2).text).toBe '2'
+            expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
+            expect(displayBuffer.lineForRow(3).text).toBe 'a'
+            expect(displayBuffer.lineForRow(4).text).toBe '6'

      describe "when the old range is contained to a single line in-between two folds", ->
        it "re-renders the line with the placeholder and re-positions the second fold", ->
          buffer.insert([5, 0], 'abc\n')

-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "abc"
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe "5"
-          expect(displayBuffer.tokenizedLineForScreenRow(5).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(6).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(1).text).toBe "1"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold1
+          expect(displayBuffer.lineForRow(3).text).toMatch "abc"
+          expect(displayBuffer.lineForRow(4).text).toBe "5"
+          expect(displayBuffer.lineForRow(5).fold).toBe fold2
+          expect(displayBuffer.lineForRow(6).text).toMatch /^9-+/

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

@@ -545,15 +545,15 @@ describe "DisplayBuffer", ->
        displayBuffer.createFold(1, 9)
        displayBuffer.createFold(11, 12)

-        expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe '1'
-        expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '10'
+        expect(displayBuffer.lineForRow(1).text).toBe '1'
+        expect(displayBuffer.lineForRow(2).text).toBe '10'

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

    describe ".outermostFoldsInBufferRowRange(startRow, endRow)", ->
      it "returns the outermost folds entirely contained in the given row range, exclusive of end row", ->
@@ -568,7 +568,7 @@ describe "DisplayBuffer", ->

  describe "::clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
    beforeEach ->
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
      displayBuffer.setEditorWidthInChars(50)

    it "allows valid positions", ->
@@ -643,7 +643,7 @@ describe "DisplayBuffer", ->

    it "correctly translates positions on soft wrapped lines containing tabs", ->
      buffer.setText('\t\taa  bb  cc  dd  ee  ff  gg')
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
      displayBuffer.setEditorWidthInChars(10)
      expect(displayBuffer.screenPositionForBufferPosition([0, 10], wrapAtSoftNewlines: true)).toEqual [1, 0]
      expect(displayBuffer.bufferPositionForScreenPosition([1, 0])).toEqual [0, 10]
@@ -686,7 +686,7 @@ describe "DisplayBuffer", ->
        expect(marker2.getScreenRange()).toEqual [[5, 4], [5, 10]]

      it "emits a 'marker-created' event on the DisplayBuffer whenever a marker is created", ->
-        displayBuffer.onDidCreateMarker markerCreatedHandler = jasmine.createSpy("markerCreatedHandler")
+        displayBuffer.on 'marker-created', markerCreatedHandler = jasmine.createSpy("markerCreatedHandler")

        marker1 = displayBuffer.markScreenRange([[5, 4], [5, 10]])
        expect(markerCreatedHandler).toHaveBeenCalledWith(marker1)
@@ -722,7 +722,7 @@ describe "DisplayBuffer", ->

      beforeEach ->
        marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker.onDidChange markerChangedHandler = jasmine.createSpy("markerChangedHandler")
+        marker.on 'changed', markerChangedHandler = jasmine.createSpy("markerChangedHandler")

      it "triggers the 'changed' event whenever the markers head's screen position changes in the buffer or on screen", ->
        marker.setHeadScreenPosition([8, 20])
@@ -859,8 +859,8 @@ describe "DisplayBuffer", ->

      it "updates markers before emitting buffer change events, but does not notify their observers until the change event", ->
        marker2 = displayBuffer.markBufferRange([[8, 1], [8, 1]])
-        marker2.onDidChange marker2ChangedHandler = jasmine.createSpy("marker2ChangedHandler")
-        displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake -> onDisplayBufferChange()
+        marker2.on 'changed', marker2ChangedHandler = jasmine.createSpy("marker2ChangedHandler")
+        displayBuffer.on 'changed', changeHandler = jasmine.createSpy("changeHandler").andCallFake -> onDisplayBufferChange()

        # New change ----

@@ -886,7 +886,7 @@ describe "DisplayBuffer", ->
        marker2ChangedHandler.reset()

        marker3 = displayBuffer.markBufferRange([[8, 1], [8, 2]])
-        marker3.onDidChange marker3ChangedHandler = jasmine.createSpy("marker3ChangedHandler")
+        marker3.on 'changed', marker3ChangedHandler = jasmine.createSpy("marker3ChangedHandler")

        onDisplayBufferChange = ->
          # calls change handler first
@@ -932,7 +932,7 @@ describe "DisplayBuffer", ->
        expect(marker3ChangedHandler).toHaveBeenCalled()

      it "updates the position of markers before emitting change events that aren't caused by a buffer change", ->
-        displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake ->
+        displayBuffer.on 'changed', changeHandler = jasmine.createSpy("changeHandler").andCallFake ->
          # calls change handler first
          expect(markerChangedHandler).not.toHaveBeenCalled()
          # but still updates the markers
@@ -998,20 +998,20 @@ describe "DisplayBuffer", ->
        expect(marker.isValid()).toBeFalsy()
        expect(displayBuffer.getMarker(marker.id)).toBeUndefined()

-      it "notifies ::onDidDestroy observers when markers are destroyed", ->
+      it "emits 'destroyed' events when markers are destroyed", ->
        destroyedHandler = jasmine.createSpy("destroyedHandler")
        marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker.onDidDestroy destroyedHandler
+        marker.on 'destroyed', destroyedHandler
        marker.destroy()
        expect(destroyedHandler).toHaveBeenCalled()
        destroyedHandler.reset()

        marker2 = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker2.onDidDestroy destroyedHandler
+        marker2.on 'destroyed', destroyedHandler
        buffer.getMarker(marker2.id).destroy()
        expect(destroyedHandler).toHaveBeenCalled()

-    describe "Marker::copy(attributes)", ->
+    describe "DisplayBufferMarker::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.getProperties()).toEqual a: 1, b: 2
-        expect(marker2.getProperties()).toEqual a: 1, b: 3
+        expect(marker1.getAttributes()).toEqual a: 1, b: 2
+        expect(marker2.getAttributes()).toEqual a: 1, b: 3

-    describe "Marker::getPixelRange()", ->
+    describe "DisplayBufferMarker::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]])

@@ -1037,28 +1037,16 @@ describe "DisplayBuffer", ->
        expect(start.top).toBe 5 * 20
        expect(start.left).toBe (4 * 10) + (6 * 11)

-    describe 'when there are multiple DisplayBuffers for a buffer', ->
-      describe 'when a marker is created', ->
-        it 'the second display buffer will not emit a marker-created event when the marker has been deleted in the first marker-created event', ->
-          displayBuffer2 = new DisplayBuffer({buffer, tabLength})
-          displayBuffer.onDidCreateMarker markerCreated1 = jasmine.createSpy().andCallFake (marker) -> marker.destroy()
-          displayBuffer2.onDidCreateMarker markerCreated2 = jasmine.createSpy()
-
-          displayBuffer.markBufferRange([[0, 0], [1, 5]], {})
-
-          expect(markerCreated1).toHaveBeenCalled()
-          expect(markerCreated2).not.toHaveBeenCalled()
-
  describe "decorations", ->
-    [marker, decoration, decorationProperties] = []
+    [marker, decoration, decorationParams] = []
    beforeEach ->
      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
-      decorationProperties = {type: 'gutter', class: 'one'}
-      decoration = displayBuffer.decorateMarker(marker, decorationProperties)
+      decorationParams = {type: 'gutter', class: 'one'}
+      decoration = displayBuffer.decorateMarker(marker, decorationParams)

    it "can add decorations associated with markers and remove them", ->
      expect(decoration).toBeDefined()
-      expect(decoration.getProperties()).toBe decorationProperties
+      expect(decoration.getParams()).toBe decorationParams
      expect(displayBuffer.decorationForId(decoration.id)).toBe decoration
      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id][0]).toBe decoration

@@ -1073,12 +1061,12 @@ describe "DisplayBuffer", ->

    describe "when a decoration is updated via Decoration::update()", ->
      it "emits an 'updated' event containing the new and old params", ->
-        decoration.onDidChangeProperties updatedSpy = jasmine.createSpy()
-        decoration.setProperties type: 'gutter', class: 'two'
+        decoration.on 'updated', updatedSpy = jasmine.createSpy()
+        decoration.update type: 'gutter', class: 'two'

-        {oldProperties, newProperties} = updatedSpy.mostRecentCall.args[0]
-        expect(oldProperties).toEqual decorationProperties
-        expect(newProperties).toEqual type: 'gutter', class: 'two', id: decoration.id
+        {oldParams, newParams} = updatedSpy.mostRecentCall.args[0]
+        expect(oldParams).toEqual decorationParams
+        expect(newParams).toEqual type: 'gutter', class: 'two', id: decoration.id

  describe "::setScrollTop", ->
    beforeEach ->
@@ -1100,33 +1088,6 @@ 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
@@ -1198,7 +1159,7 @@ describe "DisplayBuffer", ->
    it "recomputes the scroll width when the scoped character widths change in a batch", ->
      operatorWidth = 20

-      displayBuffer.onDidChangeCharacterWidths changedSpy = jasmine.createSpy()
+      displayBuffer.on 'character-widths-changed', changedSpy = jasmine.createSpy()

      displayBuffer.batchCharacterMeasurement ->
        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
@@ -1,11 +1,11 @@
 _ = require 'underscore-plus'
 {extend, flatten, toArray, last} = _

-TextEditorView = require '../src/text-editor-view'
-TextEditorComponent = require '../src/text-editor-component'
+ReactEditorView = require '../src/react-editor-view'
+EditorComponent = require '../src/editor-component'
 nbsp = String.fromCharCode(160)

-describe "TextEditorComponent", ->
+describe "EditorComponent", ->
  [contentNode, editor, wrapperView, wrapperNode, component, componentNode, verticalScrollbarNode, horizontalScrollbarNode] = []
  [lineHeightInPixels, charWidth, nextAnimationFrame, noAnimationFrame, lineOverdrawMargin] = []

@@ -34,7 +34,7 @@ describe "TextEditorComponent", ->
      contentNode = document.querySelector('#jasmine-content')
      contentNode.style.width = '1000px'

-      wrapperView = new TextEditorView(editor, {lineOverdrawMargin})
+      wrapperView = new ReactEditorView(editor, {lineOverdrawMargin})
      wrapperView.attachToDom()
      wrapperNode = wrapperView.element

@@ -65,9 +65,9 @@ describe "TextEditorComponent", ->
      linesNode = componentNode.querySelector('.lines')
      expect(linesNode.style['-webkit-transform']).toBe "translate3d(0px, 0px, 0px)"
      expect(componentNode.querySelectorAll('.line').length).toBe 6 + 2 # no margin above
-      expect(component.lineNodeForScreenRow(0).textContent).toBe editor.tokenizedLineForScreenRow(0).text
+      expect(component.lineNodeForScreenRow(0).textContent).toBe editor.lineForScreenRow(0).text
      expect(component.lineNodeForScreenRow(0).offsetTop).toBe 0
-      expect(component.lineNodeForScreenRow(5).textContent).toBe editor.tokenizedLineForScreenRow(5).text
+      expect(component.lineNodeForScreenRow(5).textContent).toBe editor.lineForScreenRow(5).text
      expect(component.lineNodeForScreenRow(5).offsetTop).toBe 5 * lineHeightInPixels

      verticalScrollbarNode.scrollTop = 4.5 * lineHeightInPixels
@@ -77,9 +77,9 @@ describe "TextEditorComponent", ->
      expect(linesNode.style['-webkit-transform']).toBe "translate3d(0px, #{-4.5 * lineHeightInPixels}px, 0px)"
      expect(componentNode.querySelectorAll('.line').length).toBe 6 + 4 # margin above and below
      expect(component.lineNodeForScreenRow(2).offsetTop).toBe 2 * lineHeightInPixels
-      expect(component.lineNodeForScreenRow(2).textContent).toBe editor.tokenizedLineForScreenRow(2).text
+      expect(component.lineNodeForScreenRow(2).textContent).toBe editor.lineForScreenRow(2).text
      expect(component.lineNodeForScreenRow(9).offsetTop).toBe 9 * lineHeightInPixels
-      expect(component.lineNodeForScreenRow(9).textContent).toBe editor.tokenizedLineForScreenRow(9).text
+      expect(component.lineNodeForScreenRow(9).textContent).toBe editor.lineForScreenRow(9).text

    it "updates the top position of subsequent lines when lines are inserted or removed", ->
      editor.getBuffer().deleteRows(0, 1)
@@ -111,11 +111,11 @@ describe "TextEditorComponent", ->

      buffer.insert([0, 0], '\n\n')
      nextAnimationFrame()
-      expect(component.lineNodeForScreenRow(3).textContent).toBe editor.tokenizedLineForScreenRow(3).text
+      expect(component.lineNodeForScreenRow(3).textContent).toBe editor.lineForScreenRow(3).text

      buffer.delete([[0, 0], [3, 0]])
      nextAnimationFrame()
-      expect(component.lineNodeForScreenRow(3).textContent).toBe editor.tokenizedLineForScreenRow(3).text
+      expect(component.lineNodeForScreenRow(3).textContent).toBe editor.lineForScreenRow(3).text

    it "updates the top position of lines when the line height changes", ->
      initialLineHeightInPixels = editor.getLineHeightInPixels()
@@ -197,50 +197,6 @@ describe "TextEditorComponent", ->
      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

@@ -253,32 +209,25 @@ describe "TextEditorComponent", ->

        atom.config.set("editor.showInvisibles", true)
        atom.config.set("editor.invisibles", invisibles)
-        nextAnimationFrame()

      it "re-renders the lines when the showInvisibles config option changes", ->
-        editor.setText " a line with tabs\tand spaces \n"
+        editor.setText " a line with tabs\tand spaces "
        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{invisibles.space}a line with tabs#{invisibles.tab}and spaces#{invisibles.space}#{invisibles.eol}"

        atom.config.set("editor.showInvisibles", false)
-        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(0).textContent).toBe " a line with tabs and spaces "

        atom.config.set("editor.showInvisibles", true)
-        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{invisibles.space}a line with tabs#{invisibles.tab}and spaces#{invisibles.space}#{invisibles.eol}"

-      it "displays leading/trailing spaces, tabs, and newlines as visible characters", ->
-        editor.setText " a line with tabs\tand spaces \n"
+      it "displays spaces, tabs, and newlines as visible characters", ->
+        editor.setText " a line with tabs\tand spaces "
        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{invisibles.space}a line with tabs#{invisibles.tab}and spaces#{invisibles.space}#{invisibles.eol}"

-        leafNodes = getLeafNodes(component.lineNodeForScreenRow(0))
-        expect(leafNodes[0].classList.contains('invisible-character')).toBe true
-        expect(leafNodes[leafNodes.length - 1].classList.contains('invisible-character')).toBe true
-
      it "displays newlines as their own token outside of the other tokens' scopes", ->
-        editor.setText "var\n"
+        editor.setText "var"
        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(0).innerHTML).toBe "<span class=\"source js\"><span class=\"storage modifier js\">var</span></span><span class=\"invisible-character\">#{invisibles.eol}</span>"

@@ -292,12 +241,10 @@ describe "TextEditorComponent", ->

      it "renders an nbsp on empty lines when the line-ending character is an empty string", ->
        atom.config.set("editor.invisibles", eol: '')
-        nextAnimationFrame()
        expect(component.lineNodeForScreenRow(10).textContent).toBe nbsp

-      it "renders an nbsp on empty lines when the line-ending character is false", ->
-        atom.config.set("editor.invisibles", eol: false)
-        nextAnimationFrame()
+      it "renders an nbsp on empty lines when no line-ending character is defined", ->
+        atom.config.set("editor.invisibles", eol: null)
        expect(component.lineNodeForScreenRow(10).textContent).toBe nbsp

      it "interleaves invisible line-ending characters with indent guides on empty lines", ->
@@ -321,8 +268,8 @@ describe "TextEditorComponent", ->

      describe "when soft wrapping is enabled", ->
        beforeEach ->
-          editor.setText "a line that wraps \n"
-          editor.setSoftWrapped(true)
+          editor.setText "a line that wraps "
+          editor.setSoftWrap(true)
          nextAnimationFrame()
          componentNode.style.width = 16 * charWidth + editor.getVerticalScrollbarWidth() + 'px'
          component.measureHeightAndWidth()
@@ -501,7 +448,7 @@ describe "TextEditorComponent", ->
      expect(component.lineNumberNodeForScreenRow(6).offsetTop).toBe 6 * lineHeightInPixels

    it "renders • characters for soft-wrapped lines", ->
-      editor.setSoftWrapped(true)
+      editor.setSoftWrap(true)
      wrapperNode.style.height = 4.5 * lineHeightInPixels + 'px'
      wrapperNode.style.width = 30 * charWidth + 'px'
      component.measureHeightAndWidth()
@@ -645,7 +592,7 @@ describe "TextEditorComponent", ->

  describe "cursor rendering", ->
    it "renders the currently visible cursors, translated relative to the scroll position", ->
-      cursor1 = editor.getLastCursor()
+      cursor1 = editor.getCursor()
      cursor1.setScreenPosition([0, 5])

      wrapperNode.style.height = 4.5 * lineHeightInPixels + 'px'
@@ -754,7 +701,7 @@ describe "TextEditorComponent", ->
      expect(cursorsNode.classList.contains('blink-off')).toBe false

      # Stop blinking after moving the cursor
-      editor.moveRight()
+      editor.moveCursorRight()
      expect(cursorsNode.classList.contains('blink-off')).toBe false

      advanceClock(component.props.cursorBlinkResumeDelay)
@@ -858,8 +805,8 @@ describe "TextEditorComponent", ->
    it "does not render empty selections", ->
      editor.addSelectionForBufferRange([[2, 2], [2, 2]])
      nextAnimationFrame()
-      expect(editor.getSelections()[0].isEmpty()).toBe true
-      expect(editor.getSelections()[1].isEmpty()).toBe true
+      expect(editor.getSelection(0).isEmpty()).toBe true
+      expect(editor.getSelection(1).isEmpty()).toBe true

      expect(componentNode.querySelectorAll('.selection').length).toBe 0

@@ -937,7 +884,7 @@ describe "TextEditorComponent", ->

    it "only applies decorations to screen rows that are spanned by their marker when lines are soft-wrapped", ->
      editor.setText("a line that wraps, ok")
-      editor.setSoftWrapped(true)
+      editor.setSoftWrap(true)
      componentNode.style.width = 16 * charWidth + 'px'
      component.measureHeightAndWidth()
      nextAnimationFrame()
@@ -1178,7 +1125,7 @@ describe "TextEditorComponent", ->
      it "renders the decoration's new params", ->
        expect(componentNode.querySelector('.test-highlight')).toBeTruthy()

-        decoration.setProperties(type: 'highlight', class: 'new-test-highlight')
+        decoration.update(type: 'highlight', class: 'new-test-highlight')
        nextAnimationFrame()

        expect(componentNode.querySelector('.test-highlight')).toBeFalsy()
@@ -1362,12 +1309,6 @@ describe "TextEditorComponent", ->
          linesNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenPosition([4, 8]), {target}))
          expect(editor.isFoldedAtBufferRow 4).toBe false

-    describe "when the horizontal scrollbar is interacted with", ->
-      it "clicking on the scrollbar does not move the cursor", ->
-        target = horizontalScrollbarNode
-        linesNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenPosition([4, 8]), {target}))
-        expect(editor.getCursorScreenPosition()).toEqual [0, 0]
-
  describe "mouse interactions on the gutter", ->
    gutterNode = null

@@ -1375,19 +1316,9 @@ describe "TextEditorComponent", ->
      gutterNode = componentNode.querySelector('.gutter')

    describe "when the gutter is clicked", ->
-      it "selects the clicked row", ->
+      it "moves the cursor to the beginning of the clicked row", ->
        gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(4)))
-        expect(editor.getSelectedScreenRange()).toEqual [[4, 0], [5, 0]]
-
-    describe "when the gutter is meta-clicked", ->
-      it "creates a new selection for the clicked row", ->
-        editor.setSelectedScreenRange([[3, 0], [3, 2]])
-
-        gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(4), metaKey: true))
-        expect(editor.getSelectedScreenRanges()).toEqual [[[3, 0], [3, 2]], [[4, 0], [5, 0]]]
-
-        gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-        expect(editor.getSelectedScreenRanges()).toEqual [[[3, 0], [3, 2]], [[4, 0], [5, 0]], [[6, 0], [7, 0]]]
+        expect(editor.getCursorScreenPosition()).toEqual [4, 0]

    describe "when the gutter is shift-clicked", ->
      beforeEach ->
@@ -1420,40 +1351,6 @@ describe "TextEditorComponent", ->
          gutterNode.dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenRowInGutter(2)))
          expect(editor.getSelectedScreenRange()).toEqual [[2, 0], [7, 0]]

-    describe "when the gutter is meta-clicked and dragged", ->
-      beforeEach ->
-        editor.setSelectedScreenRange([[3, 0], [3, 2]])
-
-      describe "when dragging downward", ->
-        it "selects the rows between the start and end of the drag", ->
-          gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(4), metaKey: true))
-          gutterNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          nextAnimationFrame()
-          gutterNode.dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          expect(editor.getSelectedScreenRanges()).toEqual [[[3, 0], [3, 2]], [[4, 0], [7, 0]]]
-
-        it "merges overlapping selections", ->
-          gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(2), metaKey: true))
-          gutterNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          nextAnimationFrame()
-          gutterNode.dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          expect(editor.getSelectedScreenRanges()).toEqual [[[2, 0], [7, 0]]]
-
-      describe "when dragging upward", ->
-        it "selects the rows between the start and end of the drag", ->
-          gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          gutterNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenRowInGutter(4), metaKey: true))
-          nextAnimationFrame()
-          gutterNode.dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenRowInGutter(4), metaKey: true))
-          expect(editor.getSelectedScreenRanges()).toEqual [[[3, 0], [3, 2]], [[4, 0], [7, 0]]]
-
-        it "merges overlapping selections", ->
-          gutterNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenRowInGutter(6), metaKey: true))
-          gutterNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenRowInGutter(2), metaKey: true))
-          nextAnimationFrame()
-          gutterNode.dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenRowInGutter(2), metaKey: true))
-          expect(editor.getSelectedScreenRanges()).toEqual [[[2, 0], [7, 0]]]
-
    describe "when the gutter is shift-clicked and dragged", ->
      describe "when the shift-click is below the existing selection's tail", ->
        describe "when dragging downward", ->
@@ -1525,7 +1422,7 @@ describe "TextEditorComponent", ->
    cursor = null

    beforeEach ->
-      cursor = editor.getLastCursor()
+      cursor = editor.getCursor()
      cursor.setScreenPosition([0, 0])

    it "adds the 'has-selection' class to the editor when there is a selection", ->
@@ -1645,7 +1542,6 @@ describe "TextEditorComponent", ->
          height: 8px;
        }
      """
-      nextAnimationFrame()

      scrollbarCornerNode = componentNode.querySelector('.scrollbar-corner')
      expect(verticalScrollbarNode.offsetWidth).toBe 8
@@ -1734,11 +1630,11 @@ describe "TextEditorComponent", ->
        nextAnimationFrame()
        expect(verticalScrollbarNode.scrollTop).toBe 10

-      it "parses negative scrollSensitivity values at the minimum", ->
+      it "parses negative scrollSensitivity values as positive", ->
        atom.config.set('editor.scrollSensitivity', -50)
        componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -10))
        nextAnimationFrame()
-        expect(verticalScrollbarNode.scrollTop).toBe 1
+        expect(verticalScrollbarNode.scrollTop).toBe 5

    describe "when the mousewheel event's target is a line", ->
      it "keeps the line on the DOM if it is scrolled off-screen", ->
@@ -1871,28 +1767,28 @@ describe "TextEditorComponent", ->
    it "inserts the newest character in the input's value into the buffer", ->
      componentNode.dispatchEvent(buildTextInputEvent(data: 'x', target: inputNode))
      nextAnimationFrame()
-      expect(editor.lineTextForBufferRow(0)).toBe 'xvar quicksort = function () {'
+      expect(editor.lineForBufferRow(0)).toBe 'xvar quicksort = function () {'

      componentNode.dispatchEvent(buildTextInputEvent(data: 'y', target: inputNode))
      nextAnimationFrame()
-      expect(editor.lineTextForBufferRow(0)).toBe 'xyvar quicksort = function () {'
+      expect(editor.lineForBufferRow(0)).toBe 'xyvar quicksort = function () {'

    it "replaces the last character if the length of the input's value doesn't increase, as occurs with the accented character menu", ->
      componentNode.dispatchEvent(buildTextInputEvent(data: 'u', target: inputNode))
      nextAnimationFrame()
-      expect(editor.lineTextForBufferRow(0)).toBe 'uvar quicksort = function () {'
+      expect(editor.lineForBufferRow(0)).toBe 'uvar quicksort = function () {'

      # simulate the accented character suggestion's selection of the previous character
      inputNode.setSelectionRange(0, 1)
      componentNode.dispatchEvent(buildTextInputEvent(data: 'ü', target: inputNode))
      nextAnimationFrame()
-      expect(editor.lineTextForBufferRow(0)).toBe 'üvar quicksort = function () {'
+      expect(editor.lineForBufferRow(0)).toBe 'üvar quicksort = function () {'

    it "does not handle input events when input is disabled", ->
      component.setInputEnabled(false)
      componentNode.dispatchEvent(buildTextInputEvent(data: 'x', target: inputNode))
      expect(nextAnimationFrame).toBe noAnimationFrame
-      expect(editor.lineTextForBufferRow(0)).toBe 'var quicksort = function () {'
+      expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () {'

    describe "when IME composition is used to insert international characters", ->
      inputNode = null
@@ -1910,46 +1806,46 @@ describe "TextEditorComponent", ->
        it "inserts the chosen completion", ->
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 's', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'svar quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'svar quicksort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 'sd', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'sdvar quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'sdvar quicksort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
          componentNode.dispatchEvent(buildTextInputEvent(data: '速度', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe '速度var quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe '速度var quicksort = function () {'

        it "reverts back to the original text when the completion helper is dismissed", ->
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 's', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'svar quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'svar quicksort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 'sd', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'sdvar quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'sdvar quicksort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () {'

        it "allows multiple accented character to be inserted with the ' on a US international layout", ->
          inputNode.value = "'"
          inputNode.setSelectionRange(0, 1)
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: "'", target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe "'var quicksort = function () {"
+          expect(editor.lineForBufferRow(0)).toBe "'var quicksort = function () {"

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
          componentNode.dispatchEvent(buildTextInputEvent(data: 'á', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe "ávar quicksort = function () {"
+          expect(editor.lineForBufferRow(0)).toBe "ávar quicksort = function () {"

          inputNode.value = "'"
          inputNode.setSelectionRange(0, 1)
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: "'", target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe "á'var quicksort = function () {"
+          expect(editor.lineForBufferRow(0)).toBe "á'var quicksort = function () {"

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
          componentNode.dispatchEvent(buildTextInputEvent(data: 'á', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe "áávar quicksort = function () {"
+          expect(editor.lineForBufferRow(0)).toBe "áávar quicksort = function () {"

      describe "when a string is selected", ->
        beforeEach ->
@@ -1958,25 +1854,25 @@ describe "TextEditorComponent", ->
        it "inserts the chosen completion", ->
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 's', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var ssort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var ssort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 'sd', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var sdsort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var sdsort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
          componentNode.dispatchEvent(buildTextInputEvent(data: '速度', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var 速度sort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var 速度sort = function () {'

        it "reverts back to the original text when the completion helper is dismissed", ->
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionstart', target: inputNode))
          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 's', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var ssort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var ssort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionupdate', data: 'sd', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var sdsort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var sdsort = function () {'

          componentNode.dispatchEvent(buildIMECompositionEvent('compositionend', target: inputNode))
-          expect(editor.lineTextForBufferRow(0)).toBe 'var quicksort = function () {'
+          expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () {'

  describe "commands", ->
    describe "editor:consolidate-selections", ->
@@ -1999,7 +1895,7 @@ describe "TextEditorComponent", ->
        hiddenParent.style.display = 'none'
        contentNode.appendChild(hiddenParent)

-        wrapperView = new TextEditorView(editor, {lineOverdrawMargin})
+        wrapperView = new ReactEditorView(editor, {lineOverdrawMargin})
        wrapperNode = wrapperView.element
        wrapperView.appendTo(hiddenParent)

@@ -2041,7 +1937,6 @@ describe "TextEditorComponent", ->
        wrapperView.hide()

        component.setFontSize(22)
-        editor.getBuffer().insert([0, 0], 'a') # regression test against atom/atom#3318

        wrapperView.show()
        editor.setCursorBufferPosition([0, Infinity])
@@ -2110,7 +2005,7 @@ describe "TextEditorComponent", ->

  describe "soft wrapping", ->
    beforeEach ->
-      editor.setSoftWrapped(true)
+      editor.setSoftWrap(true)
      nextAnimationFrame()

    it "updates the wrap location when the editor is resized", ->
@@ -2208,13 +2103,9 @@ describe "TextEditorComponent", ->
    it "adds the 'mini' class to the wrapper view", ->
      expect(wrapperNode.classList.contains('mini')).toBe true

-    it "does not have an opaque background on lines", ->
-      expect(component.refs.lines.getDOMNode().getAttribute('style')).not.toContain 'background-color'
-
    it "does not render invisible characters", ->
-      atom.config.set('editor.invisibles', eol: 'E')
-      atom.config.set('editor.showInvisibles', true)
-      nextAnimationFrame()
+      component.setInvisibles(eol: 'E')
+      component.setShowInvisibles(true)
      expect(component.lineNodeForScreenRow(0).textContent).toBe 'var quicksort = function () {'

    it "does not assign an explicit line-height on the editor contents", ->
@@ -2225,7 +2116,7 @@ describe "TextEditorComponent", ->

  describe "when placholderText is specified", ->
    it "renders the placeholder text when the buffer is empty", ->
-      editor.setPlaceholderText('Hello World')
+      component.setProps(placeholderText: 'Hello World')
      expect(componentNode.querySelector('.placeholder-text')).toBeNull()
      editor.setText('')
      nextAnimationFrame()
@@ -2236,10 +2127,10 @@ describe "TextEditorComponent", ->

  describe "legacy editor compatibility", ->
    it "triggers the screen-lines-changed event before the editor:display-update event", ->
-      editor.setSoftWrapped(true)
+      editor.setSoftWrap(true)

      callingOrder = []
-      editor.onDidChange -> callingOrder.push 'screen-lines-changed'
+      editor.on 'screen-lines-changed', -> 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()
@@ -2253,21 +2144,6 @@ describe "TextEditorComponent", ->
      setEditorWidthInChars(wrapperView, 10)
      expect(componentNode.querySelector('.scroll-view').offsetWidth).toBe charWidth * 10

-  describe "grammar data attributes", ->
-    it "adds and updates the grammar data attribute based on the current grammar", ->
-      expect(wrapperNode.dataset.grammar).toBe 'source js'
-      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
@@ -1,4 +0,0 @@
-module.exports =
-  activate: ->
-  deactivate: -> throw new Error('Top that')
-  serialize: ->
@@ -1,13 +0,0 @@
-module.exports =
-  activateCallCount: 0
-  activationCommandCallCount: 0
-  legacyActivationCommandCallCount: 0
-
-  activate: ->
-    @activateCallCount++
-
-    atom.commands.add '.workspace', 'activation-command', =>
-      @activationCommandCallCount++
-
-    atom.workspaceView.getActiveView()?.command 'activation-command', =>
-      @legacyActivationCommandCallCount++
@@ -1,2 +0,0 @@
-'activationCommands':
-  '.workspace': 'activation-command'
@@ -0,0 +1,13 @@
+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++
@@ -0,0 +1 @@
+'activationEvents': ['activation-event']
@@ -1,13 +0,0 @@
-module.exports =
-  config:
-    numbers:
-      type: 'object'
-      properties:
-        one:
-          type: 'integer'
-          default: 1
-        two:
-          type: 'integer'
-          default: 2
-
-  activate: -> # no-op
@@ -1,5 +1,5 @@
 {
  "name": "no events",
  "version": "0.1.0",
-  "activationCommands": {".workspace": []}
+  "activationEvents": []
 }
@@ -1,8 +1,7 @@
 'menu': [
-  {'label': 'Second to Last'}
+  { 'label': 'Second to Last' }
 ]

 'context-menu':
-  '.test-1': [
-    {label: 'Menu item 1', command: 'command-1'}
-  ]
+  '.test-1':
+    'Menu item 1': 'command-1'
@@ -3,6 +3,5 @@
 ]

 'context-menu':
-  '.test-1': [
-    {label: 'Menu item 2', command: 'command-2'}
-  ]
+  '.test-1':
+    'Menu item 2': 'command-2'
@@ -3,6 +3,5 @@
 ]

 'context-menu':
-  '.test-1': [
-    {label: 'Menu item 3', command: 'command-3'}
-  ]
+  '.test-1':
+    'Menu item 3': 'command-3'
@@ -1,5 +1,5 @@
 temp = require 'temp'
-GitRepository = require '../src/git-repository'
+Git = require '../src/git'
 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 "GitRepository", ->
+describe "Git", ->
  repo = null

  beforeEach ->
@@ -22,28 +22,28 @@ describe "GitRepository", ->

  describe "@open(path)", ->
    it "returns null when no repository is found", ->
-      expect(GitRepository.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()
+      expect(Git.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()

-  describe "new GitRepository(path)", ->
+  describe "new Git(path)", ->
    it "throws an exception when no repository is found", ->
-      expect(-> new GitRepository(path.join(temp.dir, 'nogit.txt'))).toThrow()
+      expect(-> new Git(path.join(temp.dir, 'nogit.txt'))).toThrow()

  describe ".getPath()", ->
    it "returns the repository path for a .git directory path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
+      repo = new Git(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 GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git'))
+      repo = new Git(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 GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
      expect(repo.isPathIgnored('a.txt')).toBeTruthy()

    it "returns false for a non-ignored path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
      expect(repo.isPathIgnored('b.txt')).toBeFalsy()

  describe ".isPathModified(path)", ->
@@ -51,7 +51,7 @@ describe "GitRepository", ->

    beforeEach ->
      workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(workingDirPath)
      filePath = path.join(workingDirPath, 'a.txt')
      newPath = path.join(workingDirPath, 'new-path.txt')

@@ -75,7 +75,7 @@ describe "GitRepository", ->

    beforeEach ->
      workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(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 "GitRepository", ->

    beforeEach ->
      workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(workingDirPath)
      filePath = path.join(workingDirPath, 'a.txt')

    it "no longer reports a path as modified after checkout", ->
@@ -111,49 +111,17 @@ describe "GitRepository", ->
      fs.writeFileSync(filePath, 'ch ch changes')
      repo.getPathStatus(filePath)
      statusHandler = jasmine.createSpy('statusHandler')
-      repo.onDidChangeStatus statusHandler
+      repo.on 'status-changed', statusHandler
      repo.checkoutHead(filePath)
      expect(statusHandler.callCount).toBe 1
-      expect(statusHandler.argsForCall[0][0]).toEqual {path: filePath, pathStatus: 0}
+      expect(statusHandler.argsForCall[0][0..1]).toEqual [filePath, 0]

      repo.checkoutHead(filePath)
      expect(statusHandler.callCount).toBe 1

-  describe ".checkoutHeadForEditor(editor)", ->
-    [filePath, editor] = []
-
-    beforeEach ->
-      workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
-      filePath = path.join(workingDirPath, 'a.txt')
-      fs.writeFileSync(filePath, 'ch ch changes')
-
-      waitsForPromise ->
-        atom.workspace.open(filePath)
-
-      runs ->
-        editor = atom.workspace.getActiveEditor()
-
-    it "displays a confirmation dialog by default", ->
-      spyOn(atom, 'confirm').andCallFake ({buttons}) -> buttons.OK()
-      atom.config.set('editor.confirmCheckoutHeadRevision', true)
-
-      repo.checkoutHeadForEditor(editor)
-
-      expect(fs.readFileSync(filePath, 'utf8')).toBe ''
-
-    it "does not display a dialog when confirmation is disabled", ->
-      spyOn(atom, 'confirm')
-      atom.config.set('editor.confirmCheckoutHeadRevision', false)
-
-      repo.checkoutHeadForEditor(editor)
-
-      expect(fs.readFileSync(filePath, 'utf8')).toBe ''
-      expect(atom.confirm).not.toHaveBeenCalled()
-
  describe ".destroy()", ->
    it "throws an exception when any method is called after it is called", ->
-      repo = new GitRepository(require.resolve('./fixtures/git/master.git/HEAD'))
+      repo = new Git(require.resolve('./fixtures/git/master.git/HEAD'))
      repo.destroy()
      expect(-> repo.getShortHead()).toThrow()

@@ -162,16 +130,16 @@ describe "GitRepository", ->

    beforeEach ->
      workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
      filePath = path.join(workingDirectory, 'file.txt')

    it "trigger a status-changed event when the new status differs from the last cached one", ->
      statusHandler = jasmine.createSpy("statusHandler")
-      repo.onDidChangeStatus statusHandler
+      repo.on 'status-changed', statusHandler
      fs.writeFileSync(filePath, '')
      status = repo.getPathStatus(filePath)
      expect(statusHandler.callCount).toBe 1
-      expect(statusHandler.argsForCall[0][0]).toEqual {path: filePath, pathStatus: status}
+      expect(statusHandler.argsForCall[0][0..1]).toEqual [filePath, status]

      fs.writeFileSync(filePath, 'abc')
      status = repo.getPathStatus(filePath)
@@ -182,7 +150,7 @@ describe "GitRepository", ->

    beforeEach ->
      workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
      directoryPath = path.join(workingDirectory, 'dir')
      filePath = path.join(directoryPath, 'b.txt')

@@ -197,7 +165,7 @@ describe "GitRepository", ->

    beforeEach ->
      workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
      modifiedPath = path.join(workingDirectory, 'file.txt')
      newPath = path.join(workingDirectory, 'untracked.txt')
      cleanPath = path.join(workingDirectory, 'other.txt')
@@ -208,7 +176,7 @@ describe "GitRepository", ->
    it "returns status information for all new and modified files", ->
      fs.writeFileSync(modifiedPath, 'making this path modified')
      statusHandler = jasmine.createSpy('statusHandler')
-      repo.onDidChangeStatuses statusHandler
+      repo.on 'statuses-changed', statusHandler
      repo.refreshStatus()

      waitsFor ->
@@ -223,7 +191,7 @@ describe "GitRepository", ->
    [editor] = []

    beforeEach ->
-      atom.project.setPaths([copyRepository()])
+      atom.project.setPath(copyRepository())

      waitsForPromise ->
        atom.workspace.open('other.txt').then (o) -> editor = o
@@ -232,19 +200,19 @@ describe "GitRepository", ->
      editor.insertNewline()

      statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepositories()[0].onDidChangeStatus statusHandler
+      atom.project.getRepo().on 'status-changed', statusHandler
      editor.save()
      expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256

    it "emits a status-changed event when a buffer is reloaded", ->
      fs.writeFileSync(editor.getPath(), 'changed')

      statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepositories()[0].onDidChangeStatus statusHandler
+      atom.project.getRepo().on 'status-changed', statusHandler
      editor.getBuffer().reload()
      expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256
      editor.getBuffer().reload()
      expect(statusHandler.callCount).toBe 1

@@ -252,11 +220,11 @@ describe "GitRepository", ->
      fs.writeFileSync(editor.getPath(), 'changed')

      statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepositories()[0].onDidChangeStatus statusHandler
-      editor.getBuffer().emitter.emit 'did-change-path'
+      atom.project.getRepo().on 'status-changed', statusHandler
+      editor.getBuffer().emit 'path-changed'
      expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
-      editor.getBuffer().emitter.emit 'did-change-path'
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256
+      editor.getBuffer().emit 'path-changed'
      expect(statusHandler.callCount).toBe 1

  describe "when a project is deserialized", ->
@@ -266,7 +234,7 @@ describe "GitRepository", ->
      project2?.destroy()

    it "subscribes to all the serialized buffers in the project", ->
-      atom.project.setPaths([copyRepository()])
+      atom.project.setPath(copyRepository())

      waitsForPromise ->
        atom.workspace.open('file.txt')
@@ -283,7 +251,7 @@ describe "GitRepository", ->
        buffer.append('changes')

        statusHandler = jasmine.createSpy('statusHandler')
-        project2.getRepositories()[0].onDidChangeStatus statusHandler
+        project2.getRepo().on 'status-changed', statusHandler
        buffer.save()
        expect(statusHandler.callCount).toBe 1
-        expect(statusHandler).toHaveBeenCalledWith {path: buffer.getPath(), pathStatus: 256}
+        expect(statusHandler).toHaveBeenCalledWith buffer.getPath(), 256
@@ -7,8 +7,6 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->

  {TerminalReporter} = require 'jasmine-tagged'

-  disableFocusMethods() if process.env.JANKY_SHA1
-
  TimeReporter = require './time-reporter'
  timeReporter = new TimeReporter()

@@ -40,10 +38,3 @@ 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
@@ -14,10 +14,6 @@ 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
@@ -74,28 +70,6 @@ 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
@@ -153,10 +127,6 @@ 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)
@@ -208,10 +178,6 @@ 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)
@@ -260,10 +226,6 @@ 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)
@@ -280,10 +242,6 @@ 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)
@@ -299,10 +257,6 @@ 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()
@@ -321,46 +275,46 @@ describe "LanguageMode", ->
      it "folds every foldable line", ->
        languageMode.foldAll()

-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
        expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 12]
        fold1.destroy()

-        fold2 = editor.tokenizedLineForScreenRow(1).fold
+        fold2 = editor.lineForScreenRow(1).fold
        expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [1, 9]
        fold2.destroy()

-        fold3 = editor.tokenizedLineForScreenRow(4).fold
+        fold3 = editor.lineForScreenRow(4).fold
        expect([fold3.getStartRow(), fold3.getEndRow()]).toEqual [4, 7]

    describe ".foldBufferRow(bufferRow)", ->
      describe "when bufferRow can be folded", ->
        it "creates a fold based on the syntactic region starting at the given row", ->
          languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
          expect(fold.getStartRow()).toBe 1
          expect(fold.getEndRow()).toBe 9

      describe "when bufferRow can't be folded", ->
        it "searches upward for the first row that begins a syntatic region containing the given buffer row (and folds it)", ->
          languageMode.foldBufferRow(8)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
          expect(fold.getStartRow()).toBe 1
          expect(fold.getEndRow()).toBe 9

      describe "when the bufferRow is already folded", ->
        it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
          languageMode.foldBufferRow(2)
-          expect(editor.tokenizedLineForScreenRow(1).fold).toBeDefined()
-          expect(editor.tokenizedLineForScreenRow(0).fold).not.toBeDefined()
+          expect(editor.lineForScreenRow(1).fold).toBeDefined()
+          expect(editor.lineForScreenRow(0).fold).not.toBeDefined()

          languageMode.foldBufferRow(1)
-          expect(editor.tokenizedLineForScreenRow(0).fold).toBeDefined()
+          expect(editor.lineForScreenRow(0).fold).toBeDefined()

      describe "when the bufferRow is in a multi-line comment", ->
        it "searches upward and downward for surrounding comment lines and folds them as a single fold", ->
          buffer.insert([1,0], "  //this is a comment\n  // and\n  //more docs\n\n//second comment")
          languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
          expect(fold.getStartRow()).toBe 1
          expect(fold.getEndRow()).toBe 3

@@ -368,7 +322,7 @@ describe "LanguageMode", ->
        it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
          buffer.insert([1,0], "  //this is a single line comment\n")
          languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(0).fold
+          fold = editor.lineForScreenRow(0).fold
          expect(fold.getStartRow()).toBe 0
          expect(fold.getEndRow()).toBe 13

@@ -390,10 +344,6 @@ 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()
@@ -407,38 +357,38 @@ describe "LanguageMode", ->
      it "folds every foldable line", ->
        languageMode.foldAll()

-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
        expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 19]
        fold1.destroy()

-        fold2 = editor.tokenizedLineForScreenRow(1).fold
+        fold2 = editor.lineForScreenRow(1).fold
        expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [1, 4]

-        fold3 = editor.tokenizedLineForScreenRow(2).fold.destroy()
+        fold3 = editor.lineForScreenRow(2).fold.destroy()

-        fold4 = editor.tokenizedLineForScreenRow(3).fold
+        fold4 = editor.lineForScreenRow(3).fold
        expect([fold4.getStartRow(), fold4.getEndRow()]).toEqual [6, 8]

    describe ".foldAllAtIndentLevel()", ->
      it "folds every foldable range at a given indentLevel", ->
        languageMode.foldAllAtIndentLevel(2)

-        fold1 = editor.tokenizedLineForScreenRow(6).fold
+        fold1 = editor.lineForScreenRow(6).fold
        expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [6, 8]
        fold1.destroy()

-        fold2 = editor.tokenizedLineForScreenRow(11).fold
+        fold2 = editor.lineForScreenRow(11).fold
        expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [11, 14]
        fold2.destroy()

      it "does not fold anything but the indentLevel", ->
        languageMode.foldAllAtIndentLevel(0)

-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
        expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 19]
        fold1.destroy()

-        fold2 = editor.tokenizedLineForScreenRow(5).fold
+        fold2 = editor.lineForScreenRow(5).fold
        expect(fold2).toBeFalsy()

    describe ".isFoldableAtBufferRow(bufferRow)", ->
@@ -463,10 +413,6 @@ 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}')
@@ -1,48 +0,0 @@
-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"}]}
@@ -1,570 +0,0 @@
-{$, $$, 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.templateForElement(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.templateForElement(element)[0].label).toBe "Menu item 1"
-            expect(atom.contextMenu.templateForElement(element)[1].label).toBe "Menu item 2"
-            expect(atom.contextMenu.templateForElement(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.templateForElement(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.templateForElement(element)[0].label).toBe "Menu item 2"
-            expect(atom.contextMenu.templateForElement(element)[1].label).toBe "Menu item 1"
-            expect(atom.contextMenu.templateForElement(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
@@ -5,9 +5,6 @@ ThemePackage = require '../src/theme-package'

 describe "Package", ->
  describe "when the package contains incompatible native modules", ->
-    beforeEach ->
-      spyOn(atom, 'inDevMode').andReturn(false)
-
    it "does not activate it", ->
      packagePath = atom.project.resolve('packages/package-with-incompatible-native-module')
      pack = new Package(packagePath)
@@ -102,6 +99,6 @@ describe "Package", ->
        theme.activate()

      it "deactivated event fires on .deactivate()", ->
-        theme.onDidDeactivate spy = jasmine.createSpy()
+        theme.on 'deactivated', spy = jasmine.createSpy()
        theme.deactivate()
        expect(spy).toHaveBeenCalled()
@@ -27,91 +27,42 @@ describe "PaneContainer", ->

    it "preserves the active pane across serialization, independent of focus", ->
      pane3A.activate()
-      expect(containerA.getActivePane()).toBe pane3A
+      expect(containerA.activePane).toBe pane3A

      containerB = containerA.testSerialization()
      [pane1B, pane2B, pane3B] = containerB.getPanes()
-      expect(containerB.getActivePane()).toBe pane3B
+      expect(containerB.activePane).toBe pane3B

-  it "does not allow the root pane to be destroyed", ->
-    container = new PaneContainer
-    container.getRoot().destroy()
-    expect(container.getRoot()).toBeDefined()
-    expect(container.getRoot().isDestroyed()).toBe false
-
-  describe "::getActivePane()", ->
+  describe "::activePane", ->
    [container, pane1, pane2] = []

    beforeEach ->
      container = new PaneContainer
-      pane1 = container.getRoot()
+      pane1 = container.root

-    it "returns the first pane if no pane has been made active", ->
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
+    it "references the first pane if no pane has been made active", ->
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true

-    it "returns the most pane on which ::activate() was most recently called", ->
+    it "references the most pane on which ::activate was most recently called", ->
      pane2 = pane1.splitRight()
      pane2.activate()
-      expect(container.getActivePane()).toBe pane2
-      expect(pane1.isActive()).toBe false
-      expect(pane2.isActive()).toBe true
+      expect(container.activePane).toBe pane2
+      expect(pane1.active).toBe false
+      expect(pane2.active).toBe true
      pane1.activate()
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
-      expect(pane2.isActive()).toBe false
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true
+      expect(pane2.active).toBe false

-    it "returns the next pane if the current active pane is destroyed", ->
+    it "is reassigned to the next pane if the current active pane is destroyed", ->
      pane2 = pane1.splitRight()
      pane2.activate()
      pane2.destroy()
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true

-  describe "::onDidChangeActivePaneItem()", ->
-    [container, pane1, pane2, observed] = []
-
-    beforeEach ->
-      container = new PaneContainer(root: new Pane(items: [new Object, new Object]))
-      container.getRoot().splitRight(items: [new Object, new Object])
-      [pane1, pane2] = container.getPanes()
-
-      observed = []
-      container.onDidChangeActivePaneItem (item) -> observed.push(item)
-
-    it "invokes observers when the active item of the active pane changes", ->
-      pane2.activateNextItem()
-      pane2.activateNextItem()
-      expect(observed).toEqual [pane2.itemAtIndex(1), pane2.itemAtIndex(0)]
-
-    it "invokes observers when the active pane changes", ->
-      pane1.activate()
-      pane2.activate()
-      expect(observed).toEqual [pane1.itemAtIndex(0), pane2.itemAtIndex(0)]
-
-  describe "::observePanes()", ->
-    it "invokes observers with all current and future panes", ->
-      container = new PaneContainer
-      container.getRoot().splitRight()
-      [pane1, pane2] = container.getPanes()
-
-      observed = []
-      container.observePanes (pane) -> observed.push(pane)
-
-      pane3 = pane2.splitDown()
-      pane4 = pane2.splitRight()
-
-      expect(observed).toEqual [pane1, pane2, pane3, pane4]
-
-  describe "::observePaneItems()", ->
-    it "invokes observers with all current and future pane items", ->
-      container = new PaneContainer(root: new Pane(items: [new Object, new Object]))
-      container.getRoot().splitRight(items: [new Object])
-      [pane1, pane2] = container.getPanes()
-      observed = []
-      container.observePaneItems (pane) -> observed.push(pane)
-
-      pane3 = pane2.splitDown(items: [new Object])
-      pane3.addItems([new Object, new Object])
-
-      expect(observed).toEqual container.getPaneItems()
+    it "does not allow the root pane to be destroyed", ->
+      pane1.destroy()
+      expect(container.root).toBe pane1
+      expect(pane1.isDestroyed()).toBe false
@@ -5,11 +5,11 @@ PaneView = require '../src/pane-view'
 {$, View, $$} = require 'atom'

 describe "PaneContainerView", ->
-  [TestView, container, pane1, pane2, pane3, deserializerDisposable] = []
+  [TestView, container, pane1, pane2, pane3] = []

  beforeEach ->
    class TestView extends View
-      deserializerDisposable = atom.deserializers.add(this)
+      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 ->
-    deserializerDisposable.dispose()
+    atom.deserializers.remove(TestView)

  describe ".getActivePaneView()", ->
    it "returns the most-recently focused pane", ->
@@ -4,8 +4,6 @@ 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) ->
@@ -15,98 +13,47 @@ describe "Pane", ->
    isEqual: (other) -> @name is other?.name

  beforeEach ->
-    deserializerDisposable = atom.deserializers.add(Item)
+    atom.deserializers.add(Item)

  afterEach ->
-    deserializerDisposable.dispose()
+    atom.deserializers.remove(Item)

  describe "construction", ->
    it "sets the active item to the first item", ->
      pane = new Pane(items: [new Item("A"), new Item("B")])
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
+      expect(pane.activeItem).toBe pane.items[0]

    it "compacts the items array", ->
      pane = new Pane(items: [undefined, new Item("A"), null, new Item("B")])
-      expect(pane.getItems().length).toBe 2
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
-
-  describe "::activate()", ->
-    [container, pane1, pane2] = []
-
-    beforeEach ->
-      container = new PaneContainer(root: new Pane)
-      container.getRoot().splitRight()
-      [pane1, pane2] = container.getPanes()
-
-    it "changes the active pane on the container", ->
-      expect(container.getActivePane()).toBe pane2
-      pane1.activate()
-      expect(container.getActivePane()).toBe pane1
-      pane2.activate()
-      expect(container.getActivePane()).toBe pane2
-
-    it "invokes ::onDidChangeActivePane observers on the container", ->
-      observed = []
-      container.onDidChangeActivePane (activePane) -> observed.push(activePane)
-
-      pane1.activate()
-      pane1.activate()
-      pane2.activate()
-      pane1.activate()
-      expect(observed).toEqual [pane1, pane2, pane1]
-
-    it "invokes ::onDidChangeActive observers on the relevant panes", ->
-      observed = []
-      pane1.onDidChangeActive (active) -> observed.push(active)
-      pane1.activate()
-      pane2.activate()
-      expect(observed).toEqual [true, false]
-
-    it "invokes ::onDidActivate() observers", ->
-      eventCount = 0
-      pane1.onDidActivate -> eventCount++
-      pane1.activate()
-      pane1.activate()
-      pane2.activate()
-      expect(eventCount).toBe 2
+      expect(pane.items.length).toBe 2
+      expect(pane.activeItem).toBe pane.items[0]

  describe "::addItem(item, index)", ->
    it "adds the item at the given index", ->
      pane = new Pane(items: [new Item("A"), new Item("B")])
-      [item1, item2] = pane.getItems()
+      [item1, item2] = pane.items
      item3 = new Item("C")
      pane.addItem(item3, 1)
-      expect(pane.getItems()).toEqual [item1, item3, item2]
+      expect(pane.items).toEqual [item1, item3, item2]

-    it "adds the item after the active item if no index is provided", ->
+    it "adds the item after the active item ", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
      pane.activateItem(item2)
      item4 = new Item("D")
      pane.addItem(item4)
-      expect(pane.getItems()).toEqual [item1, item2, item4, item3]
+      expect(pane.items).toEqual [item1, item2, item4, item3]

    it "sets the active item after adding the first item", ->
      pane = new Pane
      item = new Item("A")
-      pane.addItem(item)
-      expect(pane.getActiveItem()).toBe item
-
-    it "invokes ::onDidAddItem() observers", ->
-      pane = new Pane(items: [new Item("A"), new Item("B")])
      events = []
-      pane.onDidAddItem (event) -> events.push(event)
+      pane.on 'item-added', -> events.push('item-added')
+      pane.$activeItem.changes.onValue -> events.push('active-item-changed')

-      item = new Item("C")
-      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()
+      pane.addItem(item)
+      expect(pane.activeItem).toBe item
+      expect(events).toEqual ['item-added', 'active-item-changed']

  describe "::activateItem(item)", ->
    pane = null
@@ -115,102 +62,83 @@ describe "Pane", ->
      pane = new Pane(items: [new Item("A"), new Item("B")])

    it "changes the active item to the current item", ->
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
-      pane.activateItem(pane.itemAtIndex(1))
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(1)
+      expect(pane.activeItem).toBe pane.items[0]
+      pane.activateItem(pane.items[1])
+      expect(pane.activeItem).toBe pane.items[1]

    it "adds the given item if it isn't present in ::items", ->
      item = new Item("C")
      pane.activateItem(item)
-      expect(item in pane.getItems()).toBe true
-      expect(pane.getActiveItem()).toBe item
-
-    it "invokes ::onDidChangeActiveItem() observers", ->
-      observed = []
-      pane.onDidChangeActiveItem (item) -> observed.push(item)
-      pane.activateItem(pane.itemAtIndex(1))
-      expect(observed).toEqual [pane.itemAtIndex(1)]
+      expect(item in pane.items).toBe true
+      expect(pane.activeItem).toBe item

  describe "::activateNextItem() and ::activatePreviousItem()", ->
    it "sets the active item to the next/previous item, looping around at either end", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items

-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
      pane.activatePreviousItem()
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
      pane.activatePreviousItem()
-      expect(pane.getActiveItem()).toBe item2
+      expect(pane.activeItem).toBe item2
      pane.activateNextItem()
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
      pane.activateNextItem()
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1

  describe "::activateItemAtIndex(index)", ->
    it "activates the item at the given index", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
      pane.activateItemAtIndex(2)
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
      pane.activateItemAtIndex(1)
-      expect(pane.getActiveItem()).toBe item2
+      expect(pane.activeItem).toBe item2
      pane.activateItemAtIndex(0)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1

      # Doesn't fail with out-of-bounds indices
      pane.activateItemAtIndex(100)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
      pane.activateItemAtIndex(-1)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1

  describe "::destroyItem(item)", ->
    [pane, item1, item2, item3] = []

    beforeEach ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items

-    it "removes the item from the items list and destroyes it", ->
-      expect(pane.getActiveItem()).toBe item1
+    it "removes the item from the items list", ->
+      expect(pane.activeItem).toBe item1
      pane.destroyItem(item2)
-      expect(item2 in pane.getItems()).toBe false
-      expect(item2.isDestroyed()).toBe true
-      expect(pane.getActiveItem()).toBe item1
+      expect(item2 in pane.items).toBe false
+      expect(pane.activeItem).toBe item1

      pane.destroyItem(item1)
-      expect(item1 in pane.getItems()).toBe false
-      expect(item1.isDestroyed()).toBe true
-
-    it "invokes ::onWillDestroyItem() observers before destroying the item", ->
-      events = []
-      pane.onWillDestroyItem (event) ->
-        expect(item2.isDestroyed()).toBe false
-        events.push(event)
-
-      pane.destroyItem(item2)
-      expect(item2.isDestroyed()).toBe true
-      expect(events).toEqual [{item: item2, index: 1}]
-
-    it "invokes ::onDidRemoveItem() observers", ->
-      events = []
-      pane.onDidRemoveItem (event) -> events.push(event)
-      pane.destroyItem(item2)
-      expect(events).toEqual [{item: item2, index: 1, destroyed: true}]
+      expect(item1 in pane.items).toBe false

    describe "when the destroyed item is the active item and is the first item", ->
      it "activates the next item", ->
-        expect(pane.getActiveItem()).toBe item1
+        expect(pane.activeItem).toBe item1
        pane.destroyItem(item1)
-        expect(pane.getActiveItem()).toBe item2
+        expect(pane.activeItem).toBe item2

    describe "when the destroyed item is the active item and is not the first item", ->
      beforeEach ->
        pane.activateItem(item2)

      it "activates the previous item", ->
-        expect(pane.getActiveItem()).toBe item2
+        expect(pane.activeItem).toBe item2
        pane.destroyItem(item2)
-        expect(pane.getActiveItem()).toBe item1
+        expect(pane.activeItem).toBe item1
+
+    it "emits 'item-removed' with the item, its index, and true indicating the item is being destroyed", ->
+      pane.on 'item-removed', itemRemovedHandler = jasmine.createSpy("itemRemovedHandler")
+      pane.destroyItem(item2)
+      expect(itemRemovedHandler).toHaveBeenCalledWith(item2, 1, true)

    describe "if the item is modified", ->
      itemUri = null
@@ -229,7 +157,7 @@ describe "Pane", ->
            pane.destroyItem(item1)

            expect(item1.save).toHaveBeenCalled()
-            expect(item1 in pane.getItems()).toBe false
+            expect(item1 in pane.items).toBe false
            expect(item1.isDestroyed()).toBe true

        describe "when the item has no uri", ->
@@ -242,7 +170,7 @@ describe "Pane", ->

            expect(atom.showSaveDialogSync).toHaveBeenCalled()
            expect(item1.saveAs).toHaveBeenCalledWith("/selected/path")
-            expect(item1 in pane.getItems()).toBe false
+            expect(item1 in pane.items).toBe false
            expect(item1.isDestroyed()).toBe true

      describe "if the [Don't Save] option is selected", ->
@@ -251,7 +179,7 @@ describe "Pane", ->
          pane.destroyItem(item1)

          expect(item1.save).not.toHaveBeenCalled()
-          expect(item1 in pane.getItems()).toBe false
+          expect(item1 in pane.items).toBe false
          expect(item1.isDestroyed()).toBe true

      describe "if the [Cancel] option is selected", ->
@@ -260,7 +188,7 @@ describe "Pane", ->
          pane.destroyItem(item1)

          expect(item1.save).not.toHaveBeenCalled()
-          expect(item1 in pane.getItems()).toBe true
+          expect(item1 in pane.items).toBe true
          expect(item1.isDestroyed()).toBe false

    describe "when the last item is destroyed", ->
@@ -269,7 +197,7 @@ describe "Pane", ->
          expect(atom.config.get('core.destroyEmptyPanes')).toBe false
          pane.destroyItem(item) for item in pane.getItems()
          expect(pane.isDestroyed()).toBe false
-          expect(pane.getActiveItem()).toBeUndefined()
+          expect(pane.activeItem).toBeUndefined()
          expect(-> pane.saveActiveItem()).not.toThrow()
          expect(-> pane.saveActiveItemAs()).not.toThrow()

@@ -282,10 +210,10 @@ describe "Pane", ->
  describe "::destroyActiveItem()", ->
    it "destroys the active item", ->
      pane = new Pane(items: [new Item("A"), new Item("B")])
-      activeItem = pane.getActiveItem()
+      activeItem = pane.activeItem
      pane.destroyActiveItem()
      expect(activeItem.isDestroyed()).toBe true
-      expect(activeItem in pane.getItems()).toBe false
+      expect(activeItem in pane.items).toBe false

    it "does not throw an exception if there are no more items", ->
      pane = new Pane
@@ -294,40 +222,27 @@ describe "Pane", ->
  describe "::destroyItems()", ->
    it "destroys all items", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
      pane.destroyItems()
      expect(item1.isDestroyed()).toBe true
      expect(item2.isDestroyed()).toBe true
      expect(item3.isDestroyed()).toBe true
-      expect(pane.getItems()).toEqual []
-
-  describe "::observeItems()", ->
-    it "invokes the observer with all current and future items", ->
-      pane = new Pane(items: [new Item, new Item])
-      [item1, item2] = pane.getItems()
-
-      observed = []
-      pane.observeItems (item) -> observed.push(item)
-
-      item3 = new Item
-      pane.addItem(item3)
-
-      expect(observed).toEqual [item1, item2, item3]
+      expect(pane.items).toEqual []

  describe "when an item emits a destroyed event", ->
    it "removes it from the list of items", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
-      pane.itemAtIndex(1).destroy()
-      expect(pane.getItems()).toEqual [item1, item3]
+      [item1, item2, item3] = pane.items
+      pane.items[1].destroy()
+      expect(pane.items).toEqual [item1, item3]

  describe "::destroyInactiveItems()", ->
    it "destroys all items but the active item", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
      pane.activateItem(item2)
      pane.destroyInactiveItems()
-      expect(pane.getItems()).toEqual [item2]
+      expect(pane.items).toEqual [item2]

  describe "::saveActiveItem()", ->
    pane = null
@@ -338,30 +253,30 @@ describe "Pane", ->

    describe "when the active item has a uri", ->
      beforeEach ->
-        pane.getActiveItem().uri = "test"
+        pane.activeItem.uri = "test"

      describe "when the active item has a save method", ->
        it "saves the current item", ->
-          pane.getActiveItem().save = jasmine.createSpy("save")
+          pane.activeItem.save = jasmine.createSpy("save")
          pane.saveActiveItem()
-          expect(pane.getActiveItem().save).toHaveBeenCalled()
+          expect(pane.activeItem.save).toHaveBeenCalled()

      describe "when the current item has no save method", ->
        it "does nothing", ->
-          expect(pane.getActiveItem().save).toBeUndefined()
+          expect(pane.activeItem.save).toBeUndefined()
          pane.saveActiveItem()

    describe "when the current item has no uri", ->
      describe "when the current item has a saveAs method", ->
        it "opens a save dialog and saves the current item as the selected path", ->
-          pane.getActiveItem().saveAs = jasmine.createSpy("saveAs")
+          pane.activeItem.saveAs = jasmine.createSpy("saveAs")
          pane.saveActiveItem()
          expect(atom.showSaveDialogSync).toHaveBeenCalled()
-          expect(pane.getActiveItem().saveAs).toHaveBeenCalledWith('/selected/path')
+          expect(pane.activeItem.saveAs).toHaveBeenCalledWith('/selected/path')

      describe "when the current item has no saveAs method", ->
        it "does nothing", ->
-          expect(pane.getActiveItem().saveAs).toBeUndefined()
+          expect(pane.activeItem.saveAs).toBeUndefined()
          pane.saveActiveItem()
          expect(atom.showSaveDialogSync).not.toHaveBeenCalled()

@@ -374,22 +289,22 @@ describe "Pane", ->

    describe "when the current item has a saveAs method", ->
      it "opens the save dialog and calls saveAs on the item with the selected path", ->
-        pane.getActiveItem().path = __filename
-        pane.getActiveItem().saveAs = jasmine.createSpy("saveAs")
+        pane.activeItem.path = __filename
+        pane.activeItem.saveAs = jasmine.createSpy("saveAs")
        pane.saveActiveItemAs()
        expect(atom.showSaveDialogSync).toHaveBeenCalledWith(__filename)
-        expect(pane.getActiveItem().saveAs).toHaveBeenCalledWith('/selected/path')
+        expect(pane.activeItem.saveAs).toHaveBeenCalledWith('/selected/path')

    describe "when the current item does not have a saveAs method", ->
      it "does nothing", ->
-        expect(pane.getActiveItem().saveAs).toBeUndefined()
+        expect(pane.activeItem.saveAs).toBeUndefined()
        pane.saveActiveItemAs()
        expect(atom.showSaveDialogSync).not.toHaveBeenCalled()

  describe "::itemForUri(uri)", ->
    it "returns the item for which a call to .getUri() returns the given uri", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
      item1.uri = "a"
      item2.uri = "b"
      expect(pane.itemForUri("a")).toBe item1
@@ -397,32 +312,24 @@ describe "Pane", ->
      expect(pane.itemForUri("bogus")).toBeUndefined()

  describe "::moveItem(item, index)", ->
-    [pane, item1, item2, item3, item4] = []
-
-    beforeEach ->
+    it "moves the item to the given index and emits an 'item-moved' event with the item and its new index", ->
      pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D")])
-      [item1, item2, item3, item4] = pane.getItems()
+      [item1, item2, item3, item4] = pane.items
+      pane.on 'item-moved', itemMovedHandler = jasmine.createSpy("itemMovedHandler")

-    it "moves the item to the given index and invokes ::onDidMoveItem observers", ->
      pane.moveItem(item1, 2)
      expect(pane.getItems()).toEqual [item2, item3, item1, item4]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item1, 2)
+      itemMovedHandler.reset()

      pane.moveItem(item2, 3)
      expect(pane.getItems()).toEqual [item3, item1, item4, item2]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item2, 3)
+      itemMovedHandler.reset()

      pane.moveItem(item2, 1)
      expect(pane.getItems()).toEqual [item3, item2, item1, item4]
-
-    it "invokes ::onDidMoveItem() observers", ->
-      events = []
-      pane.onDidMoveItem (event) -> events.push(event)
-
-      pane.moveItem(item1, 2)
-      pane.moveItem(item2, 3)
-      expect(events).toEqual [
-        {item: item1, oldIndex: 0, newIndex: 2}
-        {item: item2, oldIndex: 0, newIndex: 3}
-      ]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item2, 1)

  describe "::moveItemToPane(item, pane, index)", ->
    [container, pane1, pane2] = []
@@ -432,20 +339,13 @@ describe "Pane", ->
      pane1 = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
      container = new PaneContainer(root: pane1)
      pane2 = pane1.splitRight(items: [new Item("D"), new Item("E")])
-      [item1, item2, item3] = pane1.getItems()
-      [item4, item5] = pane2.getItems()
+      [item1, item2, item3] = pane1.items
+      [item4, item5] = pane2.items

    it "moves the item to the given pane at the given index", ->
      pane1.moveItemToPane(item2, pane2, 1)
-      expect(pane1.getItems()).toEqual [item1, item3]
-      expect(pane2.getItems()).toEqual [item4, item2, item5]
-
-    it "invokes ::onDidRemoveItem() observers", ->
-      events = []
-      pane1.onDidRemoveItem (event) -> events.push(event)
-      pane1.moveItemToPane(item2, pane2, 1)
-
-      expect(events).toEqual [{item: item2, index: 1, destroyed: false}]
+      expect(pane1.items).toEqual [item1, item3]
+      expect(pane2.items).toEqual [item4, item2, item5]

    describe "when the moved item the last item in the source pane", ->
      beforeEach ->
@@ -468,27 +368,22 @@ describe "Pane", ->
    [pane1, container] = []

    beforeEach ->
-      pane1 = new Pane(items: [new Item("A")])
+      pane1 = new Pane(items: ["A"])
      container = new PaneContainer(root: pane1)

    describe "::splitLeft(params)", ->
      describe "when the parent is the container root", ->
        it "replaces itself with a row and inserts a new pane to the left of itself", ->
-          pane2 = pane1.splitLeft(items: [new Item("B")])
-          pane3 = pane1.splitLeft(items: [new Item("C")])
+          pane2 = pane1.splitLeft(items: ["B"])
+          pane3 = pane1.splitLeft(items: ["C"])
          expect(container.root.orientation).toBe 'horizontal'
          expect(container.root.children).toEqual [pane2, pane3, pane1]

-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitLeft(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
      describe "when the parent is a column", ->
        it "replaces itself with a row and inserts a new pane to the left of itself", ->
          pane1.splitDown()
-          pane2 = pane1.splitLeft(items: [new Item("B")])
-          pane3 = pane1.splitLeft(items: [new Item("C")])
+          pane2 = pane1.splitLeft(items: ["B"])
+          pane3 = pane1.splitLeft(items: ["C"])
          row = container.root.children[0]
          expect(row.orientation).toBe 'horizontal'
          expect(row.children).toEqual [pane2, pane3, pane1]
@@ -496,21 +391,16 @@ describe "Pane", ->
    describe "::splitRight(params)", ->
      describe "when the parent is the container root", ->
        it "replaces itself with a row and inserts a new pane to the right of itself", ->
-          pane2 = pane1.splitRight(items: [new Item("B")])
-          pane3 = pane1.splitRight(items: [new Item("C")])
+          pane2 = pane1.splitRight(items: ["B"])
+          pane3 = pane1.splitRight(items: ["C"])
          expect(container.root.orientation).toBe 'horizontal'
          expect(container.root.children).toEqual [pane1, pane3, pane2]

-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitRight(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
      describe "when the parent is a column", ->
        it "replaces itself with a row and inserts a new pane to the right of itself", ->
          pane1.splitDown()
-          pane2 = pane1.splitRight(items: [new Item("B")])
-          pane3 = pane1.splitRight(items: [new Item("C")])
+          pane2 = pane1.splitRight(items: ["B"])
+          pane3 = pane1.splitRight(items: ["C"])
          row = container.root.children[0]
          expect(row.orientation).toBe 'horizontal'
          expect(row.children).toEqual [pane1, pane3, pane2]
@@ -518,21 +408,16 @@ describe "Pane", ->
    describe "::splitUp(params)", ->
      describe "when the parent is the container root", ->
        it "replaces itself with a column and inserts a new pane above itself", ->
-          pane2 = pane1.splitUp(items: [new Item("B")])
-          pane3 = pane1.splitUp(items: [new Item("C")])
+          pane2 = pane1.splitUp(items: ["B"])
+          pane3 = pane1.splitUp(items: ["C"])
          expect(container.root.orientation).toBe 'vertical'
          expect(container.root.children).toEqual [pane2, pane3, pane1]

-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitUp(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
      describe "when the parent is a row", ->
        it "replaces itself with a column and inserts a new pane above itself", ->
          pane1.splitRight()
-          pane2 = pane1.splitUp(items: [new Item("B")])
-          pane3 = pane1.splitUp(items: [new Item("C")])
+          pane2 = pane1.splitUp(items: ["B"])
+          pane3 = pane1.splitUp(items: ["C"])
          column = container.root.children[0]
          expect(column.orientation).toBe 'vertical'
          expect(column.children).toEqual [pane2, pane3, pane1]
@@ -540,21 +425,16 @@ describe "Pane", ->
    describe "::splitDown(params)", ->
      describe "when the parent is the container root", ->
        it "replaces itself with a column and inserts a new pane below itself", ->
-          pane2 = pane1.splitDown(items: [new Item("B")])
-          pane3 = pane1.splitDown(items: [new Item("C")])
+          pane2 = pane1.splitDown(items: ["B"])
+          pane3 = pane1.splitDown(items: ["C"])
          expect(container.root.orientation).toBe 'vertical'
          expect(container.root.children).toEqual [pane1, pane3, pane2]

-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitDown(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
      describe "when the parent is a row", ->
        it "replaces itself with a column and inserts a new pane below itself", ->
          pane1.splitRight()
-          pane2 = pane1.splitDown(items: [new Item("B")])
-          pane3 = pane1.splitDown(items: [new Item("C")])
+          pane2 = pane1.splitDown(items: ["B"])
+          pane3 = pane1.splitDown(items: ["C"])
          column = container.root.children[0]
          expect(column.orientation).toBe 'vertical'
          expect(column.children).toEqual [pane1, pane3, pane2]
@@ -575,7 +455,7 @@ describe "Pane", ->
      pane2 = pane1.splitRight()

    it "destroys the pane's destroyable items", ->
-      [item1, item2] = pane1.getItems()
+      [item1, item2] = pane1.items
      pane1.destroy()
      expect(item1.isDestroyed()).toBe true
      expect(item2.isDestroyed()).toBe true
@@ -613,12 +493,12 @@ describe "Pane", ->

    it "can serialize and deserialize the pane and all its items", ->
      newPane = pane.testSerialization()
-      expect(newPane.getItems()).toEqual pane.getItems()
+      expect(newPane.items).toEqual pane.items

    it "restores the active item on deserialization", ->
      pane.activateItemAtIndex(1)
      newPane = pane.testSerialization()
-      expect(newPane.getActiveItem()).toEqual newPane.itemAtIndex(1)
+      expect(newPane.activeItem).toEqual newPane.items[1]

    it "does not include items that cannot be deserialized", ->
      spyOn(console, 'warn')
@@ -626,8 +506,8 @@ describe "Pane", ->
      pane.activateItem(unserializable)

      newPane = pane.testSerialization()
-      expect(newPane.getActiveItem()).toEqual pane.itemAtIndex(0)
-      expect(newPane.getItems().length).toBe pane.getItems().length - 1
+      expect(newPane.activeItem).toEqual pane.items[0]
+      expect(newPane.items.length).toBe pane.items.length - 1

    it "includes the pane's focus state in the serialized state", ->
      pane.focus()
@@ -1,31 +1,24 @@
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
 fs = require 'fs-plus'
-{Emitter} = require 'event-kit'
 {$, View} = require 'atom'
 path = require 'path'
 temp = require 'temp'

 describe "PaneView", ->
-  [container, containerModel, view1, view2, editor1, editor2, pane, paneModel, deserializerDisposable] = []
+  [container, view1, view2, editor1, editor2, pane, paneModel] = []

  class TestView extends View
    @deserialize: ({id, text}) -> new TestView({id, text})
    @content: ({id, text}) -> @div class: 'test-view', id: id, tabindex: -1, text
    initialize: ({@id, @text}) ->
-      @emitter = new Emitter
    serialize: -> { deserializer: 'TestView', @id, @text }
    getUri: -> @id
    isEqual: (other) -> other? and @id == other.id and @text == other.text
-    changeTitle: ->
-      @emitter.emit 'did-change-title', 'title'
-    onDidChangeTitle: (callback) ->
-      @emitter.on 'did-change-title', callback

  beforeEach ->
-    deserializerDisposable = atom.deserializers.add(TestView)
+    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 ->
@@ -36,15 +29,15 @@ describe "PaneView", ->

    runs ->
      pane = container.getRoot()
-      paneModel = pane.getModel()
+      paneModel = pane.model
      paneModel.addItems([view1, editor1, view2, editor2])

  afterEach ->
-    deserializerDisposable.dispose()
+    atom.deserializers.remove(TestView)

  describe "when the active pane item changes", ->
    it "hides all item views except the active one", ->
-      expect(pane.getActiveItem()).toBe view1
+      expect(pane.activeItem).toBe view1
      expect(view1.css('display')).not.toBe 'none'

      pane.activateItem(view2)
@@ -55,7 +48,7 @@ describe "PaneView", ->
      itemChangedHandler = jasmine.createSpy("itemChangedHandler")
      container.on 'pane:active-item-changed', itemChangedHandler

-      expect(pane.getActiveItem()).toBe view1
+      expect(pane.activeItem).toBe view1
      paneModel.activateItem(view2)
      paneModel.activateItem(view2)

@@ -152,47 +145,22 @@ describe "PaneView", ->
      expect(view1.data('preservative')).toBe 1234

  describe "when the title of the active item changes", ->
-    describe 'when there is no onDidChangeTitle method', ->
-      beforeEach ->
-        view1.onDidChangeTitle = null
-        view2.onDidChangeTitle = null
+    it "emits pane:active-item-title-changed", ->
+      activeItemTitleChangedHandler = jasmine.createSpy("activeItemTitleChangedHandler")
+      pane.on 'pane:active-item-title-changed', activeItemTitleChangedHandler

-        pane.activateItem(view2)
-        pane.activateItem(view1)
+      expect(pane.activeItem).toBe view1

-      it "emits pane:active-item-title-changed", ->
-        activeItemTitleChangedHandler = jasmine.createSpy("activeItemTitleChangedHandler")
-        pane.on 'pane:active-item-title-changed', activeItemTitleChangedHandler
+      view2.trigger 'title-changed'
+      expect(activeItemTitleChangedHandler).not.toHaveBeenCalled()

-        expect(pane.getActiveItem()).toBe view1
+      view1.trigger 'title-changed'
+      expect(activeItemTitleChangedHandler).toHaveBeenCalled()
+      activeItemTitleChangedHandler.reset()

-        view2.trigger 'title-changed'
-        expect(activeItemTitleChangedHandler).not.toHaveBeenCalled()
-
-        view1.trigger 'title-changed'
-        expect(activeItemTitleChangedHandler).toHaveBeenCalled()
-        activeItemTitleChangedHandler.reset()
-
-        pane.activateItem(view2)
-        view2.trigger 'title-changed'
-        expect(activeItemTitleChangedHandler).toHaveBeenCalled()
-
-    describe 'when there is a onDidChangeTitle method', ->
-      it "emits pane:active-item-title-changed", ->
-        activeItemTitleChangedHandler = jasmine.createSpy("activeItemTitleChangedHandler")
-        pane.on 'pane:active-item-title-changed', activeItemTitleChangedHandler
-
-        expect(pane.getActiveItem()).toBe view1
-        view2.changeTitle()
-        expect(activeItemTitleChangedHandler).not.toHaveBeenCalled()
-
-        view1.changeTitle()
-        expect(activeItemTitleChangedHandler).toHaveBeenCalled()
-        activeItemTitleChangedHandler.reset()
-
-        pane.activateItem(view2)
-        view2.changeTitle()
-        expect(activeItemTitleChangedHandler).toHaveBeenCalled()
+      pane.activateItem(view2)
+      view2.trigger 'title-changed'
+      expect(activeItemTitleChangedHandler).toHaveBeenCalled()

  describe "when an unmodifed buffer's path is deleted", ->
    it "removes the pane item", ->
@@ -217,7 +185,7 @@ describe "PaneView", ->

    beforeEach ->
      pane2Model = paneModel.splitRight() # Can't destroy the last pane, so we add another
-      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane2 = pane2Model._view

    it "triggers a 'pane:removed' event with the pane", ->
      removedHandler = jasmine.createSpy("removedHandler")
@@ -250,7 +218,7 @@ describe "PaneView", ->

    beforeEach ->
      pane2Model = paneModel.splitRight(items: [pane.copyActiveItem()])
-      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane2 = pane2Model._view
      expect(pane2Model.isActive()).toBe true

    it "adds or removes the .active class as appropriate", ->
@@ -278,7 +246,7 @@ describe "PaneView", ->

    it "transfers focus to the active view", ->
      focusHandler = jasmine.createSpy("focusHandler")
-      pane.getActiveItem().on 'focus', focusHandler
+      pane.activeItem.on 'focus', focusHandler
      pane.focus()
      expect(focusHandler).toHaveBeenCalled()

@@ -291,14 +259,13 @@ describe "PaneView", ->
  describe "when a pane is split", ->
    it "builds the appropriate pane-row and pane-column views", ->
      pane1 = pane
-      pane1Model = pane.getModel()
+      pane1Model = pane.model
      pane.activateItem(editor1)

      pane2Model = pane1Model.splitRight(items: [pane1Model.copyActiveItem()])
      pane3Model = pane2Model.splitDown(items: [pane2Model.copyActiveItem()])
      pane2 = pane2Model._view
-      pane2 = containerModel.getView(pane2Model).__spacePenView
-      pane3 = containerModel.getView(pane3Model).__spacePenView
+      pane3 = pane3Model._view

      expect(container.find('> .pane-row > .pane').toArray()).toEqual [pane1[0]]
      expect(container.find('> .pane-row > .pane-column > .pane').toArray()).toEqual [pane2[0], pane3[0]]
@@ -9,7 +9,7 @@ BufferedProcess = require '../src/buffered-process'

 describe "Project", ->
  beforeEach ->
-    atom.project.setPaths([atom.project.resolve('dir')])
+    atom.project.setPath(atom.project.resolve('dir'))

  describe "serialization", ->
    deserializedProject = null
@@ -41,8 +41,8 @@ describe "Project", ->
  describe "when an editor is saved and the project has no path", ->
    it "sets the project's path to the saved file's parent directory", ->
      tempFile = temp.openSync().path
-      atom.project.setPaths([])
-      expect(atom.project.getPaths()[0]).toBeUndefined()
+      atom.project.setPath(undefined)
+      expect(atom.project.getPath()).toBeUndefined()
      editor = null

      waitsForPromise ->
@@ -50,7 +50,7 @@ describe "Project", ->

      runs ->
        editor.saveAs(tempFile)
-        expect(atom.project.getPaths()[0]).toBe path.dirname(tempFile)
+        expect(atom.project.getPath()).toBe path.dirname(tempFile)

  describe ".open(path)", ->
    [absolutePath, newBufferHandler] = []
@@ -164,7 +164,7 @@ describe "Project", ->

    describe "when the project has no path", ->
      it "returns undefined for relative URIs", ->
-        atom.project.setPaths([])
+        atom.project.setPath()
        expect(atom.project.resolve('test.txt')).toBeUndefined()
        expect(atom.project.resolve('http://github.com')).toBe 'http://github.com'
        absolutePath = fs.absolute(__dirname)
@@ -173,33 +173,28 @@ describe "Project", ->
  describe ".setPath(path)", ->
    describe "when path is a file", ->
      it "sets its path to the files parent directory and updates the root directory", ->
-        atom.project.setPaths([require.resolve('./fixtures/dir/a')])
-        expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+        atom.project.setPath(require.resolve('./fixtures/dir/a'))
+        expect(atom.project.getPath()).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
        expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))

    describe "when path is a directory", ->
      it "sets its path to the directory and updates the root directory", ->
        directory = fs.absolute(path.join(__dirname, 'fixtures', 'dir', 'a-dir'))
-        atom.project.setPaths([directory])
-        expect(atom.project.getPaths()[0]).toEqual directory
+        atom.project.setPath(directory)
+        expect(atom.project.getPath()).toEqual directory
        expect(atom.project.getRootDirectory().path).toEqual directory

    describe "when path is null", ->
      it "sets its path and root directory to null", ->
-        atom.project.setPaths([])
-        expect(atom.project.getPaths()[0]?).toBeFalsy()
+        atom.project.setPath(null)
+        expect(atom.project.getPath()?).toBeFalsy()
        expect(atom.project.getRootDirectory()?).toBeFalsy()

-    it "normalizes the path to remove consecutive slashes, ., and .. segments", ->
-      atom.project.setPaths(["#{require.resolve('./fixtures/dir/a')}#{path.sep}b#{path.sep}#{path.sep}.."])
-      expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-      expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-
  describe ".replace()", ->
    [filePath, commentFilePath, sampleContent, sampleCommentContent] = []

    beforeEach ->
-      atom.project.setPaths([atom.project.resolve('../')])
+      atom.project.setPath(atom.project.resolve('../'))

      filePath = atom.project.resolve('sample.js')
      commentFilePath = atom.project.resolve('sample-with-comments.js')
@@ -332,7 +327,7 @@ describe "Project", ->

      it "works on evil filenames", ->
        platform.generateEvilFiles()
-        atom.project.setPaths([path.join(__dirname, 'fixtures', 'evil-files')])
+        atom.project.setPath(path.join(__dirname, 'fixtures', 'evil-files'))
        paths = []
        matches = []
        waitsForPromise ->
@@ -387,7 +382,7 @@ describe "Project", ->
          fs.removeSync(projectPath) if fs.existsSync(projectPath)

        it "excludes ignored files", ->
-          atom.project.setPaths([projectPath])
+          atom.project.setPath(projectPath)
          atom.config.set('core.excludeVcsIgnoredPaths', true)
          resultHandler = jasmine.createSpy("result found")
          waitsForPromise ->
@@ -399,7 +394,7 @@ describe "Project", ->

      it "includes only files when a directory filter is specified", ->
        projectPath = path.join(path.join(__dirname, 'fixtures', 'dir'))
-        atom.project.setPaths([projectPath])
+        atom.project.setPath(projectPath)

        filePath = path.join(projectPath, 'a-dir', 'oh-git')

@@ -419,7 +414,7 @@ describe "Project", ->
        projectPath = temp.mkdirSync()
        filePath = path.join(projectPath, '.text')
        fs.writeFileSync(filePath, 'match this')
-        atom.project.setPaths([projectPath])
+        atom.project.setPath(projectPath)
        paths = []
        matches = []
        waitsForPromise ->
@@ -1,9 +1,9 @@
 {times, random} = require 'underscore-plus'
 randomWords = require 'random-words'
 TextBuffer = require 'text-buffer'
-TextEditor = require '../src/text-editor'
+Editor = require '../src/editor'

-describe "TextEditor", ->
+describe "Editor", ->
  [editor, tokenizedBuffer, buffer, steps, previousSteps] = []

  softWrapColumn = 80
@@ -17,7 +17,7 @@ describe "TextEditor", ->

    times 10, (i) ->
      buffer = new TextBuffer
-      editor = new TextEditor({buffer})
+      editor = new Editor({buffer})
      editor.setEditorWidthInChars(80)
      tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
      steps = []
@@ -35,7 +35,7 @@ describe "TextEditor", ->
        logLines()
        throw new Error("Invalid buffer row #{actualBufferRow} for screen row #{screenRow}", )

-      actualScreenLine = editor.tokenizedLineForScreenRow(screenRow)
+      actualScreenLine = editor.lineForScreenRow(screenRow)
      unless actualScreenLine.text is referenceScreenLine.text
        logLines()
        throw new Error("Invalid line text at screen row #{screenRow}")
@@ -50,9 +50,9 @@ describe "TextEditor", ->

  randomlyMutateEditor = ->
    if Math.random() < .2
-      softWrapped = not editor.isSoftWrapped()
-      steps.push(['setSoftWrapped', softWrapped])
-      editor.setSoftWrapped(softWrapped)
+      softWrap = not editor.getSoftWrap()
+      steps.push(['setSoftWrap', softWrap])
+      editor.setSoftWrap(softWrap)
    else
      range = getRandomRange()
      text = getRandomText()
@@ -79,11 +79,11 @@ describe "TextEditor", ->
    text

  getReferenceScreenLines = ->
-    if editor.isSoftWrapped()
+    if editor.getSoftWrap()
      screenLines = []
      bufferRows = []
      for bufferRow in [0..tokenizedBuffer.getLastRow()]
-        for screenLine in softWrapLine(tokenizedBuffer.tokenizedLineForRow(bufferRow))
+        for screenLine in softWrapLine(tokenizedBuffer.lineForScreenRow(bufferRow))
          screenLines.push(screenLine)
          bufferRows.push(bufferRow)
    else
@@ -1,12 +1,12 @@
-TextEditor = require '../src/text-editor'
+Editor = require '../src/editor'

 describe "Selection", ->
  [buffer, editor, selection] = []

  beforeEach ->
    buffer = atom.project.bufferForPathSync('sample.js')
-    editor = new TextEditor(buffer: buffer, tabLength: 2)
-    selection = editor.getLastSelection()
+    editor = new Editor(buffer: buffer, tabLength: 2)
+    selection = editor.getSelection()

  afterEach ->
    buffer.destroy()
@@ -57,10 +57,10 @@ describe "Selection", ->
      expect(selection.isReversed()).toBeFalsy()

  describe "when only the selection's tail is moved (regression)", ->
-    it "notifies ::onDidChangeRange observers", ->
+    it "emits the 'screen-range-changed' event", ->
      selection.setBufferRange([[2, 0], [2, 10]], reversed: true)
      changeScreenRangeHandler = jasmine.createSpy('changeScreenRangeHandler')
-      selection.onDidChangeRange changeScreenRangeHandler
+      selection.on 'screen-range-changed', changeScreenRangeHandler

      buffer.insert([2, 5], 'abc')
      expect(changeScreenRangeHandler).toHaveBeenCalled()
@@ -12,25 +12,23 @@ KeymapManager = require '../src/keymap-extensions'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
 Project = require '../src/project'
-TextEditor = require '../src/text-editor'
-TextEditorView = require '../src/text-editor-view'
+Editor = require '../src/editor'
+EditorView = require '../src/editor-view'
 TokenizedBuffer = require '../src/tokenized-buffer'
-TextEditorComponent = require '../src/text-editor-component'
+EditorComponent = require '../src/editor-component'
 pathwatcher = require 'pathwatcher'
 clipboard = require 'clipboard'

 atom.themes.loadBaseStylesheets()
 atom.themes.requireStylesheet '../static/jasmine'
-atom.themes.initialLoadComplete = true

 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', ->
+$(window).on 'unload', ->
  atom.storeWindowDimensions()
  atom.saveSync()
 $('html,body').css('overflow', 'auto')
@@ -62,11 +60,9 @@ beforeEach ->
  Grim.clearDeprecations() if isCoreSpec
  $.fx.off = true
  projectPath = specProjectPath ? path.join(@specDirectory, 'fixtures')
-  atom.project = new Project(paths: [projectPath])
+  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 = {}
@@ -91,26 +87,27 @@ beforeEach ->
  config = new Config({resourcePath, configDirPath: atom.getConfigDirPath()})
  spyOn(config, 'load')
  spyOn(config, 'save')
-  atom.config = config
-  atom.loadConfig()
+  config.setDefaults('core', WorkspaceView.configDefaults)
+  config.setDefaults('editor', EditorView.configDefaults)
  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.set "core.useReactEditor", true
  config.save.reset()
+  atom.config = config

  # make editor display updates synchronous
-  spyOn(TextEditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
-  TextEditorComponent.performSyncUpdates = true
+  spyOn(EditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
+  EditorComponent.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(TextEditor.prototype, "shouldPromptToSave").andReturn false
+  spyOn(Editor.prototype, "shouldPromptToSave").andReturn false

  # make tokenization synchronous
  TokenizedBuffer.prototype.chunkSize = Infinity
@@ -125,7 +122,6 @@ beforeEach ->
 afterEach ->
  atom.packages.deactivatePackages()
  atom.menu.template = []
-  atom.contextMenu.clear()

  atom.workspaceView?.remove?()
  atom.workspaceView = null
@@ -142,7 +138,8 @@ afterEach ->

  jasmine.unspy(atom, 'saveSync')
  ensureNoPathSubscriptions()
-  atom.syntax.clearObservers()
+  atom.syntax.off()
+  ensureNoDeprecatedFunctionsCalled() if isCoreSpec
  waits(0) # yield to ui thread to make screen update more frequently

 ensureNoPathSubscriptions = ->
@@ -214,13 +211,6 @@ addCustomMatchers = (spec) ->
      element = element.get(0) if element.jquery
      element.webkitMatchesSelector(":focus") or element.querySelector(":focus")

-    toShow: ->
-      notText = if @isNot then " not" else ""
-      element = @actual
-      element = element.get(0) if element.jquery
-      @message = -> return "Expected element '#{element}' or its descendants #{notText} to show."
-      element.style.display in ['block', 'inline-block', 'static', 'fixed']
-
 window.keyIdentifierForKey = (key) ->
  if key.length > 1 # named key
    key
@@ -4,6 +4,7 @@ temp = require 'temp'

 describe "the `syntax` global", ->
  beforeEach ->
+
    waitsForPromise ->
      atom.packages.activatePackage('language-text')

@@ -16,10 +17,6 @@ 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'
@@ -1,32 +1,30 @@
 textUtils = require '../src/text-utils'

 describe 'text utilities', ->
-  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 '.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 '.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
+  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
@@ -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'])

@@ -69,7 +69,7 @@ describe "ThemeManager", ->

  describe "when the core.themes config value changes", ->
    it "add/removes stylesheets to reflect the new config value", ->
-      themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+      themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
      spyOn(themeManager, 'getUserStylesheetPath').andCallFake -> null

      waitsForPromise ->
@@ -129,10 +129,10 @@ 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")
+      themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+      themeManager.on 'stylesheet-added', stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
      cssPath = atom.project.resolve('css.css')
      lengthBefore = $('head style').length

@@ -185,17 +185,18 @@ describe "ThemeManager", ->
      $('head style[id*="css.css"]').remove()
      $('head style[id*="sample.less"]').remove()

-    it "returns a disposable allowing styles applied by the given path to be removed", ->
+  describe ".removeStylesheet(path)", ->
+    it "removes styling applied by given stylesheet path", ->
      cssPath = require.resolve('./fixtures/css.css')

      expect($(document.body).css('font-weight')).not.toBe("bold")
-      disposable = themeManager.requireStylesheet(cssPath)
+      themeManager.requireStylesheet(cssPath)
      expect($(document.body).css('font-weight')).toBe("bold")

-      themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
-      themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+      themeManager.on 'stylesheet-removed', stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
+      themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")

-      disposable.dispose()
+      themeManager.removeStylesheet(cssPath)

      expect($(document.body).css('font-weight')).not.toBe("bold")

@@ -208,7 +209,7 @@ describe "ThemeManager", ->

  describe "base stylesheet loading", ->
    beforeEach ->
-      atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
+      atom.workspaceView = new WorkspaceView
      atom.workspaceView.append $$ -> @div class: 'editor'
      atom.workspaceView.attachToDom()

@@ -216,7 +217,7 @@ describe "ThemeManager", ->
        themeManager.activateThemes()

    it "loads the correct values from the theme's ui-variables file", ->
-      themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+      themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
      atom.config.set('core.themes', ['theme-with-ui-variables'])

      waitsFor ->
@@ -233,7 +234,7 @@ describe "ThemeManager", ->

    describe "when there is a theme with incomplete variables", ->
      it "loads the correct values from the fallback ui-variables", ->
-        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+        themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
        atom.config.set('core.themes', ['theme-with-incomplete-ui-variables'])

        waitsFor ->
@@ -246,21 +247,6 @@ describe "ThemeManager", ->
          # from within the theme itself
          expect($(".editor").css("background-color")).toBe "rgb(0, 152, 255)"

-    describe "theme classes on the workspace", ->
-      it 'adds theme-* classes to the workspace for each active theme', ->
-        expect(atom.workspaceView).toHaveClass 'theme-atom-dark-ui'
-
-        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
-        atom.config.set('core.themes', ['theme-with-ui-variables'])
-
-        waitsFor ->
-          reloadHandler.callCount > 0
-
-        runs ->
-          # `theme-` twice as it prefixes the name with `theme-`
-          expect(atom.workspaceView).toHaveClass 'theme-theme-with-ui-variables'
-          expect(atom.workspaceView).not.toHaveClass 'theme-atom-dark-ui'
-
  describe "when the user stylesheet changes", ->
    it "reloads it", ->
      [stylesheetRemovedHandler, stylesheetAddedHandler, stylesheetsChangedHandler] = []
@@ -272,9 +258,9 @@ describe "ThemeManager", ->
        themeManager.activateThemes()

      runs ->
-        themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
-        themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
-        themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
+        themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+        themeManager.on 'stylesheet-removed', stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
+        themeManager.on 'stylesheet-added', stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
        spyOn(themeManager, 'loadUserStylesheet').andCallThrough()

        expect($(document.body).css('border-style')).toBe 'dotted'
@@ -315,9 +301,7 @@ describe "ThemeManager", ->
        themeManager.activateThemes()

      runs ->
-        disposable = themeManager.onDidReloadAll ->
-          disposable.dispose()
-          reloaded = true
+        themeManager.once 'reloaded', -> reloaded = true
        spyOn(console, 'warn')
        expect(-> atom.config.set('core.themes', ['atom-light-ui', 'theme-really-does-not-exist'])).not.toThrow()

@@ -326,59 +310,3 @@ describe "ThemeManager", ->
      runs ->
        expect(console.warn.callCount).toBe 1
        expect(console.warn.argsForCall[0][0].length).toBeGreaterThan 0
-
-  describe "when in safe mode", ->
-    beforeEach ->
-      themeManager = new ThemeManager({packageManager: atom.packages, resourcePath, configDirPath, safeMode: true})
-
-    describe 'when the enabled UI and syntax themes are bundled with Atom', ->
-      beforeEach ->
-        atom.config.set('core.themes', ['atom-light-ui', 'atom-dark-syntax'])
-
-        waitsForPromise ->
-          themeManager.activateThemes()
-
-      it 'uses the enabled themes', ->
-        activeThemeNames = themeManager.getActiveNames()
-        expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-light-ui')
-        expect(activeThemeNames).toContain('atom-dark-syntax')
-
-    describe 'when the enabled UI and syntax themes are not bundled with Atom', ->
-      beforeEach ->
-        atom.config.set('core.themes', ['installed-dark-ui', 'installed-dark-syntax'])
-
-        waitsForPromise ->
-          themeManager.activateThemes()
-
-      it 'uses the default dark UI and syntax themes', ->
-        activeThemeNames = themeManager.getActiveNames()
-        expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-dark-ui')
-        expect(activeThemeNames).toContain('atom-dark-syntax')
-
-    describe 'when the enabled UI theme is not bundled with Atom', ->
-      beforeEach ->
-        atom.config.set('core.themes', ['installed-dark-ui', 'atom-light-syntax'])
-
-        waitsForPromise ->
-          themeManager.activateThemes()
-
-      it 'uses the default dark UI theme', ->
-        activeThemeNames = themeManager.getActiveNames()
-        expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-dark-ui')
-        expect(activeThemeNames).toContain('atom-light-syntax')
-
-    describe 'when the enabled syntax theme is not bundled with Atom', ->
-      beforeEach ->
-        atom.config.set('core.themes', ['atom-light-ui', 'installed-dark-syntax'])
-
-        waitsForPromise ->
-          themeManager.activateThemes()
-
-      it 'uses the default dark syntax theme', ->
-        activeThemeNames = themeManager.getActiveNames()
-        expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-light-ui')
-        expect(activeThemeNames).toContain('atom-dark-syntax')
@@ -18,7 +18,7 @@ class TimeReporter extends jasmine.Reporter
    log ?= (line) -> console.log(line)
    log "Longest running suites:"
    suites = _.map(window.timedSuites, (key, value) -> [value, key])
-    for suite in _.sortBy(suites, (suite) -> -suite[1])[0...number]
+    for suite in _.sortBy(suites, (suite) => -suite[1])[0...number]
      time = Math.round(suite[1] / 100) / 10
      log "  #{suite[0]} (#{time}s)"
    undefined
@@ -1,5 +1,4 @@
 TokenizedBuffer = require '../src/tokenized-buffer'
-TextBuffer = require 'text-buffer'
 _ = require 'underscore-plus'

 describe "TokenizedBuffer", ->
@@ -13,9 +12,6 @@ describe "TokenizedBuffer", ->
    waitsForPromise ->
      atom.packages.activatePackage('language-javascript')

-  afterEach ->
-    tokenizedBuffer?.destroy()
-
  startTokenizing = (tokenizedBuffer) ->
    tokenizedBuffer.setVisible(true)

@@ -41,7 +37,7 @@ describe "TokenizedBuffer", ->
      buffer = atom.project.bufferForPathSync('sample.js')
      tokenizedBuffer = new TokenizedBuffer({buffer})
      startTokenizing(tokenizedBuffer)
-      tokenizedBuffer.onDidChange changeHandler = jasmine.createSpy('changeHandler')
+      tokenizedBuffer.on "changed", changeHandler = jasmine.createSpy('changeHandler')

    afterEach ->
      tokenizedBuffer.destroy()
@@ -49,38 +45,38 @@ describe "TokenizedBuffer", ->

    describe "on construction", ->
      it "initially creates un-tokenized screen lines, then tokenizes lines chunk at a time in the background", ->
-        line0 = tokenizedBuffer.tokenizedLineForRow(0)
+        line0 = tokenizedBuffer.lineForScreenRow(0)
        expect(line0.tokens.length).toBe 1
        expect(line0.tokens[0]).toEqual(value: line0.text, scopes: ['source.js'])

-        line11 = tokenizedBuffer.tokenizedLineForRow(11)
+        line11 = tokenizedBuffer.lineForScreenRow(11)
        expect(line11.tokens.length).toBe 2
        expect(line11.tokens[0]).toEqual(value: "  ", scopes: ['source.js'], isAtomic: true)
        expect(line11.tokens[1]).toEqual(value: "return sort(Array.apply(this, arguments));", scopes: ['source.js'])

        # background tokenization has not begun
-        expect(tokenizedBuffer.tokenizedLineForRow(0).ruleStack).toBeUndefined()
+        expect(tokenizedBuffer.lineForScreenRow(0).ruleStack).toBeUndefined()

        # tokenize chunk 1
        advanceClock()
-        expect(tokenizedBuffer.tokenizedLineForRow(0).ruleStack?).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(4).ruleStack?).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).ruleStack?).toBeFalsy()
+        expect(tokenizedBuffer.lineForScreenRow(0).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(4).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(5).ruleStack?).toBeFalsy()
        expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 4, delta: 0)
        changeHandler.reset()

        # tokenize chunk 2
        advanceClock()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).ruleStack?).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(9).ruleStack?).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(10).ruleStack?).toBeFalsy()
+        expect(tokenizedBuffer.lineForScreenRow(5).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(9).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(10).ruleStack?).toBeFalsy()
        expect(changeHandler).toHaveBeenCalledWith(start: 5, end: 9, delta: 0)
        changeHandler.reset()

        # tokenize last chunk
        advanceClock()
-        expect(tokenizedBuffer.tokenizedLineForRow(10).ruleStack?).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(12).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(10).ruleStack?).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(12).ruleStack?).toBeTruthy()
        expect(changeHandler).toHaveBeenCalledWith(start: 10, end: 12, delta: 0)

    describe "when the buffer is partially tokenized", ->
@@ -134,8 +130,8 @@ describe "TokenizedBuffer", ->
          expect(tokenizedBuffer.firstInvalidRow()).toBe 5
          buffer.setTextInRange([[6, 0], [7, 0]], "\n\n\n")

-          expect(tokenizedBuffer.tokenizedLineForRow(6).ruleStack?).toBeFalsy()
-          expect(tokenizedBuffer.tokenizedLineForRow(7).ruleStack?).toBeFalsy()
+          expect(tokenizedBuffer.lineForScreenRow(6).ruleStack?).toBeFalsy()
+          expect(tokenizedBuffer.lineForScreenRow(7).ruleStack?).toBeFalsy()

          changeHandler.reset()
          expect(tokenizedBuffer.firstInvalidRow()).toBe 5
@@ -149,10 +145,10 @@ describe "TokenizedBuffer", ->
          it "updates tokens to reflect the change", ->
            buffer.setTextInRange([[0, 0], [2, 0]], "foo()\n7\n")

-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1]).toEqual(value: '(', scopes: ['source.js', 'meta.brace.round.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: '7', scopes: ['source.js', 'constant.numeric.js'])
+            expect(tokenizedBuffer.lineForScreenRow(0).tokens[1]).toEqual(value: '(', scopes: ['source.js', 'meta.brace.round.js'])
+            expect(tokenizedBuffer.lineForScreenRow(1).tokens[0]).toEqual(value: '7', scopes: ['source.js', 'constant.numeric.js'])
            # line 2 is unchanged
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.lineForScreenRow(2).tokens[2]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])

            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
@@ -164,7 +160,7 @@ describe "TokenizedBuffer", ->
              buffer.insert([5, 30], '/* */')
              changeHandler.reset()
              buffer.insert([2, 0], '/*')
-              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js']
+              expect(tokenizedBuffer.lineForScreenRow(3).tokens[0].scopes).toEqual ['source.js']
              expect(changeHandler).toHaveBeenCalled()
              [event] = changeHandler.argsForCall[0]
              delete event.bufferChange
@@ -172,9 +168,9 @@ describe "TokenizedBuffer", ->
              changeHandler.reset()

              advanceClock()
-              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-              expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-              expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.lineForScreenRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.lineForScreenRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
              expect(changeHandler).toHaveBeenCalled()
              [event] = changeHandler.argsForCall[0]
              delete event.bufferChange
@@ -185,23 +181,23 @@ describe "TokenizedBuffer", ->
            buffer.insert([5, 0], '*/')

            buffer.insert([1, 0], 'var ')
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(1).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']

        describe "when lines are both updated and removed", ->
          it "updates tokens to reflect the change", ->
            buffer.setTextInRange([[1, 0], [3, 0]], "foo()")

            # previous line 0 remains
-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])
+            expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])

            # previous line 3 should be combined with input to form line 1
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[6]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.lineForScreenRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
+            expect(tokenizedBuffer.lineForScreenRow(1).tokens[6]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])

            # lines below deleted regions should be shifted upward
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'while', scopes: ['source.js', 'keyword.control.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: '<', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.lineForScreenRow(2).tokens[2]).toEqual(value: 'while', scopes: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.lineForScreenRow(3).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.lineForScreenRow(4).tokens[4]).toEqual(value: '<', scopes: ['source.js', 'keyword.operator.js'])

            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
@@ -214,8 +210,8 @@ describe "TokenizedBuffer", ->
            changeHandler.reset()

            buffer.setTextInRange([[2, 0], [3, 0]], '/*')
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js']
+            expect(tokenizedBuffer.lineForScreenRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+            expect(tokenizedBuffer.lineForScreenRow(3).tokens[0].scopes).toEqual ['source.js']
            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
            delete event.bufferChange
@@ -223,8 +219,8 @@ describe "TokenizedBuffer", ->
            changeHandler.reset()

            advanceClock()
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
            delete event.bufferChange
@@ -235,19 +231,19 @@ describe "TokenizedBuffer", ->
            buffer.setTextInRange([[1, 0], [2, 0]], "foo()\nbar()\nbaz()\nquux()")

            # previous line 0 remains
-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.modifier.js'])
+            expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.modifier.js'])

            # 3 new lines inserted
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0]).toEqual(value: 'bar', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0]).toEqual(value: 'baz', scopes: ['source.js'])
+            expect(tokenizedBuffer.lineForScreenRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
+            expect(tokenizedBuffer.lineForScreenRow(2).tokens[0]).toEqual(value: 'bar', scopes: ['source.js'])
+            expect(tokenizedBuffer.lineForScreenRow(3).tokens[0]).toEqual(value: 'baz', scopes: ['source.js'])

            # previous line 2 is joined with quux() on line 4
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0]).toEqual(value: 'quux', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.lineForScreenRow(4).tokens[0]).toEqual(value: 'quux', scopes: ['source.js'])
+            expect(tokenizedBuffer.lineForScreenRow(4).tokens[4]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])

            # previous line 3 is pushed down to become line 5
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.lineForScreenRow(5).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])

            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
@@ -264,17 +260,17 @@ describe "TokenizedBuffer", ->
            [event] = changeHandler.argsForCall[0]
            delete event.bufferChange
            expect(event).toEqual(start: 2, end: 2, delta: 2)
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js']
+            expect(tokenizedBuffer.lineForScreenRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+            expect(tokenizedBuffer.lineForScreenRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].scopes).toEqual ['source.js']
            changeHandler.reset()

            advanceClock() # tokenize invalidated lines in background
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(6).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(7).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(8).tokens[0].scopes).not.toBe ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(6).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(7).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.lineForScreenRow(8).tokens[0].scopes).not.toBe ['source.js', 'comment.block.js']

            expect(changeHandler).toHaveBeenCalled()
            [event] = changeHandler.argsForCall[0]
@@ -285,13 +281,13 @@ describe "TokenizedBuffer", ->
        it "tokenizes the initial chunk synchronously, then tokenizes the remaining lines in the background", ->
          commentBlock = _.multiplyString("// a comment\n", tokenizedBuffer.chunkSize + 2)
          buffer.insert([0,0], commentBlock)
-          expect(tokenizedBuffer.tokenizedLineForRow(0).ruleStack?).toBeTruthy()
-          expect(tokenizedBuffer.tokenizedLineForRow(4).ruleStack?).toBeTruthy()
-          expect(tokenizedBuffer.tokenizedLineForRow(5).ruleStack?).toBeFalsy()
+          expect(tokenizedBuffer.lineForScreenRow(0).ruleStack?).toBeTruthy()
+          expect(tokenizedBuffer.lineForScreenRow(4).ruleStack?).toBeTruthy()
+          expect(tokenizedBuffer.lineForScreenRow(5).ruleStack?).toBeFalsy()

          advanceClock()
-          expect(tokenizedBuffer.tokenizedLineForRow(5).ruleStack?).toBeTruthy()
-          expect(tokenizedBuffer.tokenizedLineForRow(6).ruleStack?).toBeTruthy()
+          expect(tokenizedBuffer.lineForScreenRow(5).ruleStack?).toBeTruthy()
+          expect(tokenizedBuffer.lineForScreenRow(6).ruleStack?).toBeTruthy()

      describe ".findOpeningBracket(closingBufferPosition)", ->
        it "returns the position of the matching bracket, skipping any nested brackets", ->
@@ -302,18 +298,18 @@ describe "TokenizedBuffer", ->
          expect(tokenizedBuffer.findClosingBracket([1, 29])).toEqual [9, 2]

      it "tokenizes leading whitespace based on the new tab length", ->
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].isAtomic).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].value).toBe "  "
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[1].isAtomic).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[1].value).toBe "  "
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].isAtomic).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].value).toBe "  "
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[1].isAtomic).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[1].value).toBe "  "

        tokenizedBuffer.setTabLength(4)
        fullyTokenize(tokenizedBuffer)

-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].isAtomic).toBeTruthy()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].value).toBe "    "
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[1].isAtomic).toBeFalsy()
-        expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[1].value).toBe "  current "
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].isAtomic).toBeTruthy()
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[0].value).toBe "    "
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[1].isAtomic).toBeFalsy()
+        expect(tokenizedBuffer.lineForScreenRow(5).tokens[1].value).toBe "  current "

  describe "when the buffer contains hard-tabs", ->
    beforeEach ->
@@ -335,7 +331,7 @@ describe "TokenizedBuffer", ->

      it "renders each tab as its own atomic token with a value of size tabLength", ->
        tabAsSpaces = _.multiplyString(' ', tokenizedBuffer.getTabLength())
-        screenLine0 = tokenizedBuffer.tokenizedLineForRow(0)
+        screenLine0 = tokenizedBuffer.lineForScreenRow(0)
        expect(screenLine0.text).toBe "# Econ 101#{tabAsSpaces}"
        { tokens } = screenLine0

@@ -347,7 +343,7 @@ describe "TokenizedBuffer", ->
        expect(tokens[2].isAtomic).toBeTruthy()
        expect(tokens[3].value).toBe ""

-        expect(tokenizedBuffer.tokenizedLineForRow(2).text).toBe "#{tabAsSpaces} buy()#{tabAsSpaces}while supply > demand"
+        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "#{tabAsSpaces} buy()#{tabAsSpaces}while supply > demand"

      it "aligns the hard tabs to the correct tab stop column", ->
        buffer.setText """
@@ -359,62 +355,62 @@ describe "TokenizedBuffer", ->
        tokenizedBuffer.setTabLength(4)
        fullyTokenize(tokenizedBuffer)

-        expect(tokenizedBuffer.tokenizedLineForRow(0).text).toBe "1   2   3   4"
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].screenDelta).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1   2   3   4"
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 3

-        expect(tokenizedBuffer.tokenizedLineForRow(1).text).toBe "12  3   4   5"
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].screenDelta).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12  3   4   5"
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 2

-        expect(tokenizedBuffer.tokenizedLineForRow(2).text).toBe "123 4       5   6"
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4       5   6"
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1

        tokenizedBuffer.setTabLength(3)
        fullyTokenize(tokenizedBuffer)

-        expect(tokenizedBuffer.tokenizedLineForRow(0).text).toBe "1  2  3  4"
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].screenDelta).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1  2  3  4"
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 2

-        expect(tokenizedBuffer.tokenizedLineForRow(1).text).toBe "12 3     4  5"
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12 3     4  5"
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 1

-        expect(tokenizedBuffer.tokenizedLineForRow(2).text).toBe "123   4     5  6"
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].screenDelta).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123   4     5  6"
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 3

        tokenizedBuffer.setTabLength(2)
        fullyTokenize(tokenizedBuffer)

-        expect(tokenizedBuffer.tokenizedLineForRow(0).text).toBe "1 2   3 4"
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1 2   3 4"
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 1

-        expect(tokenizedBuffer.tokenizedLineForRow(1).text).toBe "12  3   4 5"
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].screenDelta).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12  3   4 5"
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 2

-        expect(tokenizedBuffer.tokenizedLineForRow(2).text).toBe "123 4     5 6"
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4     5 6"
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1

        tokenizedBuffer.setTabLength(1)
        fullyTokenize(tokenizedBuffer)

-        expect(tokenizedBuffer.tokenizedLineForRow(0).text).toBe "1 2  3 4"
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1 2  3 4"
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 1

-        expect(tokenizedBuffer.tokenizedLineForRow(1).text).toBe "12 3   4 5"
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12 3   4 5"
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 1

-        expect(tokenizedBuffer.tokenizedLineForRow(2).text).toBe "123 4    5 6"
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].screenDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4    5 6"
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1

  describe "when the buffer contains UTF-8 surrogate pairs", ->
    beforeEach ->
@@ -435,7 +431,7 @@ describe "TokenizedBuffer", ->
      buffer.release()

    it "renders each UTF-8 surrogate pair as its own atomic token", ->
-      screenLine0 = tokenizedBuffer.tokenizedLineForRow(0)
+      screenLine0 = tokenizedBuffer.lineForScreenRow(0)
      expect(screenLine0.text).toBe "'abc\uD835\uDF97def'"
      { tokens } = screenLine0

@@ -447,7 +443,7 @@ describe "TokenizedBuffer", ->
      expect(tokens[3].value).toBe "def"
      expect(tokens[4].value).toBe "'"

-      screenLine1 = tokenizedBuffer.tokenizedLineForRow(1)
+      screenLine1 = tokenizedBuffer.lineForScreenRow(1)
      expect(screenLine1.text).toBe "//\uD835\uDF97xyz"
      { tokens } = screenLine1

@@ -468,7 +464,7 @@ describe "TokenizedBuffer", ->

      runs ->
        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
-        tokenizedBuffer.onDidTokenize tokenizedHandler
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
        fullyTokenize(tokenizedBuffer)
        expect(tokenizedHandler.callCount).toBe(1)

@@ -483,7 +479,7 @@ describe "TokenizedBuffer", ->
        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
        fullyTokenize(tokenizedBuffer)

-        tokenizedBuffer.onDidTokenize tokenizedHandler
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
        editor.getBuffer().insert([0, 0], "'")
        fullyTokenize(tokenizedBuffer)
        expect(tokenizedHandler).not.toHaveBeenCalled()
@@ -499,7 +495,7 @@ describe "TokenizedBuffer", ->

      runs ->
        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
-        tokenizedBuffer.onDidTokenize tokenizedHandler
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
        fullyTokenize(tokenizedBuffer)
        tokenizedHandler.reset()

@@ -525,7 +521,7 @@ describe "TokenizedBuffer", ->
        tokenizedBuffer.setGrammar(atom.syntax.selectGrammar('test.erb'))
        fullyTokenize(tokenizedBuffer)

-        {tokens} = tokenizedBuffer.tokenizedLineForRow(0)
+        {tokens} = tokenizedBuffer.lineForScreenRow(0)
        expect(tokens[0]).toEqual value: "<div class='name'>", scopes: ["text.html.ruby"]

      waitsForPromise ->
@@ -533,7 +529,7 @@ describe "TokenizedBuffer", ->

      runs ->
        fullyTokenize(tokenizedBuffer)
-        {tokens} = tokenizedBuffer.tokenizedLineForRow(0)
+        {tokens} = tokenizedBuffer.lineForScreenRow(0)
        expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby","meta.tag.block.any.html","punctuation.definition.tag.begin.html"]

  describe ".tokenForPosition(position)", ->
@@ -586,42 +582,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 ' '
-
-  describe "when the invisibles value changes", ->
-    beforeEach ->
-
-    it "updates the tokens with the appropriate invisible characters", ->
-      buffer = new TextBuffer(text: "  \t a line with tabs\tand \tspaces \t ")
-      tokenizedBuffer = new TokenizedBuffer({buffer})
-      fullyTokenize(tokenizedBuffer)
-
-      tokenizedBuffer.setInvisibles(space: 'S', tab: 'T')
-      fullyTokenize(tokenizedBuffer)
-
-      expect(tokenizedBuffer.tokenizedLineForRow(0).text).toBe "SST Sa line with tabsTand T spacesSTS"
-      # Also needs to work for copies
-      expect(tokenizedBuffer.tokenizedLineForRow(0).copy().text).toBe "SST Sa line with tabsTand T spacesSTS"
-
-    it "assigns endOfLineInvisibles to tokenized lines", ->
-      buffer = new TextBuffer(text: "a line that ends in a carriage-return-line-feed \r\na line that ends in just a line-feed\na line with no ending")
-      tokenizedBuffer = new TokenizedBuffer({buffer})
-
-      atom.config.set('editor.showInvisibles', true)
-      tokenizedBuffer.setInvisibles(cr: 'R', eol: 'N')
-      fullyTokenize(tokenizedBuffer)
-
-      expect(tokenizedBuffer.tokenizedLineForRow(0).endOfLineInvisibles).toEqual ['R', 'N']
-      expect(tokenizedBuffer.tokenizedLineForRow(1).endOfLineInvisibles).toEqual ['N']
-
-      # Lines ending in soft wraps get no invisibles
-      [left, right] = tokenizedBuffer.tokenizedLineForRow(0).softWrapAt(20)
-      expect(left.endOfLineInvisibles).toBe null
-      expect(right.endOfLineInvisibles).toEqual ['R', 'N']
-
-      tokenizedBuffer.setInvisibles(cr: 'R', eol: false)
-      expect(tokenizedBuffer.tokenizedLineForRow(0).endOfLineInvisibles).toEqual ['R']
-      expect(tokenizedBuffer.tokenizedLineForRow(1).endOfLineInvisibles).toEqual []
+      expect(tokenizedBuffer.tokenForPosition([0,0]).value).toBe '  '

  describe "leading and trailing whitespace", ->
    beforeEach ->
@@ -629,71 +590,45 @@ describe "TokenizedBuffer", ->
      tokenizedBuffer = new TokenizedBuffer({buffer})
      fullyTokenize(tokenizedBuffer)

-    it "assigns ::firstNonWhitespaceIndex on tokens that have leading whitespace", ->
-      expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0].firstNonWhitespaceIndex).toBe null
-      expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0].firstNonWhitespaceIndex).toBe 2
-      expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[1].firstNonWhitespaceIndex).toBe null
-
-      expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].firstNonWhitespaceIndex).toBe 2
-      expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[1].firstNonWhitespaceIndex).toBe 2
-      expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2].firstNonWhitespaceIndex).toBe null
+    it "sets ::hasLeadingWhitespace to true on tokens that have leading whitespace", ->
+      expect(tokenizedBuffer.lineForScreenRow(0).tokens[0].hasLeadingWhitespace).toBe false
+      expect(tokenizedBuffer.lineForScreenRow(1).tokens[0].hasLeadingWhitespace).toBe true
+      expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].hasLeadingWhitespace).toBe false
+      expect(tokenizedBuffer.lineForScreenRow(2).tokens[0].hasLeadingWhitespace).toBe true
+      expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].hasLeadingWhitespace).toBe true
+      expect(tokenizedBuffer.lineForScreenRow(2).tokens[2].hasLeadingWhitespace).toBe false

      # The 4th token *has* leading whitespace, but isn't entirely whitespace
      buffer.insert([5, 0], ' ')
-      expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[3].firstNonWhitespaceIndex).toBe 1
-      expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[4].firstNonWhitespaceIndex).toBe null
+      expect(tokenizedBuffer.lineForScreenRow(5).tokens[3].hasLeadingWhitespace).toBe true
+      expect(tokenizedBuffer.lineForScreenRow(5).tokens[4].hasLeadingWhitespace).toBe false

      # Lines that are *only* whitespace are not considered to have leading whitespace
      buffer.insert([10, 0], '  ')
-      expect(tokenizedBuffer.tokenizedLineForRow(10).tokens[0].firstNonWhitespaceIndex).toBe null
+      expect(tokenizedBuffer.lineForScreenRow(10).tokens[0].hasLeadingWhitespace).toBe false

-    it "assigns ::firstTrailingWhitespaceIndex on tokens that have trailing whitespace", ->
+    it "sets ::hasTrailingWhitespace to true on tokens that have trailing whitespace", ->
      buffer.insert([0, Infinity], '  ')
-      expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[11].firstTrailingWhitespaceIndex).toBe null
-      expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[12].firstTrailingWhitespaceIndex).toBe 0
+      expect(tokenizedBuffer.lineForScreenRow(0).tokens[11].hasTrailingWhitespace).toBe false
+      expect(tokenizedBuffer.lineForScreenRow(0).tokens[12].hasTrailingWhitespace).toBe true

      # The last token *has* trailing whitespace, but isn't entirely whitespace
      buffer.setTextInRange([[2, 39], [2, 40]], '  ')
-      expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[14].firstTrailingWhitespaceIndex).toBe null
-      expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[15].firstTrailingWhitespaceIndex).toBe 6
+      expect(tokenizedBuffer.lineForScreenRow(2).tokens[14].hasTrailingWhitespace).toBe false
+      expect(tokenizedBuffer.lineForScreenRow(2).tokens[15].hasTrailingWhitespace).toBe true

      # Lines that are *only* whitespace are considered to have trailing whitespace
      buffer.insert([10, 0], '  ')
-      expect(tokenizedBuffer.tokenizedLineForRow(10).tokens[0].firstTrailingWhitespaceIndex).toBe 0
+      expect(tokenizedBuffer.lineForScreenRow(10).tokens[0].hasTrailingWhitespace).toBe true

    it "only marks trailing whitespace on the last segment of a soft-wrapped line", ->
      buffer.insert([0, Infinity], '  ')
-      tokenizedLine = tokenizedBuffer.tokenizedLineForRow(0)
+      tokenizedLine = tokenizedBuffer.lineForScreenRow(0)
      [segment1, segment2] = tokenizedLine.softWrapAt(16)
      expect(segment1.tokens[5].value).toBe ' '
-      expect(segment1.tokens[5].firstTrailingWhitespaceIndex).toBe null
+      expect(segment1.tokens[5].hasTrailingWhitespace).toBe false
      expect(segment2.tokens[6].value).toBe '  '
-      expect(segment2.tokens[6].firstTrailingWhitespaceIndex).toBe 0
-
-    it "sets leading and trailing whitespace correctly on a line with invisible characters that is copied", ->
-      buffer.setText("  \t a line with tabs\tand \tspaces \t ")
-
-      tokenizedBuffer.setInvisibles(space: 'S', tab: 'T')
-      fullyTokenize(tokenizedBuffer)
-
-      line = tokenizedBuffer.tokenizedLineForRow(0).copy()
-      expect(line.tokens[0].firstNonWhitespaceIndex).toBe 2
-      expect(line.tokens[line.tokens.length - 1].firstTrailingWhitespaceIndex).toBe 0
-
-    it "sets the ::firstNonWhitespaceIndex and ::firstTrailingWhitespaceIndex correctly when tokens are split for soft-wrapping", ->
-      tokenizedBuffer.setInvisibles(space: 'S')
-      buffer.setText(" token ")
-      fullyTokenize(tokenizedBuffer)
-      token = tokenizedBuffer.tokenizedLines[0].tokens[0]
-
-      [leftToken, rightToken] = token.splitAt(1)
-      expect(leftToken.hasInvisibleCharacters).toBe true
-      expect(leftToken.firstNonWhitespaceIndex).toBe 1
-      expect(leftToken.firstTrailingWhitespaceIndex).toBe null
-
-      expect(leftToken.hasInvisibleCharacters).toBe true
-      expect(rightToken.firstNonWhitespaceIndex).toBe null
-      expect(rightToken.firstTrailingWhitespaceIndex).toBe 5
+      expect(segment2.tokens[6].hasTrailingWhitespace).toBe true

  describe "indent level", ->
    beforeEach ->
@@ -703,84 +638,84 @@ describe "TokenizedBuffer", ->

    describe "when the line is non-empty", ->
      it "has an indent level based on the leading whitespace on the line", ->
-        expect(tokenizedBuffer.tokenizedLineForRow(0).indentLevel).toBe 0
-        expect(tokenizedBuffer.tokenizedLineForRow(1).indentLevel).toBe 1
-        expect(tokenizedBuffer.tokenizedLineForRow(2).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(0).indentLevel).toBe 0
+        expect(tokenizedBuffer.lineForScreenRow(1).indentLevel).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(2).indentLevel).toBe 2
        buffer.insert([2, 0], ' ')
-        expect(tokenizedBuffer.tokenizedLineForRow(2).indentLevel).toBe 2.5
+        expect(tokenizedBuffer.lineForScreenRow(2).indentLevel).toBe 2.5

    describe "when the line is empty", ->
      it "assumes the indentation level of the first non-empty line below or above if one exists", ->
        buffer.insert([12, 0], '    ')
        buffer.insert([12, Infinity], '\n\n')
-        expect(tokenizedBuffer.tokenizedLineForRow(13).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(14).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(14).indentLevel).toBe 2

        buffer.insert([1, Infinity], '\n\n')
-        expect(tokenizedBuffer.tokenizedLineForRow(2).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(3).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(2).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(3).indentLevel).toBe 2

        buffer.setText('\n\n\n')
-        expect(tokenizedBuffer.tokenizedLineForRow(1).indentLevel).toBe 0
+        expect(tokenizedBuffer.lineForScreenRow(1).indentLevel).toBe 0

    describe "when the changed lines are surrounded by whitespace-only lines", ->
      it "updates the indentLevel of empty lines that precede the change", ->
-        expect(tokenizedBuffer.tokenizedLineForRow(12).indentLevel).toBe 0
+        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 0

        buffer.insert([12, 0], '\n')
        buffer.insert([13, 0], '  ')
-        expect(tokenizedBuffer.tokenizedLineForRow(12).indentLevel).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 1

      it "updates empty line indent guides when the empty line is the last line", ->
        buffer.insert([12, 2], '\n')

        # The newline and he tab need to be in two different operations to surface the bug
        buffer.insert([12, 0], '  ')
-        expect(tokenizedBuffer.tokenizedLineForRow(13).indentLevel).toBe 1
+        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 1

        buffer.insert([12, 0], '  ')
-        expect(tokenizedBuffer.tokenizedLineForRow(13).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(14)).not.toBeDefined()
+        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(14)).not.toBeDefined()

      it "updates the indentLevel of empty lines surrounding a change that inserts lines", ->
        # create some new lines
        buffer.insert([7, 0], '\n\n')
        buffer.insert([5, 0], '\n\n')

-        expect(tokenizedBuffer.tokenizedLineForRow(5).indentLevel).toBe 3
-        expect(tokenizedBuffer.tokenizedLineForRow(6).indentLevel).toBe 3
-        expect(tokenizedBuffer.tokenizedLineForRow(9).indentLevel).toBe 3
-        expect(tokenizedBuffer.tokenizedLineForRow(10).indentLevel).toBe 3
-        expect(tokenizedBuffer.tokenizedLineForRow(11).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(9).indentLevel).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(10).indentLevel).toBe 3
+        expect(tokenizedBuffer.lineForScreenRow(11).indentLevel).toBe 2

-        tokenizedBuffer.onDidChange changeHandler = jasmine.createSpy('changeHandler')
+        tokenizedBuffer.on "changed", changeHandler = jasmine.createSpy('changeHandler')

        buffer.setTextInRange([[7, 0], [8, 65]], '        one\n        two\n        three\n        four')

        delete changeHandler.argsForCall[0][0].bufferChange
        expect(changeHandler).toHaveBeenCalledWith(start: 5, end: 10, delta: 2)

-        expect(tokenizedBuffer.tokenizedLineForRow(5).indentLevel).toBe 4
-        expect(tokenizedBuffer.tokenizedLineForRow(6).indentLevel).toBe 4
-        expect(tokenizedBuffer.tokenizedLineForRow(11).indentLevel).toBe 4
-        expect(tokenizedBuffer.tokenizedLineForRow(12).indentLevel).toBe 4
-        expect(tokenizedBuffer.tokenizedLineForRow(13).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 4
+        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 4
+        expect(tokenizedBuffer.lineForScreenRow(11).indentLevel).toBe 4
+        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 4
+        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 2

      it "updates the indentLevel of empty lines surrounding a change that removes lines", ->
        # create some new lines
        buffer.insert([7, 0], '\n\n')
        buffer.insert([5, 0], '\n\n')

-        tokenizedBuffer.onDidChange changeHandler = jasmine.createSpy('changeHandler')
+        tokenizedBuffer.on "changed", changeHandler = jasmine.createSpy('changeHandler')

        buffer.setTextInRange([[7, 0], [8, 65]], '    ok')

        delete changeHandler.argsForCall[0][0].bufferChange
        expect(changeHandler).toHaveBeenCalledWith(start: 5, end: 10, delta: -1)

-        expect(tokenizedBuffer.tokenizedLineForRow(5).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(6).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(7).indentLevel).toBe 2 # new text
-        expect(tokenizedBuffer.tokenizedLineForRow(8).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(9).indentLevel).toBe 2
-        expect(tokenizedBuffer.tokenizedLineForRow(10).indentLevel).toBe 2 # }
+        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(7).indentLevel).toBe 2 # new text
+        expect(tokenizedBuffer.lineForScreenRow(8).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(9).indentLevel).toBe 2
+        expect(tokenizedBuffer.lineForScreenRow(10).indentLevel).toBe 2 # }
@@ -10,13 +10,13 @@ describe "TokenizedLine", ->
        atom.project.open('coffee.coffee').then (o) -> editor = o

    it "returns true when the line is only whitespace", ->
-      expect(editor.tokenizedLineForScreenRow(3).isOnlyWhitespace()).toBe true
-      expect(editor.tokenizedLineForScreenRow(7).isOnlyWhitespace()).toBe true
-      expect(editor.tokenizedLineForScreenRow(23).isOnlyWhitespace()).toBe true
+      expect(editor.lineForScreenRow(3).isOnlyWhitespace()).toBe true
+      expect(editor.lineForScreenRow(7).isOnlyWhitespace()).toBe true
+      expect(editor.lineForScreenRow(23).isOnlyWhitespace()).toBe true

    it "returns false when the line is not only whitespace", ->
-      expect(editor.tokenizedLineForScreenRow(0).isOnlyWhitespace()).toBe false
-      expect(editor.tokenizedLineForScreenRow(2).isOnlyWhitespace()).toBe false
+      expect(editor.lineForScreenRow(0).isOnlyWhitespace()).toBe false
+      expect(editor.lineForScreenRow(2).isOnlyWhitespace()).toBe false

  describe "::getScopeTree()", ->
    it "returns a tree whose inner nodes are scopes and whose leaf nodes are tokens in those scopes", ->
@@ -35,6 +35,6 @@ describe "TokenizedLine", ->

      runs ->
        tokenIndex = 0
-        tokens = editor.tokenizedLineForScreenRow(1).tokens
-        scopeTree = editor.tokenizedLineForScreenRow(1).getScopeTree()
+        tokens = editor.lineForScreenRow(1).tokens
+        scopeTree = editor.lineForScreenRow(1).getScopeTree()
        ensureValidScopeTree(scopeTree)
@@ -1,107 +0,0 @@
-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()
@@ -1,6 +1,6 @@
 {$, $$} = require 'atom'
 path = require 'path'
-TextEditor = require '../src/text-editor'
+Editor = require '../src/editor'
 WindowEventHandler = require '../src/window-event-handler'

 describe "Window", ->
@@ -8,7 +8,7 @@ describe "Window", ->

  beforeEach ->
    spyOn(atom, 'hide')
-    initialPath = atom.project.getPaths()[0]
+    initialPath = atom.project.getPath()
    spyOn(atom, 'getLoadSettings').andCallFake ->
      loadSettings = atom.getLoadSettings.originalValue.call(atom)
      loadSettings.initialPath = initialPath
@@ -16,7 +16,7 @@ describe "Window", ->
    atom.project.destroy()
    windowEventHandler = new WindowEventHandler()
    atom.deserializeEditorWindow()
-    projectPath = atom.project.getPaths()[0]
+    projectPath = atom.project.getPath()

  afterEach ->
    windowEventHandler.unsubscribe()
@@ -59,7 +59,7 @@ describe "Window", ->
    [beforeUnloadEvent] = []

    beforeEach ->
-      jasmine.unspy(TextEditor.prototype, "shouldPromptToSave")
+      jasmine.unspy(Editor.prototype, "shouldPromptToSave")
      beforeUnloadEvent = $.Event(new Event('beforeunload'))

    describe "when pane items are are modified", ->
@@ -113,7 +113,6 @@ describe "Window", ->
      expect(atom.state.project).toEqual projectState
      expect(atom.saveSync).toHaveBeenCalled()

-  describe ".removeEditorWindow()", ->
    it "unsubscribes from all buffers", ->
      waitsForPromise ->
        atom.workspace.open("sample.js")
@@ -124,7 +123,7 @@ describe "Window", ->
        pane.splitRight(pane.copyActiveItem())
        expect(atom.workspaceView.find('.editor').length).toBe 2

-        atom.removeEditorWindow()
+        atom.unloadEditorWindow()

        expect(buffer.getSubscriptionCount()).toBe 0

@@ -256,35 +255,3 @@ describe "Window", ->

        elements.trigger "core:focus-previous"
        expect(elements.find("[tabindex=1]:focus")).toExist()
-
-  describe "the window:open-path event", ->
-    beforeEach ->
-      spyOn(atom.workspace, 'open')
-
-    describe "when the project does not have a path", ->
-      beforeEach ->
-        atom.project.setPaths([])
-
-      describe "when the opened path exists", ->
-        it "sets the project path to the opened path", ->
-          $(window).trigger('window:open-path', [{pathToOpen: __filename}])
-
-          expect(atom.project.getPaths()[0]).toBe __dirname
-
-      describe "when the opened path does not exist but its parent directory does", ->
-        it "sets the project path to the opened path's parent directory", ->
-          $(window).trigger('window:open-path', [{pathToOpen: path.join(__dirname, 'this-path-does-not-exist.txt')}])
-
-          expect(atom.project.getPaths()[0]).toBe __dirname
-
-    describe "when the opened path is a file", ->
-      it "opens it in the workspace", ->
-        $(window).trigger('window:open-path', [{pathToOpen: __filename}])
-
-        expect(atom.workspace.open.mostRecentCall.args[0]).toBe __filename
-
-    describe "when the opened path is a directory", ->
-      it "does not open it in the workspace", ->
-        $(window).trigger('window:open-path', [{pathToOpen: __dirname}])
-
-        expect(atom.workspace.open.callCount).toBe 0
@@ -1,20 +1,15 @@
 Workspace = require '../src/workspace'
-{View} = require '../src/space-pen-extensions'

 describe "Workspace", ->
  workspace = null

  beforeEach ->
-    atom.project.setPaths([atom.project.resolve('dir')])
+    atom.project.setPath(atom.project.resolve('dir'))
    atom.workspace = workspace = new Workspace

  describe "::open(uri, options)", ->
-    openEvents = null
-
    beforeEach ->
-      openEvents = []
-      workspace.onDidOpen (event) -> openEvents.push(event)
-      spyOn(workspace.getActivePane(), 'activate').andCallThrough()
+      spyOn(workspace.activePane, 'activate').andCallThrough()

    describe "when the 'searchAllPanes' option is false (default)", ->
      describe "when called without a uri", ->
@@ -26,21 +21,18 @@ describe "Workspace", ->

          runs ->
            expect(editor1.getPath()).toBeUndefined()
-            expect(workspace.getActivePane().items).toEqual [editor1]
-            expect(workspace.getActivePaneItem()).toBe editor1
-            expect(workspace.getActivePane().activate).toHaveBeenCalled()
-            expect(openEvents).toEqual [{uri: undefined, pane: workspace.getActivePane(), item: editor1, index: 0}]
-            openEvents = []
+            expect(workspace.activePane.items).toEqual [editor1]
+            expect(workspace.activePaneItem).toBe editor1
+            expect(workspace.activePane.activate).toHaveBeenCalled()

          waitsForPromise ->
            workspace.open().then (editor) -> editor2 = editor

          runs ->
            expect(editor2.getPath()).toBeUndefined()
-            expect(workspace.getActivePane().items).toEqual [editor1, editor2]
-            expect(workspace.getActivePaneItem()).toBe editor2
-            expect(workspace.getActivePane().activate).toHaveBeenCalled()
-            expect(openEvents).toEqual [{uri: undefined, pane: workspace.getActivePane(), item: editor2, index: 1}]
+            expect(workspace.activePane.items).toEqual [editor1, editor2]
+            expect(workspace.activePaneItem).toBe editor2
+            expect(workspace.activePane.activate).toHaveBeenCalled()

      describe "when called with a uri", ->
        describe "when the active pane already has an editor for the given uri", ->
@@ -59,29 +51,8 @@ describe "Workspace", ->

            runs ->
              expect(editor).toBe editor1
-              expect(workspace.getActivePaneItem()).toBe editor
-              expect(workspace.getActivePane().activate).toHaveBeenCalled()
-
-              expect(openEvents).toEqual [
-                {
-                  uri: atom.project.resolve('a')
-                  item: editor1
-                  pane: atom.workspace.getActivePane()
-                  index: 0
-                }
-                {
-                  uri: atom.project.resolve('b')
-                  item: editor2
-                  pane: atom.workspace.getActivePane()
-                  index: 1
-                }
-                {
-                  uri: atom.project.resolve('a')
-                  item: editor1
-                  pane: atom.workspace.getActivePane()
-                  index: 0
-                }
-              ]
+              expect(workspace.activePaneItem).toBe editor
+              expect(workspace.activePane.activate).toHaveBeenCalled()

        describe "when the active pane does not have an editor for the given uri", ->
          it "adds and activates a new editor for the given path on the active pane", ->
@@ -91,9 +62,9 @@ describe "Workspace", ->

            runs ->
              expect(editor.getUri()).toBe atom.project.resolve('a')
-              expect(workspace.getActivePaneItem()).toBe editor
-              expect(workspace.getActivePane().items).toEqual [editor]
-              expect(workspace.getActivePane().activate).toHaveBeenCalled()
+              expect(workspace.activePaneItem).toBe editor
+              expect(workspace.activePane.items).toEqual [editor]
+              expect(workspace.activePane.activate).toHaveBeenCalled()

    describe "when the 'searchAllPanes' option is true", ->
      describe "when an editor for the given uri is already open on an inactive pane", ->
@@ -112,14 +83,14 @@ describe "Workspace", ->
            workspace.open('b').then (o) -> editor2 = o

          runs ->
-            expect(workspace.getActivePaneItem()).toBe editor2
+            expect(workspace.activePaneItem).toBe editor2

          waitsForPromise ->
            workspace.open('a', searchAllPanes: true)

          runs ->
-            expect(workspace.getActivePane()).toBe pane1
-            expect(workspace.getActivePaneItem()).toBe editor1
+            expect(workspace.activePane).toBe pane1
+            expect(workspace.activePaneItem).toBe editor1

      describe "when no editor for the given uri is open in any pane", ->
        it "opens an editor for the given uri in the active pane", ->
@@ -128,21 +99,21 @@ describe "Workspace", ->
            workspace.open('a', searchAllPanes: true).then (o) -> editor = o

          runs ->
-            expect(workspace.getActivePaneItem()).toBe editor
+            expect(workspace.activePaneItem).toBe editor

    describe "when the 'split' option is set", ->
      describe "when the 'split' option is 'left'", ->
        it "opens the editor in the leftmost pane of the current pane axis", ->
-          pane1 = workspace.getActivePane()
+          pane1 = workspace.activePane
          pane2 = pane1.splitRight()
-          expect(workspace.getActivePane()).toBe pane2
+          expect(workspace.activePane).toBe pane2

          editor = null
          waitsForPromise ->
            workspace.open('a', split: 'left').then (o) -> editor = o

          runs ->
-            expect(workspace.getActivePane()).toBe pane1
+            expect(workspace.activePane).toBe pane1
            expect(pane1.items).toEqual [editor]
            expect(pane2.items).toEqual []

@@ -152,37 +123,37 @@ describe "Workspace", ->
            workspace.open('a', split: 'left').then (o) -> editor = o

          runs ->
-            expect(workspace.getActivePane()).toBe pane1
+            expect(workspace.activePane).toBe pane1
            expect(pane1.items).toEqual [editor]
            expect(pane2.items).toEqual []

      describe "when a pane axis is the leftmost sibling of the current pane", ->
        it "opens the new item in the current pane", ->
          editor = null
-          pane1 = workspace.getActivePane()
+          pane1 = workspace.activePane
          pane2 = pane1.splitLeft()
          pane3 = pane2.splitDown()
          pane1.activate()
-          expect(workspace.getActivePane()).toBe pane1
+          expect(workspace.activePane).toBe pane1

          waitsForPromise ->
            workspace.open('a', split: 'left').then (o) -> editor = o

          runs ->
-            expect(workspace.getActivePane()).toBe pane1
+            expect(workspace.activePane).toBe pane1
            expect(pane1.items).toEqual [editor]

      describe "when the 'split' option is 'right'", ->
        it "opens the editor in the rightmost pane of the current pane axis", ->
          editor = null
-          pane1 = workspace.getActivePane()
+          pane1 = workspace.activePane
          pane2 = null
          waitsForPromise ->
            workspace.open('a', split: 'right').then (o) -> editor = o

          runs ->
            pane2 = workspace.getPanes().filter((p) -> p != pane1)[0]
-            expect(workspace.getActivePane()).toBe pane2
+            expect(workspace.activePane).toBe pane2
            expect(pane1.items).toEqual []
            expect(pane2.items).toEqual [editor]

@@ -192,18 +163,18 @@ describe "Workspace", ->
            workspace.open('a', split: 'right').then (o) -> editor = o

          runs ->
-            expect(workspace.getActivePane()).toBe pane2
+            expect(workspace.activePane).toBe pane2
            expect(pane1.items).toEqual []
            expect(pane2.items).toEqual [editor]

        describe "when a pane axis is the rightmost sibling of the current pane", ->
          it "opens the new item in a new pane split to the right of the current pane", ->
            editor = null
-            pane1 = workspace.getActivePane()
+            pane1 = workspace.activePane
            pane2 = pane1.splitRight()
            pane3 = pane2.splitDown()
            pane1.activate()
-            expect(workspace.getActivePane()).toBe pane1
+            expect(workspace.activePane).toBe pane1
            pane4 = null

            waitsForPromise ->
@@ -211,7 +182,7 @@ describe "Workspace", ->

            runs ->
              pane4 = workspace.getPanes().filter((p) -> p != pane1)[0]
-              expect(workspace.getActivePane()).toBe pane4
+              expect(workspace.activePane).toBe pane4
              expect(pane4.items).toEqual [editor]
              expect(workspace.paneContainer.root.children[0]).toBe pane1
              expect(workspace.paneContainer.root.children[1]).toBe pane4
@@ -220,8 +191,8 @@ describe "Workspace", ->
      it "returns the resource returned by the custom opener", ->
        fooOpener = (pathToOpen, options) -> { foo: pathToOpen, options } if pathToOpen?.match(/\.foo/)
        barOpener = (pathToOpen) -> { bar: pathToOpen } if pathToOpen?.match(/^bar:\/\//)
-        workspace.addOpener(fooOpener)
-        workspace.addOpener(barOpener)
+        workspace.registerOpener(fooOpener)
+        workspace.registerOpener(barOpener)

        waitsForPromise ->
          pathToOpen = atom.project.resolve('a.foo')
@@ -232,21 +203,21 @@ describe "Workspace", ->
          workspace.open("bar://baz").then (item) ->
            expect(item).toEqual { bar: "bar://baz" }

-    it "notifies ::onDidAddTextEditor observers", ->
+    it "emits an 'editor-created' event", ->
      absolutePath = require.resolve('./fixtures/dir/a')
      newEditorHandler = jasmine.createSpy('newEditorHandler')
-      workspace.onDidAddTextEditor newEditorHandler
+      workspace.on 'editor-created', newEditorHandler

      editor = null
      waitsForPromise ->
        workspace.open(absolutePath).then (e) -> editor = e

      runs ->
-        expect(newEditorHandler.argsForCall[0][0].textEditor).toBe editor
+        expect(newEditorHandler).toHaveBeenCalledWith editor

  describe "::reopenItem()", ->
    it "opens the uri associated with the last closed pane that isn't currently open", ->
-      pane = workspace.getActivePane()
+      pane = workspace.activePane
      waitsForPromise ->
        workspace.open('a').then ->
          workspace.open('b').then ->
@@ -255,44 +226,44 @@ describe "Workspace", ->

      runs ->
        # does not reopen items with no uri
-        expect(workspace.getActivePaneItem().getUri()).toBeUndefined()
+        expect(workspace.activePaneItem.getUri()).toBeUndefined()
        pane.destroyActiveItem()

      waitsForPromise ->
        workspace.reopenItem()

      runs ->
-        expect(workspace.getActivePaneItem().getUri()).not.toBeUndefined()
+        expect(workspace.activePaneItem.getUri()).not.toBeUndefined()

        # destroy all items
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('file1')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('file1')
        pane.destroyActiveItem()
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('b')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('b')
        pane.destroyActiveItem()
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('a')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('a')
        pane.destroyActiveItem()

        # reopens items with uris
-        expect(workspace.getActivePaneItem()).toBeUndefined()
+        expect(workspace.activePaneItem).toBeUndefined()

      waitsForPromise ->
        workspace.reopenItem()

      runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('a')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('a')

      # does not reopen items that are already open
      waitsForPromise ->
        workspace.open('b')

      runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('b')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('b')

      waitsForPromise ->
        workspace.reopenItem()

      runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('file1')
+        expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('file1')

  describe "::increase/decreaseFontSize()", ->
    it "increases/decreases the font size without going below 1", ->
@@ -311,22 +282,7 @@ describe "Workspace", ->
  describe "::openLicense()", ->
    it "opens the license as plain-text in a buffer", ->
      waitsForPromise -> workspace.openLicense()
-      runs -> expect(workspace.getActivePaneItem().getText()).toMatch /Copyright/
-
-  describe "::observeTextEditors()", ->
-    it "invokes the observer with current and future text editors", ->
-      observed = []
-
-      waitsForPromise -> workspace.open()
-      waitsForPromise -> workspace.open()
-      waitsForPromise -> workspace.openLicense()
-
-      runs ->
-        workspace.observeTextEditors (editor) -> observed.push(editor)
-
-      waitsForPromise -> workspace.open()
-
-      expect(observed).toEqual workspace.getTextEditors()
+      runs -> expect(workspace.activePaneItem.getText()).toMatch /Copyright/

  describe "when an editor is destroyed", ->
    it "removes the editor", ->
@@ -336,9 +292,23 @@ describe "Workspace", ->
        workspace.open("a").then (e) -> editor = e

      runs ->
-        expect(workspace.getTextEditors()).toHaveLength 1
+        expect(workspace.getEditors()).toHaveLength 1
        editor.destroy()
-        expect(workspace.getTextEditors()).toHaveLength 0
+        expect(workspace.getEditors()).toHaveLength 0
+
+  describe "when an editor is copied", ->
+    it "emits an 'editor-created' event", ->
+      editor = null
+      handler = jasmine.createSpy('editorCreatedHandler')
+      workspace.on 'editor-created', handler
+
+      waitsForPromise ->
+        workspace.open("a").then (o) -> editor = o
+
+      runs ->
+        expect(handler.callCount).toBe 1
+        editorCopy = editor.copy()
+        expect(handler.callCount).toBe 2

  it "stores the active grammars used by all the open editors", ->
    waitsForPromise ->
@@ -347,19 +317,14 @@ describe "Workspace", ->
    waitsForPromise ->
      atom.packages.activatePackage('language-coffee-script')

-    waitsForPromise ->
-      atom.packages.activatePackage('language-todo')
-
    waitsForPromise ->
      atom.workspace.open('sample.coffee')

    runs ->
-      atom.workspace.getActiveEditor().setText """
-        i = /test/; #FIXME
-      """
+      atom.workspace.getActiveEditor().setText('i = /test/;')

      state = atom.workspace.serialize()
-      expect(state.packagesWithActiveGrammars).toEqual ['language-coffee-script', 'language-javascript', 'language-todo']
+      expect(state.packagesWithActiveGrammars).toEqual ['language-coffee-script', 'language-javascript']

      jsPackage = atom.packages.getLoadedPackage('language-javascript')
      coffeePackage = atom.packages.getLoadedPackage('language-coffee-script')
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Ben Ogle	ec5cd6a68e	Add method organization docs	2014-08-19 19:09:56 -06:00
Ben Ogle	0fc94faf29	Changes based on feedback	2014-08-01 11:03:13 -07:00
Ben Ogle	de2d9739c8	Initial API guidelines doc	2014-07-31 12:33:59 -07:00