Add method organization docs

.node-version

@@ -1 +0,0 @@
-v0.10.21

CONTRIBUTING.md

@@ -12,21 +12,19 @@ propose changes to this document in a pull request.
 ## Submitting Issues
 
 * Check the [debugging guide](https://atom.io/docs/latest/debugging) for tips
-  on debugging. You might be able to find the cause of the problem and fix
+  on debugging. You might be able to find the cause of the problem and fix 
   things yourself.
 * Include the version of Atom you are using and the OS.
 * Include screenshots and animated GIFs whenever possible; they are immensely
   helpful.
 * Include the behavior you expected and other places you've seen that behavior
   such as Emacs, vi, Xcode, etc.
-* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools
+* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools 
   are open _before_ the error is triggered, a full stack trace for the error
   will be logged. If you can reproduce the error, use this approach to get the
   full stack trace and include it in the issue.
 * On Mac, check Console.app for stack traces to include if reporting a crash.
 * Perform a cursory search to see if a similar issue has already been submitted.
-* Please setup a [profile picture](https://help.github.com/articles/how-do-i-set-up-my-profile-picture)
-  to make yourself recognizable and so we can all get to know each other better.
 
 ### Package Repositories
 
@@ -64,8 +62,6 @@ For more information on how to work with Atom's official packages, see
     * Use `path.join()` to concatenate filenames.
     * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
       temporary directory.
-* Using a plain `return` when returning explicitly at the end of a function.
-    * Not `return null`, `return undefined`, `null`, or `undefined`
 
 ## Git Commit Messages
 
@@ -86,7 +82,6 @@ For more information on how to work with Atom's official packages, see
     * :green_heart: `:green_heart:` when fixing the CI build
     * :white_check_mark: `:white_check_mark:` when adding tests
     * :lock: `:lock:` when dealing with security
-    * :arrow_up: `:arrow_up:` when upgrading dependencies
 
 ## CoffeeScript Styleguide
 
@@ -101,23 +96,30 @@ For more information on how to work with Atom's official packages, see
 
 ## Documentation Styleguide
 
-* Use [AtomDoc](https://github.com/atom/atomdoc).
+* Use [TomDoc](http://tomdoc.org).
 * Use [Markdown](https://daringfireball.net/projects/markdown).
 * Reference methods and classes in markdown with the custom `{}` notation:
     * Reference classes with `{ClassName}`
     * Reference instance methods with `{ClassName::methodName}`
     * Reference class methods with `{ClassName.methodName}`
+    * Delegate to comments elsewhere with `{Delegates to: ClassName.methodName}`
+      style notation.
 
 ### Example
 
 ```coffee
 # Public: Disable the package with the given name.
 #
-# * `name`    The {String} name of the package to disable.
-# * `options` (optional) The {Object} with disable options (default: {}):
-#   * `trackTime`     A {Boolean}, `true` to track the amount of time taken.
-#   * `ignoreErrors`  A {Boolean}, `true` to catch and ignore errors thrown.
-# * `callback` The {Function} to call after the package has been disabled.
+# This method emits multiple events:
+#
+# * `package-will-be-disabled` - before the package is disabled.
+# * `package-disabled`         - after the package is disabled.
+#
+# name     - The {String} name of the package to disable.
+# options  - The {Object} with disable options (default: {}):
+#   :trackTime - `true` to track the amount of time disabling took.
+#   :ignoreErrors - `true` to catch and ignore errors thrown.
+# callback - The {Function} to call after the package has been disabled.
 #
 # Returns `undefined`.
 disablePackage: (name, options, callback) ->

Dockerfile

@@ -1,22 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Image to build Atom and create a .rpm file
-
-# Base docker image
-FROM fedora:20
-
-# Install dependencies
-RUN yum install -y \
-    make \
-    gcc \
-    gcc-c++ \
-    glibc-devel \
-    git-core \
-    libgnome-keyring-devel \
-    rpmdevtools
-
-# Install node
-RUN curl -sL https://rpm.nodesource.com/setup | bash -
-RUN yum install -y nodejs
-
-ADD . /atom
-WORKDIR /atom

README.md

@@ -4,9 +4,6 @@ Atom is a hackable text editor for the 21st century, built on [atom-shell](http:
 
 Visit [atom.io](https://atom.io) to learn more.
 
-Visit [issue #3684](https://github.com/atom/atom/issues/3684) to learn more
-about the Atom 1.0 roadmap.
-
 ## Installing
 
 ### Mac OS X
@@ -28,28 +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.
-
-### Red Hat Linux (Fedora, CentOS, Red Hat)
-
-Currently only a 64-bit version is available.
-
-1. Download `atom.x86_64.rpm` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
-2. Run `sudo yum localinstall atom.x86_64.rpm` on the downloaded package.
-3. Launch Atom using the installed `atom` command.
-
-The Linux version does not currently automatically update so you will need to
-repeat these steps to upgrade to future releases.
-
 ## Building
 
 * [Linux](docs/build-instructions/linux.md)

apm/package.json

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

atom.sh

@@ -50,7 +50,7 @@ if [ $OS == 'Mac' ]; then
 
   # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
   if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | 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
@@ -63,7 +63,7 @@ if [ $OS == 'Mac' ]; then
     "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@"
     exit $?
   else
-    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
+    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
   fi
 elif [ $OS == 'Linux' ]; then
   SCRIPT=$(readlink -f "$0")
@@ -71,7 +71,9 @@ elif [ $OS == 'Linux' ]; then
   ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
   DOT_ATOM_DIR="$HOME/.atom"
 
-  mkdir -p "$DOT_ATOM_DIR"
+  if [ ! -d "$DOT_ATOM_DIR" ]; then
+    mkdir -p "$DOT_ATOM_DIR"
+  fi
 
   : ${TMPDIR:=/tmp}
 

benchmark/benchmark-bootstrap.coffee

@@ -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)

benchmark/benchmark-helper.coffee

@@ -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)

benchmark/benchmark-suite.coffee

@@ -7,7 +7,7 @@ describe "editorView.", ->
 
   beforeEach ->
     atom.workspaceViewParentSelector = '#jasmine-content'
-    atom.workspaceView = atom.views.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", ->

benchmark/browser-process-startup.coffee

@@ -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)

build/Gruntfile.coffee

@@ -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:
@@ -120,10 +117,7 @@ module.exports = (grunt) ->
 
   for child in fs.readdirSync('node_modules') when child isnt '.bin'
     directory = path.join('node_modules', child)
-    metadataPath = path.join(directory, 'package.json')
-    continue unless grunt.file.isFile(metadataPath)
-
-    {engines, theme} = grunt.file.readJSON(metadataPath)
+    {engines, theme} = grunt.file.readJSON(path.join(directory, 'package.json'))
     if engines?.atom?
       coffeeConfig.glob_to_multiple.src.push("#{directory}/**/*.coffee")
       lessConfig.glob_to_multiple.src.push("#{directory}/**/*.less")
@@ -136,7 +130,7 @@ module.exports = (grunt) ->
 
     atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}
 
-    docsOutputDir: 'docs/output'
+    docsOutputDir: 'docs/output/api'
 
     coffee: coffeeConfig
 
@@ -150,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'
@@ -231,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)

build/debian/Dockerfile

@@ -1,50 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create the atom editor in a container 
-# AUTHOR:         Jessica Frazelle <jessie@docker.com>
-# COMMENTS:
-#   This file describes how to build the atom editor 
-#   in a container with all dependencies installed.
-#   Tested on Debian Jessie.
-# USAGE:
-#   # Download atom Dockerfile
-#   wget http://raw.githubusercontent.com/atom/atom/master/Dockerfile
-#
-#   # Build atom image
-#   docker build -t atom .
-#
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -e DISPLAY=unix$DISPLAY atom
-#
-
-DOCKER-VERSION 1.3
-
-# Base docker image
-FROM debian:jessie
-MAINTAINER Jessica Frazelle <jessie@docker.com>
-
-# Install dependencies
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    curl \
-    git \
-    libasound2 \
-    libgconf-2-4 \
-    libgnome-keyring-dev \
-    libgtk2.0-0 \
-    libnss3 \
-    libxtst6 \
-    --no-install-recommends
-
-# install node
-RUN curl -sL https://deb.nodesource.com/setup | bash -
-RUN apt-get install -y nodejs
-
-# clone atom
-RUN git clone https://github.com/atom/atom /src
-WORKDIR /src
-RUN git fetch && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-RUN script/build && script/grunt install
-
-# Autorun atom
-CMD /usr/local/bin/atom --foreground --log-file /var/log/atom.log && tail -f /var/log/atom.log

build/package.json

@@ -7,18 +7,18 @@
   },
   "dependencies": {
     "async": "~0.2.9",
-    "donna": "1.0.6",
+    "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",
     "grunt-cson": "0.10.0",
-    "grunt-download-atom-shell": "~0.10.0",
+    "grunt-download-atom-shell": "~0.8.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.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"

build/tasks/build-task.coffee

@@ -148,12 +148,15 @@ 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'), ''
       fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
 
-    dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
+    dependencies = ['compile', "generate-license:save"]
     dependencies.push('copy-info-plist') if process.platform is 'darwin'
     dependencies.push('set-exe-icon') if process.platform is 'win32'
     grunt.task.run(dependencies...)

build/tasks/codesign-task.coffee

@@ -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()

build/tasks/compile-packages-slug-task.coffee

@@ -1,54 +0,0 @@
-path = require 'path'
-CSON = require 'season'
-fs = require 'fs-plus'
-_ = require 'underscore-plus'
-
-module.exports = (grunt) ->
-  {spawn, rm} = require('./task-helpers')(grunt)
-
-  grunt.registerTask 'compile-packages-slug', 'Add bundled package metadata information to the main package.json file', ->
-    appDir = fs.realpathSync(grunt.config.get('atom.appDir'))
-
-    modulesDirectory = path.join(appDir, 'node_modules')
-    packages = {}
-
-    for moduleDirectory in fs.listSync(modulesDirectory)
-      continue if path.basename(moduleDirectory) is '.bin'
-
-      metadataPath = path.join(moduleDirectory, 'package.json')
-      metadata = grunt.file.readJSON(metadataPath)
-      continue unless metadata?.engines?.atom?
-
-      moduleCache = metadata._atomModuleCache ? {}
-
-      rm metadataPath
-      _.remove(moduleCache.extensions?['.json'] ? [], 'package.json')
-
-      for property in ['_from', '_id', 'dist', 'readme', 'readmeFilename']
-        delete metadata[property]
-
-      pack = {metadata, keymaps: {}, menus: {}}
-
-      if metadata.main
-        mainPath = require.resolve(path.resolve(moduleDirectory, metadata.main))
-        pack.main = path.relative(appDir, mainPath)
-
-      for keymapPath in fs.listSync(path.join(moduleDirectory, 'keymaps'), ['.cson', '.json'])
-        relativePath = path.relative(appDir, keymapPath)
-        pack.keymaps[relativePath] = CSON.readFileSync(keymapPath)
-        rm keymapPath
-
-      for menuPath in fs.listSync(path.join(moduleDirectory, 'menus'), ['.cson', '.json'])
-        relativePath = path.relative(appDir, menuPath)
-        pack.menus[relativePath] = CSON.readFileSync(menuPath)
-        rm menuPath
-
-      packages[metadata.name] = pack
-
-      for extension, paths of moduleCache.extensions
-        delete moduleCache.extensions[extension] if paths.length is 0
-
-    metadata = grunt.file.readJSON(path.join(appDir, 'package.json'))
-    metadata._atomPackages = packages
-
-    grunt.file.write(path.join(appDir, 'package.json'), JSON.stringify(metadata))

build/tasks/create-installer.coffee

@@ -1,46 +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')
-    releasesDir = path.join(buildDir, 'Releases')
-    atomGitHubToken = process.env.ATOM_ACCESS_TOKEN
-
-    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))
-
-    # We use the previous releases to build deltas for the current release,
-    # sync down the existing releases directory by rolling through GitHub releases
-    cmd = 'build/windows/SyncGitHubReleases.exe'
-    args = ['-r', releasesDir, '-u', 'https://github.com/atom/atom', '-t', atomGitHubToken]
-
-    spawn {cmd, args}, (error, result, code) ->
-      if error?
-        grunt.log.error "ATOM_ACCESS_TOKEN environment variable not set or invalid, can't download old releases; continuing anyways"
-
-      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'
-
-        cmd = 'build/windows/update.com'
-        args = ['--releasify', path.join(buildDir, pkgs), '-r', releasesDir, '-g', 'build/windows/install-spinner.gif']
-        spawn {cmd, args}, (error, result, code) -> done(error)

build/tasks/docs-task.coffee

@@ -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)

build/tasks/generate-module-cache-task.coffee

@@ -1,39 +0,0 @@
-path = require 'path'
-fs = require 'fs-plus'
-ModuleCache = require '../../src/module-cache'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'generate-module-cache', 'Generate a module cache for all core modules and packages', ->
-    appDir = grunt.config.get('atom.appDir')
-
-    {packageDependencies} = grunt.file.readJSON('package.json')
-
-    for packageName, version of packageDependencies
-      ModuleCache.create(path.join(appDir, 'node_modules', packageName))
-
-    ModuleCache.create(appDir)
-
-    metadata = grunt.file.readJSON(path.join(appDir, 'package.json'))
-
-    metadata._atomModuleCache.folders.forEach (folder) ->
-      if '' in folder.paths
-        folder.paths = [
-          ''
-          'exports'
-          'spec'
-          'src'
-          'src/browser'
-          'static'
-          'vendor'
-        ]
-
-    # Reactionary does not have an explicit react dependency
-    metadata._atomModuleCache.folders.push
-      paths: [
-        'node_modules/reactionary-atom-fork/lib'
-      ]
-      dependencies: {
-        'react-atom-fork': metadata.dependencies['react-atom-fork']
-      }
-
-    grunt.file.write(path.join(appDir, 'package.json'), JSON.stringify(metadata))

build/tasks/install-task.coffee

@@ -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,16 +22,12 @@ 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')
 
-      iconName = path.join(shareDir,'resources', 'app', 'resources', 'atom.png')
+      iconName = path.join(shareDir,'resources','app','resources','atom.png')
 
       mkdir binDir
       cp 'atom.sh', path.join(binDir, 'atom')
@@ -40,11 +35,11 @@ module.exports = (grunt) ->
       mkdir path.dirname(shareDir)
       cp shellAppDir, shareDir
 
-      # Create atom.desktop if installation not in temporary folder
+      # Create Atom.desktop if installation not in temporary folder
       tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
       if installDir.indexOf(tmpDir) isnt 0
-        desktopFile = path.join('resources', 'linux', 'atom.desktop.in')
-        desktopInstallFile = path.join(installDir, 'share', 'applications', 'atom.desktop')
+        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
+        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')
 
         {description} = grunt.file.readJSON('package.json')
         iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')

build/tasks/license-overrides.coffee

@@ -60,18 +60,3 @@ module.exports =
         ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
         IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       """
-
-  'jschardet@1.1.0':
-    license: 'LGPL'
-    source: 'README.md in the repository'
-    sourceText: """
-      JsChardet
-      =========
-
-      Port of python's chardet (http://chardet.feedparser.org/).
-
-      License
-      -------
-
-      LGPL
-    """

build/tasks/mkdeb-task.coffee

@@ -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)

build/tasks/mkrpm-task.coffee

@@ -1,48 +0,0 @@
-fs = require 'fs'
-path = require 'path'
-_ = require 'underscore-plus'
-
-module.exports = (grunt) ->
-  {spawn, rm, mkdir} = require('./task-helpers')(grunt)
-
-  fillTemplate = (filePath, data) ->
-    template = _.template(String(fs.readFileSync("#{filePath}.in")))
-    filled = template(data)
-
-    outputPath = path.join(grunt.config.get('atom.buildDir'), path.basename(filePath))
-    grunt.file.write(outputPath, filled)
-    outputPath
-
-  grunt.registerTask 'mkrpm', 'Create rpm package', ->
-    done = @async()
-
-    if process.arch is 'ia32'
-      arch = 'i386'
-    else if process.arch is 'x64'
-      arch = 'amd64'
-    else
-      return done("Unsupported arch #{process.arch}")
-
-    {name, version, description} = grunt.file.readJSON('package.json')
-    buildDir = grunt.config.get('atom.buildDir')
-
-    rpmDir = path.join(buildDir, 'rpm')
-    rm rpmDir
-    mkdir rpmDir
-
-    installDir = grunt.config.get('atom.installDir')
-    shareDir = path.join(installDir, 'share', 'atom')
-    iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-
-    data = {name, version, description, installDir, iconName}
-    specFilePath = fillTemplate(path.join('resources', 'linux', 'redhat', 'atom.spec'), data)
-    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
-
-    cmd = path.join('script', 'mkrpm')
-    args = [specFilePath, desktopFilePath, buildDir]
-    spawn {cmd, args}, (error) ->
-      if error?
-        done(error)
-      else
-        grunt.log.ok "Created rpm package in #{rpmDir}"
-        done()

build/tasks/publish-build-task.coffee

@@ -17,30 +17,18 @@ defaultHeaders =
 
 module.exports = (gruntObject) ->
   grunt = gruntObject
-  {cp} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'publish-build', 'Publish the built app', ->
-    tasks = []
-    tasks.push('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    tasks.push('upload-assets') if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
+    tasks = ['upload-assets']
+    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', ->
-    doneCallback = @async()
-    startTime = Date.now()
-    done = (args...) ->
-      elapsedTime = Math.round((Date.now() - startTime) / 100) / 10
-      grunt.log.ok("Upload time: #{elapsedTime}s")
-      doneCallback(args...)
-
-    unless token
-      return done(new Error('ATOM_ACCESS_TOKEN environment variable not set'))
-
+    done = @async()
     buildDir = grunt.config.get('atom.buildDir')
     assets = getAssets()
 
@@ -54,45 +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')
-
-      # Check for a Debian build
-      sourcePath = "#{buildDir}/atom-#{version}-#{arch}.deb"
-      assetName = "atom-#{arch}.deb"
-
-      # Check for a Fedora build
-      unless fs.isFileSync(sourcePath)
-        rpmName = fs.readdirSync("#{buildDir}/rpm")[0]
-        sourcePath = "#{buildDir}/rpm/#{rpmName}"
-        if process.arch is 'ia32'
-          arch = 'i386'
-        else
-          arch = 'x86_64'
-        assetName = "atom.#{arch}.rpm"
-
-      {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)
@@ -111,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)
@@ -123,22 +82,10 @@ getAtomDraftRelease = (callback) ->
       logError('Fetching atom/atom releases failed', error, releases)
       callback(error)
     else
-      [firstDraft] = releases.filter ({draft}) -> draft
-      if firstDraft?
-        options =
-          uri: firstDraft.assets_url
-          method: 'GET'
-          headers: defaultHeaders
-          json: true
-        request options, (error, response, assets=[]) ->
-          if error? or response.statusCode isnt 200
-            logError('Fetching draft release assets failed', error, assets)
-            callback(error ? new Error(response.statusCode))
-          else
-            firstDraft.assets = assets
-            callback(null, firstDraft)
-      else
-        callback(new Error('No draft release in atom/atom repo'))
+      for release in releases when release.draft
+        callback(null, release)
+        return
+      callback(new Error('No draft release in atom/atom repo'))
 
 deleteRelease = (release) ->
   options =

build/tasks/set-version-task.coffee

@@ -32,7 +32,7 @@ module.exports = (grunt) ->
       packageJsonPath = path.join(appDir, 'package.json')
       packageJson = require(packageJsonPath)
       packageJson.version = version
-      packageJsonString = JSON.stringify(packageJson)
+      packageJsonString = JSON.stringify(packageJson, null, 2)
       fs.writeFileSync(packageJsonPath, packageJsonString)
 
       if process.platform is 'darwin'
@@ -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
 

build/tasks/spec-task.coffee

@@ -2,36 +2,26 @@ fs = require 'fs'
 path = require 'path'
 
 _ = require 'underscore-plus'
-async = require 'async'
 
-concurrency = 2
+async = require 'async'
 
 module.exports = (grunt) ->
   {isAtomPackage, spawn} = require('./task-helpers')(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')}"]
@@ -63,15 +53,19 @@ module.exports = (grunt) ->
       continue unless isAtomPackage(packagePath)
       packageSpecQueue.push(packagePath)
 
-    packageSpecQueue.concurrency = concurrency - 1
+    packageSpecQueue.concurrency = 1
     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}"]
@@ -86,7 +80,7 @@ module.exports = (grunt) ->
         fs.unlinkSync('ci.log')
       else
         # TODO: Restore concurrency on Windows
-        packageSpecQueue.concurrency = concurrency
+        packageSpecQueue.concurrency = 2
 
       callback(null, error)
 
@@ -96,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
@@ -104,13 +98,14 @@ module.exports = (grunt) ->
     method [runCoreSpecs, runPackageSpecs], (error, results) ->
       [coreSpecFailed, failedPackages] = results
       elapsedTime = Math.round((Date.now() - startTime) / 100) / 10
-      grunt.log.ok("Total spec time: #{elapsedTime}s using #{concurrency} cores")
+      grunt.verbose.writeln("Total spec time: #{elapsedTime}s")
       failures = failedPackages
       failures.push "atom core" if coreSpecFailed
 
       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)

build/tasks/task-helpers.coffee

@@ -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)

build/windows/atom.nuspec.erb

@@ -1,31 +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>

coffeelint.json

@@ -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"
-  }
-}

docs/advanced/configuration.md

@@ -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.

docs/advanced/keymaps.md

@@ -6,25 +6,25 @@ Keymap files are encoded as JSON or CSON files containing nested hashes. They
 work much like stylesheets, but instead of applying style properties to elements
 matching the selector, they specify the meaning of keystrokes on elements
 matching the selector. Here is an example of some bindings that apply when
-keystrokes pass through `atom-text-editor` elements:
+keystrokes pass through elements with the class `.editor`:
 
 ```coffee
-'atom-text-editor':
+'.editor':
   'cmd-delete': 'editor:delete-to-beginning-of-line'
   'alt-backspace': 'editor:delete-to-beginning-of-word'
   'ctrl-A': 'editor:select-to-first-character-of-line'
   'ctrl-shift-e': 'editor:select-to-end-of-line'
   'cmd-left': 'editor:move-to-first-character-of-line'
 
-'atom-text-editor:not(.mini)'
+'.editor:not(.mini)'
   'cmd-alt-[': 'editor:fold-current-row'
   'cmd-alt-]': 'editor:unfold-current-row'
 ```
 
 Beneath the first selector are several bindings, mapping specific *keystroke
-patterns* to *commands*. When an element with the `atom-text-editor` class is focused and
+patterns* to *commands*. When an element with the `.editor` class is focused and
 `cmd-delete` is pressed, an custom DOM event called
-`editor:delete-to-beginning-of-line` is emitted on the `atom-text-editor` element.
+`editor:delete-to-beginning-of-line` is emitted on the `.editor` element.
 
 The second selector group also targets editors, but only if they don't have the
 `.mini` class. In this example, the commands for code folding don't really make
@@ -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`
@@ -91,7 +91,7 @@ the current keystroke sequence and continue searching from its parent. If you
 want to remove a binding from a keymap you don't control, such as keymaps in
 Atom core or in packages, use the `unset!` directive.
 
-For example, the following code removes the keybinding for `a` in the Tree View,
+For example, the following code removes the keybinding for `a` in the Tree View, 
 which is normally used to trigger the `tree-view:add-file` command:
 
 ```coffee

docs/advanced/scopes-and-scope-descriptors.md

@@ -1,87 +0,0 @@
-# Scoped Settings, Scopes and Scope Descriptors
-
-Atom supports language-specific settings. You can soft wrap only Markdown files, or set the tab length to 4 in Python files.
-
-Language-specific settings are a subset of something more general we call "scoped settings". Scoped settings allow targeting down to a specific syntax token type. For example, you could conceivably set a setting to target only Ruby comments, only code inside Markdown files, or even only JavaScript function names.
-
-## Scope names in syntax tokens
-
-Each token in the editor has a collection of scope names. For example, the aformentioned JavaScript function name might have the scope names `function` and `name`. An open paren might have the scope names `punctuation`, `parameters`, `begin`.
-
-Scope names work just like CSS classes. In fact, in the editor, scope names are attached to a token's DOM node as CSS classes.
-
-Take this piece of JavaScript:
-
-```js
-function functionName() {
-  console.log('Log it out');
-}
-```
-
-In the dev tools, the first line's markup looks like this.
-
-![screen shot 2014-10-14 at 11 21 35 am](https://cloud.githubusercontent.com/assets/69169/4634321/2b1b923c-53cf-11e4-9268-6e57bcb14ec8.png)
-
-All the class names on the spans are scope names. Any scope name can be used to target a setting's value.
-
-## Scope Selectors
-
-Scope selectors allow you to target specific tokens just like a CSS selector targets specific nodes in the DOM. Some examples:
-
-```coffee
-'.source.js' # selects all javascript tokens
-'.source.js .function.name' # selects all javascript function names
-'.function.name' # selects all function names in any language
-```
-
-[Config::set][config-set] accepts a `scopeSelector`. If you'd like to set a setting for JavaScript function names, you can give it the js function name `scopeSelector`:
-
-```coffee
-atom.config.set('.source.js .function.name', 'my-package.my-setting', 'special value')
-```
-
-## Scope Descriptors
-
-A scope descriptor is an [Object][scope-descriptor] that wraps an `Array` of
-`String`s. The Array describes a path from the root of the syntax tree to a
-token including _all_ scope names for the entire path.
-
-In our JavaScript example above, a scope descriptor for the function name token would be:
-
-```coffee
-['source.js', 'meta.function.js', 'entity.name.function.js']
-```
-
-[Config::get][config-get] accepts a `scopeDescriptor`. You can get the value for your setting scoped to JavaScript function names via:
-
-```coffee
-scopeDescriptor = ['source.js', 'meta.function.js', 'entity.name.function.js']
-value = atom.config.get(scopeDescriptor, 'my-package.my-setting')
-```
-
-But, you do not need to generate scope descriptors by hand. There are a couple methods available to get the scope descriptor from the editor:
-
-* [Editor::getRootScopeDescriptor][editor-getRootScopeDescriptor] to get the language's descriptor. eg. `[".source.js"]`
-* [Editor::scopeDescriptorForBufferPosition][editor-scopeDescriptorForBufferPosition] to get the descriptor at a specific position in the buffer.
-* [Cursor::getScopeDescriptor][cursor-getScopeDescriptor] to get a cursor's descriptor based on position. eg. if the cursor were in the name of the method in our example it would return `["source.js", "meta.function.js", "entity.name.function.js"]`
-
-Let's revisit our example using these methods:
-
-```coffee
-editor = atom.workspace.getActiveTextEditor()
-cursor = editor.getLastCursor()
-valueAtCursor = atom.config.get(cursor.getScopeDescriptor(), 'my-package.my-setting')
-valueForLanguage = atom.config.get(editor.getRootScopeDescriptor(), 'my-package.my-setting')
-```
-
-
-[config]:https://atom.io/docs/api/latest/Config
-[config-get]:https://atom.io/docs/api/latest/Config#instance-get
-[config-set]:https://atom.io/docs/api/latest/Config#instance-set
-[config-observe]:https://atom.io/docs/api/latest/Config#instance-observe
-
-[editor-getRootScopeDescriptor]:https://atom.io/docs/api/latest/TextEditor#instance-getRootScopeDescriptor
-[editor-scopeDescriptorForBufferPosition]:https://atom.io/docs/api/latest/TextEditor#instance-scopeDescriptorForBufferPosition
-
-[cursor-getScopeDescriptor]:https://atom.io/docs/api/latest/Cursor#instance-getScopeDescriptor
-[scope-descriptor]:https://atom.io/docs/api/latest/ScopeDescriptor

docs/advanced/view-system.md

@@ -11,7 +11,7 @@ have methods that are view-specific. For example, you could call both general
 and view-specific on the global `atom.workspaceView` instance:
 
 ```coffeescript
-atom.workspaceView.find('atom-text-editor.active') # standard jQuery method
+atom.workspaceView.find('.editor.active') # standard jQuery method
 atom.workspaceView.getActiveEditor()      # view-specific method
 ```
 
@@ -20,7 +20,7 @@ If you retrieve a jQuery wrapper for an element associated with a view, use the
 
 ```coffeescript
 # this is a plain jQuery object; you can't call view-specific methods
-editorElement = atom.workspaceView.find('atom-text-editor.active')
+editorElement = atom.workspaceView.find('.editor.active')
 
 # get the view object by calling `.view()` to call view-specific methods
 editorView = editorElement.view()

docs/api-guidelines.md

@@ -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

docs/build-instructions/linux.md

@@ -6,92 +6,53 @@ 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).
 
-* `sudo apt-get install build-essential git libgnome-keyring-dev fakeroot`
-* Instructions for  [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
-
-### Fedora / CentOS / RHEL
-
-* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
-* Instructions for [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).
+### 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).
 
 ### Arch
-
-* `sudo pacman -S base-devel git nodejs libgnome-keyring python2`
+* `sudo pacman -S base-devel git nodejs libgnome-keyring`
 * `export PYTHON=/usr/bin/python2` before building Atom.
 
 ## Instructions
 
 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
-  ```
-
-  To use the newly installed Atom, quit and restart all running Atom instances.
-
-5. *Optionally*, you may generate distributable packages of Atom at `$TMPDIR/atom-build`. Currenty, `.deb` and `.rpm` package types are supported. To create a `.deb` package run:
-
-  ```sh
-  script/grunt mkdeb
-  ```
-
-  To create an `.rpm` package run
-
-  ```sh
-  script/grunt mkrpm
-  ```
-
-## 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
 
-### TypeError: Unable to watch path
+### Exception: "TypeError: Unable to watch path"
 
 If you get following error with a big traceback right after Atom starts:
 
@@ -109,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.
@@ -117,35 +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.
 
-### AttributeError: 'module' object has no attribute 'script_main'
-
-If you get following error with a big traceback while building Atom:
-
-  ```
-  sys.exit(gyp.script_main()) AttributeError: 'module' object has no attribute 'script_main' gyp ERR!
-  ```
-
-you need to uninstall the system version of gyp.
-
-On Fedora you would do the following:
-
-  ```sh
-  sudo yum remove gyp
-  ```
-
-#### 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.

docs/build-instructions/windows.md

@@ -36,7 +36,7 @@
 ## Why do I have to use GitHub for Windows?
 
 You don't. You can use your existing Git! GitHub for Windows's Git Shell is just
-easier to set up.
+easier to set up. 
 
 If you _prefer_ using your existing Git installation, make sure git's cmd directory is in your PATH env variable (e.g. `C:\Program Files (x86)\Git\cmd`) before you open your powershell or command window.
 Note that you may have to open your command window as administrator. For powershell that doesn't seem to always be the case, though.
@@ -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.
 

docs/contributing-to-packages.md

@@ -9,27 +9,22 @@ in the proper package's repository.
 
 ### Cloning
 
-The first step is creating your own clone.
+The first step is creating your own clone. You can of course do this manually
+with git, or you can use the `apm develop` command to create a clone based on
+the package's `repository` field in the `package.json`.
 
-For example, if you want to make changes to the `tree-view` package, fork the repo on your github account, then clone it:
+For example, if you want to make changes to the `tree-view` package, run the
+following command:
 
 ```
-> git clone git@github.com:your-username/tree-view.git
-```
-
-Next install all the dependencies:
-
-```
-> cd tree-view
-> apm install
+> apm develop tree-view
+Cloning https://github.com/atom/tree-view ✓
 Installing modules ✓
+~/.atom/dev/packages/tree-view -> ~/github/tree-view
 ```
 
-Now you can link it to development mode so when you run an Atom window with `atom --dev`, you will use your fork instead of the built in package:
-
-```
-> apm link -d
-```
+This clones the `tree-view` repository to `~/github`. If you prefer a different
+path, specify it via the `ATOM_REPOS_HOME` environment variable.
 
 ### Running in Development Mode
 
@@ -51,4 +46,7 @@ from the package directory to create and remove dev-mode symlinks.
 
 ### Installing Dependencies
 
-You'll want to keep dependencies up to date by running `apm update` after pulling any upstream changes.
+Finally, you need to install the cloned package's dependencies by running
+`apm install` within the package directory. This step is also performed
+automatically the first time you run `apm develop`, but you'll want to keep
+dependencies up to date by running `apm update` after pulling upstream changes.

docs/creating-a-package.md

@@ -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'}
-  ]
-  'atom-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':
-  'atom-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/

docs/customizing-atom.md

@@ -60,10 +60,10 @@ with events in specific contexts. Here's a small example, excerpted from Atom's
 built-in keymaps:
 
 ```coffee
-'atom-text-editor':
+'.editor':
   'enter': 'editor:newline'
 
-'atom-text-editor.mini input':
+'.mini.editor input':
   'enter': 'core:confirm'
 ```
 
@@ -169,7 +169,7 @@ For example, to change the color of the cursor, you could add the following
 rule to your _~/.atom/styles.less_ file:
 
 ```less
-atom-text-editor.is-focused .cursor {
+.editor.is-focused .cursor {
   border-color: pink;
 }
 ```

docs/index.md

@@ -9,7 +9,6 @@
 * [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
 * [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
-* [Contributing to Core Packages](contributing-to-packages.md)
 * [Debugging](debugging.md)
 
 ### Advanced Topics
@@ -19,4 +18,3 @@
 * [Keymaps](advanced/keymaps.md)
 * [Serialization](advanced/serialization.md)
 * [View System](advanced/view-system.md)
-* [Scopes and Scope Descriptors](advanced/scopes-and-scope-descriptors.md)

docs/your-first-package.md

@@ -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!')
 ```
 
@@ -91,13 +91,13 @@ _keymaps/ascii-art.cson_ and add a key binding linking `ctrl-alt-a` to the
 you don't need it anymore. When finished, the file will look like this:
 
 ```coffeescript
-'atom-text-editor':
+'.editor':
   'cmd-alt-a': 'ascii-art:convert'
 ```
 
-Notice `atom-text-editor` on the first line. Just like CSS, keymap selectors *scope* key
+Notice `.editor` on the first line. Just like CSS, keymap selectors *scope* key
 bindings so they only apply to specific elements. In this case, our binding is
-only active for elements matching the `atom-text-editor` selector. If the Tree View has
+only active for elements matching the `.editor` selector. If the Tree View has
 focus, pressing `cmd-alt-a` won't trigger the `ascii-art:convert` command. But
 if the editor has focus, the `ascii-art:convert` method *will* be triggered.
 More information on key bindings can be found in the
@@ -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) ->

dot-atom/init.coffee

@@ -4,8 +4,11 @@
 # after packages are loaded/activated and after the previous editor state
 # has been restored.
 #
-# An example hack to log to the console when each text editor is saved.
+# An example hack to make opened Markdown files always be soft wrapped:
 #
-# atom.workspace.observeTextEditors (editor) ->
-#   editor.onDidSave ->
-#     console.log "Saved! #{editor.getPath()}"
+# path = require 'path'
+#
+# atom.workspaceView.eachEditorView (editorView) ->
+#   editor = editorView.getEditor()
+#   if path.extname(editor.getPath()) is '.md'
+#     editor.setSoftWrap(true)

dot-atom/keymap.cson

@@ -9,17 +9,10 @@
 #
 # Here's an example taken from Atom's built-in keymap:
 #
-# 'atom-text-editor':
+# '.editor':
 #   'enter': 'editor:newline'
 #
-# 'atom-workspace':
-#   'ctrl-shift-p': 'core:move-up'
+# '.workspace':
+#   '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
-#
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it here:
-# https://github.com/bevry/cson#what-is-cson

dot-atom/snippets.cson

@@ -13,6 +13,3 @@
 #     'prefix': 'log'
 #     'body': 'console.log $1'
 #
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it here:
-# https://github.com/bevry/cson#what-is-cson

dot-atom/styles.less

@@ -12,10 +12,10 @@
 
 }
 
-atom-text-editor {
+.editor {
 
 }
 
-atom-text-editor .cursor {
+.editor .cursor {
 
 }

exports/atom.coffee

@@ -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

keymaps/base.cson

@@ -1,27 +1,25 @@
-'atom-text-editor':
+'.editor':
   # Platform Bindings
   'home': 'editor:move-to-first-character-of-line'
   'end': 'editor:move-to-end-of-screen-line'
   'shift-home': 'editor:select-to-first-character-of-line'
   'shift-end': 'editor:select-to-end-of-line'
 
-'atom-text-editor:not(.mini)':
+'.editor:not(.mini)':
   # Atom Specific
   'ctrl-C': 'editor:copy-path'
 
   # Sublime Parity
   'tab': 'editor:indent'
   'enter': 'editor:newline'
+  'num-enter': 'editor:newline'
   'shift-tab': 'editor:outdent-selected-rows'
   'ctrl-K': 'editor:delete-line'
 
-'.select-list atom-text-editor.mini':
-  'enter': 'core:confirm'
-
 '.tool-panel.panel-left, .tool-panel.panel-right':
   'escape': 'tool-panel:unfocus'
 
-'atom-text-editor !important, atom-text-editor.mini !important':
+'.editor !important, .editor.mini !important':
   'escape': 'editor:consolidate-selections'
 
 # allow standard input fields to work correctly
@@ -29,6 +27,7 @@
   'tab': 'core:focus-next'
   'shift-tab': 'core:focus-previous'
   'enter': 'native!'
+  'num-enter': 'native!'
   'backspace': 'native!'
   'shift-backspace': 'native!'
   'delete': 'native!'

keymaps/darwin.cson

@@ -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'
@@ -29,8 +30,6 @@
   'ctrl-alt-cmd-l': 'window:reload'
   'alt-cmd-i': 'window:toggle-dev-tools'
   'cmd-alt-ctrl-p': 'window:run-package-specs'
-  'ctrl-shift-left': 'pane:move-item-left'
-  'ctrl-shift-right': 'pane:move-item-right'
 
   # Sublime Parity
   'cmd-,': 'application:show-settings'
@@ -102,7 +101,7 @@
   'cmd-8': 'pane:show-item-8'
   'cmd-9': 'pane:show-item-9'
 
-'atom-text-editor':
+'.editor':
   # Platform Bindings
   'alt-left': 'editor:move-to-beginning-of-word'
   'alt-right': 'editor:move-to-end-of-word'
@@ -112,7 +111,7 @@
   # Apple Specific
   'cmd-backspace': 'editor:delete-to-beginning-of-line'
   'cmd-shift-backspace': 'editor:delete-to-beginning-of-line'
-  'cmd-delete': 'editor:delete-to-end-of-line'
+  'cmd-delete': 'editor:delete-to-beginning-of-line'
   'ctrl-A': 'editor:select-to-first-character-of-line'
   'ctrl-E': 'editor:select-to-end-of-line'
   'cmd-left': 'editor:move-to-first-character-of-line'
@@ -121,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'
 
@@ -136,7 +135,7 @@
   'cmd-l': 'editor:select-line'
   'ctrl-t': 'editor:transpose'
 
-'atom-workspace atom-text-editor:not(.mini)':
+'.workspace .editor:not(.mini)':
   # Atom specific
   'alt-cmd-z': 'editor:checkout-head-revision'
   'cmd-<': 'editor:scroll-to-cursor'
@@ -145,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'

keymaps/emacs.cson

@@ -1,4 +1,4 @@
-'atom-text-editor':
+'.editor':
   'alt-f': 'editor:move-to-end-of-word'
   'alt-F': 'editor:select-to-end-of-word'
   'alt-b': 'editor:move-to-beginning-of-word'

keymaps/linux.cson

@@ -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,14 +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-pageup': 'pane:move-item-left'
-  'ctrl-shift-pagedown': 'pane:move-item-right'
+  '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'
@@ -81,7 +78,7 @@
   'alt-8': 'pane:show-item-8'
   'alt-9': 'pane:show-item-9'
 
-'atom-workspace atom-text-editor':
+'.workspace .editor':
   # Platform Bindings
   'ctrl-left': 'editor:move-to-beginning-of-word'
   'ctrl-right': 'editor:move-to-end-of-word'
@@ -101,7 +98,7 @@
   'ctrl-k ctrl-l': 'editor:lower-case'
   'ctrl-l': 'editor:select-line'
 
-'atom-workspace atom-text-editor:not(.mini)':
+'.workspace .editor:not(.mini)':
   # Atom specific
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'

keymaps/win32.cson

@@ -5,6 +5,7 @@
 
   # Atom Specific
   'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -14,10 +15,6 @@
   'ctrl-alt-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-left': 'pane:move-item-left'
-  'ctrl-shift-right': 'pane:move-item-right'
   'F11': 'window:toggle-full-screen'
 
   # Sublime Parity
@@ -29,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'
@@ -78,7 +75,7 @@
   'ctrl-k ctrl-left':  'window:focus-pane-on-left'
   'ctrl-k ctrl-right': 'window:focus-pane-on-right'
 
-'atom-workspace atom-text-editor':
+'.workspace .editor':
   # Platform Bindings
   'ctrl-left': 'editor:move-to-beginning-of-word'
   'ctrl-right': 'editor:move-to-end-of-word'
@@ -98,7 +95,7 @@
   'ctrl-k ctrl-l': 'editor:lower-case'
   'ctrl-l': 'editor:select-line'
 
-'atom-workspace atom-text-editor:not(.mini)':
+'.workspace .editor:not(.mini)':
   # Atom specific
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'

menus/darwin.cson

@@ -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' }
@@ -190,39 +188,7 @@
     submenu: [
       { label: 'Terms of Use', command: 'application:open-terms-of-use' }
       { label: 'Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
       { type: 'separator' }
     ]
   }
 ]
-
-'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'}
-  ]
-  'atom-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'}
-  ]

menus/linux.cson

@@ -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: [
@@ -147,39 +151,7 @@
       { label: "VERSION", enabled: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
       { type: 'separator' }
     ]
   }
 ]
-
-'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'}
-  ]
-  'atom-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'}
-  ]

menus/win32.cson

@@ -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' }
@@ -109,7 +109,7 @@
           { label: 'Focus Pane On Left', command: 'window:focus-pane-on-left' }
           { label: 'Focus Pane On Right', command: 'window:focus-pane-on-right' }
           { type: 'separator' }
-          { label: 'Close Pane', command: 'pane:close' }
+          { label: 'Close pane', command: 'pane:close' }
         ]
       }
       {
@@ -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: [
@@ -165,39 +175,7 @@
       { label: "VERSION", enabled: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
       { type: 'separator' }
     ]
   }
 ]
-
-'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'}
-  ]
-  'atom-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'}
-  ]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.146.0",
+  "version": "0.121.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,130 +17,128 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.19.1",
+  "atomShellVersion": "0.15.0",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.2.2",
+    "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-json": "~0.0",
     "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.17.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.3.2",
+    "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.3",
-    "scoped-property-store": "^0.15.0",
-    "scrollbar-style": "^1.0.2",
+    "scandal": "1.0.0",
+    "scoped-property-store": "^0.9.0",
+    "scrollbar-style": "^1.0.1",
     "season": "^1.0.2",
-    "semver": "2.2.1",
+    "semver": "1.1.4",
     "serializable": "^1",
-    "space-pen": "3.8.1",
+    "space-pen": "3.2.0",
     "temp": "0.7.0",
-    "text-buffer": "^3.6.0",
-    "theorist": "^1.0.2",
-    "underscore-plus": "^1.6.1",
+    "text-buffer": "^3.0.0",
+    "theorist": "^1",
+    "underscore-plus": "^1.5.1",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.21.0",
-    "atom-dark-ui": "0.35.0",
-    "atom-light-syntax": "0.21.0",
-    "atom-light-ui": "0.30.0",
-    "base16-tomorrow-dark-theme": "0.21.0",
+    "atom-dark-syntax": "0.19.0",
+    "atom-dark-ui": "0.33.0",
+    "atom-light-syntax": "0.20.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.33.0",
-    "autoflow": "0.18.0",
-    "autosave": "0.18.0",
-    "background-tips": "0.17.0",
-    "bookmarks": "0.30.0",
-    "bracket-matcher": "0.62.0",
-    "command-palette": "0.27.0",
-    "deprecation-cop": "0.11.0",
-    "dev-live-reload": "0.35.0",
-    "encoding-selector": "0.7.0",
-    "exception-reporting": "0.20.0",
-    "find-and-replace": "0.146.0",
-    "fuzzy-finder": "0.60.0",
-    "git-diff": "0.43.0",
-    "go-to-line": "0.26.0",
-    "grammar-selector": "0.37.0",
-    "image-view": "0.40.0",
-    "incompatible-packages": "0.10.0",
-    "keybinding-resolver": "0.20.0",
-    "link": "0.26.0",
-    "markdown-preview": "0.110.0",
-    "metrics": "0.38.0",
-    "open-on-github": "0.30.0",
-    "package-generator": "0.32.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.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.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.159.0",
-    "snippets": "0.56.0",
-    "spell-check": "0.43.0",
-    "status-bar": "0.46.0",
-    "styleguide": "0.30.0",
-    "symbols-view": "0.68.0",
-    "tabs": "0.55.0",
-    "timecop": "0.23.0",
-    "tree-view": "0.132.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.112.0",
     "update-package-dependencies": "0.6.0",
-    "welcome": "0.19.0",
-    "whitespace": "0.26.0",
-    "wrap-guide": "0.23.0",
-    "language-c": "0.30.0",
-    "language-coffee-script": "0.37.0",
-    "language-css": "0.23.0",
-    "language-gfm": "0.53.0",
+    "welcome": "0.17.0",
+    "whitespace": "0.25.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.44.0",
     "language-git": "0.9.0",
-    "language-go": "0.19.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.43.0",
+    "language-javascript": "0.39.0",
     "language-json": "0.8.0",
-    "language-less": "0.18.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.18.0",
+    "language-php": "0.15.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.23.0",
-    "language-ruby": "0.41.0",
-    "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.25.0",
-    "language-shellscript": "0.10.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.13.0",
-    "language-toml": "0.14.0",
-    "language-xml": "0.24.0",
-    "language-yaml": "0.19.0"
+    "language-todo": "0.10.0",
+    "language-toml": "0.12.0",
+    "language-xml": "0.17.0",
+    "language-yaml": "0.13.0"
   },
   "private": true,
   "scripts": {

resources/linux/Atom.desktop.in

@@ -1,10 +1,8 @@
 [Desktop Entry]
 Name=Atom
 Comment=<%= description %>
-GenericName=Text Editor
 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;

resources/linux/debian/control.in

@@ -1,11 +1,8 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
-Suggests: libgnome-keyring0, gir1.2-gnomekeyring-1.0
 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.

resources/linux/debian/lintian-overrides

@@ -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

resources/linux/redhat/atom.spec.in

@@ -1,26 +0,0 @@
-Name:           <%= name %>
-Version:        <%= version %>
-Release:        0.1%{?dist}
-Summary:        Atom is a hackable text editor for the 21st century
-License:        MIT
-URL:            https://atom.io/
-AutoReqProv:    no # Avoid libchromiumcontent.so missing dependency
-
-%description
-<%= description %>
-
-%install
-mkdir -p %{buildroot}/usr/local/share/atom
-cp -r /tmp/atom-build/Atom/* %{buildroot}/usr/local/share/atom
-mkdir -p %{buildroot}/usr/local/bin/
-ln -sf /usr/local/share/atom/resources/app/apm/node_modules/.bin/apm %{buildroot}/usr/local/bin/apm
-cp atom.sh %{buildroot}/usr/local/bin/atom
-chmod 755 atom.sh
-mkdir -p %{buildroot}/usr/local/share/applications/
-mv atom.desktop %{buildroot}/usr/local/share/applications/
-
-%files
-/usr/local/bin/atom
-/usr/local/bin/apm
-/usr/local/share/atom/
-/usr/local/share/applications/atom.desktop

script/cibuild

@@ -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');
   }

script/cibuild-atom-linux

@@ -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

script/cibuild-atom-rpm

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker build -t atom-rpm .
-docker run \
- --env JANKY_SHA1="$JANKY_SHA1" \
- --env JANKY_BRANCH="$JANKY_BRANCH" \
- --env ATOM_ACCESS_TOKEN="$BUILD_ATOM_RPM_ACCESS_TOKEN" \
- atom-rpm /atom/script/rpmbuild

script/copy-folder.cmd

@@ -15,4 +15,4 @@ if [%2] == [] (
 if exist %2 rmdir %2 /s /q
 
 :: cp -rf %1 %2
-(robocopy %1 %2 /e) ^& IF %ERRORLEVEL% LEQ 1 exit 0
+xcopy %1 %2 /e /h /c /i /y /r

script/mkdeb

@@ -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

script/mkrpm

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SPEC_FILE="$1"
-DESKTOP_FILE="$2"
-BUILD_DIRECTORY="$3"
-
-RPM_BUILD_ROOT=~/rpmbuild
-ARCH=`uname -m`
-
-rpmdev-setuptree
-
-cp -r $BUILD_DIRECTORY/Atom/* $RPM_BUILD_ROOT/BUILD
-cp $SPEC_FILE $RPM_BUILD_ROOT/SPECS
-cp ./atom.sh $RPM_BUILD_ROOT/BUILD
-cp $DESKTOP_FILE $RPM_BUILD_ROOT/BUILD
-
-rpmbuild -ba $SPEC_FILE
-cp $RPM_BUILD_ROOT/RPMS/$ARCH/atom-*.rpm $BUILD_DIRECTORY/rpm
-
-rm -rf $RPM_BUILD_ROOT

script/rpmbuild

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-script/build
-script/grunt mkrpm publish-build --stack

script/utils/verify-requirements.js

@@ -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 {

spec/atom-reporter.coffee

@@ -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()

spec/atom-spec.coffee

@@ -6,24 +6,527 @@ ThemeManager = require '../src/theme-manager'
 
 describe "the `atom` global", ->
   beforeEach ->
-    atom.workspaceView = atom.views.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

spec/command-installer-spec.coffee

@@ -20,7 +20,7 @@ describe "install(commandPath, callback)", ->
 
       installDone = false
       installError = null
-      installer.createSymlink commandFilePath, false, (error) ->
+      installer.install commandFilePath, false, (error) ->
         installDone = true
         installError = error
 

spec/command-registry-spec.coffee

@@ -1,218 +0,0 @@
-CommandRegistry = require '../src/command-registry'
-_ = require 'underscore-plus'
-
-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
-
-  afterEach ->
-    registry.destroy()
-
-  describe "when a command event is dispatched on an element", ->
-    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 "invokes inline listeners prior to listeners applied via selectors", ->
-      calls = []
-      registry.add '.grandchild', 'command', -> calls.push('grandchild')
-      registry.add child, 'command', -> calls.push('child-inline')
-      registry.add '.child', 'command', -> calls.push('child')
-      registry.add '.parent', 'command', -> calls.push('parent')
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['grandchild', 'child-inline', '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", ->
-      registry.add '.child', 'command', (event) -> event.preventDefault()
-
-      dispatchedEvent = new CustomEvent('command', bubbles: true)
-      spyOn(dispatchedEvent, 'preventDefault')
-      grandchild.dispatchEvent(dispatchedEvent)
-      expect(dispatchedEvent.preventDefault).toHaveBeenCalled()
-
-    it "forwards .abortKeyBinding() calls from the synthetic event to the original", ->
-      registry.add '.child', 'command', (event) -> event.abortKeyBinding()
-
-      dispatchedEvent = new CustomEvent('command', bubbles: true)
-      dispatchedEvent.abortKeyBinding = jasmine.createSpy('abortKeyBinding')
-      grandchild.dispatchEvent(dispatchedEvent)
-      expect(dispatchedEvent.abortKeyBinding).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', ->
-
-      registry.add grandchild, 'namespace:inline-command-1', ->
-      registry.add child, 'namespace:inline-command-2', ->
-
-      commands = registry.findCommands(target: grandchild)
-      nonJqueryCommands = _.reject commands, (cmd) -> cmd.jQuery
-      expect(nonJqueryCommands).toEqual [
-        {name: 'namespace:inline-command-1', displayName: 'Namespace: Inline Command 1'}
-        {name: 'namespace:command-3', displayName: 'Namespace: Command 3'}
-        {name: 'namespace:inline-command-2', displayName: 'Namespace: Inline Command 2'}
-        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
-        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
-      ]
-
-  describe "::dispatch(target, commandName)", ->
-    it "simulates invocation of the given command ", ->
-      called = false
-      registry.add '.grandchild', 'command', (event) ->
-        expect(this).toBe grandchild
-        expect(event.type).toBe 'command'
-        expect(event.eventPhase).toBe Event.BUBBLING_PHASE
-        expect(event.target).toBe grandchild
-        expect(event.currentTarget).toBe grandchild
-        called = true
-
-      registry.dispatch(grandchild, 'command')
-      expect(called).toBe true
-
-    it "returns a boolean indicating whether any listeners matched the command", ->
-      registry.add '.grandchild', 'command', ->
-
-      expect(registry.dispatch(grandchild, 'command')).toBe true
-      expect(registry.dispatch(grandchild, 'bogus')).toBe false
-      expect(registry.dispatch(parent, 'command')).toBe false
-
-  describe "::getSnapshot and ::restoreSnapshot", ->
-    it "removes all command handlers except for those in the snapshot", ->
-      registry.add '.parent', 'namespace:command-1', ->
-      registry.add '.child', 'namespace:command-2', ->
-      snapshot = registry.getSnapshot()
-      registry.add '.grandchild', 'namespace:command-3', ->
-
-      expect(registry.findCommands(target: grandchild)[0..2]).toEqual [
-        {name: 'namespace:command-3', displayName: 'Namespace: Command 3'}
-        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
-        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
-      ]
-
-      registry.restoreSnapshot(snapshot)
-
-      expect(registry.findCommands(target: grandchild)[0..1]).toEqual [
-        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
-        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
-      ]
-
-      registry.add '.grandchild', 'namespace:command-3', ->
-      registry.restoreSnapshot(snapshot)
-
-      expect(registry.findCommands(target: grandchild)[0..1]).toEqual [
-        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
-        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
-      ]

spec/config-spec.coffee

@@ -12,7 +12,7 @@ describe "Config", ->
 
   describe ".get(keyPath)", ->
     it "allows a key path's value to be read", ->
-      expect(atom.config.set("foo.bar.baz", 42)).toBe 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", ->
@@ -88,19 +76,6 @@ describe "Config", ->
       expect(atom.config.getDefault('foo.bar')).toEqual initialDefaultValue
       expect(atom.config.getDefault('foo.bar')).not.toBe initialDefaultValue
 
-    describe "when scoped settings are used", ->
-      it "returns the global default when no scoped default set", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        expect(atom.config.getDefault('.source.coffee', 'foo.bar.baz')).toBe 10
-
-      it "returns the scoped default when a scoped default is set", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        expect(atom.config.getDefault('.source.coffee', 'foo.bar.baz')).toBe 42
-
-        atom.config.set('.source.coffee', 'foo.bar.baz', 55)
-        expect(atom.config.getDefault('.source.coffee', 'foo.bar.baz')).toBe 42
-
   describe ".isDefault(keyPath)", ->
     it "returns true when the value of the key path is its default value", ->
       atom.config.setDefaults("foo", same: 1, changes: 1)
@@ -112,21 +87,6 @@ describe "Config", ->
       expect(atom.config.isDefault('foo.same')).toBe false
       expect(atom.config.isDefault('foo.changes')).toBe false
 
-    describe "when scoped settings are used", ->
-      it "returns false when a scoped setting was set by the user", ->
-        expect(atom.config.isDefault('.source.coffee', 'foo.bar.baz')).toBe true
-
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        expect(atom.config.isDefault('.source.coffee', 'foo.bar.baz')).toBe true
-
-        atom.config.set('.source.coffee', 'foo.bar.baz', 55)
-        expect(atom.config.isDefault('.source.coffee', 'foo.bar.baz')).toBe false
-
-  describe ".setDefaults(keyPath)", ->
-    it "sets a default when the setting's key contains an escaped dot", ->
-      atom.config.setDefaults("foo", 'a\\.b': 1, b: 2)
-      expect(atom.config.get("foo")).toEqual 'a\\.b': 1, b: 2
-
   describe ".toggle(keyPath)", ->
     it "negates the boolean value of the current key path value", ->
       atom.config.set('foo.a', 1)
@@ -158,66 +118,6 @@ describe "Config", ->
       atom.config.restoreDefault('a.c')
       expect(atom.config.get('a.c')).toBeUndefined()
 
-    it "calls ::save()", ->
-      atom.config.setDefaults('a', b: 3)
-      atom.config.set('a.b', 4)
-      atom.config.save.reset()
-
-      atom.config.restoreDefault('a.c')
-      expect(atom.config.save.callCount).toBe 1
-
-    describe "when scoped settings are used", ->
-      it "restores the global default when no scoped default set", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.set('.source.coffee', 'foo.bar.baz', 55)
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.baz')).toBe 55
-
-        atom.config.restoreDefault('.source.coffee', 'foo.bar.baz')
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.baz')).toBe 10
-
-      it "restores the scoped default when a scoped default is set", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        atom.config.set('.source.coffee', 'foo.bar.baz', 55)
-        atom.config.set('.source.coffee', 'foo.bar.ok', 100)
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.baz')).toBe 55
-
-        atom.config.restoreDefault('.source.coffee', 'foo.bar.baz')
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.baz')).toBe 42
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.ok')).toBe 100
-
-      it "calls ::save()", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        atom.config.set('.source.coffee', 'foo.bar.baz', 55)
-        atom.config.save.reset()
-
-        atom.config.restoreDefault('.source.coffee', 'foo.bar.baz')
-        expect(atom.config.save.callCount).toBe 1
-
-  describe ".getSettings()", ->
-    it "returns all settings including defaults", ->
-      atom.config.setDefaults("foo", bar: baz: 10)
-      atom.config.set("foo.ok", 12)
-
-      expect(atom.config.getSettings().foo).toEqual
-        ok: 12
-        bar:
-          baz: 10
-
-    describe "when scoped settings are used", ->
-      it "returns all the scoped settings including all the defaults", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.set("foo.ok", 12)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: omg: 'omg')
-
-        expect(atom.config.getSettings(".source.coffee").foo).toEqual
-          ok: 12
-          bar:
-            baz: 42
-            omg: 'omg'
-
   describe ".pushAtKeyPath(keyPath, value)", ->
     it "pushes the given value to the array at the key path and updates observers", ->
       atom.config.set("foo.bar.baz", ["a"])
@@ -227,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", ->
@@ -238,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", ->
@@ -249,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
 
@@ -288,7 +182,7 @@ describe "Config", ->
 
         expect(CSON.writeFileSync.argsForCall[0][0]).toBe(path.join(atom.config.configDirPath, "atom.config.json"))
         writtenConfig = CSON.writeFileSync.argsForCall[0][1]
-        expect(writtenConfig).toEqual global: atom.config.settings
+        expect(writtenConfig).toBe atom.config.settings
 
     describe "when ~/.atom/config.json doesn't exist", ->
       it "writes any non-default properties to ~/.atom/config.cson", ->
@@ -302,29 +196,9 @@ describe "Config", ->
         atom.config.save()
 
         expect(CSON.writeFileSync.argsForCall[0][0]).toBe(path.join(atom.config.configDirPath, "atom.config.cson"))
+        CoffeeScript = require 'coffee-script'
         writtenConfig = CSON.writeFileSync.argsForCall[0][1]
-        expect(writtenConfig).toEqual global: atom.config.settings
-
-    describe "when scoped settings are defined", ->
-      it 'writes out explicitly set config settings', ->
-        atom.config.set('.source.ruby', 'foo.bar', 'ruby')
-        atom.config.set('.source.ruby', 'foo.omg', 'wow')
-        atom.config.set('.source.coffee', 'foo.bar', 'coffee')
-
-        CSON.writeFileSync.reset()
-        atom.config.save()
-
-        writtenConfig = CSON.writeFileSync.argsForCall[0][1]
-        expect(writtenConfig).toEqualJson
-          global:
-            atom.config.settings
-          '.ruby.source':
-            foo:
-              bar: 'ruby'
-              omg: 'wow'
-          '.coffee.source':
-            foo:
-              bar: 'coffee'
+        expect(writtenConfig).toEqual atom.config.settings
 
   describe ".setDefaults(keyPath, defaults)", ->
     it "assigns any previously-unassigned keys to the object at the key path", ->
@@ -340,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] = []
 
@@ -402,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
@@ -428,14 +260,6 @@ describe "Config", ->
       atom.config.set('foo.bar.baz', "value 2")
       expect(observeHandler).not.toHaveBeenCalled()
 
-    it 'does not fire the callback for a similarly named keyPath', ->
-      bazCatHandler = jasmine.createSpy("bazCatHandler")
-      observeSubscription = atom.config.observe "foo.bar.bazCat", bazCatHandler
-
-      bazCatHandler.reset()
-      atom.config.set('foo.bar.baz', "value 10")
-      expect(bazCatHandler).not.toHaveBeenCalled()
-
   describe ".initializeConfigDirectory()", ->
     beforeEach ->
       if fs.existsSync(dotAtomPath)
@@ -472,39 +296,14 @@ describe "Config", ->
     afterEach ->
       fs.removeSync(dotAtomPath)
 
-    describe "when the config file contains scoped settings", ->
-      beforeEach ->
-        fs.writeFileSync atom.config.configFilePath, """
-          global:
-            foo:
-              bar: 'baz'
-
-          '.source.ruby':
-            foo:
-              bar: 'more-specific'
-        """
-        atom.config.loadUserConfig()
-
-      it "updates the config data based on the file contents", ->
-        expect(atom.config.get("foo.bar")).toBe 'baz'
-        expect(atom.config.get(['.source.ruby'], "foo.bar")).toBe 'more-specific'
-
     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')
@@ -523,59 +322,18 @@ 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()
-      fs.writeFileSync atom.config.configFilePath, """
-        global:
-          foo:
-            bar: 'baz'
-            scoped: false
-        '.source.ruby':
-          foo:
-            scoped: true
-      """
+      fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
       atom.config.loadUserConfig()
       atom.config.observeUserConfig()
       updatedHandler = jasmine.createSpy("updatedHandler")
-      atom.config.onDidChange updatedHandler
+      atom.config.on 'updated', updatedHandler
 
     afterEach ->
       atom.config.unobserveUserConfig()
@@ -589,92 +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 scoped settings are used', ->
-        it "fires a change event for scoped settings that are removed", ->
-          atom.config.onDidChange ['.source.ruby'], 'foo.scoped', scopedSpy = jasmine.createSpy()
-
-          fs.writeFileSync atom.config.configFilePath, """
-            global:
-              foo:
-                scoped: false
-          """
-          waitsFor 'update event', -> updatedHandler.callCount > 0
-          runs ->
-            expect(scopedSpy).toHaveBeenCalled()
-            expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe false
-
-        it "does not fire a change event for paths that did not change", ->
-          atom.config.onDidChange ['.source.ruby'], 'foo.scoped', noChangeSpy = jasmine.createSpy()
-
-          fs.writeFileSync atom.config.configFilePath, """
-            global:
-              foo:
-                bar: 'baz'
-            '.source.ruby':
-              foo:
-                scoped: true
-          """
-          waitsFor 'update event', -> updatedHandler.callCount > 0
-          runs ->
-            expect(noChangeSpy).not.toHaveBeenCalled()
-            expect(atom.config.get(['.source.ruby'], 'foo.bar')).toBe 'baz'
-            expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe true
-
-
-    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')
@@ -689,474 +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']
-
-    describe "when scoped settings are used", ->
-      beforeEach ->
-        schema =
-          type: 'string'
-          default: 'ok'
-          scopes:
-            '.source.js':
-              default: 'omg'
-        atom.config.setSchema('foo.bar.str', schema)
-
-      it 'it respects the scoped defaults', ->
-        expect(atom.config.get('foo.bar.str')).toBe 'ok'
-        expect(atom.config.get(['.source.js'], 'foo.bar.str')).toBe 'omg'
-        expect(atom.config.get(['.source.coffee'], 'foo.bar.str')).toBe 'ok'
-
-  describe "scoped settings", ->
-    describe ".get(scopeDescriptor, keyPath)", ->
-      it "returns the property with the most specific scope selector", ->
-        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings("config", ".source .string.quoted.double", foo: bar: baz: 22)
-        atom.config.addScopedSettings("config", ".source", foo: bar: baz: 11)
-
-        expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
-        expect(atom.config.get([".source.js", ".string.quoted.double.js"], "foo.bar.baz")).toBe 22
-        expect(atom.config.get([".source.js", ".variable.assignment.js"], "foo.bar.baz")).toBe 11
-        expect(atom.config.get([".text"], "foo.bar.baz")).toBeUndefined()
-
-      it "favors the most recently added properties in the event of a specificity tie", ->
-        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.single", foo: bar: baz: 42)
-        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double", foo: bar: baz: 22)
-
-        expect(atom.config.get([".source.coffee", ".string.quoted.single"], "foo.bar.baz")).toBe 42
-        expect(atom.config.get([".source.coffee", ".string.quoted.single.double"], "foo.bar.baz")).toBe 22
-
-      describe 'when there are global defaults', ->
-        it 'falls back to the global when there is no scoped property specified', ->
-          atom.config.setDefaults("foo", hasDefault: 'ok')
-          expect(atom.config.get([".source.coffee", ".string.quoted.single"], "foo.hasDefault")).toBe 'ok'
-
-      describe 'setting priority', ->
-        describe 'when package settings are added after user settings', ->
-          it "returns the user's setting because the user's setting has higher priority", ->
-            atom.config.set(".source.coffee", "foo.bar.baz", 100)
-            atom.config.addScopedSettings("some-package", ".source.coffee", foo: bar: baz: 1)
-            expect(atom.config.get([".source.coffee"], "foo.bar.baz")).toBe 100
-
-    describe ".set(scope, keyPath, value)", ->
-      it "sets the value and overrides the others", ->
-        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings("config", ".source .string.quoted.double", foo: bar: baz: 22)
-        atom.config.addScopedSettings("config", ".source", foo: bar: baz: 11)
-
-        expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
-
-        expect(atom.config.set(".source.coffee .string.quoted.double.coffee", "foo.bar.baz", 100)).toBe true
-        expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 100
-
-    describe ".removeScopedSettingsForName(name)", ->
-      it "allows properties to be removed by name", ->
-        disposable1 = atom.config.addScopedSettings("a", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        disposable2 = atom.config.addScopedSettings("b", ".source .string.quoted.double", foo: bar: baz: 22)
-
-        disposable2.dispose()
-        expect(atom.config.get([".source.js", ".string.quoted.double.js"], "foo.bar.baz")).toBeUndefined()
-        expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
-
-    describe ".observe(scopeDescriptor, keyPath)", ->
-      it 'calls the supplied callback when the value at the descriptor/keypath changes', ->
-        atom.config.observe [".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz", changeSpy = jasmine.createSpy()
-        expect(changeSpy).toHaveBeenCalledWith(undefined)
-        changeSpy.reset()
-
-        atom.config.set("foo.bar.baz", 12)
-        expect(changeSpy).toHaveBeenCalledWith(12)
-        changeSpy.reset()
-
-        disposable1 = atom.config.addScopedSettings("a", ".source .string.quoted.double", foo: bar: baz: 22)
-        expect(changeSpy).toHaveBeenCalledWith(22)
-        changeSpy.reset()
-
-        disposable2 = atom.config.addScopedSettings("b", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        expect(changeSpy).toHaveBeenCalledWith(42)
-        changeSpy.reset()
-
-        disposable2.dispose()
-        expect(changeSpy).toHaveBeenCalledWith(22)
-        changeSpy.reset()
-
-        disposable1.dispose()
-        expect(changeSpy).toHaveBeenCalledWith(12)
-        changeSpy.reset()
-
-        atom.config.set("foo.bar.baz", undefined)
-        expect(changeSpy).toHaveBeenCalledWith(undefined)
-        changeSpy.reset()
-
-    describe ".onDidChange(scopeDescriptor, keyPath)", ->
-      it 'calls the supplied callback when the value at the descriptor/keypath changes', ->
-        keyPath = "foo.bar.baz"
-        atom.config.onDidChange [".source.coffee", ".string.quoted.double.coffee"], keyPath, changeSpy = jasmine.createSpy()
-
-        atom.config.set("foo.bar.baz", 12)
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: undefined, newValue: 12, keyPath})
-        changeSpy.reset()
-
-        disposable1 = atom.config.addScopedSettings("a", ".source .string.quoted.double", foo: bar: baz: 22)
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: 12, newValue: 22, keyPath})
-        changeSpy.reset()
-
-        disposable2 = atom.config.addScopedSettings("b", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: 22, newValue: 42, keyPath})
-        changeSpy.reset()
-
-        disposable2.dispose()
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: 42, newValue: 22, keyPath})
-        changeSpy.reset()
-
-        disposable1.dispose()
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: 22, newValue: 12, keyPath})
-        changeSpy.reset()
-
-        atom.config.set("foo.bar.baz", undefined)
-        expect(changeSpy).toHaveBeenCalledWith({oldValue: 12, newValue: undefined, keyPath})
-        changeSpy.reset()

spec/context-menu-manager-spec.coffee

@@ -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

spec/deserializer-manager-spec.coffee

@@ -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()

spec/display-buffer-spec.coffee

@@ -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')
@@ -56,14 +56,9 @@ describe "DisplayBuffer", ->
       buffer.delete([[8, 0], [10, 0]])
       expect(displayBuffer.getScrollTop()).toBe 60
 
-    it "updates the display buffer prior to invoking change handlers registered on the buffer", ->
-      buffer.onDidChange -> expect(displayBuffer2.tokenizedLineForScreenRow(0).text).toBe "testing"
-      displayBuffer2 = new DisplayBuffer({buffer, tabLength})
-      buffer.setText("testing")
-
   describe "soft wrapping", ->
     beforeEach ->
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
       displayBuffer.setEditorWidthInChars(50)
       changeHandler.reset()
 
@@ -72,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", ->
@@ -126,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", ->
@@ -209,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", ->
@@ -225,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
@@ -239,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", ->
@@ -247,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'
@@ -256,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'
@@ -267,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'
@@ -280,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'
@@ -292,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'
@@ -310,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-+/
@@ -331,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()
 
@@ -347,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", ->
@@ -368,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", ->
@@ -389,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)
 
@@ -408,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)
 
@@ -454,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)
 
@@ -469,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)
 
@@ -483,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)
 
@@ -550,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", ->
@@ -573,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", ->
@@ -648,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]
@@ -691,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)
@@ -727,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])
@@ -864,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 ----
 
@@ -891,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
@@ -937,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
@@ -1003,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)
@@ -1025,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]])
 
@@ -1042,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
 
@@ -1078,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 ->
@@ -1105,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
@@ -1203,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)

spec/editor-component-spec.coffee

@@ -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)
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{invisibles.space}a line with tabs#{invisibles.tab}and spaces#{invisibles.space}#{invisibles.eol}"
+
+      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}"
 
-      it "displays leading/trailing spaces, tabs, and newlines as visible characters", ->
-        editor.setText " a line with tabs\tand spaces \n"
-        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' scopeDescriptor", ->
-        editor.setText "var\n"
+      it "displays newlines as their own token outside of the other tokens' scopes", ->
+        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()
@@ -446,6 +393,12 @@ describe "TextEditorComponent", ->
         foldedLineNode = component.lineNodeForScreenRow(4)
         expect(foldedLineNode.querySelector('.fold-marker')).toBeFalsy()
 
+    getLeafNodes = (node) ->
+      if node.children.length > 0
+        flatten(toArray(node.children).map(getLeafNodes))
+      else
+        [node]
+
   describe "gutter rendering", ->
     [gutter] = []
 
@@ -495,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()
@@ -639,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'
@@ -698,34 +651,16 @@ describe "TextEditorComponent", ->
       expect(cursorRect.left).toBe rangeRect.left
       expect(cursorRect.width).toBe rangeRect.width
 
-    it "accounts for the width of paired characters when positioning cursors", ->
-      atom.config.set('editor.fontFamily', 'sans-serif')
-      editor.setText('he\u0301y') # e with an accent mark
-      editor.setCursorBufferPosition([0, 3])
-      nextAnimationFrame()
-
-      cursor = componentNode.querySelector('.cursor')
-      cursorRect = cursor.getBoundingClientRect()
-
-      cursorLocationTextNode = component.lineNodeForScreenRow(0).querySelector('.source.js').firstChild
-      range = document.createRange()
-      range.setStart(cursorLocationTextNode, 3)
-      range.setEnd(cursorLocationTextNode, 4)
-      rangeRect = range.getBoundingClientRect()
-
-      expect(cursorRect.left).toBe rangeRect.left
-      expect(cursorRect.width).toBe rangeRect.width
-
     it "positions cursors correctly after character widths are changed via a stylesheet change", ->
       atom.config.set('editor.fontFamily', 'sans-serif')
       editor.setCursorScreenPosition([0, 16])
       nextAnimationFrame()
 
-      atom.styles.addStyleSheet """
+      atom.themes.applyStylesheet 'test', """
         .function.js {
           font-weight: bold;
         }
-      """, context: 'atom-text-editor'
+      """
       nextAnimationFrame() # update based on new measurements
 
       cursor = componentNode.querySelector('.cursor')
@@ -766,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)
@@ -870,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
 
@@ -949,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()
@@ -1131,13 +1066,6 @@ describe "TextEditorComponent", ->
       regions = componentNode.querySelectorAll('.test-highlight .region')
       expect(regions.length).toBe 2
 
-    it "renders classes on the regions directly if 'deprecatedRegionClass' option is defined", ->
-      decoration = editor.decorateMarker(marker, type: 'highlight', class: 'test-highlight', deprecatedRegionClass: 'test-highlight-region')
-      nextAnimationFrame()
-
-      regions = componentNode.querySelectorAll('.test-highlight .region.test-highlight-region')
-      expect(regions.length).toBe 2
-
     describe "when flashing a decoration via Decoration::flash()", ->
       highlightNode = null
       beforeEach ->
@@ -1197,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()
@@ -1255,22 +1183,6 @@ describe "TextEditorComponent", ->
     beforeEach ->
       linesNode = componentNode.querySelector('.lines')
 
-    describe "when the mouse is single-clicked below the last line", ->
-      it "moves the cursor to the end of file buffer position", ->
-        editor.setText('foo')
-        editor.setCursorBufferPosition([0, 0])
-        height = 4.5 * lineHeightInPixels
-        wrapperNode.style.height = height + 'px'
-        wrapperNode.style.width = 10 * charWidth + 'px'
-        component.measureHeightAndWidth()
-        nextAnimationFrame()
-
-        coordinates = clientCoordinatesForScreenPosition([0, 2])
-        coordinates.clientY = height * 2
-        linesNode.dispatchEvent(buildMouseEvent('mousedown', coordinates))
-        nextAnimationFrame()
-        expect(editor.getCursorScreenPosition()).toEqual [0, 3]
-
     describe "when a non-folded line is single-clicked", ->
       describe "when no modifier keys are held down", ->
         it "moves the cursor to the nearest screen position", ->
@@ -1397,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
 
@@ -1410,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 ->
@@ -1455,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", ->
@@ -1544,9 +1406,8 @@ describe "TextEditorComponent", ->
 
     it "transfers focus to the hidden input", ->
       expect(document.activeElement).toBe document.body
-      wrapperNode.focus()
-      expect(document.activeElement).toBe wrapperNode
-      expect(wrapperNode.shadowRoot.activeElement).toBe inputNode
+      componentNode.focus()
+      expect(document.activeElement).toBe inputNode
 
     it "adds the 'is-focused' class to the editor when the hidden input is focused", ->
       expect(document.activeElement).toBe document.body
@@ -1561,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", ->
@@ -1675,14 +1536,12 @@ describe "TextEditorComponent", ->
       component.measureHeightAndWidth()
       nextAnimationFrame()
 
-      atom.styles.addStyleSheet """
+      atom.themes.applyStylesheet "test", """
         ::-webkit-scrollbar {
           width: 8px;
           height: 8px;
         }
-      """, context: 'atom-text-editor'
-
-      nextAnimationFrame()
+      """
 
       scrollbarCornerNode = componentNode.querySelector('.scrollbar-corner')
       expect(verticalScrollbarNode.offsetWidth).toBe 8
@@ -1771,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", ->
@@ -1908,53 +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 () {'
-
-    it "groups events that occur close together in time into single undo entries", ->
-      currentTime = 0
-      spyOn(Date, 'now').andCallFake -> currentTime
-
-      atom.config.set('editor.undoGroupingInterval', 100)
-
-      editor.setText("")
-      componentNode.dispatchEvent(buildTextInputEvent(data: 'x', target: inputNode))
-
-      currentTime += 99
-      componentNode.dispatchEvent(buildTextInputEvent(data: 'y', target: inputNode))
-
-      currentTime += 99
-      componentNode.dispatchEvent(new CustomEvent('editor:duplicate-lines', bubbles: true, cancelable: true))
-
-      currentTime += 100
-      componentNode.dispatchEvent(new CustomEvent('editor:duplicate-lines', bubbles: true, cancelable: true))
-      expect(editor.getText()).toBe "xy\nxy\nxy"
-
-      componentNode.dispatchEvent(new CustomEvent('core:undo', bubbles: true, cancelable: true))
-      expect(editor.getText()).toBe "xy\nxy"
-
-      componentNode.dispatchEvent(new CustomEvent('core:undo', bubbles: true, cancelable: true))
-      expect(editor.getText()).toBe ""
+      expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () {'
 
     describe "when IME composition is used to insert international characters", ->
       inputNode = null
@@ -1972,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 ->
@@ -2020,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", ->
@@ -2061,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)
 
@@ -2103,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])
@@ -2172,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", ->
@@ -2270,12 +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)
+      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", ->
@@ -2286,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()
@@ -2297,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()
@@ -2314,161 +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 "encoding data attributes", ->
-    it "adds and updates the encoding data attribute based on the current encoding", ->
-      expect(wrapperNode.dataset.encoding).toBe 'utf8'
-      editor.setEncoding('utf16le')
-      expect(wrapperNode.dataset.encoding).toBe 'utf16le'
-
-  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]
-
-  describe 'scoped config settings', ->
-    [coffeeEditor, coffeeComponent] = []
-
-    beforeEach ->
-      waitsForPromise ->
-        atom.packages.activatePackage('language-coffee-script')
-      waitsForPromise ->
-        atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
-
-    afterEach: ->
-      atom.packages.deactivatePackages()
-      atom.packages.unloadPackages()
-
-    describe 'soft wrap settings', ->
-      beforeEach ->
-        atom.config.set '.source.coffee', 'editor.softWrap', true
-        atom.config.set '.source.coffee', 'editor.preferredLineLength', 17
-        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', true
-
-        editor.setEditorWidthInChars(20)
-        coffeeEditor.setEditorWidthInChars(20)
-
-      it "wraps lines when editor.softWrap is true for a matching scope", ->
-        expect(editor.lineTextForScreenRow(2)).toEqual '    if (items.length <= 1) return items;'
-        expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
-
-      it 'updates the wrapped lines when editor.preferredLineLength changes', ->
-        atom.config.set '.source.coffee', 'editor.preferredLineLength', 20
-        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
-
-      it 'updates the wrapped lines when editor.softWrapAtPreferredLineLength changes', ->
-        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', false
-        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
-
-      it 'updates the wrapped lines when editor.softWrap changes', ->
-        atom.config.set '.source.coffee', 'editor.softWrap', false
-        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if items.length <= 1'
-
-        atom.config.set '.source.coffee', 'editor.softWrap', true
-        expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
-
-      it 'updates the wrapped lines when the grammar changes', ->
-        editor.setGrammar(coffeeEditor.getGrammar())
-        expect(editor.isSoftWrapped()).toBe true
-        expect(editor.lineTextForScreenRow(0)).toEqual 'var quicksort = '
-
-      describe '::isSoftWrapped()', ->
-        it 'returns the correct value based on the scoped settings', ->
-          expect(editor.isSoftWrapped()).toBe false
-          expect(coffeeEditor.isSoftWrapped()).toBe true
-
-    describe 'invisibles settings', ->
-      [jsInvisibles, coffeeInvisibles] = []
-      beforeEach ->
-        jsInvisibles =
-          eol: 'J'
-          space: 'A'
-          tab: 'V'
-          cr: 'A'
-
-        coffeeInvisibles =
-          eol: 'C'
-          space: 'O'
-          tab: 'F'
-          cr: 'E'
-
-        atom.config.set '.source.js', 'editor.showInvisibles', true
-        atom.config.set '.source.js', 'editor.invisibles', jsInvisibles
-
-        atom.config.set '.source.coffee', 'editor.showInvisibles', false
-        atom.config.set '.source.coffee', 'editor.invisibles', coffeeInvisibles
-
-        editor.setText " a line with tabs\tand spaces \n"
-        nextAnimationFrame()
-
-      it "renders the invisibles when editor.showInvisibles is true for a given grammar", ->
-        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{jsInvisibles.space}a line with tabs#{jsInvisibles.tab}and spaces#{jsInvisibles.space}#{jsInvisibles.eol}"
-
-      it "does not render the invisibles when editor.showInvisibles is false for a given grammar", ->
-        editor.setGrammar(coffeeEditor.getGrammar())
-        nextAnimationFrame()
-        expect(component.lineNodeForScreenRow(0).textContent).toBe " a line with tabs and spaces "
-
-      it "re-renders the invisibles when the invisible settings change", ->
-        jsGrammar = editor.getGrammar()
-        editor.setGrammar(coffeeEditor.getGrammar())
-        atom.config.set '.source.coffee', 'editor.showInvisibles', true
-        nextAnimationFrame()
-        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{coffeeInvisibles.space}a line with tabs#{coffeeInvisibles.tab}and spaces#{coffeeInvisibles.space}#{coffeeInvisibles.eol}"
-
-        newInvisibles =
-          eol: 'N'
-          space: 'E'
-          tab: 'W'
-          cr: 'I'
-        atom.config.set '.source.coffee', 'editor.invisibles', newInvisibles
-        nextAnimationFrame()
-        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{newInvisibles.space}a line with tabs#{newInvisibles.tab}and spaces#{newInvisibles.space}#{newInvisibles.eol}"
-
-        editor.setGrammar(jsGrammar)
-        nextAnimationFrame()
-        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{jsInvisibles.space}a line with tabs#{jsInvisibles.tab}and spaces#{jsInvisibles.space}#{jsInvisibles.eol}"
-
-    describe 'editor.showIndentGuide', ->
-      beforeEach ->
-        atom.config.set '.source.js', 'editor.showIndentGuide', true
-        atom.config.set '.source.coffee', 'editor.showIndentGuide', false
-
-      it "has an 'indent-guide' class when scoped editor.showIndentGuide is true, but not when scoped editor.showIndentGuide is false", ->
-        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
-        expect(line1LeafNodes[0].textContent).toBe '  '
-        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe true
-        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
-
-        editor.setGrammar(coffeeEditor.getGrammar())
-
-        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
-        expect(line1LeafNodes[0].textContent).toBe '  '
-        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe false
-        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
-
-      it "removes the 'indent-guide' class when editor.showIndentGuide to false", ->
-        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
-        expect(line1LeafNodes[0].textContent).toBe '  '
-        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe true
-        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
-
-        atom.config.set '.source.js', 'editor.showIndentGuide', false
-
-        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
-        expect(line1LeafNodes[0].textContent).toBe '  '
-        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe false
-        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
-
   buildMouseEvent = (type, properties...) ->
     properties = extend({bubbles: true, cancelable: true}, properties...)
     properties.detail ?= 1
@@ -2505,9 +2180,3 @@ describe "TextEditorComponent", ->
 
   lineHasClass = (screenRow, klass) ->
     component.lineNodeForScreenRow(screenRow).classList.contains(klass)
-
-  getLeafNodes = (node) ->
-    if node.children.length > 0
-      flatten(toArray(node.children).map(getLeafNodes))
-    else
-      [node]

spec/fixtures/module-cache/file.json

@@ -1,3 +0,0 @@
-{
-  "foo": "bar"
-}

spec/fixtures/packages/package-that-throws-on-deactivate/index.coffee

@@ -1,4 +0,0 @@
-module.exports =
-  activate: ->
-  deactivate: -> throw new Error('Top that')
-  serialize: ->

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

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

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

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

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

@@ -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++

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

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

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

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

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

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

spec/fixtures/packages/package-with-menus/menus/menu-1.cson

@@ -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'

spec/fixtures/packages/package-with-menus/menus/menu-2.cson

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