WIP

.gitattributes

@@ -6,9 +6,3 @@ spec/fixtures/**/*.less text eol=lf
 spec/fixtures/**/*.css text eol=lf
 spec/fixtures/**/*.txt text eol=lf
 spec/fixtures/dir/**/* text eol=lf
-
-# Git 1.7 does not support **/* patterns
-spec/fixtures/css.css text eol=lf
-spec/fixtures/sample.js text eol=lf
-spec/fixtures/sample.less text eol=lf
-spec/fixtures/sample.txt text eol=lf

.gitignore

@@ -1,7 +1,5 @@
 *.swp
-*~
 .DS_Store
-Thumbs.db
 .project
 .svn
 .nvm-version
@@ -13,3 +11,4 @@ debug.log
 docs/output
 docs/includes
 spec/fixtures/evil-files/
+/apm

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/apm"]
+	path = vendor/apm
+	url = https://github.com/atom/apm.git

.npmrc

@@ -1 +1,2 @@
+ca =
 cache = ~/.atom/.npm

.pairs

@@ -11,7 +11,6 @@ pairs:
   bo: Ben Ogle; benogle
   jr: Jason Rudolph; jasonrudolph
   jl: Jessica Lord; jlord
-  dh: Daniel Hengeveld; danielh
 email:
   domain: github.com
 #global: true

CONTRIBUTING.md

@@ -1,109 +1,76 @@
-# Contributing to Atom
+# :tada: Contributing to Atom :tada:
 
-:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
-
-The following is a set of guidelines for contributing to Atom and its packages,
-which are hosted in the [Atom Organization](https://github.com/atom) on GitHub.
-If you're unsure which package is causing your problem or if you're having an
-issue with Atom core, please open an issue on the [main atom repository](https://github.com/atom/atom/issues).
-These are just guidelines, not rules, use your best judgement and feel free to
-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 
-  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 
-  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.
+These are just guidelines, not rules, use your best judgement and feel free
+to propose changes to this document in a pull request.
 
+## Issues
+  * Include screenshots and animated GIFs whenever possible, they are immensely
+    helpful.
+  * Include the behavior you expected to happen and other places you've seen
+    that behavior such as Emacs, vi, Xcode, etc.
+  * Check the Console app for stack traces to include if reporting a crash.
+  * Check the Dev tools (`alt-cmd-i`) for errors and stack traces to include.
+  
 ### Package Repositories
 
 This is the repository for the core Atom editor only. Atom comes bundled with
 many packages and themes that are stored in other repos under the
-[Atom organization](https://github.com/atom) such as
-[tabs](https://github.com/atom/tabs),
+[atom organization](https://github.com/atom) such as [tabs](https://github.com/atom/tabs),
 [find-and-replace](https://github.com/atom/find-and-replace),
-[language-javascript](https://github.com/atom/language-javascript), and
-[atom-light-ui](http://github.com/atom/atom-light-ui).
+[language-javascript](https://github.com/atom/language-javascript),
+and [atom-light-ui](http://github.com/atom/atom-light-ui).
 
-For more information on how to work with Atom's official packages, see
-[Contributing to Atom Packages](https://atom.io/docs/latest/contributing-to-packages.html)
+If you think you know which package is causing the issue you are reporting, feel
+free to open up the issue in that specific repository instead. When in doubt
+just open the issue here but be aware that it may get closed here and reopened
+in the proper package's repository.
 
 ## Pull Requests
-
-* Include screenshots and animated GIFs in your pull request whenever possible.
-* Follow the [CoffeeScript](#coffeescript-styleguide),
-  [JavaScript](https://github.com/styleguide/javascript),
-  and [CSS](https://github.com/styleguide/css) styleguides.
-* Include thoughtfully-worded, well-structured
-  [Jasmine](http://jasmine.github.io/) specs.
-* Document new code based on the
-  [Documentation Styleguide](#documentation-styleguide)
-* End files with a newline.
-* Place requires in the following order:
+  * Include screenshots and animated GIFs whenever possible.
+  * Follow the [CoffeeScript](#coffeescript-styleguide),
+    [JavaScript](https://github.com/styleguide/javascript),
+    and [CSS](https://github.com/styleguide/css) styleguides
+  * Include thoughtfully worded [Jasmine](http://pivotal.github.com/jasmine)
+    specs
+  * Avoid placing files in `vendor`. 3rd-party packages should be added as a
+    `package.json` dependency.
+  * Files end with a newline.
+  * Requires should be in the following order:
     * Built in Node Modules (such as `path`)
     * Built in Atom and Atom Shell Modules (such as `atom`, `shell`)
     * Local Modules (using relative paths)
-* Place class properties in the following order:
-    * Class methods and properties (methods starting with a `@`)
-    * Instance methods and properties
-* Avoid platform-dependent code:
+  * Class variables and methods should be in the following order:
+    * Class methods (methods starting with a `@`)
+    * Instance methods
+  * Beware of platform differences
     * Use `require('atom').fs.getHomeDirectory()` to get the home directory.
     * Use `path.join()` to concatenate filenames.
-    * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
-      temporary directory.
+    * Temporary directory is not `/tmp` on Windows, use `os.tmpdir()` when
+      possible
 
 ## Git Commit Messages
-
-* Use the present tense ("Add feature" not "Added feature")
-* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
-* Limit the first line to 72 characters or less
-* Reference issues and pull requests liberally
-* Consider starting the commit message with an applicable emoji:
-    * :lipstick: `:lipstick:` when improving the format/structure of the code
-    * :racehorse: `:racehorse:` when improving performance
-    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
-    * :memo: `:memo:` when writing docs
-    * :penguin: `:penguin:` when fixing something on Linux
-    * :apple: `:apple:` when fixing something on Mac OS
-    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
-    * :bug: `:bug:` when fixing a bug
-    * :fire: `:fire:` when removing code or files
-    * :green_heart: `:green_heart:` when fixing the CI build
-    * :white_check_mark: `:white_check_mark:` when adding tests
-    * :lock: `:lock:` when dealing with security
+  * Use the present tense
+  * Reference issues and pull requests liberally
+  * Consider starting the commit message with an applicable emoji:
+    * :lipstick: when improving the format/structure of the code
+    * :racehorse: when improving performance
+    * :non-potable_water: when plugging memory leaks
+    * :memo: when writing docs
 
 ## CoffeeScript Styleguide
 
 * Set parameter defaults without spaces around the equal sign
-    * `clear = (count=1) ->` instead of `clear = (count = 1) ->`
-* Use parentheses if it improves code clarity.
-* Prefer alphabetic keywords to symbolic keywords:
-    * `a is b` instead of `a == b`
-* Avoid spaces inside the curly-braces of hash literals:
-    * `{a: 1, b: 2}` instead of `{ a: 1, b: 2 }`
-* Include a single line of whitespace between methods.
+  * `clear = (count=1) ->` instead of `clear = (count = 1) ->`
 
 ## Documentation Styleguide
 
 * 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.
+* 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
 

LICENSE

@@ -0,0 +1 @@
+Copyright 2014 GitHub, Inc.

LICENSE.md

@@ -1,20 +0,0 @@
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,37 +1,17 @@
-![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
+# Atom — The hackable editor
 
-Atom is a hackable text editor for the 21st century, built on [atom-shell](http://github.com/atom/atom-shell), and based on everything we love about our favorite editors. We designed it to be deeply customizable, but still approachable using the default configuration.
+![Atom](http://i.imgur.com/OrTvUAD.png)
 
-Visit [atom.io](https://atom.io) to learn more.
+Check out our [guides and API documentation](https://atom.io/docs/latest).
 
 ## Installing
 
-### Mac OS X
-
 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).
 
 Atom will automatically update when a new release is available.
 
-### Windows
-
-Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).
-
-1. Install [chocolatey](https://chocolatey.org).
-2. Close and reopen your command prompt or PowerShell window.
-3. Run `cinst Atom`
-4. In the future run `cup Atom` to upgrade to the latest release.
-
-You can also download a `.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
-The Windows version does not currently automatically update so you will need to
-manually upgrade to future releases by re-downloading the `.zip` file.
-
 ## Building
 
-* [Linux](docs/build-instructions/linux.md)
-* [OS X](docs/build-instructions/os-x.md)
-* [FreeBSD](docs/build-instructions/freebsd.md)
-* [Windows](docs/build-instructions/windows.md)
+Follow the instructions in the [build docs][building].
 
-## Developing
-
-Check out the [guides](https://atom.io/docs/latest) and the [API reference](https://atom.io/docs/api).
+[building]: https://github.com/atom/atom/blob/master/docs/building-atom.md

apm/README.md

@@ -1,2 +0,0 @@
-This folder is where [apm](https://github.com/atom/apm) is installed to so that
-it is bundled with Atom.

apm/package.json

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

atom.sh

@@ -1,28 +1,22 @@
-#!/bin/bash
+#!/bin/sh
+ATOM_PATH=${ATOM_PATH-/Applications/Atom.app}
+ATOM_BINARY=$ATOM_PATH/Contents/MacOS/Atom
 
-if [ "$(uname)" == 'Darwin' ]; then
-  OS='Mac'
-elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-  OS='Linux'
-elif [ "$(expr substr $(uname -s) 1 10)" == 'MINGW32_NT' ]; then
-  OS='Cygwin'
-else
-  echo "Your platform ($(uname -a)) is not supported."
+if [ ! -d $ATOM_PATH ]; then sleep 5; fi # Wait for Atom to reappear, Sparkle may be replacing it.
+
+if [ ! -d $ATOM_PATH ]; then
+  echo "Atom application not found at '$ATOM_PATH'" >&2
   exit 1
 fi
 
-while getopts ":wtfvh-:" opt; do
+while getopts ":wtfvhs-:" opt; do
   case "$opt" in
     -)
       case "${OPTARG}" in
         wait)
           WAIT=1
           ;;
-        help|version)
-          REDIRECT_STDERR=1
-          EXPECT_OUTPUT=1
-          ;;
-        foreground|test)
+        help|version|foreground|test)
           EXPECT_OUTPUT=1
           ;;
       esac
@@ -30,76 +24,25 @@ while getopts ":wtfvh-:" opt; do
     w)
       WAIT=1
       ;;
-    h|v)
-      REDIRECT_STDERR=1
-      EXPECT_OUTPUT=1
-      ;;
-    f|t)
+    h|v|f|t)
       EXPECT_OUTPUT=1
       ;;
   esac
 done
 
-if [ $REDIRECT_STDERR ]; then
-  exec 2> /dev/null
+if [ $EXPECT_OUTPUT ]; then
+  $ATOM_BINARY --executed-from="$(pwd)" --pid=$$ $@
+  exit $?
+else
+  open -a $ATOM_PATH -n --args --executed-from="$(pwd)" --pid=$$ $@
 fi
 
-if [ $OS == 'Mac' ]; then
-  ATOM_PATH=${ATOM_PATH:-/Applications} # Set ATOM_PATH unless it is already set
-  ATOM_APP_NAME=Atom.app
-
-  # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
-  if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
-  fi
-
-  # Exit if Atom can't be found
-  if [ -z "$ATOM_PATH" ]; then
-    echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
-    exit 1
-  fi
-
-  if [ $EXPECT_OUTPUT ]; 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=$$ "$@"
-  fi
-elif [ $OS == 'Linux' ]; then
-  SCRIPT=$(readlink -f "$0")
-  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
-  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-  DOT_ATOM_DIR="$HOME/.atom"
-
-  if [ ! -d "$DOT_ATOM_DIR" ]; then
-    mkdir -p "$DOT_ATOM_DIR"
-  fi
-
-  : ${TMPDIR:=/tmp}
-
-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
-
-  if [ $EXPECT_OUTPUT ]; then
-    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-    exit $?
-  else
-    (
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$DOT_ATOM_DIR/nohup.out" 2>&1
-    if [ $? -ne 0 ]; then
-      cat "$DOT_ATOM_DIR/nohup.out"
-      exit $?
-    fi
-    ) &
-  fi
-fi
-
-# Exits this process when Atom is used as $EDITOR
+# Used to exit process when atom is used as $EDITOR
 on_die() {
   exit 0
 }
 trap 'on_die' SIGQUIT SIGTERM
 
-# If the wait flag is set, don't exit this process until Atom tells it to.
 if [ $WAIT ]; then
   while true; do
     sleep 1

build/Gruntfile.coffee

@@ -36,33 +36,32 @@ module.exports = (grunt) ->
     grunt.log.write = (args...) -> grunt.log
 
   [major, minor, patch] = packageJson.version.split('.')
-  tmpDir = os.tmpdir()
-  appName = if process.platform is 'darwin' then 'Atom.app' else 'Atom'
-  buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
-  installDir = grunt.option('install-dir')
-
-  home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
-  atomShellDownloadDir = path.join(home, '.atom', 'atom-shell')
-
-  symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
-  shellAppDir = path.join(buildDir, appName)
   if process.platform is 'win32'
+    appName = 'Atom'
+    tmpDir = os.tmpdir()
+    installRoot = process.env.ProgramFiles
+    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
+    shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= path.join(process.env.ProgramFiles, appName)
-    killCommand = 'taskkill /F /IM atom.exe'
-  else if process.platform is 'darwin'
+    atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
+  else
+    appName = 'Atom.app'
+    tmpDir = '/tmp'
+    installRoot = '/Applications'
+    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
+    shellAppDir = path.join(buildDir, appName)
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
-    installDir ?= path.join('/Applications', appName)
-    killCommand = 'pkill -9 Atom'
-  else
-    contentsDir = shellAppDir
-    appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
-    killCommand ='pkill -9 Atom'
+    atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
+
+  installDir = path.join(installRoot, appName)
 
   coffeeConfig =
+    options:
+      sourceMap: true
     glob_to_multiple:
       expand: true
       src: [
@@ -96,8 +95,6 @@ module.exports = (grunt) ->
   csonConfig =
     options:
       rootObject: true
-      cachePath: path.join(home, '.atom', 'compile-cache', 'grunt-cson')
-
     glob_to_multiple:
       expand: true
       src: [
@@ -130,8 +127,6 @@ module.exports = (grunt) ->
 
     atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}
 
-    docsOutputDir: 'docs/output/api'
-
     coffee: coffeeConfig
 
     less: lessConfig
@@ -221,7 +216,7 @@ module.exports = (grunt) ->
 
     shell:
       'kill-atom':
-        command: killCommand
+        command: 'pkill -9 Atom'
         options:
           stdout: false
           stderr: false
@@ -232,7 +227,4 @@ module.exports = (grunt) ->
   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'])
-
-  defaultTasks = ['download-atom-shell', 'build', 'set-version']
-  defaultTasks.push 'install' unless process.platform is 'linux'
-  grunt.registerTask('default', defaultTasks)
+  grunt.registerTask('default', ['download-atom-shell', 'build', 'set-version', 'install'])

build/package.json

@@ -13,27 +13,24 @@
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
-    "grunt-contrib-coffee": "~0.9.0",
+    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
     "grunt-contrib-csslint": "~0.1.2",
+    "grunt-contrib-coffee": "~0.9.0",
     "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.10.0",
-    "grunt-download-atom-shell": "~0.8.0",
+    "grunt-cson": "0.6.0",
+    "grunt-download-atom-shell": "git+https://atom-bot:467bac80a0017b96fb5be5cfc686f5e0cc607b10@github.com/atom/grunt-download-atom-shell#v0.6.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",
     "harmony-collections": "~0.3.8",
     "json-front-matter": "~0.1.3",
-    "legal-eagle": "~0.4.0",
-    "minidump": "~0.7",
-    "normalize-package-data": "0.2.12",
-    "npm": "~1.4.5",
+    "legal-eagle": "~0.3.0",
+    "minidump": "0.4.x",
     "rcedit": "~0.1.2",
-    "read-package-json": "1.1.8",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
-    "runas": "~1.0.1",
+    "runas": "0.5.x",
     "underscore-plus": "1.x",
     "unzip": "~0.1.9",
     "vm-compatibility-layer": "~0.1.0"

build/tasks/build-task.coffee

@@ -1,6 +1,5 @@
 fs = require 'fs'
 path = require 'path'
-_ = require 'underscore-plus'
 
 module.exports = (grunt) ->
   {cp, isAtomPackage, mkdir, rm} = require('./task-helpers')(grunt)
@@ -14,9 +13,9 @@ module.exports = (grunt) ->
     mkdir path.dirname(buildDir)
 
     if process.platform is 'darwin'
-      cp 'atom-shell/Atom.app', shellAppDir, filter: /default_app/
-    else
-      cp 'atom-shell', shellAppDir, filter: /default_app/
+      cp 'atom-shell/Atom.app', shellAppDir
+    else if process.platform is 'win32'
+      cp 'atom-shell', shellAppDir
 
     mkdir appDir
 
@@ -45,117 +44,36 @@ module.exports = (grunt) ->
       path.join('git-utils', 'deps')
       path.join('oniguruma', 'deps')
       path.join('less', 'dist')
+      path.join('less', 'test')
       path.join('bootstrap', 'docs')
-      path.join('bootstrap', '_config.yml')
-      path.join('bootstrap', '_includes')
-      path.join('bootstrap', '_layouts')
-      path.join('npm', 'doc')
-      path.join('npm', 'html')
-      path.join('npm', 'man')
-      path.join('npm', 'node_modules', '.bin', 'beep')
-      path.join('npm', 'node_modules', '.bin', 'clear')
-      path.join('npm', 'node_modules', '.bin', 'starwars')
-      path.join('pegjs', 'examples')
+      path.join('bootstrap', 'examples')
+      path.join('spellchecker', 'vendor')
+      path.join('xmldom', 'test')
       path.join('jasmine-reporters', 'ext')
-      path.join('jasmine-node', 'node_modules', 'gaze')
-      path.join('jasmine-node', 'spec')
-      path.join('node_modules', 'nan')
-      path.join('build', 'binding.Makefile')
-      path.join('build', 'config.gypi')
-      path.join('build', 'gyp-mac-tool')
-      path.join('build', 'Makefile')
       path.join('build', 'Release', 'obj.target')
-      path.join('build', 'Release', 'obj')
       path.join('build', 'Release', '.deps')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')
-
-      # These are only require in dev mode when the grammar isn't precompiled
-      path.join('atom-keymap', 'node_modules', 'loophole')
-      path.join('atom-keymap', 'node_modules', 'pegjs')
-      path.join('atom-keymap', 'node_modules', '.bin', 'pegjs')
-      path.join('snippets', 'node_modules', 'loophole')
-      path.join('snippets', 'node_modules', 'pegjs')
-      path.join('snippets', 'node_modules', '.bin', 'pegjs')
-
-      '.DS_Store'
-      '.jshintrc'
-      '.npmignore'
-      '.pairs'
-      '.travis.yml'
     ]
-    ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath)
-
-    # Add .* to avoid matching hunspell_dictionaries.
-    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep)}.*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.*\\.pdb"
-
-    # Ignore *.cc and *.h files from native modules
-    ignoredPaths.push "#{_.escapeRegExp(path.join('ctags', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('git-utils', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('keytar', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('nslog', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('oniguruma', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('pathwatcher', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('runas', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('scrollbar-style', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'src') + path.sep)}.*\\.(cc|h)*"
-
-    # Ignore build files
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}binding\\.gyp$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}.+\\.target.mk$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}linker\\.lock$"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.+\\.node\\.dSYM"
-
-    # Hunspell dictionaries are only not needed on OS X.
-    if process.platform is 'darwin'
-      ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
-
-    testFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}te?sts?#{_.escapeRegExp(path.sep)}")
-    exampleFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}examples?#{_.escapeRegExp(path.sep)}")
-    benchmarkFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}benchmarks?#{_.escapeRegExp(path.sep)}")
-
     nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
-    filterNodeModule = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      nodeModulesFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
     packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")
-    filterPackage = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      packageFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
     for directory in nonPackageDirectories
-      cp directory, path.join(appDir, directory), filter: filterNodeModule
-
+      cp directory, path.join(appDir, directory), filter: nodeModulesFilter
     for directory in packageDirectories
-      cp directory, path.join(appDir, directory), filter: filterPackage
+      cp directory, path.join(appDir, directory), filter: packageFilter
 
     cp 'spec', path.join(appDir, 'spec')
     cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
     cp 'static', path.join(appDir, 'static')
-    cp 'apm', path.join(appDir, 'apm'), filter: filterNodeModule
+    cp 'apm', path.join(appDir, 'apm'), filter: nodeModulesFilter
 
     if process.platform is 'darwin'
       grunt.file.recurse path.join('resources', 'mac'), (sourcePath, rootDirectory, subDirectory='', filename) ->
         unless /.+\.plist/.test(sourcePath)
           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"]
     dependencies.push('copy-info-plist') if process.platform is 'darwin'
     dependencies.push('set-exe-icon') if process.platform is 'win32'

build/tasks/clean-task.coffee

@@ -5,7 +5,7 @@ module.exports = (grunt) ->
   {rm} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'partial-clean', 'Delete some of the build files', ->
-    tmpdir = os.tmpdir()
+    tmpdir = if process.platform is 'win32' then os.tmpdir() else '/tmp'
 
     rm grunt.config.get('atom.buildDir')
     rm require('../src/coffee-cache').cacheDir

build/tasks/codesign-task.coffee

@@ -1,12 +1,10 @@
-path = require 'path'
-
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'codesign', 'Codesign the app', ->
     done = @async()
 
-    if process.platform is 'darwin' and process.env.XCODE_KEYCHAIN
+    if process.env.XCODE_KEYCHAIN
       unlockKeychain (error) ->
         if error?
           done(error)
@@ -22,15 +20,6 @@ module.exports = (grunt) ->
     spawn {cmd, args}, (error) -> callback(error)
 
   signApp = (callback) ->
-    switch process.platform
-      when 'darwin'
-        cmd = 'codesign'
-        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) -> callback(error)
-      else
-        callback()
+    cmd = 'codesign'
+    args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+    spawn {cmd, args}, (error) -> callback(error)

build/tasks/docs-task.coffee

@@ -15,17 +15,15 @@ module.exports = (grunt) ->
   grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
     done = @async()
 
-    docsOutputDir = grunt.config.get('docsOutputDir')
-
     downloadIncludes (error, includePaths) ->
       if error?
         done(error)
       else
-        rm(docsOutputDir)
+        rm('docs/output/api')
         args = [
           commonArgs...
           '--title', 'Atom API Documentation'
-          '-o', docsOutputDir
+          '-o', 'docs/output/api'
           '-r', 'docs/README.md'
           '--stability', '1'
           'src/'
@@ -145,8 +143,6 @@ downloadFileFromRepo = ({repo, file}, callback) ->
 
 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'}

build/tasks/generate-license-task.coffee

@@ -17,7 +17,7 @@ module.exports = (grunt) ->
 
       licenseText = getLicenseText(dependencyLicenses)
       if mode is 'save'
-        targetPath = path.join(grunt.config.get('atom.appDir'), 'LICENSE.md')
+        targetPath = path.join(grunt.config.get('atom.appDir'), 'LICENSE')
         fs.writeFileSync(targetPath, licenseText)
       else
         console.log licenseText
@@ -26,7 +26,7 @@ module.exports = (grunt) ->
 getLicenseText = (dependencyLicenses) ->
   {keys} = require 'underscore-plus'
   text = """
-    #{fs.readFileSync('LICENSE.md', 'utf8')}
+    Copyright 2014 GitHub, Inc.
 
     This application bundles the following third-party packages in accordance
     with the following licenses:\n\n

build/tasks/install-task.coffee

@@ -1,7 +1,4 @@
-fs = require 'fs'
 path = require 'path'
-_ = require 'underscore-plus'
-fs = require 'fs-plus'
 runas = null
 
 module.exports = (grunt) ->
@@ -10,7 +7,6 @@ module.exports = (grunt) ->
   grunt.registerTask 'install', 'Install the built application', ->
     installDir = grunt.config.get('atom.installDir')
     shellAppDir = grunt.config.get('atom.shellAppDir')
-
     if process.platform is 'win32'
       runas ?= require 'runas'
       copyFolder = path.resolve 'script', 'copy-folder.cmd'
@@ -19,39 +15,7 @@ module.exports = (grunt) ->
 
       createShortcut = path.resolve 'script', 'create-shortcut.cmd'
       runas('cmd', ['/c', createShortcut, path.join(installDir, 'atom.exe'), 'Atom'])
-    else if process.platform is 'darwin'
+    else
       rm installDir
       mkdir path.dirname(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')
-
-      mkdir binDir
-      cp 'atom.sh', path.join(binDir, 'atom')
-      rm shareDir
-      mkdir path.dirname(shareDir)
-      cp shellAppDir, shareDir
-
-      # 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')
-
-        {description} = grunt.file.readJSON('package.json')
-        iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-        installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/atom/atom"
-        template = _.template(String(fs.readFileSync(desktopFile)))
-        filled = template({description, installDir, iconName})
-
-        grunt.file.write(desktopInstallFile, filled)
-
-      # Create relative symbol link for apm.
-      process.chdir(binDir)
-      rm('apm')
-      fs.symlinkSync(path.join('..', 'share', 'atom', 'resources', 'app', 'apm', 'node_modules', '.bin', 'apm'), 'apm')
-
-      fs.chmodSync(path.join(shareDir, 'atom'), "755")

build/tasks/mkdeb-task.coffee

@@ -1,40 +0,0 @@
-fs = require 'fs'
-path = require 'path'
-_ = require 'underscore-plus'
-
-module.exports = (grunt) ->
-  {spawn} = 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 'mkdeb', 'Create debian 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')
-    section = 'devel'
-    maintainer = 'GitHub <atom@github.com>'
-    installDir = '/usr'
-    iconName = 'atom'
-    data = {name, version, description, section, arch, maintainer, installDir, iconName}
-
-    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/output-build-filetypes.coffee

@@ -1,21 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-build-filetypes', 'Log counts for each filetype in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    types = {}
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      extension = path.extname(fileName) or fileName
-      types[extension] ?= 0
-      types[extension]++
-
-    extensions = Object.keys(types).sort (extension1, extension2) ->
-      diff = types[extension2] - types[extension1]
-      if diff is 0
-        extension1.toLowerCase().localeCompare(extension2.toLowerCase())
-      else
-        diff
-
-    extensions.forEach (extension) ->
-      grunt.log.error "#{extension}: #{types[extension]}"

build/tasks/output-long-paths-task.coffee

@@ -1,18 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-long-paths', 'Log long paths in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    longPaths = []
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      if relativePath
-        fullPath = path.join(relativePath, fileName)
-      else
-        fullPath = fileName
-      longPaths.push(fullPath) if fullPath.length >= 200
-
-    longPaths.sort (longPath1, longPath2) -> longPath2.length - longPath1.length
-
-    longPaths.forEach (longPath) ->
-      grunt.log.error "#{longPath.length} character path: #{longPath}"

build/tasks/prebuild-less-task.coffee

@@ -9,12 +9,10 @@ module.exports = (grunt) ->
       ['atom-dark-ui', 'atom-light-syntax']
       ['atom-dark-ui', 'solarized-dark-syntax']
       ['atom-dark-ui', 'base16-tomorrow-dark-theme']
-      ['atom-dark-ui', 'base16-tomorrow-light-theme']
       ['atom-light-ui', 'atom-light-syntax']
       ['atom-light-ui', 'atom-dark-syntax']
       ['atom-light-ui', 'solarized-dark-syntax']
       ['atom-light-ui', 'base16-tomorrow-dark-theme']
-      ['atom-light-ui', 'base16-tomorrow-light-theme']
     ]
 
     directory = path.join(grunt.config.get('atom.appDir'), 'less-compile-cache')

build/tasks/publish-build-task.coffee

@@ -8,7 +8,11 @@ GitHub = require 'github-releases'
 request = require 'request'
 
 grunt = null
-
+maxReleases = 10
+assets = [
+  {assetName: 'atom-mac.zip', sourceName: 'Atom.app'}
+  {assetName: 'atom-mac-symbols.zip', sourceName: 'Atom.breakpad.syms'}
+]
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -19,62 +23,66 @@ module.exports = (gruntObject) ->
   grunt = gruntObject
 
   grunt.registerTask 'publish-build', 'Publish the built app', ->
+    return unless process.platform is 'darwin'
     return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
-    tasks = ['upload-assets']
-    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    grunt.task.run(tasks)
 
-  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
-    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))
-
-  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
     done = @async()
     buildDir = grunt.config.get('atom.buildDir')
-    assets = getAssets()
 
-    zipAssets buildDir, assets, (error) ->
+    createBuildRelease (error, release) ->
       return done(error) if error?
-      getAtomDraftRelease (error, release) ->
-        return done(error) if error?
-        assetNames = (asset.assetName for asset in assets)
-        deleteExistingAssets release, assetNames, (error) ->
-          return done(error) if error?
-          uploadAssets(release, buildDir, assets, done)
 
-getAssets = ->
-  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'}
-    ]
+      zipApps buildDir, assets, (error) ->
+        return done(error) if error?
+        uploadAssets release, buildDir, assets, (error) ->
+          return done(error) if error?
+          publishRelease release, (error) ->
+            return done(error) if error?
+            getAtomDraftRelease (error, release) ->
+              return done(error) if error?
+              assetNames = (asset.assetName for asset in assets)
+              deleteExistingAssets release, assetNames, (error) ->
+                return done(error) if error?
+                uploadAssets(release, buildDir, assets, done)
 
 logError = (message, error, details) ->
   grunt.log.error(message)
   grunt.log.error(error.message ? error) if error?
   grunt.log.error(details) if details
 
-zipAssets = (buildDir, assets, callback) ->
-  zip = (directory, sourcePath, assetName, callback) ->
-    if process.platform is 'win32'
-      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} #{sourcePath}"
-    else
-      zipCommand = "zip -r --symlinks #{assetName} #{sourcePath}"
+zipApps = (buildDir, assets, callback) ->
+  zip = (directory, sourceName, assetName, callback) ->
     options = {cwd: directory, maxBuffer: Infinity}
-    child_process.exec zipCommand, options, (error, stdout, stderr) ->
-      logError("Zipping #{sourcePath} failed", error, stderr) if error?
+    child_process.exec "zip -r --symlinks #{assetName} #{sourceName}", options, (error, stdout, stderr) ->
+      if error?
+        logError("Zipping #{sourceName} failed", error, stderr)
       callback(error)
 
   tasks = []
-  for {assetName, sourcePath} in assets
+  for {assetName, sourceName} in assets
     fs.removeSync(path.join(buildDir, assetName))
-    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
+    tasks.push(zip.bind(this, buildDir, sourceName, assetName))
   async.parallel(tasks, callback)
 
+getRelease = (callback) ->
+  options =
+    uri: 'https://api.github.com/repos/atom/atom-master-builds/releases'
+    method: 'GET'
+    headers: defaultHeaders
+    json: true
+  request options, (error, response, releases=[]) ->
+    if error? or response.statusCode isnt 200
+      logError('Fetching releases failed', error, releases)
+      callback(error ? new Error(response.statusCode))
+    else
+      if releases.length > maxReleases
+        deleteRelease(release) for release in releases[maxReleases..]
+
+      for release in releases when release.name is commitSha
+        callback(null, release)
+        return
+      callback()
+
 getAtomDraftRelease = (callback) ->
   atomRepo = new GitHub({repo: 'atom/atom', token})
   atomRepo.getReleases (error, releases=[]) ->
@@ -117,6 +125,35 @@ deleteExistingAssets = (release, assetNames, callback) ->
     tasks.push(deleteAsset.bind(this, asset.url))
   async.parallel(tasks, callback)
 
+createBuildRelease = (callback) ->
+  getRelease (error, release) ->
+    if error?
+      callback(error)
+      return
+
+    if release?
+      deleteExistingAssets release, (error) ->
+        callback(error, release)
+      return
+
+    options =
+      uri: 'https://api.github.com/repos/atom/atom-master-builds/releases'
+      method: 'POST'
+      headers: defaultHeaders
+      json:
+        tag_name: "v#{commitSha}"
+        target_commitish: 'master'
+        name: commitSha
+        body: "Build of [atom@#{commitSha.substring(0, 7)}](https://github.com/atom/atom/commits/#{commitSha})"
+        draft: true
+        prerelease: true
+    request options, (error, response, release={}) ->
+      if error? or response.statusCode isnt 201
+        logError('Creating release failed', error, release)
+        callback(error ? new Error(response.statusCode))
+      else
+        callback(null, release)
+
 uploadAssets = (release, buildDir, assets, callback) ->
   upload = (release, assetName, assetPath, callback) ->
     options =
@@ -137,7 +174,21 @@ uploadAssets = (release, buildDir, assets, callback) ->
     fs.createReadStream(assetPath).pipe(assetRequest)
 
   tasks = []
-  for {assetName} in assets
+  for {assetName, sourceName} in assets
     assetPath = path.join(buildDir, assetName)
     tasks.push(upload.bind(this, release, assetName, assetPath))
   async.parallel(tasks, callback)
+
+publishRelease = (release, callback) ->
+  options =
+    uri: release.url
+    method: 'POST'
+    headers: defaultHeaders
+    json:
+      draft: false
+  request options, (error, response, body={}) ->
+    if error? or response.statusCode isnt 200
+      logError('Creating release failed', error, body)
+      callback(error ? new Error(response.statusCode))
+    else
+      callback()

build/tasks/publish-packages.coffee

@@ -0,0 +1,108 @@
+async = require 'async'
+request = require 'request'
+
+# Configure and publish all packages in package.json to atom.io
+#
+# This task should be run whenever you want to be sure that atom.io contains
+# all the packages and versions referenced in Atom's package.json file.
+module.exports = (grunt) ->
+  {spawn} = require('./task-helpers')(grunt)
+
+  baseUrl = "https://atom.io/api/packages"
+
+  packageExists = (packageName, token, callback) ->
+    requestSettings =
+      url: "#{baseUrl}/#{packageName}"
+      json: true
+      headers:
+        authorization: token
+    request.get requestSettings, (error, response, body={}) ->
+      if error?
+        callback(error)
+      else
+        callback(null, response.statusCode is 404)
+
+  createPackage = (packageName, token, callback) ->
+    requestSettings =
+      url: baseUrl
+      json: true
+      headers:
+        authorization: token
+      method: 'POST'
+      body:
+        repository: "atom/#{packageName}"
+
+    request.get requestSettings, (error, response, body={}) ->
+      if error?
+        callback(error)
+      else if response.statusCode isnt 201
+        message = body.message ? body.error ? body
+        callback(new Error("Creating package failed: #{message}"))
+      else
+        callback()
+
+  createPackageVersion = (packageName, tag, token, callback) ->
+    requestSettings =
+      url: "#{baseUrl}/#{packageName}/versions"
+      json: true
+      method: 'POST'
+      headers:
+        authorization: token
+      body:
+        tag: tag
+
+    request.get requestSettings, (error, response, body={}) ->
+      if error?
+        callback(error)
+      else if response.statusCode isnt 201
+        message = body.message ? body.error ? body
+        if message is 'Version exists'
+          callback()
+        else
+          callback(new Error("Creating new version failed: #{message}"))
+      else
+        callback()
+
+  getToken = (callback) ->
+    if token = process.env.ATOM_ACCESS_TOKEN
+      callback(null, token)
+    else
+      spawn {cmd: 'security', args: ['-q', 'find-generic-password', '-ws', 'GitHub API Token']}, (error, result, code) ->
+        token = result.toString() unless error?
+        callback(error, token)
+
+  grunt.registerTask 'publish-packages', 'Publish all bundled packages', ->
+    done = @async()
+
+    getToken (error, token) ->
+      unless token
+        grunt.log.error('Token not found in keychain or ATOM_ACCESS_TOKEN environment variable')
+        done(false)
+
+      {packageDependencies} = grunt.file.readJSON('package.json') ? {}
+      tasks = []
+      for name, version of packageDependencies
+        do (name, version) ->
+          tasks.push (callback) ->
+            grunt.verbose.writeln("Publishing #{name}@#{version}")
+            tag = "v#{version}"
+            packageExists name, token, (error, exists) ->
+              if error?
+                callback(error)
+                return
+
+              if exists
+                createPackage name, token, (error) ->
+                  if error?
+                    callback(error)
+                  else
+                    createPackageVersion(name, tag, token, callback)
+              else
+                createPackageVersion(name, tag, token, callback)
+
+      async.waterfall tasks, (error) ->
+        if error?
+          grunt.log.error(error.message)
+          done(false)
+        else
+          done()

build/tasks/set-version-task.coffee

@@ -5,18 +5,14 @@ module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   getVersion = (callback) ->
-    onBuildMachine = process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
-    inRepository = fs.existsSync(path.resolve(__dirname, '..', '..', '.git'))
-    {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
-    if onBuildMachine or not inRepository
+    if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+      {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
       callback(null, version)
     else
       cmd = 'git'
       args = ['rev-parse', '--short', 'HEAD']
       spawn {cmd, args}, (error, {stdout}={}, code) ->
-        commitHash = stdout?.trim?()
-        combinedVersion = "#{version}-#{commitHash}"
-        callback(error, combinedVersion)
+        callback(error, stdout?.trim?())
 
   grunt.registerTask 'set-version', 'Set the version in the plist and package.json', ->
     done = @async()
@@ -52,5 +48,3 @@ module.exports = (grunt) ->
 
         rcedit = require('rcedit')
         rcedit(shellExePath, {'version-string': strings}, done)
-      else
-        done()

build/tasks/spec-task.coffee

@@ -39,8 +39,7 @@ module.exports = (grunt) ->
       grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
         if process.platform is 'win32'
-          if error
-            process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
+          process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
@@ -53,7 +52,9 @@ module.exports = (grunt) ->
       continue unless isAtomPackage(packagePath)
       packageSpecQueue.push(packagePath)
 
-    packageSpecQueue.concurrency = 1
+    # TODO: Restore concurrency on Windows
+    packageSpecQueue.concurrency = 1 unless process.platform is 'win32'
+
     packageSpecQueue.drain = -> callback(null, failedPackages)
 
   runCoreSpecs = (callback) ->
@@ -76,7 +77,7 @@ module.exports = (grunt) ->
 
     spawn options, (error, results, code) ->
       if process.platform is 'win32'
-        process.stderr.write(fs.readFileSync('ci.log')) if error
+        process.stderr.write(fs.readFileSync('ci.log'))
         fs.unlinkSync('ci.log')
       else
         # TODO: Restore concurrency on Windows
@@ -104,8 +105,8 @@ module.exports = (grunt) ->
 
       grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
 
-      if process.platform is 'win32' and process.env.JANKY_SHA1
-        # Package specs are still flaky on Windows CI
-        done(!coreSpecFailed)
-      else
+      # TODO: Mark the build as green on Windows until specs pass.
+      if process.platform is 'darwin'
         done(!coreSpecFailed and failedPackages.length == 0)
+      else if process.platform is 'win32'
+        done(true)

build/tasks/task-helpers.coffee

@@ -7,7 +7,7 @@ module.exports = (grunt) ->
       grunt.fatal("Cannot copy non-existent #{source.cyan} to #{destination.cyan}")
 
     copyFile = (sourcePath, destinationPath) ->
-      return if filter?(sourcePath) or filter?.test?(sourcePath)
+      return if filter?.test(sourcePath)
 
       stats = fs.lstatSync(sourcePath)
       if stats.isSymbolicLink()

docs/README.md

@@ -1,6 +1,6 @@
 # Welcome to the Atom API Documentation
 
-![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
+![Atom](http://i.imgur.com/OrTvUAD.png)
 
 ## FAQ
 

docs/advanced/configuration.md

@@ -11,31 +11,41 @@ value of a namespaced config key with `atom.config.get`:
 @showInvisibles() if atom.config.get "editor.showInvisibles"
 ```
 
-Or you can use the `::subscribe` with `atom.config.observe` to track changes
-from any view object.
+Or you can use the `::observeConfig` to track changes from any view object.
 
 ```coffeescript
 class MyView extends View
   initialize: ->
-    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+    @observeConfig 'editor.fontSize', () =>
       @adjustFontSize()
 ```
 
-The `atom.config.observe` method will call the given callback immediately with
-the current value for the specified key path, and it will also call it in the
-future whenever the value of that key path changes.
+The `::observeConfig` method will call the given callback immediately with the
+current value for the specified key path, and it will also call it in the future
+whenever the value of that key path changes.
 
-Subscriptions made with `::subscribe` are automatically canceled when the
+Subscriptions made with `observeConfig` are automatically canceled when the
 view is removed. You can cancel config subscriptions manually via the
-`off` method on the subscription object that `atom.config.observe` returns.
+`unobserveConfig` method.
 
 ```coffeescript
-fontSizeSubscription = atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-  @adjustFontSize()
+view1.unobserveConfig() # unobserve all properties
+```
 
-# ... later on
+You can add the ability to observe config values to non-view classes by
+extending their prototype with the `ConfigObserver` mixin:
 
-fontSizeSubscription.off() # Stop observing
+```coffeescript
+{ConfigObserver} = require 'atom'
+
+class MyClass
+  ConfigObserver.includeInto(this)
+  
+  constructor: ->
+    @observeConfig 'editor.showInvisibles', -> # ...
+
+  destroy: ->
+    @unobserveConfig()
 ```
 
 ### Writing Config Settings

docs/advanced/keymaps.md

@@ -10,8 +10,8 @@ keystrokes pass through elements with the class `.editor`:
 
 ```coffee
 '.editor':
-  'cmd-delete': 'editor:delete-to-beginning-of-line'
-  'alt-backspace': 'editor:delete-to-beginning-of-word'
+  'cmd-delete': 'editor:backspace-to-beginning-of-line'
+  'alt-backspace': 'editor:backspace-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'
@@ -24,7 +24,7 @@ keystrokes pass through elements with the class `.editor`:
 Beneath the first selector are several bindings, mapping specific *keystroke
 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 `.editor` element.
+`editor:backspace-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
@@ -83,32 +83,6 @@ file. For now, we've opted to handle cases where selector ordering is critical
 by breaking the keymap into two separate files, such as `snippets-1.cson` and
 `snippets-2.cson`.
 
-## Removing Bindings
-
-When the keymap system encounters a binding with the `unset!` directive as its
-command, it will treat the current element as if it had no key bindings matching
-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, 
-which is normally used to trigger the `tree-view:add-file` command:
-
-```coffee
-'.tree-view':
-    'a': 'unset!'
-```
-
-![](https://cloud.githubusercontent.com/assets/38924/3174771/e7f6ce64-ebf4-11e3-922d-f280bffb3fc5.png)
-
-## Forcing Chromium's Native Keystroke Handling
-
-If you want to force the native browser behavior for a given keystroke, use the
-`native!` directive as the command of a binding. This can be useful to enable
-the correct behavior in native input elements, for example. If you apply the
-`.native-key-bindings` class to an element, all the keystrokes typically handled
-by the browser will be assigned the `native!` directive.
-
 ## Overloading Key Bindings
 
 Occasionally, it makes sense to layer multiple actions on top of the same key

docs/advanced/node-modules.md

@@ -1,24 +0,0 @@
-## Developing Node Modules
-
-Atom contains a number of packages that are Node modules instead of Atom packages. If you want to
-make changes to the Node modules, for instance `atom-keymap`, you have to link them into the
-development environment differently than you would a normal Atom package.
-
-### Linking a Node Module Into Your Atom Dev Environment
-
-Here are the steps to run a local version of a node module *not an apm* within Atom. We're using
-`atom-keymap` as an example:
-
-```bash
-$ git clone https://github.com/atom/atom-keymap.git
-$ cd atom-keymap
-$ npm install
-$ npm link
-$ apm rebuild # This is the special step, it makes the npm work with Atom's version of Node
-$ cd WHERE-YOU-CLONED-ATOM
-$ npm link atom-keymap
-$ atom # Should work!
-```
-
-After this, you'll have to `npm install` and `apm rebuild` when you make a change to the node
-module's code.

docs/advanced/serialization.md

@@ -19,7 +19,7 @@ module.exports =
   activate: (state) ->
     @myObject =
       if state
-        atom.deserializers.deserialize(state)
+        deserialize(state)
       else
         new MyObject("Hello")
 
@@ -31,8 +31,7 @@ module.exports =
 
 ```coffee-script
 class MyObject
-  atom.deserializers.add(this)
-
+  registerDeserializer(this)
   @deserialize: ({data}) -> new MyObject(data)
   constructor: (@data) ->
   serialize: -> { deserializer: 'MyObject', data: @data }
@@ -51,8 +50,8 @@ class-level method on the same class that implements `serialize`. This method's
 job is to convert a state object returned from a previous call `serialize` back
 into a genuine object.
 
-#### atom.deserializers.add(klass)
-You need to call the `atom.deserializers.add` method with your class in
+#### registerDeserializer(klass)
+You need to call the global `registerDeserializer` method with your class in
 order to make it available to the deserialization system. Now you can call the
 global `deserialize` method with state returned from `serialize`, and your
 class's `deserialize` method will be selected automatically.
@@ -61,15 +60,14 @@ class's `deserialize` method will be selected automatically.
 
 ```coffee-script
 class MyObject
-  atom.deserializers.add(this)
-
   @version: 2
   @deserialize: (state) -> ...
-  serialize: -> { version: @constructor.version, ... }
+  serialize: -> { version: MyObject.version, ... }
 ```
 
 Your serializable class can optionally have a class-level `@version` property
 and include a `version` key in its serialized state. When deserializing, Atom
 will only attempt to call deserialize if the two versions match, and otherwise
 return undefined. We plan on implementing a migration system in the future, but
-this at least protects you from improperly deserializing old state.
+this at least protects you from improperly deserializing old state. If you find
+yourself in dire need of the migration system, let us know.

docs/api-guidelines.md

@@ -1,112 +0,0 @@
-# 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/apm-rest-api.md

@@ -1,271 +0,0 @@
-# Atom.io package and update API
-
-This guide describes the web API used by [apm](https://github.com/atom/apm) and
-Atom. The vast majority of use cases are met by the `apm` command-line tool,
-which does other useful things like incrementing your version in `package.json`
-and making sure you have pushed your git tag. In fact, Atom itself shells out to
-`apm` rather than hitting the API directly. If you're curious about how Atom
-uses `apm`, see the [PackageManager class](https://github.com/atom/settings-view/blob/master/lib/package-manager.coffee)
-in the `settings-view` package.
-
-*This API should be considered pre-release and is subject to change (though significant breaking changes are unlikely).*
-
-### Authorization
-
-For calls to the API that require authentication, provide a valid token from your
-[Atom.io account page](https://atom.io/account) in the `Authorization` header.
-
-### Media type
-
-All requests that take parameters require `application/json`.
-
-# API Resources
-
-## Packages
-
-### Listing packages
-
-#### GET /api/packages
-
-Parameters:
-
-- **page** (optional)
-
-Returns a list of all packages in the following format:
-```json
-  [
-    {
-      "releases": {
-        "latest": "0.6.0"
-      },
-      "name": "thedaniel-test-package",
-      "repository": {
-        "type": "git",
-        "url": "https://github.com/thedaniel/test-package"
-      }
-    },
-    ...
-  ]
-```
-
-Results are paginated 30 at a time, and links to the next and last pages are
-provided in the `Link` header:
-
-```
-Link: <https://www.atom.io/api/packages?page=1>; rel="self",
-      <https://www.atom.io/api/packages?page=41>; rel="last",
-      <https://www.atom.io/api/packages?page=2>; rel="next"
-```
-
-### Showing package details
-
-#### GET /api/packages/:package_name
-
-Returns package details and versions for a single package
-
-Parameters:
-
-- **engine** (optional) - Only show packages with versions compatible with this
-  Atom version. Must be valid [SemVer](http://semver.org).
-
-Returns:
-
-```json
-  {
-    "releases": {
-      "latest": "0.6.0"
-    },
-    "name": "thedaniel-test-package",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/thedaniel/test-package"
-    },
-    "versions": [
-      (see single version output below)
-      ...,
-    ]
-  }
-```
-
-### Creating a package
-
-#### POST /api/packages
-
-Create a new package; requires authentication.
-
-The name and version will be fetched from the `package.json`
-file in the specified repository. The authenticating user *must* have access
-to the indicated repository.
-
-When a package is created, a release hook is registered with GitHub for package
-version creation.
-
-Parameters:
-
-- **repository** - String. The repository containing the plugin, in the form "owner/repo"
-
-Returns:
-
-- **201** - Successfully created, returns created package.
-- **400** - Repository is inaccessible, nonexistent, not an atom package. Possible
-  error messages include:
-  - That repo does not exist, isn't an atom package, or atombot does not have access
-  - The package.json at owner/repo isn't valid
-- **409** - A package by that name already exists
-
-### Deleting a package
-
-#### DELETE /api/packages/:package_name
-
-Delete a package; requires authentication.
-
-Returns:
-
-- **204** - Success
-- **400** - Repository is inaccessible
-- **401** - Unauthorized
-
-### Renaming a package
-
-Packages are renamed by publishing a new version with the name changed in `package.json`
-See [Creating a new package version](#creating-a-new-package-version) for details.
-
-Requests made to the previous name will forward to the new name.
-
-### Package Versions
-
-#### GET /api/packages/:package_name/versions/:version_name
-
-Returns `package.json` with `dist` key added for e.g. tarball download:
-
-```json
-  {
-    "bugs": {
-      "url": "https://github.com/thedaniel/test-package/issues"
-    },
-    "dependencies": {
-      "async": "~0.2.6",
-      "pegjs": "~0.7.0",
-      "season": "~0.13.0"
-    },
-    "description": "Expand snippets matching the current prefix with `tab`.",
-    "dist": {
-      "tarball": "https://codeload.github.com/..."
-    },
-    "engines": {
-      "atom": "*"
-    },
-    "main": "./lib/snippets",
-    "name": "thedaniel-test-package",
-    "publishConfig": {
-      "registry": "https://...",
-    },
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/thedaniel/test-package.git"
-    },
-    "version": "0.6.0"
-  }
-```
-
-
-### Creating a new package version
-
-#### POST /api/packages/:package_name/versions
-
-Creates a new package version from a git tag; requires authentication. If `rename`
-is not `true`, the `name` field in `package.json` *must* match the current package
-name.
-
-#### Parameters
-
-- **tag** - A git tag for the version you'd like to create. It's important to note
-  that the version name will not be taken from the tag, but from the `version`
-  key in the `package.json` file at that ref. The authenticating user *must* have
-  access to the package repository.
-- **rename** - Boolean indicating whether this version contains a new name for the package.
-
-#### Returns
-
-- **201** - Successfully created. Returns created version.
-- **400** - Git tag not found / Repository inaccessible / package.json invalid
-- **409** - Version exists
-
-### Deleting a version
-
-#### DELETE /api/packages/:package_name/versions/:version_name
-
-Deletes a package version; requires authentication.
-
-Note that a version cannot be republished with a different tag if it is deleted.
-If you need to delete the latest version of a package for e.g. security reasons,
-you'll need to increment the version when republishing.
-
-Returns 204 No Content
-
-
-## Stars
-
-### Listing user stars
-
-#### GET /api/users/:login/stars
-
-List a user's starred packages.
-
-Return value is similar to **GET /api/packages**
-
-#### GET /api/stars
-
-List the authenticated user's starred packages; requires authentication.
-
-Return value is similar to **GET /api/packages**
-
-### Starring a package
-
-#### POST /api/packages/:name/star
-
-Star a package; requires authentication.
-
-Returns a package.
-
-### Unstarring a package
-
-#### DELETE /api/packages/:name/star
-
-Unstar a package; requires authentication.
-
-Returns 204 No Content.
-
-### Listing a package's stargazers
-
-#### GET /api/packages/:name/stargazers
-
-List the users that have starred a package.
-
-Returns a list of user objects:
-
-```json
-[
-  {"login":"aperson"},
-  {"login":"anotherperson"},
-]
-```
-
-## Atom updates
-
-### Listing Atom updates
-
-#### GET /api/updates
-
-Atom update feed, following the format expected by [Squirrel](https://github.com/Squirrel/).
-
-Returns:
-
-```json
-{
-    "name": "0.96.0",
-    "notes": "[HTML release notes]",
-    "pub_date": "2014-05-19T15:52:06.000Z",
-    "url": "https://www.atom.io/api/updates/download"
-}
-```

docs/build-instructions/freebsd.md

@@ -1,22 +0,0 @@
-# FreeBSD
-
-FreeBSD -RELEASE 64-bit is the recommended platform.
-
-## Requirements
-
-  * FreeBSD
-  * `pkg install node`
-  * `pkg install npm`
-  * `pkg install libgnome-keyring`
-  * `npm config set python /usr/local/bin/python2 -g` to ensure that gyp uses Python 2
-
-## Instructions
-
-  ```sh
-  git clone https://github.com/atom/atom
-  cd atom
-  script/build # Creates application at $TMPDIR/atom-build/Atom
-  sudo script/grunt install # Installs command to /usr/local/bin/atom
-  ```
-
-## Troubleshooting

docs/build-instructions/linux.md

@@ -1,87 +0,0 @@
-# Linux
-
-Ubuntu LTS 12.04 64-bit is the recommended platform.
-
-## Requirements
-
-  * OS with 64-bit or 32-bit architecture
-  * C++ toolchain
-  * 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).
-  * 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).
-
-### 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`
-* `export PYTHON=/usr/bin/python2` before building Atom.
-
-## Instructions
-
-If you have problems with permissions don't forget to prefix with `sudo`
-
-Create the atom application at `$TMPDIR/atom-build/Atom`:
-
-```sh
-script/build
-```
-
-Install the `atom` and `apm` commands to `/usr/local/bin`:
-
-```sh
-sudo script/grunt install
-```
-
-Generate a `.deb` package at `$TMPDIR/atom-build`: (*optional*)
-
-```sh
-script/grunt mkdeb
-```
-
-Use the newly installed atom by restarting any running atom instances.
-
-## Troubleshooting
-
-### Exception: "TypeError: Unable to watch path"
-
-If you get following error with a big traceback right after Atom starts:
-
-  ```
-  TypeError: Unable to watch path
-  ```
-
-you have to increase number of watched files by inotify.  For testing if
-this is the reason for this error you can issue
-
-  ```sh
-  sudo sysctl fs.inotify.max_user_watches=32768
-  ```
-
-and restart Atom.  If Atom now works fine, you can make this setting permanent:
-
-  ```sh
-  echo 32768 > /proc/sys/fs/inotify/max_user_watches
-  ```
-
-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 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.
-
-### 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/os-x.md

@@ -1,20 +0,0 @@
-# OS X
-
-## Requirements
-
-  * OS X 10.8 or later
-  * [node.js](http://nodejs.org/download/) v0.10.x
-  * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install)
-
-## Instructions
-
-  ```sh
-  git clone https://github.com/atom/atom.git
-  cd atom
-  script/build # Creates application at /Applications/Atom.app
-  ```
-
-## Troubleshooting
-
-### OSX build error reports in atom/atom
-* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Aos-x&type=Issues) to get a list of reports about build errors on OSX.

docs/build-instructions/windows.md

@@ -1,76 +0,0 @@
-# Windows
-
-## Requirements
-
-### On Windows 7
-  * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4)
-  * [Visual Studio 2010 Service Pack 1](http://www.microsoft.com/en-us/download/details.aspx?id=23691)
-  * [node.js](http://nodejs.org/download/) v0.10.x
-    * For 64-bit builds of node and native modules you **must** have the
-    [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279).
-    You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422)
-  * [Python](http://www.python.org/download/) v2.7.
-    * The python.exe must be available at `%SystemDrive%\Python27\python.exe`.
-      If it is installed elsewhere, you can create a symbolic link to the
-      directory containing the python.exe using:
-      `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
-  * [GitHub for Windows](http://windows.github.com/)
-
-### On Windows 8
-  * [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2)
-  * [node.js](http://nodejs.org/download/) v0.10.x
-  * [Python](http://www.python.org/download/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp))
-  * [GitHub for Windows](http://windows.github.com/)
-
-## Instructions
-
-  ```bat
-  # Use the `Git Shell` app which was installed by GitHub for Windows. Also Make
-  # sure you have logged into the GitHub for Windows GUI App.
-  cd C:\
-  git clone https://github.com/atom/atom/
-  cd atom
-  script/build # Creates application in the `Program Files` directory
-  ```
-
-## 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. 
-
-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.
-
-If none of this works, do install Github for Windows and use its Git shell. Makes life easier.
-
-
-## Troubleshooting
-
-### Common Errors
-* `node is not recognized`
-
-  * If you just installed node you need to restart your computer before node is
-  available on your Path.
-
-
-* `script/build` outputs only the Node and Python versions before returning
-
-  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
-    See [issue #2200](https://github.com/atom/atom/issues/2200).
-
-* `error MSB4025: The project file could not be loaded. Invalid character in the given encoding.`
-
-  * These can occur because your home directory (`%USERPROFILE%`) has non-ASCII
-    characters in it. This is a bug in [gyp](https://code.google.com/p/gyp/)
-    which is used to build native node modules and there is no known workaround.
-    * https://github.com/TooTallNate/node-gyp/issues/297
-    * https://code.google.com/p/gyp/issues/detail?id=393
-
-* 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.
-
-
-### Windows build error reports in atom/atom
-* If all fails, use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows, and see if yours has already been reported.
-
-* If it hasn't, please open a new issue with your Windows version 32/64bit and a print/screenshot of your build output, incl. the node and python versions.

docs/contributing-to-packages.md

@@ -1,52 +0,0 @@
-# Contributing to Official Atom Packages
-
-If you think you know which package is causing the issue you are reporting, feel
-free to open up the issue in that specific repository instead. When in doubt
-just open the issue here but be aware that it may get closed here and reopened
-in the proper package's repository.
-
-## Hacking on Packages
-
-### Cloning
-
-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, run the
-following command:
-
-```
-> apm develop tree-view
-Cloning https://github.com/atom/tree-view ✓
-Installing modules ✓
-~/.atom/dev/packages/tree-view -> ~/github/tree-view
-```
-
-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
-
-Editing a package in Atom is a bit of a circular experience: you're using Atom
-to modify itself. What happens if you temporarily break something? You don't
-want the version of Atom you're using to edit to become useless in the process.
-For this reason, you'll only want to load packages in **development mode** while
-you are working on them. You'll perform your editing in **stable mode**, only
-switching to development mode to test your changes.
-
-To open a development mode window, use the "Application: Open Dev" command,
-which is normally bound to `cmd-shift-o`. You can also run dev mode from the
-command line with `atom --dev`.
-
-To load your package in development mode, create a symlink to it in
-`~/.atom/dev/packages`. This occurs automatically when you clone the package
-with `apm develop`. You can also run `apm link --dev` and `apm unlink --dev`
-from the package directory to create and remove dev-mode symlinks.
-
-### Installing Dependencies
-
-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/contributing.md

@@ -1 +0,0 @@
-../CONTRIBUTING.md

docs/contributing.md

@@ -0,0 +1,142 @@
+# Contributing to Atom Packages
+
+The following is a set of guidelines for contributing to Atom packages, which
+are hosted in the [Atom Organization](https://github.com/atom) on GitHub. If
+you're unsure which package is causing your problem or if you're having an issue
+with Atom core, please use the feedback form in the application or email
+[atom@github.com](mailto:atom@github.com).
+
+## Submitting Issues
+
+* 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 and stack traces to include.
+* 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.
+
+## Hacking on Packages
+
+### Cloning
+
+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, run the
+following command:
+
+```
+> apm develop tree-view
+Cloning https://github.com/atom/tree-view ✓
+Installing modules ✓
+~/.atom/dev/packages/tree-view -> ~/github/tree-view
+```
+
+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
+
+Editing a package in Atom is a bit of a circular experience: you're using Atom
+to modify itself. What happens if you temporarily break something? You don't
+want the version of Atom you're using to edit to become useless in the process.
+For this reason, you'll only want to load packages in **development mode** while
+you are working on them. You'll perform your editing in **stable mode**, only
+switching to development mode to test your changes.
+
+To open a development mode window, use the "Application: Open Dev" command,
+which is normally bound to `cmd-shift-o`. You can also run dev mode from the
+command line with `atom --dev`.
+
+To load your package in development mode, create a symlink to it in
+`~/.atom/dev/packages`. This occurs automatically when you clone the package
+with `apm develop`. You can also run `apm link --dev` and `apm unlink --dev`
+from the package directory to create and remove dev-mode symlinks.
+
+### Installing Dependencies
+
+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.
+
+## Submitting Pull Requests
+
+### Code Guidelines
+
+* Include screenshots and animated GIFs in your pull request whenever possible.
+* Follow the [CoffeeScript](#coffeescript-styleguide),
+  [JavaScript](https://github.com/styleguide/javascript),
+  and [CSS](https://github.com/styleguide/css) styleguides.
+* Include thoughtfully-worded, well-structured
+  [Jasmine](http://pivotal.github.com/jasmine) specs.
+* Document new code based on the
+  [Documentation Styleguide](#documentation-styleguide)
+* End files with a newline.
+* Place requires in the following order:
+  * Built in Node Modules (such as `path`)
+  * Built in Atom and Atom Shell Modules (such as `atom`, `shell`)
+  * Local Modules (using relative paths)
+* Place class properties in the following order:
+  * Class methods and properties (methods starting with a `@`)
+  * Instance methods and properties
+* Avoid platform-dependent code:
+  * Use `require('atom').fs.getHomeDirectory()` to get the home directory.
+  * Use `path.join()` to concatenate filenames.
+  * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
+    temporary directory.
+
+### Commit Message Guidelines
+  * Use the present tense ("Add feature" not "Added feature")
+  * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+  * Limit the first line to 72 characters or less
+  * Reference issues and pull requests liberally
+  * Consider starting the commit message with an applicable emoji:
+    * :lipstick: when improving the format/structure of the code
+    * :racehorse: when improving performance
+    * :non-potable_water: when plugging memory leaks
+    * :memo: when writing docs
+    * :bulb: Check out the [Emoji Cheat Sheet](http://www.emoji-cheat-sheet.com)
+      for more ideas.
+
+## CoffeeScript Styleguide
+
+* Use parentheses if it improves code clarity.
+* Prefer alphabetic keywords to symbolic keywords:
+  * `a is b` instead of `a == b`
+* Avoid spaces inside the curly-braces of hash literals:
+  * `{a: 1, b: 2}` instead of `{ a: 1, b: 2 }`
+* Set parameter defaults without spaces around the equal sign:
+  * `clear = (count=1) ->` instead of `clear = (count = 1) ->`
+* Include a single line of whitespace between methods.
+
+## Documentation Styleguide
+
+* 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}`
+
+### Example
+
+```coffee
+# Public: Disable the package with the given name.
+#
+# 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) ->
+```

docs/converting-a-text-mate-bundle.md

@@ -20,7 +20,7 @@ apm help init
 
 You should see a message print out with details about the `apm init` command.
 
-If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+If you do not, launch Atom and run the _Atom > Install Shell Commmands_ menu
 to install the `apm` and `atom` commands.
 
 ### Convert the Package
@@ -49,4 +49,4 @@ the editor to see it in action!
 [plist]: http://en.wikipedia.org/wiki/Property_list
 [R]: http://en.wikipedia.org/wiki/R_(programming_language)
 [TextMate]: http://macromates.com
-[TextMateOrg]: https://github.com/textmate
+[TextMateOrg]: https://github.com/textmate/r.tmbundle

docs/converting-a-text-mate-theme.md

@@ -25,7 +25,7 @@ apm help init
 
 You should see a message print out with details about the `apm init` command.
 
-If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+If you do not, launch Atom and run the _Atom > Install Shell Commmands_ menu
 to install the `apm` and `atom` commands.
 
 You can now run `apm help init` to see all the options for initializing new

docs/creating-a-package.md

@@ -130,7 +130,7 @@ Ideally, you won't need much in the way of styling. We've provided a standard
 set of components which define both the colors and UI elements for any package
 that fits into Atom seamlessly. You can view all of Atom's UI components by opening
 the styleguide: open the command palette (`cmd-shift-P`) and search for _styleguide_,
-or just type `cmd-ctrl-shift-G`.
+or just type `cmd-ctrl-G`.
 
 If you _do_ need special styling, try to keep only structural styles in the package
 stylesheets. If you _must_ specify colors and sizing, these should be taken from
@@ -225,21 +225,6 @@ 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, pass in another object instead of a command. To add a separator, use
-`-` for the command of the item.
-
-```coffeescript
-'context-menu':
-  '.workspace':
-    'Inspect Element': 'core:inspect'
-    'Separator': '-'
-    'Text':
-      'Select All': 'core:select-all'
-      'Another Separator': '-'
-      'Deleted Selected Text': 'core:delete'
-```
-
 ## Snippets
 
 An extension can supply language snippets in the _snippets_ directory which

docs/creating-a-theme.md

@@ -51,7 +51,7 @@ editor such as comments, strings and the line numbers in the gutter.
 
 As an example, let's make the `.gutter` `background-color` into `@red`.
 
-Reload Atom by pressing `cmd-alt-ctrl-l` to see the changes you made reflected
+Reload Atom by pressing `cmd-alt-option-L` to see the changes you made reflected
 in your Atom window. Pretty neat!
 
 __Tip:__ You can avoid reloading to see changes you make by opening an atom

docs/customizing-atom.md

@@ -34,7 +34,7 @@ apm help install
 
 You should see a message print out with details about the `apm install` command.
 
-If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+If you do not, launch Atom and run the _Atom > Install Shell Commmands_ menu
 to install the `apm` and `atom` commands.
 
 You can also install packages by using the `apm install` command:
@@ -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
-.editor.is-focused .cursor {
+.editor .cursor {
   border-color: pink;
 }
 ```

docs/debugging.md

@@ -1,107 +0,0 @@
-# Debugging
-
-Atom provides several tools to help you understand unexpected behavior and debug problems. This guide describes some of those tools and a few approaches to help you debug and provide more helpful information when [submitting issues]:
-
-* [Update to the latest version](#update-to-the-latest-version)
-* [Check Atom and package settings](#check-atom-and-package-settings) 
-* [Check the keybindings](#check-the-keybindings)
-* [Check if the problem shows up in safe mode](#check-if-the-problem-shows-up-in-safe-mode)
-* [Check your config files](#check-your-config-files)
-* [Check for errors in the developer tools](#check-for-errors-in-the-developer-tools)
-
-## Update to the latest version
-
-You might be running into an issue which was already fixed in a more recent version of Atom than the one you're using.
-
-If you're building Atom from source, pull down the latest version of master and [re-build][building atom].
-
-If you're using released version, check which version of Atom you're using:
-
-```shell
-$ atom --version
-0.99.0
-```
-
-Head on over to the [list of releases][atom releases] and see if there's a more recent release. You can update to the most recent release by downloading Atom from the releases page, or with the in-app auto-updater. The in-app auto-updater checks for and downloads a new version after you restart Atom, or if you use the Atom > Check for Update menu option.
-
-## Check Atom and package settings
-
-In some cases, unexpected behavior might be caused by misconfigured or unconfigured settings in Atom or in one of the packages.
-
-Open Atom's Settings View with `cmd-,` or the Atom > Preferences menu option.
-
-![Settings View]
-
-Check Atom's settings in the Settings pane, there's a description of each configuration option [here][customizing guide]. For example, if you want Atom to use hard tabs (real tabs) and not soft tabs (spaces), disable the "Soft Tabs" option.
-
-Since Atom ships with a set of packages and you can install additional packages yourself, check the list of packages and their settings. For example, if you'd like to get rid of the vertical line in the middle of the editor, disable the [Wrap Guide package]. And if you don't like it when Atom strips trailing whitespace or ensures that there's a single trailing newline in the file, you can configure that in the [Whitespace packages'][whitespace package] settings.
-
-![Package Settings]
-
-## Check the keybindings
-
-If a command is not executing when you hit a keystroke or the wrong command is executing, there might be an issue with the keybindings for that keystroke. Atom ships with the [Keybinding resolver][keybinding resolver package], a neat package which helps you understand which keybindings are executed.
-
-Show the keybinding resolver with <code>cmd-.</code> or with "Key Binding Resolver: Show" from the Command palette. With the keybinding resolver shown, hit a keystroke:
-
-![Keybinding Resolver]
-
-The keybinding resolver shows you a list of keybindings that exist for the keystroke, where each item in the list has the following:
-* the command for the keybinding,
-* the CSS selector used to define the context in which the keybinding is valid, and
-* the file in which the keybinding is defined.
-
-Of all the keybinding that are listed (grey color), at most one keybinding is matched and executed (green color). If the command you wanted to trigger isn't listed, then a keybinding for that command hasn't been defined. More keybindings are provided by [packages] and you can [define your own keybindings][customizing keybindings].
-
-If multiple keybindings are matched, Atom determines which keybinding will be executed based on the [specificity of the selectors and the order in which they were loaded][specificity and order]. If the command you wanted to trigger is listed in the Keybinding resolver, but wasn't the one that was executed, this is normally explained by one of two causes:
-* the keystroke was not used in the context defined by the keybinding's selector. For example, you can't trigger the "Tree View: Add File" command if the Tree View is not focused, or
-* there is another keybinding that took precedence. This often happens when you install a package which defines keybinding that conflict with existing keybindings. If the package's keybindings have selectors with higher specificity or were loaded later, they'll have priority over existing ones.
-
-Atom loads core Atom keybindings and package keybindings first, and user-defined keybindings after last. Since user-defined keybindings are loaded last, you can use your `keymap.cson` file to tweak the keybindings and sort out problems like these. For example, you can remove keybindings with [the `unset!` directive][unset directive].
-
-If you notice that a package's keybindings are taking precedence over core Atom keybindings, it might be a good idea to report the issue on the package's GitHub repository.
-
-## Check if the problem shows up in safe mode
-
-A large part of Atom's functionality comes from packages you can install. In some cases, these packages might be causing unexpected behavior, problems, or performance issues.
-
-To determine if a package you installed is causing problems, start Atom from the terminal in safe mode:
-
-```
-$ atom --safe
-```
-
-This starts Atom, but does not load packages from `~/.atom/packages` or `~/.atom/dev/packages`. If you can no longer reproduce the problem in safe mode, it's likely it was caused by one of the packages.
-
-To figure out which package is causing trouble, start Atom normally again and open Settings (`cmd-,`). Since Settings allow you to disable each installed package, you can disable packages one by one until you can no longer reproduce the issue. Restart (`cmd-q`) or reload (`cmd-ctrl-alt-l`) Atom after you disable each package to make sure it's completely gone.
-
-When you find the problematic package, you can disable or uninstall the package, and consider creating an issue on the package's GitHub repository.
-
-## Check your config files
-
-You might have defined some custom functionality or styles in Atom's [Init script or Stylesheet]. In some situations, these personal hacks might be causing problems so try clearing those files and restarting Atom.
-
-## Check for errors in the developer tools
-
-When an error is thrown in Atom, the developer tools are automatically shown with the error logged in the Console tab. However, if the dev tools are open before the error is triggered, a full stack trace for the error will be logged:
-
-![devtools error]
-
-If you can reproduce the error, use this approach to get the full stack trace. The stack trace might point to a problem in your [Init script][init script or stylesheet] or a specific package you installed, which you can then disable and report an issue on its GitHub repository.
-
-[submitting issues]: https://github.com/atom/atom/blob/master/CONTRIBUTING.md#submitting-issues
-[building atom]: https://github.com/atom/atom#building
-[atom releases]: https://github.com/atom/atom/releases
-[customizing guide]: https://atom.io/docs/latest/customizing-atom#configuration-key-reference
-[settings view]: https://f.cloud.github.com/assets/671378/2241795/ba4827d8-9ce4-11e3-93a8-6666ee100917.png
-[package settings]: https://cloud.githubusercontent.com/assets/38924/3173588/7e5f6b0c-ebe8-11e3-9ec3-e8d140967e79.png
-[wrap guide package]: https://atom.io/packages/wrap-guide
-[whitespace package]: https://atom.io/packages/whitespace
-[keybinding resolver package]: https://atom.io/packages/keybinding-resolver
-[keybinding resolver]: https://f.cloud.github.com/assets/671378/2241702/5dd5a102-9cde-11e3-9e3f-1d999930492f.png
-[customizing keybindings]: https://atom.io/docs/latest/customizing-atom#customizing-key-bindings
-[packages]: https://atom.io/packages
-[specificity and order]: https://atom.io/docs/latest/advanced/keymaps#specificity-and-cascade-order
-[unset directive]:  https://atom.io/docs/latest/advanced/keymaps#removing-bindings
-[init script or stylesheet]: https://atom.io/docs/latest/customizing-atom#quick-personal-hacks
-[devtools error]: https://cloud.githubusercontent.com/assets/38924/3177710/11b4e510-ec13-11e3-96db-a2e8a7891773.png

docs/getting-started.md

@@ -73,7 +73,7 @@ from.
 You can split any editor pane horizontally or vertically by using `cmd-k right`
 or `cmd-k down`. Once you have a split pane, you can move focus between them
 with `cmd-k cmd-right` or `cmd-k cmd-down`. To close a pane, close all its
-editors with `cmd-w`, then press `cmd-w` one more time to close the pane. You
+editors with `meta-w`, then press `meta-w` one more time to close the pane. You
 can configure panes to auto-close when empty in the Settings view.
 
 ### Folding

docs/index.md

@@ -5,16 +5,13 @@
 * [Creating a Package](creating-a-package.md)
 * [Creating a Theme](creating-a-theme.md)
 * [Publishing a Package](publishing-a-package.md)
-* [Writing Specs](writing-specs.md)
 * [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
 * [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
-* [Debugging](debugging.md)
 
 ### Advanced Topics
 
 * [Configuration](advanced/configuration.md)
-* [Developing Node Modules](advanced/node-modules.md)
 * [Keymaps](advanced/keymaps.md)
 * [Serialization](advanced/serialization.md)
 * [View System](advanced/view-system.md)

docs/publishing-a-package.md

@@ -7,7 +7,7 @@ Publishing a package allows other people to install it and use it in Atom. It
 is a great way to share what you've made and get feedback and contributions from
 others.
 
-This guide assumes your package's name is `my-package` but you should pick a
+This guide assumes your package's name is `my-package` and but you should pick a
 better name.
 
 ### Install apm
@@ -24,7 +24,7 @@ apm help publish
 
 You should see a message print out with details about the `apm publish` command.
 
-If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+If you do not, launch Atom and run the _Atom > Install Shell Commmands_ menu
 to install the `apm` and `atom` commands.
 
 ### Prepare Your Package
@@ -42,7 +42,7 @@ If not, there are a few things you should check before publishing:
   * Your package is in a Git repository that has been pushed to
     [GitHub][github]. Follow [this guide][repo-guide] if your package isn't
     already on GitHub.
-
+  
 ### Publish Your Package
 
 Before you publish a package it is a good idea to check ahead of time if
@@ -59,7 +59,7 @@ Now let's review what the `apm publish` command does:
   3. Creates a new [Git tag][git-tag] for the version being published.
   4. Pushes the tag and current branch up to GitHub.
   5. Updates atom.io with the new version being published.
-
+  
 Now run the following commands to publish your package:
 
 ```sh
@@ -75,34 +75,18 @@ credentials are stored securely in your [keychain][keychain] once you login.
 :tada: Your package is now published and available on atom.io. Head on over to
 `http://atom.io/packages/my-package` to see your package's page.
 
-With `apm publish`, you can bump the version and publish by using
-```sh
-apm publish <version-type>
-```
-where `<version-type>` can be `major`, `minor` and `patch`.
-
-The `major` option to the publish command tells apm to increment the first
-digit of the version before publishing so the published version will be `1.0.0`
-and the Git tag created will be `v1.0.0`.
-
 The `minor` option to the publish command tells apm to increment the second
 digit of the version before publishing so the published version will be `0.1.0`
 and the Git tag created will be `v0.1.0`.
 
-The `patch` option to the publish command tells apm to increment the third
-digit of the version before publishing so the published version will be `0.0.1`
-and the Git tag created will be `v0.0.1`.
-
-Use `major` when you make a huge change, like a rewrite, or a large change to the functionality or interface.
-Use `minor` when adding or removing a feature.
-Use `patch` when you make a small change like a bug fix that does not add or remove features.
+In the future you can run `apm publish major` to publish the `1.0.0` version but
+since this was the first version being published it is a good idead to start
+with a minor release.
 
 ### Further Reading
 
 * Check out [semantic versioning][semver] to learn more about versioning your
   package releases.
-* Consult the [Atom.io package API docs][apm-rest-api] to learn more about how
-  `apm` works.
 
 [atomio]: https://atom.io
 [github]: https://github.com
@@ -111,4 +95,3 @@ Use `patch` when you make a small change like a bug fix that does not add or rem
 [repo-guide]: http://guides.github.com/overviews/desktop
 [semver]: http://semver.org
 [your-first-package]: your-first-package.html
-[apm-rest-api]: apm-rest-api.md

docs/writing-specs.md

@@ -1,129 +0,0 @@
-# Writing specs
-
-Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec framework. Any new functionality should have specs to guard against regressions.
-
-## Create a new spec
-
-[Atom specs](https://github.com/atom/atom/tree/master/spec) and [package specs](https://github.com/atom/markdown-preview/tree/master/spec) are added to their respective `spec` directory. The example below creates a spec for Atom core.
-
-0. Create a spec file
-
-  Spec files **must** end with `-spec` so add `sample-spec.coffee` to `atom/spec`.
-
-0. Add one or more `describe` methods
-
-  The `describe` method takes two arguments, a description and a function. If the description explains a behavior it typically begins with `when` if it is more like a unit test it begins with the method name.
-
-  ```coffee
-  describe "when a test is written", ->
-    # contents
-  ```
-
-  or
-
-  ```coffee
-  describe "Editor::moveUp", ->
-    # contents
-  ```
-
-0. Add one or more `it` method
-
-  The `it` method also takes two arguments, a description and a function. Try and make the description flow with the `it` method. For example, a description of `this should work` doesn't read well as `it this should work`. But a description of `should work` sounds great as `it should work`.
-
-  ```coffee
-  describe "when a test is written", ->
-    it "has some expectations that should pass", ->
-      # Expectations
-  ```
-
-0. Add one or more expectations
-
-  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Expectations) about them. Below is a simple example.
-
-  ```coffee
-  describe "when a test is written", ->
-    it "has some expectations that should pass", ->
-      expect("apples").toEqual("apples")
-      expect("oranges").not.toEqual("apples")
-  ```
-
-## Asynchronous specs
-
-Writing Asynchronous specs can be tricky at first. Some examples.
-
-0. Promises
-
-  Working with promises is rather easy in Atom. You can use our `waitsForPromise` function.
-
-  ```coffee
-    describe "when we open a file", ->
-      it "should be opened in an editor", ->
-        waitsForPromise ->
-          atom.workspace.open('c.coffee').then (editor) ->
-            expect(editor.getPath()).toContain 'c.coffee'
-  ```
-
-  This method can be used in the `describe`, `it`, `beforeEach` and `afterEach` functions.
-
-  ```coffee
-  describe "when we open a file", ->
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open 'c.coffee'
-
-    it "should be opened in an editor", ->
-      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'
-
-  ```
-
-  If you need to wait for multiple promises use a new `waitsForPromise` function for each promise. (Caution: Without `beforeEach` this example will fail!)
-
-  ```coffee
-  describe "waiting for the packages to load", ->
-
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open('sample.js')
-      waitsForPromise ->
-        atom.packages.activatePackage('tabs')
-      waitsForPromise ->
-        atom.packages.activatePackage('tree-view')
-
-    it 'should have waited long enough', ->
-      expect(atom.packages.isPackageActive('tabs')).toBe true
-      expect(atom.packages.isPackageActive('tree-view')).toBe true
-  ```
-
-0. Asynchronous functions with callbacks
-
-  Specs for asynchronous functions can be done using the `waitsFor` and `runs` functions. A simple example.
-
-  ```coffee
-  describe "fs.readdir(path, cb)", ->
-    it "is async", ->
-      spy = jasmine.createSpy('fs.readdirSpy')
-
-      fs.readdir('/tmp/example', spy)
-      waitsFor ->
-        spy.callCount > 0
-      runs ->
-        exp = [null, ['example.coffee']]
-        expect(spy.mostRecentCall.args).toEqual exp
-        expect(spy).toHaveBeenCalledWith(null, ['example.coffee'])
-  ```
-
-For a more detailed documentation on asynchronous tests please visit the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Asynchronous_Support).
-
-
-## Running specs
-
-Most of the time you'll want to run specs by triggering the `window:run-package-specs` command. This command is not only to run package specs, it is also for Atom core specs. This will run all the specs in the current project's spec directory. If you want to run the Atom core specs and **all** the default package specs trigger the `window:run-all-specs` command.
-
-To run a limited subset of specs use the `fdescribe` or `fit` methods. You can use those to focus a single spec or several specs. In the example above, focusing an individual spec looks like this:
-
-```coffee
-describe "when a test is written", ->
-  fit "has some expectations that should pass", ->
-    expect("apples").toEqual("apples")
-    expect("oranges").not.toEqual("apples")
-```

docs/your-first-package.md

@@ -21,7 +21,7 @@ To begin, press `cmd-shift-P` to bring up the [Command
 Palette](https://github.com/atom/command-palette). Type "generate package" and
 select the "Package Generator: Generate Package" command. Now we need to name
 the package. Try to avoid naming your package with the *atom-* prefix, for
-example we are going to call this package _ascii-art_.
+example we are going to call this package _ascii-art_. 
 
 Atom will open a new window with the contents of our new _ascii-art_ package
 displayed in the Tree View. Because this window is opened **after** the package
@@ -149,10 +149,8 @@ ASCII art professional!
 
 * [Getting your project on GitHub guide](http://guides.github.com/overviews/desktop)
 
-* [Writing specs](writing-specs.md) for your package
-
 * [Creating a package guide](creating-a-package.html) for more information
   on the mechanics of packages
 
-* [Publishing a package guide](publishing-a-package.html) for more information
+* [Publishing a package guide](publish-a-package.html) for more information
   on publishing your package to [atom.io](https://atom.io)

dot-atom/.gitignore

@@ -1,5 +0,0 @@
-storage
-compile-cache
-dev
-.npm
-.node-gyp

dot-atom/keymap.cson

@@ -12,7 +12,7 @@
 # '.editor':
 #   'enter': 'editor:newline'
 #
-# '.workspace':
+# 'body':
 #   'ctrl-P': 'core:move-up'
 #   'ctrl-p': 'core:move-down'
 #

exports/atom.coffee

@@ -15,15 +15,10 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.$ = $
   module.exports.$$ = $$
   module.exports.$$$ = $$$
-  if atom.config.get('core.useReactMiniEditors')
-    module.exports.EditorView = require '../src/react-editor-view'
-  else
-    module.exports.EditorView = require '../src/editor-view'
+  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'
   module.exports.View = View
   module.exports.WorkspaceView = require '../src/workspace-view'
   module.exports.Workspace = require '../src/workspace'
-  module.exports.React = require 'react-atom-fork'
-  module.exports.Reactionary = require 'reactionary-atom-fork'

keymaps/base.cson

@@ -1,10 +1,17 @@
 '.editor':
   # Platform Bindings
+  'alt-left': 'editor:move-to-beginning-of-word'
+  'alt-right': 'editor:move-to-end-of-word'
+  'alt-shift-left': 'editor:select-to-beginning-of-word'
+  'alt-shift-right': 'editor:select-to-end-of-word'
   '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'
 
+  # Sublime Parity
+  'ctrl-t': 'editor:transpose'
+
 '.editor:not(.mini)':
   # Atom Specific
   'ctrl-C': 'editor:copy-path'
@@ -12,9 +19,10 @@
   # Sublime Parity
   'tab': 'editor:indent'
   'enter': 'editor:newline'
-  'num-enter': 'editor:newline'
   'shift-tab': 'editor:outdent-selected-rows'
   'ctrl-K': 'editor:delete-line'
+  'ctrl-shift-up': 'editor:add-selection-above'
+  'ctrl-shift-down': 'editor:add-selection-below'
 
 '.tool-panel.panel-left, .tool-panel.panel-right':
   'escape': 'tool-panel:unfocus'
@@ -27,7 +35,6 @@
   '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,7 +21,6 @@
   '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'
@@ -53,10 +52,7 @@
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
-  'shift-delete': 'core:delete'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
@@ -69,10 +65,6 @@
   'cmd-}': 'pane:show-next-item'
   'cmd-alt-left': 'pane:show-previous-item'
   'cmd-alt-right': 'pane:show-next-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
-  'ctrl-tab': 'pane:show-next-item'
-  'ctrl-shift-tab': 'pane:show-previous-item'
   'cmd-=': 'window:increase-font-size'
   'cmd-+': 'window:increase-font-size'
   'cmd--': 'window:decrease-font-size'
@@ -102,23 +94,16 @@
   'cmd-9': 'pane:show-item-9'
 
 '.editor':
-  # Platform Bindings
-  'alt-left': 'editor:move-to-beginning-of-word'
-  'alt-right': 'editor:move-to-end-of-word'
-  'alt-shift-left': 'editor:select-to-beginning-of-word'
-  'alt-shift-right': 'editor:select-to-end-of-word'
-
   # Apple Specific
-  'cmd-backspace': 'editor:delete-to-beginning-of-line'
-  'cmd-shift-backspace': 'editor:delete-to-beginning-of-line'
-  'cmd-delete': 'editor:delete-to-beginning-of-line'
+  'cmd-backspace': 'editor:backspace-to-beginning-of-line'
+  'cmd-delete': 'editor:backspace-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'
   'cmd-right': 'editor:move-to-end-of-screen-line'
   'cmd-shift-left': 'editor:select-to-first-character-of-line'
   'cmd-shift-right': 'editor:select-to-end-of-line'
-  'alt-backspace': 'editor:delete-to-beginning-of-word'
+  'alt-backspace': 'editor:backspace-to-beginning-of-word'
   'alt-delete': 'editor:delete-to-end-of-word'
   'ctrl-a': 'editor:move-to-beginning-of-line'
   'ctrl-e': 'editor:move-to-end-of-line'
@@ -133,7 +118,6 @@
   'cmd-k cmd-u': 'editor:upper-case'
   'cmd-k cmd-l': 'editor:lower-case'
   'cmd-l': 'editor:select-line'
-  'ctrl-t': 'editor:transpose'
 
 '.workspace .editor:not(.mini)':
   # Atom specific
@@ -152,8 +136,6 @@
   'cmd-j': 'editor:join-lines'
   'cmd-D': 'editor:duplicate-lines'
   'cmd-L': 'editor:split-selections-into-lines'
-  'ctrl-shift-up': 'editor:add-selection-above'
-  'ctrl-shift-down': 'editor:add-selection-below'
 
   'cmd-alt-[': 'editor:fold-current-row'
   'cmd-alt-]': 'editor:unfold-current-row'

keymaps/emacs.cson

@@ -3,5 +3,5 @@
   'alt-F': 'editor:select-to-end-of-word'
   'alt-b': 'editor:move-to-beginning-of-word'
   'alt-B': 'editor:select-to-beginning-of-word'
-  'alt-h': 'editor:delete-to-beginning-of-word'
+  'alt-h': 'editor:backspace-to-beginning-of-word'
   'alt-d': 'editor:delete-to-end-of-word'

keymaps/linux.cson

@@ -1,141 +0,0 @@
-'body':
-  # Atom Specific
-  'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
-  'escape': 'core:cancel'
-  'up': 'core:move-up'
-  'down': 'core:move-down'
-  'left': 'core:move-left'
-  'right': 'core:move-right'
-  'ctrl-alt-r': 'window:reload'
-  'ctrl-shift-i': 'window:toggle-dev-tools'
-  'ctrl-alt-p': 'window:run-package-specs'
-  'ctrl-alt-s': 'application:run-all-specs'
-  'ctrl-shift-o': 'application:open-dev'
-  'F11': 'window:toggle-full-screen'
-
-  # Sublime Parity
-  'ctrl-N': 'application:new-window'
-  'ctrl-W': 'window:close'
-  'ctrl-o': 'application:open-file'
-  'ctrl-q': 'application:quit'
-  'ctrl-T': 'pane:reopen-closed-item'
-  'ctrl-n': 'application:new-file'
-  'ctrl-s': 'core:save'
-  'ctrl-S': 'core:save-as'
-  'ctrl-w': 'core:close'
-  'ctrl-z': 'core:undo'
-  'ctrl-y': 'core:redo'
-  'ctrl-shift-z': 'core:redo'
-  'ctrl-x': 'core:cut'
-  'ctrl-c': 'core:copy'
-  'ctrl-v': 'core:paste'
-  'ctrl-insert': 'core:copy'
-  'shift-insert': 'core:paste'
-  'shift-up': 'core:select-up'
-  'shift-down': 'core:select-down'
-  'shift-left': 'core:select-left'
-  'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
-  'delete': 'core:delete'
-  'shift-delete': 'core:cut'
-  'pageup': 'core:page-up'
-  'pagedown': 'core:page-down'
-  'backspace': 'core:backspace'
-  'shift-backspace': 'core:backspace'
-  'ctrl-tab': 'pane:show-next-item'
-  'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
-  'ctrl-shift-up': 'core:move-up'
-  'ctrl-shift-down': 'core:move-down'
-  'ctrl-=': 'window:increase-font-size'
-  'ctrl-+': 'window:increase-font-size'
-  'ctrl--': 'window:decrease-font-size'
-  'ctrl-_': 'window:decrease-font-size'
-  'ctrl-0': 'window:reset-font-size'
-
-  'ctrl-k up': 'pane:split-up' # Atom Specific
-  'ctrl-k down': 'pane:split-down' # Atom Specific
-  'ctrl-k left': 'pane:split-left' # Atom Specific
-  'ctrl-k right': 'pane:split-right' # Atom Specific
-  'ctrl-k ctrl-w': 'pane:close' # Atom Specific
-  'ctrl-k alt-ctrl-w': 'pane:close-other-items' # Atom Specific
-  'ctrl-k ctrl-p': 'window:focus-previous-pane'
-  'ctrl-k ctrl-n': 'window:focus-next-pane'
-  'ctrl-k ctrl-up':    'window:focus-pane-above'
-  'ctrl-k ctrl-down':  'window:focus-pane-below'
-  'ctrl-k ctrl-left':  'window:focus-pane-on-left'
-  'ctrl-k ctrl-right': 'window:focus-pane-on-right'
-  'alt-1': 'pane:show-item-1'
-  'alt-2': 'pane:show-item-2'
-  'alt-3': 'pane:show-item-3'
-  'alt-4': 'pane:show-item-4'
-  'alt-5': 'pane:show-item-5'
-  'alt-6': 'pane:show-item-6'
-  'alt-7': 'pane:show-item-7'
-  'alt-8': 'pane:show-item-8'
-  'alt-9': 'pane:show-item-9'
-
-'.workspace .editor':
-  # Platform Bindings
-  'ctrl-left': 'editor:move-to-beginning-of-word'
-  'ctrl-right': 'editor:move-to-end-of-word'
-  'ctrl-shift-left': 'editor:select-to-beginning-of-word'
-  'ctrl-shift-right': 'editor:select-to-end-of-word'
-  'ctrl-backspace': 'editor:delete-to-beginning-of-word'
-  'ctrl-delete': 'editor:delete-to-end-of-word'
-  'ctrl-home': 'core:move-to-top'
-  'ctrl-end': 'core:move-to-bottom'
-  'ctrl-shift-home': 'core:select-to-top'
-  'ctrl-shift-end': 'core:select-to-bottom'
-
-  # Sublime Parity
-  'ctrl-a': 'core:select-all'
-  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
-  'ctrl-k ctrl-u': 'editor:upper-case'
-  'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'
-
-'.workspace .editor:not(.mini)':
-  # Atom specific
-  'alt-ctrl-z': 'editor:checkout-head-revision'
-  'ctrl-<': 'editor:scroll-to-cursor'
-  'alt-ctrl-f': 'editor:fold-selection'
-
-  # Sublime Parity
-  'ctrl-enter': 'editor:newline-below'
-  'ctrl-shift-enter': 'editor:newline-above'
-  'ctrl-]': 'editor:indent-selected-rows'
-  'ctrl-[': 'editor:outdent-selected-rows'
-  'ctrl-up': 'editor:move-line-up'
-  'ctrl-down': 'editor:move-line-down'
-  'ctrl-/': 'editor:toggle-line-comments'
-  'ctrl-j': 'editor:join-lines'
-  'ctrl-D': 'editor:duplicate-lines'
-  'alt-shift-up': 'editor:add-selection-above'
-  'alt-shift-down': 'editor:add-selection-below'
-
-  'ctrl-alt-[': 'editor:fold-current-row'
-  'ctrl-alt-]': 'editor:unfold-current-row'
-  'ctrl-alt-{': 'editor:fold-all' # Atom Specific
-  'ctrl-alt-}': 'editor:unfold-all' # Atom Specific
-  'ctrl-k ctrl-0': 'editor:unfold-all'
-  'ctrl-k ctrl-1': 'editor:fold-at-indent-level-1'
-  'ctrl-k ctrl-2': 'editor:fold-at-indent-level-2'
-  'ctrl-k ctrl-3': 'editor:fold-at-indent-level-3'
-  'ctrl-k ctrl-4': 'editor:fold-at-indent-level-4'
-  'ctrl-k ctrl-5': 'editor:fold-at-indent-level-5'
-  'ctrl-k ctrl-6': 'editor:fold-at-indent-level-6'
-  'ctrl-k ctrl-7': 'editor:fold-at-indent-level-7'
-  'ctrl-k ctrl-8': 'editor:fold-at-indent-level-8'
-  'ctrl-k ctrl-9': 'editor:fold-at-indent-level-9'
-
-# allow standard input fields to work correctly
-'body .native-key-bindings':
-  'ctrl-z': 'native!'
-  'ctrl-Z': 'native!'
-  'ctrl-x': 'native!'
-  'ctrl-c': 'native!'
-  'ctrl-v': 'native!'

keymaps/win32.cson

@@ -1,11 +1,6 @@
 'body':
-  # Platform Bindings
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
-
   # Atom Specific
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -15,47 +10,33 @@
   'ctrl-alt-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
   'ctrl-alt-s': 'application:run-all-specs'
-  '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'
+  'ctrl-o': 'application:open'
   'ctrl-T': 'pane:reopen-closed-item'
   'ctrl-n': 'application:new-file'
   'ctrl-s': 'core:save'
   'ctrl-S': 'core:save-as'
   'ctrl-w': 'core:close'
-  'ctrl-f4': 'core:close'
   'ctrl-z': 'core:undo'
-  'ctrl-shift-z': 'core:redo'
   'ctrl-y': 'core:redo'
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
   'ctrl-v': 'core:paste'
-  'ctrl-insert': 'core:copy'
-  'shift-insert': 'core:paste'
   'shift-up': 'core:select-up'
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
-  'shift-delete': 'core:cut'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
-  'shift-backspace': 'core:backspace'
   'ctrl-tab': 'pane:show-next-item'
   'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
   'ctrl-shift-up': 'core:move-up'
   'ctrl-shift-down': 'core:move-down'
-  'ctrl-alt-up': 'editor:add-selection-above'
-  'ctrl-alt-down': 'editor:add-selection-below'
   'ctrl-=': 'window:increase-font-size'
   'ctrl-+': 'window:increase-font-size'
   'ctrl--': 'window:decrease-font-size'
@@ -76,24 +57,14 @@
   'ctrl-k ctrl-right': 'window:focus-pane-on-right'
 
 '.workspace .editor':
-  # Platform Bindings
-  'ctrl-left': 'editor:move-to-beginning-of-word'
-  'ctrl-right': 'editor:move-to-end-of-word'
-  'ctrl-shift-left': 'editor:select-to-beginning-of-word'
-  'ctrl-shift-right': 'editor:select-to-end-of-word'
-  'ctrl-backspace': 'editor:delete-to-beginning-of-word'
-  'ctrl-delete': 'editor:delete-to-end-of-word'
-  'ctrl-home': 'core:move-to-top'
-  'ctrl-end': 'core:move-to-bottom'
-  'ctrl-shift-home': 'core:select-to-top'
-  'ctrl-shift-end': 'core:select-to-bottom'
+  # Windows specific
+  'ctrl-delete': 'editor:backspace-to-beginning-of-word'
 
   # Sublime Parity
   'ctrl-a': 'core:select-all'
-  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
+  'ctrl-alt-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'
 
 '.workspace .editor:not(.mini)':
   # Atom specific

menus/darwin.cson

@@ -4,10 +4,10 @@
     submenu: [
       { label: 'About Atom', command: 'application:about' }
       { label: 'View License', command: 'application:open-license' }
-      { label: 'VERSION', enabled: false }
-      { label: 'Restart and Install Update', command: 'application:install-update', visible: false}
-      { label: 'Check for Update', command: 'application:check-for-update', visible: false}
-      { label: 'Downloading Update', enabled: false, visible: false}
+      { label: "VERSION", enabled: false }
+      { label: "Restart and Install Update", command: 'application:install-update', visible: false}
+      { label: "Check for Update", command: 'application:check-for-update', visible: false}
+      { label: "Downloading Update", command: 'application:check-for-update', enabled: false, visible: false}
       { type: 'separator' }
       { label: 'Preferences...', command: 'application:show-settings' }
       { label: 'Open Your Config', command: 'application:open-your-config' }
@@ -37,8 +37,8 @@
       { label: 'Save As...', command: 'core:save-as' }
       { label: 'Save All', command: 'window:save-all' }
       { type: 'separator' }
-      { label: 'Close Tab', command: 'core:close' }
-      { label: 'Close Pane', command: 'pane:close' }
+      { label: 'Close Buffer', command: 'core:close' }
+      { label: 'Close All Buffers', command: 'pane:close' }
       { label: 'Close Window', command: 'window:close' }
     ]
   }
@@ -109,7 +109,6 @@
     submenu: [
       { label: 'Add Selection Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection Below', command: 'editor:add-selection-below' }
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { label: 'Split into Lines', command: 'editor:split-selections-into-lines'}
       { type: 'separator' }
       { label: 'Select to Top', command: 'core:select-to-top' }
@@ -135,25 +134,6 @@
     submenu: [
       { label: 'Reload', command: 'window:reload' }
       { label: 'Toggle Full Screen', command: 'window:toggle-full-screen' }
-      {
-        label: 'Panes'
-        submenu: [
-          { 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' }
-          { label: 'Focus Next Pane', command: 'window:focus-next-pane' }
-          { label: 'Focus Previous Pane', command: 'window:focus-previous-pane' }
-          { type: 'separator' }
-          { label: 'Focus Pane Above', command: 'window:focus-pane-above' }
-          { label: 'Focus Pane Below', command: 'window:focus-pane-below' }
-          { 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: 'Developer'
         submenu: [
@@ -186,7 +166,6 @@
   {
     label: 'Help'
     submenu: [
-      { label: 'Terms of Use', command: 'application:open-terms-of-use' }
       { label: 'Documentation', command: 'application:open-documentation' }
       { type: 'separator' }
     ]

menus/linux.cson

@@ -1,157 +0,0 @@
-'menu': [
-  {
-    label: '&File'
-    submenu: [
-      { label: 'New &Window', command: 'application:new-window' }
-      { label: '&New File', command: 'application:new-file' }
-      { label: '&Open File...', command: 'application:open-file' }
-      { 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' }
-      { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
-      { label: 'Clos&e Window', command: 'window:close' }
-      { type: 'separator' }
-      { label: 'Quit', command: 'application:quit' }
-    ]
-  }
-
-  {
-    label: '&Edit'
-    submenu: [
-      { label: '&Undo', command: 'core:undo' }
-      { label: '&Redo', command: 'core:redo' }
-      { type: 'separator' }
-      { 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' }
-      { type: 'separator' }
-      { label: '&Toggle Comments', command: 'editor:toggle-line-comments' }
-      {
-        label: 'Lines',
-        submenu: [
-          { label: '&Indent', command: 'editor:indent-selected-rows' }
-          { label: '&Outdent', command: 'editor:outdent-selected-rows' }
-          { label: '&Auto Indent', command: 'editor:auto-indent' }
-          { type: 'separator' }
-          { label: 'Move Line &Up', command: 'editor:move-line-up' }
-          { label: 'Move Line &Down', command: 'editor:move-line-down' }
-          { label: 'Du&plicate Lines', command: 'editor:duplicate-lines' }
-          { label: 'D&elete Line', command: 'editor:delete-line' }
-          { label: '&Join Lines', command: 'editor:join-lines' }
-        ]
-      }
-      {
-        label: 'Text',
-        submenu: [
-          { label: '&Upper Case', command: 'editor:upper-case' }
-          { label: '&Lower Case', command: 'editor:lower-case' }
-          { type: 'separator' }
-          { label: 'Delete to End of &Word', command: 'editor:delete-to-end-of-word' }
-          { label: '&Delete Line', command: 'editor:delete-line' }
-          { type: 'separator' }
-          { label: '&Transpose', command: 'editor:transpose' }
-        ]
-      }
-      {
-        label: 'Folding',
-        submenu: [
-          { label: '&Fold', command: 'editor:fold-current-row' }
-          { label: '&Unfold', command: 'editor:unfold-current-row' }
-          { label: 'Unfold &All', command: 'editor:unfold-all' }
-          { type: 'separator' }
-          { label: 'Fol&d All', command: 'editor:fold-all' }
-          { label: 'Fold Level 1', command: 'editor:fold-at-indent-level-1' }
-          { label: 'Fold Level 2', command: 'editor:fold-at-indent-level-2' }
-          { label: 'Fold Level 3', command: 'editor:fold-at-indent-level-3' }
-          { label: 'Fold Level 4', command: 'editor:fold-at-indent-level-4' }
-          { label: 'Fold Level 5', command: 'editor:fold-at-indent-level-5' }
-          { label: 'Fold Level 6', command: 'editor:fold-at-indent-level-6' }
-          { label: 'Fold Level 7', command: 'editor:fold-at-indent-level-7' }
-          { label: 'Fold Level 8', command: 'editor:fold-at-indent-level-8' }
-          { label: 'Fold Level 9', command: 'editor:fold-at-indent-level-9' }
-        ]
-      }
-    ]
-  }
-
-  {
-    label: '&View'
-    submenu: [
-      { label: '&Reload', command: 'window:reload' }
-      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      {
-        label: 'Developer'
-        submenu: [
-          { label: 'Open In &Dev Mode...', command: 'application:open-dev' }
-          { label: 'Run &Atom Specs', command: 'application:run-all-specs' }
-          { label: 'Run Package &Specs', command: 'window:run-package-specs' }
-          { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' }
-        ]
-      }
-      { type: 'separator' }
-      { label: 'Toggle Soft &Wrap', command: 'editor:toggle-soft-wrap' }
-    ]
-  }
-
-  {
-    label: '&Selection'
-    submenu: [
-      { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
-      { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
-      { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
-      { type: 'separator' }
-      { label: 'Select to &Top', command: 'core:select-to-top' }
-      { label: 'Select to Botto&m', command: 'core:select-to-bottom' }
-      { type: 'separator' }
-      { label: 'Select &Line', command: 'editor:select-line' }
-      { label: 'Select &Word', command: 'editor:select-word' }
-      { label: 'Select to Beginning of W&ord', command: 'editor:select-to-beginning-of-word' }
-      { label: 'Select to Beginning of L&ine', command: 'editor:select-to-beginning-of-line' }
-      { label: 'Select to First &Character of Line', command: 'editor:select-to-first-character-of-line' }
-      { label: 'Select to End of Wor&d', command: 'editor:select-to-end-of-word' }
-      { label: 'Select to End of Lin&e', command: 'editor:select-to-end-of-line' }
-    ]
-  }
-
-  {
-    label: 'F&ind'
-    submenu: []
-  }
-
-  {
-    label: '&Packages'
-    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: [
-      { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
-      { label: 'View &License', command: 'application:open-license' }
-      { label: "VERSION", enabled: false }
-      { type: 'separator' }
-      { label: '&Documentation', command: 'application:open-documentation' }
-      { type: 'separator' }
-    ]
-  }
-]

menus/win32.cson

@@ -4,23 +4,17 @@
     submenu: [
       { label: 'New &Window', command: 'application:new-window' }
       { label: '&New File', command: 'application:new-file' }
-      { label: '&Open File...', command: 'application:open-file' }
-      { label: 'Open Folder...', command: 'application:open-folder' }
+      { label: '&Open...', command: 'application:open' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
-      { label: 'Se&ttings', 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' }
+      { 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' }
       { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
       { label: 'Clos&e Window', command: 'window:close' }
       { type: 'separator' }
       { label: 'E&xit', command: 'application:quit' }
@@ -93,25 +87,6 @@
     submenu: [
       { label: '&Reload', command: 'window:reload' }
       { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      {
-        label: 'Panes'
-        submenu: [
-          { 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' }
-          { label: 'Focus Next Pane', command: 'window:focus-next-pane' }
-          { label: 'Focus Previous Pane', command: 'window:focus-previous-pane' }
-          { type: 'separator' }
-          { label: 'Focus Pane Above', command: 'window:focus-pane-above' }
-          { label: 'Focus Pane Below', command: 'window:focus-pane-below' }
-          { 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: 'Developer'
         submenu: [
@@ -132,7 +107,6 @@
       { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
       { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { type: 'separator' }
       { label: 'Select to &Top', command: 'core:select-to-top' }
       { label: 'Select to Botto&m', command: 'core:select-to-bottom' }
@@ -170,9 +144,10 @@
   {
     label: '&Help'
     submenu: [
-      { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
+      { label: '&About Atom...', command: 'application:about' }
       { label: 'View &License', command: 'application:open-license' }
       { label: "VERSION", enabled: false }
+      { label: "Install &update", command: 'application:install-update', visible: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
       { type: 'separator' }

package.json

@@ -1,8 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.121.0",
-  "description": "A hackable text editor for the 21st Century.",
+  "version": "0.70.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -11,134 +10,122 @@
   "bugs": {
     "url": "https://github.com/atom/atom/issues"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
-    }
-  ],
-  "atomShellVersion": "0.15.0",
+  "license": "All Rights Reserved",
+  "atomShellVersion": "0.10.6",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^1.0.0",
-    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
+    "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
-    "delegato": "^1",
-    "emissary": "^1.2.1",
-    "first-mate": "^2.0.1",
-    "fs-plus": "^2.2.6",
+    "delegato": "1.x",
+    "emissary": "1.x",
+    "first-mate": ">=1.4 <2.0",
+    "fs-plus": "2.x",
     "fstream": "0.1.24",
-    "fuzzaldrin": "^1.1",
-    "git-utils": "^2.1.3",
-    "grim": "0.11.0",
+    "fuzzaldrin": "~1.1",
+    "git-utils": "1.x",
     "guid": "0.0.10",
-    "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.13.0",
-    "mixto": "^1",
+    "jasmine-tagged": ">=1.1.1 <2.0",
     "mkdirp": "0.3.5",
-    "nslog": "^1.0.1",
-    "oniguruma": "^3.0.3",
+    "keytar": "0.15.1",
+    "less-cache": "0.12.0",
+    "mixto": "1.x",
+    "nslog": "0.5.0",
+    "oniguruma": "1.x",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.0.6",
-    "property-accessors": "^1",
-    "q": "^1.0.1",
+    "pathwatcher": "0.16.0",
+    "pegjs": "0.8.0",
+    "property-accessors": "1.x",
+    "q": "1.0.x",
     "random-words": "0.0.1",
-    "react-atom-fork": "^0.11.1",
-    "reactionary-atom-fork": "^1.0.0",
-    "runas": "1.0.1",
-    "scandal": "1.0.0",
-    "scoped-property-store": "^0.9.0",
-    "scrollbar-style": "^1.0.1",
-    "season": "^1.0.2",
+    "runas": "0.5.x",
+    "scandal": "0.15.0",
+    "scrollbar-style": "^0.1.0",
+    "season": ">=1.0.2 <2.0",
     "semver": "1.1.4",
-    "serializable": "^1",
-    "space-pen": "3.2.0",
-    "temp": "0.7.0",
-    "text-buffer": "^3.0.0",
-    "theorist": "^1",
-    "underscore-plus": "^1.5.1",
+    "serializable": "1.x",
+    "space-pen": "3.1.1",
+    "temp": "0.5.0",
+    "text-buffer": "^1.4.2",
+    "theorist": "1.x",
+    "underscore-plus": ">=1.0.2 <2.0",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "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.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.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",
+    "atom-dark-syntax": "0.15.0",
+    "atom-dark-ui": "0.23.0",
+    "atom-light-syntax": "0.15.0",
+    "atom-light-ui": "0.22.0",
+    "base16-tomorrow-dark-theme": "0.13.0",
+    "solarized-dark-syntax": "0.12.0",
+    "solarized-light-syntax": "0.7.0",
+    "archive-view": "0.26.0",
+    "autocomplete": "0.27.0",
+    "autoflow": "0.15.0",
+    "autosave": "0.12.0",
+    "background-tips": "0.9.0",
+    "bookmarks": "0.21.0",
+    "bracket-matcher": "0.25.0",
+    "command-palette": "0.19.0",
+    "dev-live-reload": "0.28.0",
+    "exception-reporting": "0.17.0",
+    "feedback": "0.28.0",
+    "find-and-replace": "0.89.1",
+    "fuzzy-finder": "0.39.0",
+    "git-diff": "0.25.0",
+    "go-to-line": "0.18.0",
+    "grammar-selector": "0.23.0",
+    "image-view": "0.29.0",
+    "keybinding-resolver": "0.11.0",
+    "link": "0.20.0",
+    "markdown-preview": "0.47.0",
+    "metrics": "0.30.0",
+    "open-on-github": "0.23.0",
+    "package-generator": "0.30.0",
+    "release-notes": "0.26.0",
+    "settings-view": "0.90.0",
+    "snippets": "0.35.0",
+    "spell-check": "0.28.0",
+    "status-bar": "0.35.0",
+    "styleguide": "0.26.0",
+    "symbols-view": "0.41.0",
+    "tabs": "0.28.0",
+    "timecop": "0.17.0",
+    "tree-view": "0.76.0",
     "update-package-dependencies": "0.6.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",
+    "welcome": "0.11.0",
+    "whitespace": "0.18.0",
+    "wrap-guide": "0.17.0",
+    "language-c": "0.13.0",
+    "language-coffee-script": "0.15.0",
+    "language-css": "0.13.0",
+    "language-gfm": "0.19.0",
     "language-git": "0.9.0",
-    "language-go": "0.16.0",
-    "language-html": "0.22.0",
-    "language-hyperlink": "0.10.0",
-    "language-java": "0.11.0",
-    "language-javascript": "0.39.0",
+    "language-go": "0.7.0",
+    "language-html": "0.11.0",
+    "language-hyperlink": "0.8.0",
+    "language-java": "0.9.0",
+    "language-javascript": "0.17.0",
     "language-json": "0.8.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.15.0",
+    "language-less": "0.6.0",
+    "language-make": "0.9.0",
+    "language-objective-c": "0.10.0",
+    "language-perl": "0.8.0",
+    "language-php": "0.10.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.18.0",
-    "language-ruby": "0.33.0",
-    "language-ruby-on-rails": "0.15.0",
-    "language-sass": "0.14.0",
+    "language-python": "0.12.0",
+    "language-ruby": "0.15.0",
+    "language-ruby-on-rails": "0.10.0",
+    "language-sass": "0.8.0",
     "language-shellscript": "0.8.0",
-    "language-source": "0.8.0",
-    "language-sql": "0.9.0",
+    "language-source": "0.7.0",
+    "language-sql": "0.7.0",
     "language-text": "0.6.0",
-    "language-todo": "0.10.0",
-    "language-toml": "0.12.0",
-    "language-xml": "0.17.0",
-    "language-yaml": "0.13.0"
+    "language-todo": "0.6.0",
+    "language-toml": "0.11.0",
+    "language-xml": "0.8.0",
+    "language-yaml": "0.6.0"
   },
   "private": true,
   "scripts": {

resources/linux/Atom.desktop.in

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Atom
-Comment=<%= description %>
-Exec=<%= installDir %>/share/atom/atom %U
-Icon=<%= iconName %>
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;TextEditor;

resources/linux/debian/control.in

@@ -1,8 +0,0 @@
-Package: <%= name %>
-Version: <%= version %>
-Section: <%= section %>
-Priority: optional
-Architecture: <%= arch %>
-Installed-Size: `du -ks usr|cut -f 1`
-Maintainer: <%= maintainer %>
-Description: <%= description %>

script/bootstrap

@@ -1,8 +1,6 @@
-#!/usr/bin/env node
-
-var fs = require('fs');
-var verifyRequirements = require('./utils/verify-requirements');
+#!/usr/bin/env node --harmony_collections
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
+var fs = require('fs');
 var path = require('path');
 
 // Executes an array of commands one by one.
@@ -10,90 +8,39 @@ function executeCommands(commands, done, index) {
   index = (index == undefined ? 0 : index);
   if (index < commands.length) {
     var command = commands[index];
-    if (command.message)
-      console.log(command.message);
     var options = null;
     if (typeof command !== 'string') {
       options = command.options;
       command = command.command;
     }
     safeExec(command, options, executeCommands.bind(this, commands, done, index + 1));
-  }
-  else
+  } else
     done(null);
 }
 
-function bootstrap() {
-  var apmInstallPath = path.resolve(__dirname, '..', 'apm');
-  if (!fs.existsSync(apmInstallPath))
-    fs.mkdirSync(apmInstallPath);
-  if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
-    fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
+var apmVendorPath = path.resolve(__dirname, '..', 'vendor', 'apm');
+var apmInstallPath = path.resolve(__dirname, '..', 'apm');
+if (!fs.existsSync(apmInstallPath))
+  fs.mkdirSync(apmInstallPath);
+if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
+  fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
-  var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
-  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? ' --no-color' : '';
+var apmPath = 'apm/node_modules/atom-package-manager/bin/apm'
+var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
+var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season'];
+var npmCommand = 'npm --userconfig=' + path.resolve('.npmrc') + ' ';
+var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
+var commands = [
+  'git submodule --quiet sync',
+  'git submodule --quiet update --recursive --init',
+  {command: npmCommand + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
+  echoNewLine,
+  apmPath + ' clean ' + apmFlags,
+  apmPath + ' install --quiet ' + apmFlags,
+  apmPath + ' dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
+];
 
-  var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
-  var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
-  var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
-
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];
-
-  var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
-  var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
-  var apmInstallCommand = npmPath + npmFlags + 'install';
-  var apmInstallOptions = {cwd: apmInstallPath};
-  var moduleInstallCommand = apmPath + ' install' + apmFlags;
-  var dedupeApmCommand = apmPath + ' dedupe' + apmFlags;
-  var dedupeNpmCommand = npmPath + npmFlags + 'dedupe';
-
-  if (process.argv.indexOf('--no-quiet') === -1) {
-    buildInstallCommand  += ' --quiet';
-    apmInstallCommand    += ' --quiet';
-    moduleInstallCommand += ' --quiet';
-    dedupeApmCommand     += ' --quiet';
-    dedupeNpmCommand     += ' --quiet';
-    buildInstallOptions.ignoreStdout = true;
-    apmInstallOptions.ignoreStdout = true;
-  }
-
-  // apm ships with 32-bit node so make sure its native modules are compiled
-  // for a 32-bit target architecture
-  if (process.env.JANKY_SHA1 && process.platform === 'win32')
-    apmInstallCommand += ' --arch=ia32';
-
-  var commands = [
-    {
-      command: buildInstallCommand,
-      message: 'Installing build modules...',
-      options: buildInstallOptions
-    },
-    {
-      command: apmInstallCommand,
-      message: 'Installing apm...',
-      options: apmInstallOptions
-    },
-    apmPath + ' clean' + apmFlags,
-    moduleInstallCommand,
-    dedupeApmCommand + ' ' + packagesToDedupe.join(' '),
-    {
-      command: dedupeNpmCommand + ' request semver',
-      options: {
-        cwd: path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager')
-      }
-    },
-  ];
-
-  process.chdir(path.dirname(__dirname));
-  executeCommands(commands, process.exit);
-}
-
-verifyRequirements(function(error, successMessage) {
-  if (error) {
-    console.log(error);
-    process.exit(1);
-  }
-
-  console.log(successMessage);
-  bootstrap();
-});
+process.chdir(path.dirname(__dirname));
+executeCommands(commands, process.exit);

script/build

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --harmony_collections
 var cp = require('./utils/child-process-wrapper.js');
 var path = require('path');
 

script/cibuild

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --harmony_collections
 var cp = require('./utils/child-process-wrapper.js');
 var fs = require('fs');
 var path = require('path');
@@ -19,34 +19,26 @@ function loadEnvironmentVariables(filePath) {
       var value = parts[1].trim().substr(1, parts[1].length - 2);
       process.env[key] = value;
     }
-  } catch(error) {
-    console.error("Failed to load environment variables: " + filePath, error.code);
-  }
+  } catch(error) { }
 }
 
 function readEnvironmentVariables() {
-  if (process.platform === 'win32')
-    loadEnvironmentVariables(path.resolve('/jenkins/config/atomcredentials'));
-  else {
-    loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials');
-    loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain');
-  }
+  loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials')
+  loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain')
 }
 
 readEnvironmentVariables();
-cp.safeExec.bind(global, 'npm install npm', {cwd: path.resolve(__dirname, '..', 'build')}, function() {
-  cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
-    if (error)
-      process.exit(1);
-    require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom'))
-    var async = require('async');
-    var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
-    var tasks = [
-      cp.safeExec.bind(global, 'git clean -dff'),
-      cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
-    ]
-    async.series(tasks, function(error) {
-      process.exit(error ? 1 : 0);
-    });
-  })();
+cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
+  if (error)
+    process.exit(1);
+  require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom'))
+  var async = require('async');
+  var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+  var tasks = [
+    cp.safeExec.bind(global, 'git clean -dff'),
+    cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
+  ]
+  async.series(tasks, function(error) {
+    process.exit(error ? 1 : 0);
+  });
 })();

script/clean

@@ -1,15 +1,14 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --harmony_collections
 var cp = require('./utils/child-process-wrapper.js');
-var fs = require('fs');
 var path = require('path');
 var os = require('os');
 
-var removeCommand = process.platform === 'win32' ? 'rmdir /S /Q ' : 'rm -rf ';
+var removeCommand = process.platform === 'win32' ? 'del /F /Q /S ' : 'rm -rf ';
 var productName = require('../package.json').productName;
 
 process.chdir(path.dirname(__dirname));
 var home = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
-var tmpdir = os.tmpdir();
+var tmpdir = process.platform === 'win32' ? os.tmpdir() : '/tmp';
 
 // Windows: Use START as a way to ignore error if Atom.exe isnt running
 var killatom = process.platform === 'win32' ? 'START taskkill /F /IM ' + productName + '.exe' : 'pkill -9 ' + productName + ' || true';
@@ -19,28 +18,21 @@ var commands = [
   [__dirname, '..', 'node_modules'],
   [__dirname, '..', 'build', 'node_modules'],
   [__dirname, '..', 'apm', 'node_modules'],
+  [__dirname, '..', 'vendor', 'apm', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],
   [home, '.atom', '.npm'],
-  [home, '.atom', 'compile-cache'],
-  [home, '.atom', 'atom-shell'],
   [tmpdir, 'atom-build'],
   [tmpdir, 'atom-cached-atom-shells'],
+  [tmpdir, 'atom-compile-cache'],
 ];
 var run = function() {
   var next = commands.shift();
   if (!next)
     process.exit(0);
-
-  if (Array.isArray(next)) {
-    var pathToRemove = path.resolve.apply(path.resolve, next);
-    if (fs.existsSync(pathToRemove))
-      next = removeCommand + pathToRemove;
-    else
-      return run();
-  }
-
+  if (Array.isArray(next))
+    next = removeCommand + path.resolve.apply(path.resolve, next);
   cp.safeExec(next, run);
 };
 run();

script/grunt

@@ -1,17 +1,9 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --harmony_collections
 var cp = require('./utils/child-process-wrapper.js');
-var fs = require('fs');
 var path = require('path');
 
 // node build/node_modules/.bin/grunt "$@"
 var gruntPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
-
-if (!fs.existsSync(gruntPath)) {
-  console.error('Grunt command does not exist at: ' + gruntPath);
-  console.error('Run script/bootstrap to install Grunt');
-  process.exit(1);
-}
-
 var args = ['--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
 args = args.concat(process.argv.slice(2));
 cp.safeSpawn(gruntPath, args, process.exit);

script/grunt.cmd

@@ -1,5 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\grunt" %*
-) ELSE (
-  node  "%~dp0\grunt" %*
-)

script/install-cli

@@ -0,0 +1,10 @@
+#!/usr/bin/env coffee
+
+path = require 'path'
+CommandInstaller = require '../src/command-installer'
+
+callback = (error) ->
+  console.warn error.message if error?
+
+CommandInstaller.installAtomCommand(path.resolve(__dirname, '..'), callback)
+CommandInstaller.installApmCommand(path.resolve(__dirname, '..'), callback)

script/mkdeb

@@ -1,35 +0,0 @@
-#!/bin/bash
-# mkdeb version control-file-path deb-file-path
-
-set -e
-
-SCRIPT=`readlink -f "$0"`
-ROOT=`readlink -f $(dirname $SCRIPT)/..`
-cd $ROOT
-
-VERSION="$1"
-ARCH="$2"
-CONTROL_FILE="$3"
-DESKTOP_FILE="$4"
-ICON_FILE="$5"
-DEB_PATH="$6"
-
-TARGET_ROOT="`mktemp -d`"
-chmod 755 "$TARGET_ROOT"
-TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
-
-mkdir -p "$TARGET/usr"
-env INSTALL_PREFIX="$TARGET/usr" script/grunt install
-
-mkdir -p "$TARGET/DEBIAN"
-cp "$CONTROL_FILE" "$TARGET/DEBIAN/control"
-
-mkdir -p "$TARGET/usr/share/applications"
-cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"
-
-mkdir -p "$TARGET/usr/share/pixmaps"
-cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
-
-dpkg-deb -b "$TARGET"
-mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
-rm -rf $TARGET_ROOT

script/test

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --harmony_collections
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
 var path = require('path');
 

script/utils/verify-requirements.js

@@ -1,117 +0,0 @@
-var path = require('path');
-var fs = require('fs');
-var childProcess = require('child_process');
-
-var pythonExecutable = process.env.PYTHON;
-
-module.exports = function(cb) {
-  verifyNode(function(error, nodeSuccessMessage) {
-    if (error) {
-      cb(error);
-      return;
-    }
-
-    verifyNpm(function(error, npmSuccessMessage) {
-      if (error) {
-        cb(error);
-        return;
-      }
-
-      verifyPython27(function(error, pythonSuccessMessage) {
-        cb(error, (nodeSuccessMessage + "\n" + npmSuccessMessage + "\n" + pythonSuccessMessage).trim());
-      });
-    });
-  });
-
-};
-
-function verifyNode(cb) {
-  var nodeVersion = process.versions.node;
-  var versionArray = nodeVersion.split('.');
-  var nodeMajorVersion = +versionArray[0];
-  var nodeMinorVersion = +versionArray[1];
-  if (nodeMajorVersion === 0 && nodeMinorVersion < 10) {
-    error = "node v0.10 is required to build Atom.";
-    cb(error);
-  }
-  else {
-    cb(null, "Node: v" + nodeVersion);
-  }
-}
-
-function verifyNpm(cb) {
-  var localNpmPath = path.resolve(__dirname, '..', '..', 'build', 'node_modules', '.bin', 'npm');
-  if (process.platform === 'win32')
-    localNpmPath += ".cmd";
-
-  var npmCommand = fs.existsSync(localNpmPath) ? localNpmPath : 'npm';
-  if (npmCommand === 'npm' && process.platform === 'win32')
-    npmCommand += ".cmd";
-
-  childProcess.execFile(npmCommand, ['-v'], { env: process.env }, function(err, stdout) {
-    if (err)
-      return cb("npm 1.4 is required to build Atom. An error (" + err + ") occured when checking the version.");
-
-    var npmVersion = stdout ? stdout.trim() : '';
-    var versionArray = npmVersion.split('.');
-    var npmMajorVersion = +versionArray[0] || 0;
-    var npmMinorVersion = +versionArray[1] || 0;
-    if (npmMajorVersion === 1 && npmMinorVersion < 4)
-      cb("npm v1.4+ is required to build Atom.");
-    else
-      cb(null, "npm: v" + npmVersion);
-  });
-}
-
-
-function verifyPython27(cb) {
-  if (process.platform == 'win32') {
-    if (!pythonExecutable) {
-      var systemDrive = process.env.SystemDrive || 'C:\\';
-      pythonExecutable = path.join(systemDrive, 'Python27', 'python.exe');
-
-      if (!fs.existsSync(pythonExecutable)) {
-        pythonExecutable = 'python';
-      }
-    }
-
-    checkPythonVersion(pythonExecutable, cb);
-  }
-  else {
-    cb(null, '');
-  }
-}
-
-function checkPythonVersion (python, cb) {
-  var pythonHelpMessage = "Set the PYTHON env var to '/path/to/Python27/python.exe' if your python is installed in a non-default location.";
-
-  childProcess.execFile(python, ['-c', 'import platform; print(platform.python_version());'], { env: process.env }, function (err, stdout) {
-    if (err) {
-      error = "Python 2.7 is required to build Atom. An error (" + err + ") occured when checking the version of '" + python + "'. ";
-      error += pythonHelpMessage;
-      cb(error);
-      return;
-    }
-
-    var version = stdout.trim();
-    if (~version.indexOf('+')) {
-      version = version.replace(/\+/g, '');
-    }
-    if (~version.indexOf('rc')) {
-      version = version.replace(/rc(.*)$/ig, '');
-    }
-
-    // Atom requires python 2.7 or higher (but not python 3) for node-gyp
-    var versionArray = version.split('.').map(function(num) { return +num; });
-    var goodPythonVersion = (versionArray[0] === 2 && versionArray[1] >= 7);
-    if (!goodPythonVersion) {
-      error = "Python 2.7 is required to build Atom. '" + python + "' returns version " + version + ". ";
-      error += pythonHelpMessage;
-      cb(error);
-      return;
-    }
-
-    // Finally, if we've gotten this far, callback to resume the install process.
-    cb(null, "Python: v" + version);
-  });
-}

spec/atom-reporter.coffee

@@ -2,14 +2,13 @@ path = require 'path'
 _ = require 'underscore-plus'
 {convertStackTrace} = require 'coffeestack'
 {View, $, $$} = require '../src/space-pen-extensions'
-grim = require 'grim'
 
 sourceMaps = {}
 formatStackTrace = (spec, message='', stackTrace) ->
   return stackTrace unless stackTrace
 
-  jasminePattern = /^\s*at\s+.*\(?.*[/\\]jasmine(-[^/\\]*)?\.js:\d+:\d+\)?\s*$/
-  firstJasmineLinePattern = /^\s*at [/\\].*[/\\]jasmine(-[^/\\]*)?\.js:\d+:\d+\)?\s*$/
+  jasminePattern = /^\s*at\s+.*\(?.*\/jasmine(-[^\/]*)?\.js:\d+:\d+\)?\s*$/
+  firstJasmineLinePattern = /^\s*at \/.*\/jasmine(-[^\/]*)?\.js:\d+:\d+\)?\s*$/
   convertedLines = []
   for line in stackTrace.split('\n')
     convertedLines.push(line) unless jasminePattern.test(line)
@@ -24,7 +23,7 @@ formatStackTrace = (spec, message='', stackTrace) ->
 
   for line, index in lines
     # Remove prefix of lines matching: at [object Object].<anonymous> (path:1:2)
-    prefixMatch = line.match(/at \[object Object\]\.<anonymous> \(([^)]+)\)/)
+    prefixMatch = line.match(/at \[object Object\]\.<anonymous> \(([^\)]+)\)/)
     line = "at #{prefixMatch[1]}" if prefixMatch
 
     # Relativize locations to spec directory
@@ -53,11 +52,6 @@ class AtomReporter extends View
         @div outlet: "message", class: 'message'
       @div outlet: "results", class: 'results'
 
-      @div outlet: "deprecations", class: 'status alert alert-warning', style: 'display: none', =>
-        @span outlet: 'deprecationStatus', '0 deprecations'
-        @div class: 'deprecation-toggle'
-      @div outlet: 'deprecationList', class: 'deprecation-list'
-
   startedAt: null
   runningSpecCount: 0
   completeSpecCount: 0
@@ -65,7 +59,6 @@ class AtomReporter extends View
   failedCount: 0
   skippedCount: 0
   totalSpecCount: 0
-  deprecationCount: 0
   @timeoutId: 0
 
   reportRunnerStarting: (runner) ->
@@ -95,29 +88,6 @@ class AtomReporter extends View
   reportSpecStarting: (spec) ->
     @specStarted(spec)
 
-  addDeprecations: (spec) ->
-    deprecations = grim.getDeprecations()
-    @deprecationCount += deprecations.length
-    @deprecations.show() if @deprecationCount > 0
-    if @deprecationCount is 1
-      @deprecationStatus.text("1 deprecation")
-    else
-      @deprecationStatus.text("#{@deprecationCount} deprecations")
-
-    for deprecation in deprecations
-      @deprecationList.append $$ ->
-        @div class: 'padded', =>
-          @div class: 'result-message fail deprecation-message', deprecation.message
-
-          for stack in deprecation.stacks
-            fullStack = stack.map ({functionName, location}) ->
-              if functionName is '<unknown>'
-                "  at #{location}"
-              else
-                "  at #{functionName} (#{location})"
-            @pre class: 'stack-trace padded', formatStackTrace(spec, deprecation.message, fullStack.join('\n'))
-    grim.clearDeprecations()
-
   handleEvents: ->
     $(document).on "click", ".spec-toggle", ({currentTarget}) =>
       element = $(currentTarget)
@@ -126,13 +96,6 @@ class AtomReporter extends View
       element.toggleClass('folded')
       false
 
-    $(document).on "click", ".deprecation-toggle", ({currentTarget}) =>
-      element = $(currentTarget)
-      deprecationList = $(document).find('.deprecation-list')
-      deprecationList.toggle()
-      element.toggleClass('folded')
-      false
-
   updateSpecCounts: ->
     if @skippedCount
       specCount = "#{@completeSpecCount - @skippedCount}/#{@totalSpecCount - @skippedCount} (#{@skippedCount} skipped)"
@@ -212,7 +175,6 @@ class AtomReporter extends View
       specView = new SpecResultView(spec)
       specView.attach()
       @failedCount++
-    @addDeprecations(spec)
 
 class SuiteResultView extends View
   @content: ->

spec/atom-spec.coffee

@@ -113,31 +113,18 @@ describe "the `atom` global", ->
                 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
+              atom.workspaceView.openSync()
+              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
 
         describe "when the package has no main module", ->
           it "does not throw an exception", ->
@@ -173,28 +160,28 @@ describe "the `atom` global", ->
               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
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)).toHaveLength 0
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element2)).toHaveLength 0
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element3)).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
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)[0].command).toBe "test-1"
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element2)[0].command).toBe "test-2"
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element3)).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
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)).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
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)[0].command).toBe 'keymap-1'
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-n', element1)[0].command).toBe 'keymap-2'
+              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-y', element3)).toHaveLength 0
 
         describe "menu loading", ->
           beforeEach ->
@@ -380,8 +367,8 @@ describe "the `atom` global", ->
 
           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
+            expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', $$ -> @div class: 'test-1')).toHaveLength 0
+            expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', $$ -> @div class: 'test-2')).toHaveLength 0
 
         it "removes the package's stylesheets", ->
           waitsForPromise ->
@@ -510,20 +497,20 @@ describe "the `atom` global", ->
           # enabling of theme
           pack = atom.packages.enablePackage(packageName)
 
+          activatedPackages = null
           waitsFor ->
-            pack in atom.packages.getActivePackages()
+            activatedPackages = atom.packages.getActivePackages()
+            activatedPackages.length > 0
 
           runs ->
+            expect(activatedPackages).toContain(pack)
             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 ->
+            activatedPackages = atom.packages.getActivePackages()
+            expect(activatedPackages).not.toContain(pack)
             expect(atom.config.get('core.themes')).not.toContain packageName
             expect(atom.config.get('core.themes')).not.toContain packageName
             expect(atom.config.get('core.disabledPackages')).not.toContain packageName
@@ -531,22 +518,7 @@ describe "the `atom` global", ->
   describe ".isReleasedVersion()", ->
     it "returns false if the version is a SHA and true otherwise", ->
       version = '0.1.0'
-      spyOn(atom, 'getVersion').andCallFake -> version
+      spyOn(atom.constructor, 'getVersion').andCallFake -> version
       expect(atom.isReleasedVersion()).toBe true
       version = '36b5518'
       expect(atom.isReleasedVersion()).toBe false
-
-  describe "window:update-available", ->
-    it "is triggered when the auto-updater sends the update-downloaded event", ->
-      updateAvailableHandler = jasmine.createSpy("update-available-handler")
-      atom.workspaceView.on 'window:update-available', updateAvailableHandler
-      autoUpdater = require('remote').require('auto-updater')
-      autoUpdater.emit 'update-downloaded', null, "notes", "version"
-
-      waitsFor ->
-        updateAvailableHandler.callCount > 0
-
-      runs ->
-        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
-        expect(notes).toBe 'notes'
-        expect(version).toBe 'version'

spec/config-spec.coffee

@@ -5,10 +5,6 @@ fs = require 'fs-plus'
 
 describe "Config", ->
   dotAtomPath = path.join(temp.dir, 'dot-atom-dir')
-  dotAtomPath = null
-
-  beforeEach ->
-    dotAtomPath = temp.path('dot-atom-dir')
 
   describe ".get(keyPath)", ->
     it "allows a key path's value to be read", ->
@@ -40,53 +36,15 @@ describe "Config", ->
 
     describe "when the value equals the default value", ->
       it "does not store the value", ->
-        atom.config.setDefaults "foo",
-          same: 1
-          changes: 1
-          sameArray: [1, 2, 3]
-          sameObject: {a: 1, b: 2}
-          null: null
-          undefined: undefined
+        atom.config.setDefaults("foo", same: 1, changes: 1)
         expect(atom.config.settings.foo).toBeUndefined()
-
         atom.config.set('foo.same', 1)
         atom.config.set('foo.changes', 2)
-        atom.config.set('foo.sameArray', [1, 2, 3])
-        atom.config.set('foo.null', undefined)
-        atom.config.set('foo.undefined', null)
-        atom.config.set('foo.sameObject', {b: 2, a: 1})
         expect(atom.config.settings.foo).toEqual {changes: 2}
 
         atom.config.set('foo.changes', 1)
         expect(atom.config.settings.foo).toEqual {}
 
-  describe ".getDefault(keyPath)", ->
-    it "returns a clone of the default value", ->
-      atom.config.setDefaults("foo", same: 1, changes: 1)
-      expect(atom.config.getDefault('foo.same')).toBe 1
-      expect(atom.config.getDefault('foo.changes')).toBe 1
-
-      atom.config.set('foo.same', 2)
-      atom.config.set('foo.changes', 3)
-      expect(atom.config.getDefault('foo.same')).toBe 1
-      expect(atom.config.getDefault('foo.changes')).toBe 1
-
-      initialDefaultValue = [1, 2, 3]
-      atom.config.setDefaults("foo", bar: initialDefaultValue)
-      expect(atom.config.getDefault('foo.bar')).toEqual initialDefaultValue
-      expect(atom.config.getDefault('foo.bar')).not.toBe initialDefaultValue
-
-  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)
-      expect(atom.config.isDefault('foo.same')).toBe true
-      expect(atom.config.isDefault('foo.changes')).toBe true
-
-      atom.config.set('foo.same', 2)
-      atom.config.set('foo.changes', 3)
-      expect(atom.config.isDefault('foo.same')).toBe false
-      expect(atom.config.isDefault('foo.changes')).toBe false
-
   describe ".toggle(keyPath)", ->
     it "negates the boolean value of the current key path value", ->
       atom.config.set('foo.a', 1)
@@ -212,13 +170,6 @@ describe "Config", ->
       expect(atom.config.get("foo.quux.x")).toBe 0
       expect(atom.config.get("foo.quux.y")).toBe 1
 
-    it "emits an updated event", ->
-      updatedCallback = jasmine.createSpy('updated')
-      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 ".observe(keyPath)", ->
     [observeHandler, observeSubscription] = []
 
@@ -262,10 +213,8 @@ describe "Config", ->
 
   describe ".initializeConfigDirectory()", ->
     beforeEach ->
-      if fs.existsSync(dotAtomPath)
-        fs.removeSync(dotAtomPath)
-
       atom.config.configDirPath = dotAtomPath
+      expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
       fs.removeSync(dotAtomPath)

spec/context-menu-manager-spec.coffee

@@ -17,59 +17,6 @@ describe "ContextMenuManager", ->
       expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
       expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
 
-    it 'does not add duplicate menu items',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'].length).toBe 1
-
-    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',
@@ -158,7 +105,7 @@ describe "ContextMenuManager", ->
           expect(menu[2].command).toEqual 'dev-command'
           expect(menu[3]).toBeUndefined()
 
-  describe "executeBuildHandlers", ->
+  describe "#executeBuildHandlers", ->
     menuTemplate = [
         label: 'label'
         executeAtBuild: ->
@@ -172,3 +119,4 @@ describe "ContextMenuManager", ->
 
       expect(buildFn).toHaveBeenCalled()
       expect(buildFn.mostRecentCall.args[0]).toBe event
+

spec/display-buffer-spec.coffee

@@ -18,10 +18,10 @@ describe "DisplayBuffer", ->
     displayBuffer.destroy()
     buffer.release()
 
-  describe "::copy()", ->
+  describe ".copy()", ->
     it "creates a new DisplayBuffer with the same initial state", ->
       marker1 = displayBuffer.markBufferRange([[1, 2], [3, 4]], id: 1)
-      marker2 = displayBuffer.markBufferRange([[2, 3], [4, 5]], reversed: true, id: 2)
+      marker2 = displayBuffer.markBufferRange([[2, 3], [4, 5]], isReversed: true, id: 2)
       marker3 = displayBuffer.markBufferPosition([5, 6], id: 3)
       displayBuffer.createFold(3, 5)
 
@@ -47,15 +47,6 @@ describe "DisplayBuffer", ->
       buffer.insert([0,0], oneHundredLines)
       expect(displayBuffer.getLineCount()).toBe 100 + originalLineCount
 
-    it "reassigns the scrollTop if it exceeds the max possible value after lines are removed", ->
-      displayBuffer.manageScrollPosition = true
-      displayBuffer.setHeight(50)
-      displayBuffer.setLineHeightInPixels(10)
-      displayBuffer.setScrollTop(80)
-
-      buffer.delete([[8, 0], [10, 0]])
-      expect(displayBuffer.getScrollTop()).toBe 60
-
   describe "soft wrapping", ->
     beforeEach ->
       displayBuffer.setSoftWrap(true)
@@ -91,7 +82,7 @@ describe "DisplayBuffer", ->
 
         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')
+            buffer.change([[0, 0], [1, 0]], 'abcdefghijklmnopqrstuvwxyz\n')
             displayBuffer.setEditorWidthInChars(10)
             expect(displayBuffer.lineForRow(0).text).toBe 'abcdefghij'
             expect(displayBuffer.lineForRow(1).text).toBe 'klmnopqrst'
@@ -151,7 +142,7 @@ describe "DisplayBuffer", ->
 
       describe "when buffer lines are removed", ->
         it "removes lines and emits a change event", ->
-          buffer.setTextInRange([[3, 21], [7, 5]], ';')
+          buffer.change([[3, 21], [7, 5]], ';')
           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));'
@@ -215,19 +206,6 @@ describe "DisplayBuffer", ->
         displayBuffer.setEditorWidthInChars(-1)
         expect(displayBuffer.editorWidthInChars).not.toBe -1
 
-    it "sets ::scrollLeft to 0 and keeps it there when soft wrapping is enabled", ->
-      displayBuffer.setDefaultCharWidth(10)
-      displayBuffer.setWidth(50)
-      displayBuffer.manageScrollPosition = true
-
-      displayBuffer.setSoftWrap(false)
-      displayBuffer.setScrollLeft(Infinity)
-      expect(displayBuffer.getScrollLeft()).toBeGreaterThan 0
-      displayBuffer.setSoftWrap(true)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-      displayBuffer.setScrollLeft(10)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-
   describe "primitive folding", ->
     beforeEach ->
       displayBuffer.destroy()
@@ -337,14 +315,6 @@ describe "DisplayBuffer", ->
           expect(line0.fold).toBe outerFold
           expect(line1.fold).toBeUndefined()
 
-      describe "when a fold ends where another fold begins", ->
-        it "continues to hide the lines inside the second fold", ->
-          fold2 = displayBuffer.createFold(4, 9)
-          fold1 = displayBuffer.createFold(0, 4)
-
-          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", ->
           otherDisplayBuffer = new DisplayBuffer({buffer, tabLength})
@@ -360,7 +330,7 @@ describe "DisplayBuffer", ->
 
       describe "when the old range surrounds a fold", ->
         beforeEach ->
-          buffer.setTextInRange([[1, 0], [5, 1]], 'party!')
+          buffer.change([[1, 0], [5, 1]], 'party!')
 
         it "removes the fold and replaces the selection with the new text", ->
           expect(displayBuffer.lineForRow(0).text).toBe "0"
@@ -382,7 +352,7 @@ describe "DisplayBuffer", ->
           displayBuffer.createFold(2, 9)
           changeHandler.reset()
 
-          buffer.setTextInRange([[1, 0], [10, 0]], 'goodbye')
+          buffer.change([[1, 0], [10, 0]], 'goodbye')
 
           expect(displayBuffer.lineForRow(0).text).toBe "0"
           expect(displayBuffer.lineForRow(1).text).toBe "goodbye10"
@@ -401,7 +371,7 @@ describe "DisplayBuffer", ->
       describe "when the old range precedes lines with a fold", ->
         describe "when the new range precedes lines with a fold", ->
           it "updates the buffer and re-positions subsequent folds", ->
-            buffer.setTextInRange([[0, 0], [1, 1]], 'abc')
+            buffer.change([[0, 0], [1, 1]], 'abc')
 
             expect(displayBuffer.lineForRow(0).text).toBe "abc"
             expect(displayBuffer.lineForRow(1).fold).toBe fold1
@@ -424,7 +394,7 @@ describe "DisplayBuffer", ->
 
       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")
+          buffer.change([[1, 1], [3, 0]], "a\nb\nc\nd\n")
           expect(displayBuffer.lineForRow(1).text).toBe '1a'
           expect(displayBuffer.lineForRow(2).text).toBe 'b'
           expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
@@ -432,7 +402,7 @@ describe "DisplayBuffer", ->
 
       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')
+          buffer.change([[10, 0], [11, 0]], 'abc')
 
           expect(displayBuffer.lineForRow(1).text).toBe "1"
           expect(displayBuffer.lineForRow(2).fold).toBe fold1
@@ -460,7 +430,7 @@ describe "DisplayBuffer", ->
 
         describe "when the end of the new range exceeds the end of the fold", ->
           it "expands the fold to contain all the inserted lines", ->
-            buffer.setTextInRange([[3, 0], [4, 0]], 'a\nb\nc\nd\n')
+            buffer.change([[3, 0], [4, 0]], 'a\nb\nc\nd\n')
             expect(fold1.getStartRow()).toBe 2
             expect(fold1.getEndRow()).toBe 7
 
@@ -477,7 +447,7 @@ describe "DisplayBuffer", ->
         describe "when the end of the new range precedes the end of the fold", ->
           it "destroys the fold", ->
             fold2.destroy()
-            buffer.setTextInRange([[3, 0], [6, 0]], 'a\n')
+            buffer.change([[3, 0], [6, 0]], 'a\n')
             expect(displayBuffer.lineForRow(2).text).toBe '2'
             expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
             expect(displayBuffer.lineForRow(3).text).toBe 'a'
@@ -566,7 +536,7 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.outermostFoldsInBufferRowRange(3, 18)).toEqual [fold1, fold3, fold5]
         expect(displayBuffer.outermostFoldsInBufferRowRange(5, 16)).toEqual [fold3]
 
-  describe "::clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
+  describe ".clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
     beforeEach ->
       displayBuffer.setSoftWrap(true)
       displayBuffer.setEditorWidthInChars(50)
@@ -628,7 +598,7 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.clipScreenPosition([0, 1], skipAtomicTokens: true)).toEqual [0, tabLength]
         expect(displayBuffer.clipScreenPosition([0, tabLength], skipAtomicTokens: true)).toEqual [0, tabLength]
 
-  describe "::screenPositionForBufferPosition(bufferPosition, options)", ->
+  describe ".screenPositionForBufferPosition(bufferPosition, options)", ->
     it "clips the specified buffer position", ->
       expect(displayBuffer.screenPositionForBufferPosition([0, 2])).toEqual [0, 2]
       expect(displayBuffer.screenPositionForBufferPosition([0, 100000])).toEqual [0, 29]
@@ -648,26 +618,13 @@ describe "DisplayBuffer", ->
       expect(displayBuffer.screenPositionForBufferPosition([0, 10], wrapAtSoftNewlines: true)).toEqual [1, 0]
       expect(displayBuffer.bufferPositionForScreenPosition([1, 0])).toEqual [0, 10]
 
-  describe "::getMaxLineLength()", ->
+  describe ".getMaxLineLength()", ->
     it "returns the length of the longest screen line", ->
       expect(displayBuffer.getMaxLineLength()).toBe 65
       buffer.delete([[6, 0], [6, 65]])
       expect(displayBuffer.getMaxLineLength()).toBe 62
 
-    it "correctly updates the location of the longest screen line when changes occur", ->
-      expect(displayBuffer.getLongestScreenRow()).toBe 6
-      buffer.delete([[0, 0], [2, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 4
-      buffer.delete([[4, 0], [5, 0]])
-
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
-      buffer.delete([[2, 0], [4, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
-  describe "::destroy()", ->
+  describe ".destroy()", ->
     it "unsubscribes all display buffer markers from their underlying buffer marker (regression)", ->
       marker = displayBuffer.markBufferPosition([12, 2])
       displayBuffer.destroy()
@@ -820,17 +777,17 @@ describe "DisplayBuffer", ->
           isValid: true
         }
 
-      it "triggers the 'changed' event whenever the marker is invalidated or revalidated", ->
+      xit "triggers the 'changed' event whenever the marker is invalidated or revalidated", ->
         buffer.deleteRow(8)
         expect(markerChangedHandler).toHaveBeenCalled()
         expect(markerChangedHandler.argsForCall[0][0]).toEqual {
           oldHeadScreenPosition: [5, 10]
           oldHeadBufferPosition: [8, 10]
-          newHeadScreenPosition: [5, 0]
+          newHeadScreenPosition: [5, 10]
           newHeadBufferPosition: [8, 0]
           oldTailScreenPosition: [5, 4]
           oldTailBufferPosition: [8, 4]
-          newTailScreenPosition: [5, 0]
+          newTailScreenPosition: [5, 4]
           newTailBufferPosition: [8, 0]
           textChanged: true
           isValid: false
@@ -841,12 +798,12 @@ describe "DisplayBuffer", ->
 
         expect(markerChangedHandler).toHaveBeenCalled()
         expect(markerChangedHandler.argsForCall[0][0]).toEqual {
-          oldHeadScreenPosition: [5, 0]
-          oldHeadBufferPosition: [8, 0]
+          oldHeadScreenPosition: [5, 10]
+          oldHeadBufferPosition: [8, 10]
           newHeadScreenPosition: [5, 10]
           newHeadBufferPosition: [8, 10]
-          oldTailScreenPosition: [5, 0]
-          oldTailBufferPosition: [8, 0]
+          oldTailScreenPosition: [5, 4]
+          oldTailBufferPosition: [8, 4]
           newTailScreenPosition: [5, 4]
           newTailBufferPosition: [8, 4]
           textChanged: true
@@ -857,7 +814,7 @@ describe "DisplayBuffer", ->
         displayBuffer.createFold(10, 11)
         expect(markerChangedHandler).not.toHaveBeenCalled()
 
-      it "updates markers before emitting buffer change events, but does not notify their observers until the change event", ->
+      xit "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.on 'changed', marker2ChangedHandler = jasmine.createSpy("marker2ChangedHandler")
         displayBuffer.on 'changed', changeHandler = jasmine.createSpy("changeHandler").andCallFake -> onDisplayBufferChange()
@@ -874,7 +831,7 @@ describe "DisplayBuffer", ->
           expect(marker.getTailScreenPosition()).toEqual [5, 7]
           expect(marker2.isValid()).toBeFalsy()
 
-        buffer.setTextInRange([[8, 0], [8, 2]], ".....")
+        buffer.change([[8, 0], [8, 2]], ".....")
         expect(changeHandler).toHaveBeenCalled()
         expect(markerChangedHandler).toHaveBeenCalled()
         expect(marker2ChangedHandler).toHaveBeenCalled()
@@ -945,7 +902,7 @@ describe "DisplayBuffer", ->
         expect(changeHandler).toHaveBeenCalled()
         expect(markerChangedHandler).toHaveBeenCalled()
 
-    describe "::findMarkers(attributes)", ->
+    describe ".findMarkers(attributes)", ->
       it "allows the startBufferRow and endBufferRow to be specified", ->
         marker1 = displayBuffer.markBufferRange([[0, 0], [3, 0]], class: 'a')
         marker2 = displayBuffer.markBufferRange([[0, 0], [5, 0]], class: 'a')
@@ -955,42 +912,6 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.findMarkers(class: 'a', startBufferRow: 0, endBufferRow: 3)).toEqual [marker1]
         expect(displayBuffer.findMarkers(endBufferRow: 10)).toEqual [marker3]
 
-      it "allows the startScreenRow and endScreenRow to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[6, 0], [7, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[9, 0], [10, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', startScreenRow: 6, endScreenRow: 7)).toEqual [marker2]
-
-      it "allows intersectsBufferRowRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsBufferRowRange: [5, 6])).toEqual [marker1]
-
-      it "allows intersectsScreenRowRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsScreenRowRange: [5, 10])).toEqual [marker2]
-
-      it "allows containedInScreenRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', containedInScreenRange: [[5, 0], [7, 0]])).toEqual [marker2]
-
-      it "allows intersectsBufferRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsBufferRange: [[5, 0], [6, 0]])).toEqual [marker1]
-
-      it "allows intersectsScreenRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsScreenRange: [[5, 0], [10, 0]])).toEqual [marker2]
-
     describe "marker destruction", ->
       it "allows markers to be destroyed", ->
         marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
@@ -1011,7 +932,7 @@ describe "DisplayBuffer", ->
         buffer.getMarker(marker2.id).destroy()
         expect(destroyedHandler).toHaveBeenCalled()
 
-    describe "DisplayBufferMarker::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)
@@ -1022,148 +943,3 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.getMarkerCount()).toBe initialMarkerCount + 2
         expect(marker1.getAttributes()).toEqual a: 1, b: 2
         expect(marker2.getAttributes()).toEqual a: 1, b: 3
-
-    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]])
-
-        displayBuffer.setLineHeightInPixels(20)
-        displayBuffer.setDefaultCharWidth(10)
-
-        for char in ['r', 'e', 't', 'u', 'r', 'n']
-          displayBuffer.setScopedCharWidth(["source.js", "keyword.control.js"], char, 11)
-
-        {start, end} = marker.getPixelRange()
-        expect(start.top).toBe 5 * 20
-        expect(start.left).toBe (4 * 10) + (6 * 11)
-
-  describe "decorations", ->
-    [marker, decoration, decorationParams] = []
-    beforeEach ->
-      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
-      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.getParams()).toBe decorationParams
-      expect(displayBuffer.decorationForId(decoration.id)).toBe decoration
-      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id][0]).toBe decoration
-
-      decoration.destroy()
-      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).not.toBeDefined()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    it "will not fail if the decoration is removed twice", ->
-      decoration.destroy()
-      decoration.destroy()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    describe "when a decoration is updated via Decoration::update()", ->
-      it "emits an 'updated' event containing the new and old params", ->
-        decoration.on 'updated', updatedSpy = jasmine.createSpy()
-        decoration.update type: 'gutter', class: 'two'
-
-        {oldParams, newParams} = updatedSpy.mostRecentCall.args[0]
-        expect(oldParams).toEqual decorationParams
-        expect(newParams).toEqual type: 'gutter', class: 'two', id: decoration.id
-
-  describe "::setScrollTop", ->
-    beforeEach ->
-      displayBuffer.manageScrollPosition = true
-      displayBuffer.setLineHeightInPixels(10)
-
-    it "disallows negative values", ->
-      displayBuffer.setHeight(displayBuffer.getScrollHeight() + 100)
-      expect(displayBuffer.setScrollTop(-10)).toBe 0
-      expect(displayBuffer.getScrollTop()).toBe 0
-
-    it "disallows values that would make ::getScrollBottom() exceed ::getScrollHeight()", ->
-      displayBuffer.setHeight(50)
-      maxScrollTop = displayBuffer.getScrollHeight() - displayBuffer.getHeight()
-
-      expect(displayBuffer.setScrollTop(maxScrollTop)).toBe maxScrollTop
-      expect(displayBuffer.getScrollTop()).toBe maxScrollTop
-
-      expect(displayBuffer.setScrollTop(maxScrollTop + 50)).toBe maxScrollTop
-      expect(displayBuffer.getScrollTop()).toBe maxScrollTop
-
-  describe "::setScrollLeft", ->
-    beforeEach ->
-      displayBuffer.manageScrollPosition = true
-      displayBuffer.setLineHeightInPixels(10)
-      displayBuffer.setDefaultCharWidth(10)
-
-    it "disallows negative values", ->
-      displayBuffer.setWidth(displayBuffer.getScrollWidth() + 100)
-      expect(displayBuffer.setScrollLeft(-10)).toBe 0
-      expect(displayBuffer.getScrollLeft()).toBe 0
-
-    it "disallows values that would make ::getScrollRight() exceed ::getScrollWidth()", ->
-      displayBuffer.setWidth(50)
-      maxScrollLeft = displayBuffer.getScrollWidth() - displayBuffer.getWidth()
-
-      expect(displayBuffer.setScrollLeft(maxScrollLeft)).toBe maxScrollLeft
-      expect(displayBuffer.getScrollLeft()).toBe maxScrollLeft
-
-      expect(displayBuffer.setScrollLeft(maxScrollLeft + 50)).toBe maxScrollLeft
-      expect(displayBuffer.getScrollLeft()).toBe maxScrollLeft
-
-  describe "::scrollToScreenPosition(position, [options])", ->
-    beforeEach ->
-      displayBuffer.manageScrollPosition = true
-      displayBuffer.setLineHeightInPixels(10)
-      displayBuffer.setDefaultCharWidth(10)
-      displayBuffer.setHorizontalScrollbarHeight(0)
-      displayBuffer.setHeight(50)
-      displayBuffer.setWidth(50)
-
-    it "sets the scroll top and scroll left so the given screen position is in view", ->
-      displayBuffer.scrollToScreenPosition([8, 20])
-      expect(displayBuffer.getScrollBottom()).toBe (9 + displayBuffer.getVerticalScrollMargin()) * 10
-      expect(displayBuffer.getScrollRight()).toBe (20 + displayBuffer.getHorizontalScrollMargin()) * 10
-
-    describe "when the 'center' option is true", ->
-      it "vertically scrolls to center the given position vertically", ->
-        displayBuffer.scrollToScreenPosition([8, 20], center: true)
-        expect(displayBuffer.getScrollTop()).toBe (8 * 10) + 5 - (50 / 2)
-        expect(displayBuffer.getScrollRight()).toBe (20 + displayBuffer.getHorizontalScrollMargin()) * 10
-
-      it "does not scroll vertically if the position is already in view", ->
-        displayBuffer.scrollToScreenPosition([4, 20], center: true)
-        expect(displayBuffer.getScrollTop()).toBe 0
-
-  describe "scroll width", ->
-    cursorWidth = 1
-    beforeEach ->
-      displayBuffer.setDefaultCharWidth(10)
-
-    it "recomputes the scroll width when the default character width changes", ->
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 65 + cursorWidth
-
-      displayBuffer.setDefaultCharWidth(12)
-      expect(displayBuffer.getScrollWidth()).toBe 12 * 65 + cursorWidth
-
-    it "recomputes the scroll width when the max line length changes", ->
-      buffer.insert([6, 12], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 66 + cursorWidth
-
-      buffer.delete([[6, 10], [6, 12]], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change", ->
-      operatorWidth = 20
-      displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + operatorWidth + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change in a batch", ->
-      operatorWidth = 20
-
-      displayBuffer.on 'character-widths-changed', changedSpy = jasmine.createSpy()
-
-      displayBuffer.batchCharacterMeasurement ->
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '?', operatorWidth)
-
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 63 + operatorWidth * 2 + cursorWidth
-      expect(changedSpy.callCount).toBe 1

spec/editor-spec.coffee

@@ -7,12 +7,9 @@ describe "Editor", ->
     buffer.setText(buffer.getText().replace(/[ ]{2}/g, "\t"))
 
   beforeEach ->
-    waitsForPromise ->
-      atom.project.open('sample.js', autoIndent: false).then (o) -> editor = o
-
-    runs ->
-      buffer = editor.buffer
-      lineLengths = buffer.getLines().map (line) -> line.length
+    editor = atom.project.openSync('sample.js', autoIndent: false)
+    buffer = editor.buffer
+    lineLengths = buffer.getLines().map (line) -> line.length
 
     waitsForPromise ->
       atom.packages.activatePackage('language-javascript')
@@ -20,7 +17,7 @@ describe "Editor", ->
   describe "when the editor is deserialized", ->
     it "restores selections and folds based on markers in the buffer", ->
       editor.setSelectedBufferRange([[1, 2], [3, 4]])
-      editor.addSelectionForBufferRange([[5, 6], [7, 5]], reversed: true)
+      editor.addSelectionForBufferRange([[5, 6], [7, 5]], isReversed: true)
       editor.foldBufferRow(4)
       expect(editor.isFoldedAtBufferRow(4)).toBeTruthy()
 
@@ -34,33 +31,15 @@ describe "Editor", ->
       editor2.destroy()
 
   describe "when the editor is constructed with an initialLine option", ->
-    it "positions the cursor on the specified line", ->
-      editor = null
-
-      waitsForPromise ->
-        atom.workspace.open('sample.less', initialLine: 5).then (o) -> editor = o
-
-      runs ->
-        buffer = editor.buffer
-        expect(editor.getCursor().getBufferPosition().row).toEqual 5
-        expect(editor.getCursor().getBufferPosition().column).toEqual 0
-
-  describe "when the editor is constructed with an initialColumn option", ->
-    it "positions the cursor on the specified column", ->
-      editor = null
-
-      waitsForPromise ->
-        atom.workspace.open('sample.less', initialColumn: 8).then (o) -> editor = o
-
-      runs ->
-        buffer = editor.buffer
-        expect(editor.getCursor().getBufferPosition().row).toEqual 0
-        expect(editor.getCursor().getBufferPosition().column).toEqual 8
+    it "and positions the cursor on the specified line", ->
+      editor = atom.project.openSync('sample.js', initialLine: 2)
+      buffer = editor.buffer
+      expect(editor.getCursor().getBufferPosition().row).toEqual 2
 
   describe ".copy()", ->
     it "returns a different edit session with the same initial state", ->
       editor.setSelectedBufferRange([[1, 2], [3, 4]])
-      editor.addSelectionForBufferRange([[5, 6], [7, 8]], reversed: true)
+      editor.addSelectionForBufferRange([[5, 6], [7, 8]], isReversed: true)
       editor.foldBufferRow(4)
       expect(editor.isFoldedAtBufferRow(4)).toBeTruthy()
 
@@ -78,31 +57,21 @@ describe "Editor", ->
 
   describe "config defaults", ->
     it "uses the `editor.tabLength`, `editor.softWrap`, and `editor.softTabs` config values", ->
-      editor1 = null
-      editor2 = null
       atom.config.set('editor.tabLength', 4)
       atom.config.set('editor.softWrap', true)
       atom.config.set('editor.softTabs', false)
+      editor1 = atom.project.openSync('a')
+      expect(editor1.getTabLength()).toBe 4
+      expect(editor1.getSoftWrap()).toBe true
+      expect(editor1.getSoftTabs()).toBe false
 
-      waitsForPromise ->
-        atom.workspace.open('a').then (o) -> editor1 = o
-
-      runs ->
-        expect(editor1.getTabLength()).toBe 4
-        expect(editor1.getSoftWrap()).toBe true
-        expect(editor1.getSoftTabs()).toBe false
-
-        atom.config.set('editor.tabLength', 100)
-        atom.config.set('editor.softWrap', false)
-        atom.config.set('editor.softTabs', true)
-
-      waitsForPromise ->
-        atom.workspace.open('b').then (o) -> editor2 = o
-
-      runs ->
-        expect(editor2.getTabLength()).toBe 100
-        expect(editor2.getSoftWrap()).toBe false
-        expect(editor2.getSoftTabs()).toBe true
+      atom.config.set('editor.tabLength', 100)
+      atom.config.set('editor.softWrap', false)
+      atom.config.set('editor.softTabs', true)
+      editor2 = atom.project.openSync('b')
+      expect(editor2.getTabLength()).toBe 100
+      expect(editor2.getSoftWrap()).toBe false
+      expect(editor2.getSoftTabs()).toBe true
 
   describe "title", ->
     describe ".getTitle()", ->
@@ -142,21 +111,6 @@ describe "Editor", ->
         editor.moveCursorDown()
         expect(editor.getCursorBufferPosition()).toEqual [1, 1]
 
-      it "emits a single 'cursors-moved' event for all moved cursors", ->
-        editor.on 'cursors-moved', cursorsMovedHandler = jasmine.createSpy("cursorsMovedHandler")
-
-        editor.moveCursorDown()
-        expect(cursorsMovedHandler.callCount).toBe 1
-
-        cursorsMovedHandler.reset()
-        editor.addCursorAtScreenPosition([3, 0])
-        editor.moveCursorDown()
-        expect(cursorsMovedHandler.callCount).toBe 1
-
-        cursorsMovedHandler.reset()
-        editor.getCursor().moveDown()
-        expect(cursorsMovedHandler.callCount).toBe 1
-
     describe ".setCursorScreenPosition(screenPosition)", ->
       it "clears a goal column established by vertical movement", ->
         # set a goal column by moving down
@@ -622,38 +576,6 @@ describe "Editor", ->
         editor.moveCursorToBeginningOfNextWord()
         expect(editor.getCursorBufferPosition()).toEqual [11, 9]
 
-    describe ".moveCursorToBeginningOfNextParagraph()", ->
-      it "moves the cursor before the first line of the next paragraph", ->
-        editor.setCursorBufferPosition [0,6]
-        cursor = editor.getCursor()
-
-        editor.moveCursorToBeginningOfNextParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual  { row : 10, column : 0 }
-
-        editor.setText("")
-        editor.setCursorBufferPosition [0,0]
-        cursor = editor.getCursor()
-        editor.moveCursorToBeginningOfNextParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual [0, 0]
-
-    describe ".moveCursorToBeginningOfPreviousParagraph()", ->
-      it "moves the cursor before the first line of the pevious paragraph", ->
-        editor.setCursorBufferPosition [10,0]
-        cursor = editor.getCursor()
-
-        editor.moveCursorToBeginningOfPreviousParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual  { row : 0, column : 0 }
-
-        editor.setText("")
-        editor.setCursorBufferPosition [0,0]
-        cursor = editor.getCursor()
-        editor.moveCursorToBeginningOfPreviousParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual [0, 0]
-
     describe ".getCurrentParagraphBufferRange()", ->
       it "returns the buffer range of the current paragraph, delimited by blank lines or the beginning / end of the file", ->
         buffer.setText """
@@ -723,81 +645,6 @@ describe "Editor", ->
           cursor2 = editor.addCursorAtBufferPosition([1,4])
           expect(cursor2.marker).toBe cursor1.marker
 
-    describe "autoscroll", ->
-      beforeEach ->
-        editor.manageScrollPosition = true
-        editor.setVerticalScrollMargin(2)
-        editor.setHorizontalScrollMargin(2)
-        editor.setLineHeightInPixels(10)
-        editor.setDefaultCharWidth(10)
-        editor.setHorizontalScrollbarHeight(0)
-        editor.setHeight(5.5 * 10)
-        editor.setWidth(5.5 * 10)
-
-      it "scrolls down when the last cursor gets closer than ::verticalScrollMargin to the bottom of the editor", ->
-        expect(editor.getScrollTop()).toBe 0
-        expect(editor.getScrollBottom()).toBe 5.5 * 10
-
-        editor.setCursorScreenPosition([2, 0])
-        expect(editor.getScrollBottom()).toBe 5.5 * 10
-
-        editor.moveCursorDown()
-        expect(editor.getScrollBottom()).toBe 6 * 10
-
-        editor.moveCursorDown()
-        expect(editor.getScrollBottom()).toBe 7 * 10
-
-      it "scrolls up when the last cursor gets closer than ::verticalScrollMargin to the top of the editor", ->
-        editor.setCursorScreenPosition([11, 0])
-        editor.setScrollBottom(editor.getScrollHeight())
-
-        editor.moveCursorUp()
-        expect(editor.getScrollBottom()).toBe editor.getScrollHeight()
-
-        editor.moveCursorUp()
-        expect(editor.getScrollTop()).toBe 7 * 10
-
-        editor.moveCursorUp()
-        expect(editor.getScrollTop()).toBe 6 * 10
-
-      it "scrolls right when the last cursor gets closer than ::horizontalScrollMargin to the right of the editor", ->
-        expect(editor.getScrollLeft()).toBe 0
-        expect(editor.getScrollRight()).toBe 5.5 * 10
-
-        editor.setCursorScreenPosition([0, 2])
-        expect(editor.getScrollRight()).toBe 5.5 * 10
-
-        editor.moveCursorRight()
-        expect(editor.getScrollRight()).toBe 6 * 10
-
-        editor.moveCursorRight()
-        expect(editor.getScrollRight()).toBe 7 * 10
-
-      it "scrolls left when the last cursor gets closer than ::horizontalScrollMargin to the left of the editor", ->
-        editor.setScrollRight(editor.getScrollWidth())
-        editor.setCursorScreenPosition([6, 62])
-
-        expect(editor.getScrollRight()).toBe editor.getScrollWidth()
-
-        editor.moveCursorLeft()
-        expect(editor.getScrollLeft()).toBe 59 * 10
-
-        editor.moveCursorLeft()
-        expect(editor.getScrollLeft()).toBe 58 * 10
-
-      it "scrolls down when inserting lines makes the document longer than the editor's height", ->
-        editor.setCursorScreenPosition([13, Infinity])
-        editor.insertNewline()
-        expect(editor.getScrollBottom()).toBe 14 * 10
-        editor.insertNewline()
-        expect(editor.getScrollBottom()).toBe 15 * 10
-
-      it "autoscrolls to the cursor when it moves due to undo", ->
-        editor.insertText('abc')
-        editor.setScrollTop(Infinity)
-        editor.undo()
-        expect(editor.getScrollTop()).toBe 0
-
   describe "selection", ->
     selection = null
 
@@ -836,7 +683,7 @@ describe "Editor", ->
         expect(selection1.isReversed()).toBeFalsy()
 
       it "merges selections when they intersect when moving up", ->
-        editor.setSelectedBufferRanges([[[0,9], [0,13]], [[1,10], [1,20]]], reversed: true)
+        editor.setSelectedBufferRanges([[[0,9], [0,13]], [[1,10], [1,20]]], isReversed: true)
         [selection1, selection2] = editor.getSelections()
 
         editor.selectUp()
@@ -847,7 +694,7 @@ describe "Editor", ->
         expect(selection1.isReversed()).toBeTruthy()
 
       it "merges selections when they intersect when moving left", ->
-        editor.setSelectedBufferRanges([[[0,9], [0,13]], [[0,14], [1,20]]], reversed: true)
+        editor.setSelectedBufferRanges([[[0,9], [0,13]], [[0,14], [1,20]]], isReversed: true)
         [selection1, selection2] = editor.getSelections()
 
         editor.selectLeft()
@@ -876,30 +723,6 @@ describe "Editor", ->
         expect(selection1.getScreenRange()).toEqual [[3, 0], [4, 5]]
         expect(selection2.getScreenRange()).toEqual [[5, 6], [6, 2]]
 
-    describe ".selectToBeginningOfNextParagraph()", ->
-      it "selects from the cursor to first line of the next paragraph", ->
-        editor.setSelectedBufferRange([[3, 0], [4, 5]])
-        editor.addCursorAtScreenPosition([5, 6])
-        editor.selectToScreenPosition([6, 2])
-
-        editor.selectToBeginningOfNextParagraph()
-
-        selections = editor.getSelections()
-        expect(selections.length).toBe 1
-        expect(selections[0].getScreenRange()).toEqual [[3, 0], [10, 0]]
-
-    describe ".selectToBeginningOfPreviousParagraph()", ->
-      it "selects from the cursor to the first line of the pevious paragraph", ->
-        editor.setSelectedBufferRange([[3, 0], [4, 5]])
-        editor.addCursorAtScreenPosition([5, 6])
-        editor.selectToScreenPosition([6, 2])
-
-        editor.selectToBeginningOfPreviousParagraph()
-
-        selections = editor.getSelections()
-        expect(selections.length).toBe 1
-        expect(selections[0].getScreenRange()).toEqual [[0, 0], [5, 6]]
-
       it "merges selections if they intersect, maintaining the directionality of the last selection", ->
         editor.setCursorScreenPosition([4, 10])
         editor.selectToScreenPosition([5, 27])
@@ -1177,7 +1000,7 @@ describe "Editor", ->
         expect(selection1).toBe selection
         expect(selection1.getBufferRange()).toEqual [[2, 2], [3, 3]]
 
-      describe "when the 'preserveFolds' option is false (the default)", ->
+      describe "when the preserveFolds option is false (the default)", ->
         it "removes folds that contain the selections", ->
           editor.setSelectedBufferRange([[0,0], [0,0]])
           editor.createFold(1, 4)
@@ -1191,7 +1014,7 @@ describe "Editor", ->
           expect(editor.lineForScreenRow(6).fold).toBeUndefined()
           expect(editor.lineForScreenRow(10).fold).toBeDefined()
 
-      describe "when the 'preserveFolds' option is true", ->
+      describe "when the preserve folds option is true", ->
         it "does not remove folds that contain the selections", ->
           editor.setSelectedBufferRange([[0,0], [0,0]])
           editor.createFold(1, 4)
@@ -1200,26 +1023,6 @@ describe "Editor", ->
           expect(editor.isFoldedAtBufferRow(1)).toBeTruthy()
           expect(editor.isFoldedAtBufferRow(6)).toBeTruthy()
 
-    describe ".setSelectedBufferRange(range)", ->
-      describe "when the 'autoscroll' option is true", ->
-        it "autoscrolls to the selection", ->
-          editor.manageScrollPosition = true
-          editor.setLineHeightInPixels(10)
-          editor.setDefaultCharWidth(10)
-          editor.setHeight(50)
-          editor.setWidth(50)
-          editor.setHorizontalScrollbarHeight(0)
-
-          expect(editor.getScrollTop()).toBe 0
-
-          editor.setSelectedBufferRange([[5, 6], [6, 8]], autoscroll: true)
-          expect(editor.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10
-          expect(editor.getScrollRight()).toBe 50
-
-          editor.setSelectedBufferRange([[6, 6], [6, 8]], autoscroll: true)
-          expect(editor.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10
-          expect(editor.getScrollRight()).toBe (8 + editor.getHorizontalScrollMargin()) * 10
-
     describe ".selectMarker(marker)", ->
       describe "if the marker is valid", ->
         it "selects the marker's range and returns the selected range", ->
@@ -1234,23 +1037,6 @@ describe "Editor", ->
           expect(editor.selectMarker(marker)).toBeFalsy()
           expect(editor.getSelectedBufferRange()).toEqual [[0, 0], [0, 0]]
 
-    describe ".addSelectionForBufferRange(bufferRange)", ->
-      it "adds a selection for the specified buffer range", ->
-        editor.addSelectionForBufferRange([[3, 4], [5, 6]])
-        expect(editor.getSelectedBufferRanges()).toEqual [[[0, 0], [0, 0]], [[3, 4], [5, 6]]]
-
-      it "autoscrolls to the added selection if needed", ->
-        editor.manageScrollPosition = true
-
-        editor.setLineHeightInPixels(10)
-        editor.setDefaultCharWidth(10)
-        editor.setHeight(50)
-        editor.setWidth(50)
-
-        editor.addSelectionForBufferRange([[8, 10], [8, 15]])
-        expect(editor.getScrollTop()).toBe 75
-        expect(editor.getScrollLeft()).toBe 160
-
     describe ".addSelectionBelow()", ->
       describe "when the selection is non-empty", ->
         it "selects the same region of the line below current selections if possible", ->
@@ -1459,14 +1245,10 @@ describe "Editor", ->
         expect(selection.isEmpty()).toBeTruthy()
 
     it "does not share selections between different edit sessions for the same buffer", ->
-      editor2 = null
-      waitsForPromise ->
-        atom.project.open('sample.js').then (o) -> editor2 = o
-
-      runs ->
-        editor.setSelectedBufferRanges([[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
-        editor2.setSelectedBufferRanges([[[8, 7], [6, 5]], [[4, 3], [2, 1]]])
-        expect(editor2.getSelectedBufferRanges()).not.toEqual editor.getSelectedBufferRanges()
+      editor2 = atom.project.openSync('sample.js')
+      editor.setSelectedBufferRanges([[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+      editor2.setSelectedBufferRanges([[[8, 7], [6, 5]], [[4, 3], [2, 1]]])
+      expect(editor2.getSelectedBufferRanges()).not.toEqual editor.getSelectedBufferRanges()
 
   describe "buffer manipulation", ->
     describe ".insertText(text)", ->
@@ -1498,17 +1280,6 @@ describe "Editor", ->
             expect(cursor1.getBufferPosition()).toEqual [1, 5]
             expect(cursor2.getBufferPosition()).toEqual [2, 7]
 
-          it "autoscrolls to the last cursor", ->
-            editor.manageScrollPosition = true
-            editor.setCursorScreenPosition([1, 2])
-            editor.addCursorAtScreenPosition([10, 4])
-            editor.setLineHeightInPixels(10)
-            editor.setHeight(50)
-
-            expect(editor.getScrollTop()).toBe 0
-            editor.insertText('a')
-            expect(editor.getScrollTop()).toBe 80
-
       describe "when there are multiple non-empty selections", ->
         describe "when the selections are on the same line", ->
           it "replaces each selection range with the inserted characters", ->
@@ -1653,42 +1424,6 @@ describe "Editor", ->
           editor.undo()
           expect(editor.getCursorBufferPosition()).toEqual [3,4]
 
-      it "indents the new line to the correct level when editor.autoIndent is true", ->
-        atom.config.set('editor.autoIndent', true)
-
-        editor.setText('  var test')
-        editor.setCursorBufferPosition([0,2])
-        editor.insertNewlineAbove()
-
-        expect(editor.getCursorBufferPosition()).toEqual [0,2]
-        expect(editor.lineForBufferRow(0)).toBe '  '
-        expect(editor.lineForBufferRow(1)).toBe '  var test'
-
-        editor.setText('\n  var test')
-        editor.setCursorBufferPosition([1,2])
-        editor.insertNewlineAbove()
-
-        expect(editor.getCursorBufferPosition()).toEqual [1,2]
-        expect(editor.lineForBufferRow(0)).toBe ''
-        expect(editor.lineForBufferRow(1)).toBe '  '
-        expect(editor.lineForBufferRow(2)).toBe '  var test'
-
-        editor.setText('function() {\n}')
-        editor.setCursorBufferPosition([1,1])
-        editor.insertNewlineAbove()
-
-        expect(editor.getCursorBufferPosition()).toEqual [1,2]
-        expect(editor.lineForBufferRow(0)).toBe 'function() {'
-        expect(editor.lineForBufferRow(1)).toBe '  '
-        expect(editor.lineForBufferRow(2)).toBe '}'
-
-    describe "when a new line is appended before a closing tag (e.g. by pressing enter before a selection)", ->
-      it "moves the line down and keeps the indentation level the same when editor.autoIndent is true", ->
-        atom.config.set('editor.autoIndent', true)
-        editor.setCursorBufferPosition([9,2])
-        editor.insertNewline()
-        expect(editor.lineForBufferRow(10)).toBe '  };'
-
     describe ".backspace()", ->
       describe "when there is a single cursor", ->
         changeScreenRangeHandler = null
@@ -1836,77 +1571,46 @@ describe "Editor", ->
           editor.backspace()
           expect(editor.lineForBufferRow(0)).toBe 'var  =  () {'
 
-    describe ".deleteToBeginningOfWord()", ->
+    describe ".backspaceToBeginningOfWord()", ->
       describe "when no text is selected", ->
         it "deletes all text between the cursor and the beginning of the word", ->
           editor.setCursorBufferPosition([1, 24])
           editor.addCursorAtBufferPosition([3, 5])
           [cursor1, cursor2] = editor.getCursors()
 
-          editor.deleteToBeginningOfWord()
+          editor.backspaceToBeginningOfWord()
           expect(buffer.lineForRow(1)).toBe '  var sort = function(ems) {'
           expect(buffer.lineForRow(3)).toBe '    ar pivot = items.shift(), current, left = [], right = [];'
           expect(cursor1.getBufferPosition()).toEqual [1, 22]
           expect(cursor2.getBufferPosition()).toEqual [3, 4]
 
-          editor.deleteToBeginningOfWord()
+          editor.backspaceToBeginningOfWord()
           expect(buffer.lineForRow(1)).toBe '  var sort = functionems) {'
           expect(buffer.lineForRow(2)).toBe '    if (items.length <= 1) return itemsar pivot = items.shift(), current, left = [], right = [];'
           expect(cursor1.getBufferPosition()).toEqual [1, 21]
           expect(cursor2.getBufferPosition()).toEqual [2, 39]
 
-          editor.deleteToBeginningOfWord()
+          editor.backspaceToBeginningOfWord()
           expect(buffer.lineForRow(1)).toBe '  var sort = ems) {'
           expect(buffer.lineForRow(2)).toBe '    if (items.length <= 1) return ar pivot = items.shift(), current, left = [], right = [];'
           expect(cursor1.getBufferPosition()).toEqual [1, 13]
           expect(cursor2.getBufferPosition()).toEqual [2, 34]
 
-          editor.setText('  var sort')
-          editor.setCursorBufferPosition([0, 2])
-          editor.deleteToBeginningOfWord()
-          expect(buffer.lineForRow(0)).toBe 'var sort'
-
       describe "when text is selected", ->
         it "deletes only selected text", ->
           editor.setSelectedBufferRanges([[[1, 24], [1, 27]], [[2, 0], [2, 4]]])
-          editor.deleteToBeginningOfWord()
+          editor.backspaceToBeginningOfWord()
           expect(buffer.lineForRow(1)).toBe '  var sort = function(it) {'
           expect(buffer.lineForRow(2)).toBe 'if (items.length <= 1) return items;'
 
-    describe '.deleteToEndOfLine()', ->
-      describe 'when no text is selected', ->
-        it 'deletes all text between the cursor and the end of the line', ->
-          editor.setCursorBufferPosition([1, 24])
-          editor.addCursorAtBufferPosition([2, 5])
-          [cursor1, cursor2] = editor.getCursors()
-
-          editor.deleteToEndOfLine()
-          expect(buffer.lineForRow(1)).toBe '  var sort = function(it'
-          expect(buffer.lineForRow(2)).toBe '    i'
-          expect(cursor1.getBufferPosition()).toEqual [1, 24]
-          expect(cursor2.getBufferPosition()).toEqual [2, 5]
-
-        describe 'when at the end of the line', ->
-          it 'deletes the next newline', ->
-            editor.setCursorBufferPosition([1, 30])
-            editor.deleteToEndOfLine()
-            expect(buffer.lineForRow(1)).toBe '  var sort = function(items) {    if (items.length <= 1) return items;'
-
-      describe 'when text is selected', ->
-        it 'deletes only the text in the selection', ->
-          editor.setSelectedBufferRanges([[[1, 24], [1, 27]], [[2, 0], [2, 4]]])
-          editor.deleteToEndOfLine()
-          expect(buffer.lineForRow(1)).toBe '  var sort = function(it) {'
-          expect(buffer.lineForRow(2)).toBe 'if (items.length <= 1) return items;'
-
-    describe ".deleteToBeginningOfLine()", ->
+    describe ".backspaceToBeginningOfLine()", ->
       describe "when no text is selected", ->
         it "deletes all text between the cursor and the beginning of the line", ->
           editor.setCursorBufferPosition([1, 24])
           editor.addCursorAtBufferPosition([2, 5])
           [cursor1, cursor2] = editor.getCursors()
 
-          editor.deleteToBeginningOfLine()
+          editor.backspaceToBeginningOfLine()
           expect(buffer.lineForRow(1)).toBe 'ems) {'
           expect(buffer.lineForRow(2)).toBe 'f (items.length <= 1) return items;'
           expect(cursor1.getBufferPosition()).toEqual [1, 0]
@@ -1915,13 +1619,13 @@ describe "Editor", ->
         describe "when at the beginning of the line", ->
           it "deletes the newline", ->
             editor.setCursorBufferPosition([2])
-            editor.deleteToBeginningOfLine()
+            editor.backspaceToBeginningOfLine()
             expect(buffer.lineForRow(1)).toBe '  var sort = function(items) {    if (items.length <= 1) return items;'
 
       describe "when text is selected", ->
         it "still deletes all text to begginning of the line", ->
           editor.setSelectedBufferRanges([[[1, 24], [1, 27]], [[2, 0], [2, 4]]])
-          editor.deleteToBeginningOfLine()
+          editor.backspaceToBeginningOfLine()
           expect(buffer.lineForRow(1)).toBe 'ems) {'
           expect(buffer.lineForRow(2)).toBe '    if (items.length <= 1) return items;'
 
@@ -2081,20 +1785,6 @@ describe "Editor", ->
               editor.indent()
               expect(buffer.lineForRow(0)).toMatch(tabRegex)
 
-            it "respects the tab stops when cursor is in the middle of a tab", ->
-              editor.setTabLength(4)
-              buffer.insert([12, 2], "\n ")
-              editor.setCursorBufferPosition [13, 1]
-              editor.indent()
-              expect(buffer.lineForRow(13)).toMatch /^\s+$/
-              expect(buffer.lineForRow(13).length).toBe 4
-              expect(editor.getCursorBufferPosition()).toEqual [13, 4]
-
-              buffer.insert([13, 0], "  ")
-              editor.setCursorBufferPosition [13, 6]
-              editor.indent()
-              expect(buffer.lineForRow(13).length).toBe 8
-
           describe "if 'softTabs' is false", ->
             it "insert a \t into the buffer", ->
               editor.setSoftTabs(false)
@@ -2113,20 +1803,6 @@ describe "Editor", ->
                 expect(buffer.lineForRow(5).length).toBe 6
                 expect(editor.getCursorBufferPosition()).toEqual [5, 6]
 
-              it "respects the tab stops when cursor is in the middle of a tab", ->
-                editor.setTabLength(4)
-                buffer.insert([12, 2], "\n ")
-                editor.setCursorBufferPosition [13, 1]
-                editor.indent(autoIndent: true)
-                expect(buffer.lineForRow(13)).toMatch /^\s+$/
-                expect(buffer.lineForRow(13).length).toBe 4
-                expect(editor.getCursorBufferPosition()).toEqual [13, 4]
-
-                buffer.insert([13, 0], "  ")
-                editor.setCursorBufferPosition [13, 6]
-                editor.indent(autoIndent: true)
-                expect(buffer.lineForRow(13).length).toBe 8
-
             describe "when 'softTabs' is false", ->
               it "moves the cursor to the end of the leading whitespace and inserts enough tabs to bring the line to the suggested level of indentaion", ->
                 convertToHardTabs(buffer)
@@ -2222,44 +1898,17 @@ describe "Editor", ->
 
       describe ".copySelectedText()", ->
         it "copies selected text onto the clipboard", ->
-          editor.setSelectedBufferRanges([[[0,4], [0,13]], [[1,6], [1, 10]], [[2,8], [2, 13]]])
-
           editor.copySelectedText()
           expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
           expect(buffer.lineForRow(1)).toBe "  var sort = function(items) {"
-          expect(buffer.lineForRow(2)).toBe "    if (items.length <= 1) return items;"
-          expect(clipboard.readText()).toBe 'quicksort\nsort\nitems'
-          expect(atom.clipboard.readWithMetadata().metadata.selections).toEqual([
-            'quicksort'
-            'sort'
-            'items'
-          ])
+          expect(clipboard.readText()).toBe 'quicksort\nsort'
 
       describe ".pasteText()", ->
         it "pastes text into the buffer", ->
           atom.clipboard.write('first')
           editor.pasteText()
-          expect(editor.lineForBufferRow(0)).toBe "var first = function () {"
-          expect(editor.lineForBufferRow(1)).toBe "  var first = function(items) {"
-
-        describe 'when the clipboard has many selections', ->
-          it "pastes each selection separately into the buffer", ->
-            atom.clipboard.write('first\nsecond', {selections: ['first', 'second'] })
-            editor.pasteText()
-            expect(editor.lineForBufferRow(0)).toBe "var first = function () {"
-            expect(editor.lineForBufferRow(1)).toBe "  var second = function(items) {"
-
-          describe 'and the selections count does not match', ->
-            it "pastes the whole text into the buffer", ->
-              atom.clipboard.write('first\nsecond\nthird', {selections: ['first', 'second', 'third'] })
-              editor.pasteText()
-              expect(editor.lineForBufferRow(0)).toBe "var first"
-              expect(editor.lineForBufferRow(1)).toBe "second"
-              expect(editor.lineForBufferRow(2)).toBe "third = function () {"
-
-              expect(editor.lineForBufferRow(3)).toBe "  var first"
-              expect(editor.lineForBufferRow(4)).toBe "second"
-              expect(editor.lineForBufferRow(5)).toBe "third = function(items) {"
+          expect(editor.buffer.lineForRow(0)).toBe "var first = function () {"
+          expect(buffer.lineForRow(1)).toBe "  var first = function(items) {"
 
     describe ".indentSelectedRows()", ->
       describe "when nothing is selected", ->
@@ -2354,15 +2003,6 @@ describe "Editor", ->
           editor.outdentSelectedRows()
           expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
 
-        it "outdents only up to the first non-space non-tab character", ->
-          editor.insertText(' \tfoo\t ')
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "\tfoo\t var quicksort = function () {"
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "foo\t var quicksort = function () {"
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "foo\t var quicksort = function () {"
-
       describe "when one line is selected", ->
         it "outdents line and retains editor", ->
           editor.setSelectedBufferRange([[1,4], [1,14]])
@@ -2457,14 +2097,10 @@ describe "Editor", ->
 
       it "does not explode if the current language mode has no comment regex", ->
         editor.destroy()
-
-        waitsForPromise ->
-          atom.workspace.open(null, autoIndent: false).then (o) -> editor = o
-
-        runs ->
-          editor.setSelectedBufferRange([[4, 5], [4, 5]])
-          editor.toggleLineCommentsInSelection()
-          expect(buffer.lineForRow(4)).toBe "    while(items.length > 0) {"
+        editor = atom.project.openSync(null, autoIndent: false)
+        editor.setSelectedBufferRange([[4, 5], [4, 5]])
+        editor.toggleLineCommentsInSelection()
+        expect(buffer.lineForRow(4)).toBe "    while(items.length > 0) {"
 
       it "uncomments when the line lacks the trailing whitespace in the comment regex", ->
         editor.setCursorBufferPosition([10, 0])
@@ -2783,21 +2419,14 @@ describe "Editor", ->
 
   describe "soft-tabs detection", ->
     it "assigns soft / hard tabs based on the contents of the buffer, or uses the default if unknown", ->
-      waitsForPromise ->
-        atom.workspace.open('sample.js', softTabs: false).then (editor) ->
-          expect(editor.getSoftTabs()).toBeTruthy()
+      editor = atom.project.openSync('sample.js', softTabs: false)
+      expect(editor.getSoftTabs()).toBeTruthy()
 
-      waitsForPromise ->
-        atom.workspace.open('sample-with-tabs.coffee', softTabs: true).then (editor) ->
-          expect(editor.getSoftTabs()).toBeFalsy()
+      editor = atom.project.openSync('sample-with-tabs.coffee', softTabs: true)
+      expect(editor.getSoftTabs()).toBeFalsy()
 
-      waitsForPromise ->
-        atom.workspace.open('sample-with-tabs-and-initial-comment.js', softTabs: true).then (editor) ->
-          expect(editor.getSoftTabs()).toBeFalsy()
-
-      waitsForPromise ->
-        atom.workspace.open(null, softTabs: false).then (editor) ->
-          expect(editor.getSoftTabs()).toBeFalsy()
+      editor = atom.project.openSync(null, softTabs: false)
+      expect(editor.getSoftTabs()).toBeFalsy()
 
   describe ".indentLevelForLine(line)", ->
     it "returns the indent level when the line has only leading whitespace", ->
@@ -2821,21 +2450,16 @@ describe "Editor", ->
 
   describe "when a better-matched grammar is added to syntax", ->
     it "switches to the better-matched grammar and re-tokenizes the buffer", ->
-      editor.destroy()
-
       jsGrammar = atom.syntax.selectGrammar('a.js')
       atom.syntax.removeGrammar(jsGrammar)
 
-      waitsForPromise ->
-        atom.workspace.open('sample.js', autoIndent: false).then (o) -> editor = o
+      editor2 = atom.project.openSync('sample.js', autoIndent: false)
+      expect(editor2.getGrammar()).toBe atom.syntax.nullGrammar
+      expect(editor2.lineForScreenRow(0).tokens.length).toBe 1
 
-      runs ->
-        expect(editor.getGrammar()).toBe atom.syntax.nullGrammar
-        expect(editor.lineForScreenRow(0).tokens.length).toBe 1
-
-        atom.syntax.addGrammar(jsGrammar)
-        expect(editor.getGrammar()).toBe jsGrammar
-        expect(editor.lineForScreenRow(0).tokens.length).toBeGreaterThan 1
+      atom.syntax.addGrammar(jsGrammar)
+      expect(editor2.getGrammar()).toBe jsGrammar
+      expect(editor2.lineForScreenRow(0).tokens.length).toBeGreaterThan 1
 
   describe "auto-indent", ->
     copyText = (text, {startColumn}={}) ->
@@ -2857,7 +2481,7 @@ describe "Editor", ->
 
             atom.config.set("editor.autoIndent", false)
             editor.indent()
-            expect(editor.lineForBufferRow(2)).toBe "  "
+            expect(editor.lineForBufferRow(2)).toBe "   "
 
       describe "when editor.autoIndent is true", ->
         beforeEach ->
@@ -2882,7 +2506,7 @@ describe "Editor", ->
 
           describe "when the line preceding the newline does't add a level of indentation", ->
             it "indents the new line to the same level a as the preceding line", ->
-              editor.setCursorBufferPosition([5, 14])
+              editor.setCursorBufferPosition([5, 13])
               editor.insertText('\n')
               expect(editor.indentationForBufferRow(6)).toBe editor.indentationForBufferRow(5)
 
@@ -2905,16 +2529,6 @@ describe "Editor", ->
             expect(editor.indentationForBufferRow(1)).toBe 1
             expect(editor.indentationForBufferRow(2)).toBe 1
 
-          describe "when the cursor is before whitespace", ->
-            it "retains the whitespace following the cursor on the new line", ->
-              editor.setText("  var sort = function() {}")
-              editor.setCursorScreenPosition([0, 23])
-              editor.insertNewline()
-
-              expect(buffer.lineForRow(0)).toBe '  var sort = function()'
-              expect(buffer.lineForRow(1)).toBe '   {}'
-              expect(editor.getCursorScreenPosition()).toEqual [1, 2]
-
         describe "when inserted text matches a decrease indent pattern", ->
           describe "when the preceding line matches an increase indent pattern", ->
             it "decreases the indentation to match that of the preceding line", ->
@@ -2938,7 +2552,7 @@ describe "Editor", ->
               expect(editor.lineForBufferRow(13)).toBe "}; # too many closing brackets!"
 
         describe "when inserted text does not match a decrease indent pattern", ->
-          it "does not decrease the indentation", ->
+          it "does not the indentation", ->
             editor.setCursorBufferPosition([12, 0])
             editor.insertText('  ')
             expect(editor.lineForBufferRow(12)).toBe '  };'
@@ -3012,18 +2626,6 @@ describe "Editor", ->
       expect(editor.lineForBufferRow(4)).toBe "    }"
       expect(editor.lineForBufferRow(5)).toBe "    i=1"
 
-  describe "soft and hard tabs", ->
-    it "resets the tab style when tokenization is complete", ->
-      editor.destroy()
-      atom.project.open('sample-with-tabs-and-leading-comment.coffee').then (o) -> editor = o
-      expect(editor.softTabs).toBe true
-
-      waitsForPromise ->
-        atom.packages.activatePackage('language-coffee-script')
-
-      runs ->
-        expect(editor.softTabs).toBe false
-
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
       expect(buffer.getMarkerCount()).toBeGreaterThan 0
@@ -3134,15 +2736,10 @@ describe "Editor", ->
       expect(editor.shouldPromptToSave()).toBeFalsy()
       buffer.setText('changed')
       expect(editor.shouldPromptToSave()).toBeTruthy()
-
-      editor2 = null
-      waitsForPromise ->
-        atom.project.open('sample.js', autoIndent: false).then (o) -> editor2 = o
-
-      runs ->
-        expect(editor.shouldPromptToSave()).toBeFalsy()
-        editor2.destroy()
-        expect(editor.shouldPromptToSave()).toBeTruthy()
+      editor2 = atom.project.openSync('sample.js', autoIndent: false)
+      expect(editor.shouldPromptToSave()).toBeFalsy()
+      editor2.destroy()
+      expect(editor.shouldPromptToSave()).toBeTruthy()
 
   describe "when the edit session contains surrogate pair characters", ->
     it "correctly backspaces over them", ->
@@ -3189,18 +2786,10 @@ describe "Editor", ->
     describe "when the editor uses soft tabs but the row has hard tabs", ->
       it "only replaces whitespace charachters", ->
         editor.setSoftWrap(true)
-        editor.setText("\t1\n\t2")
+        editor.setText("	1\n	2")
         editor.setCursorBufferPosition([0, 0])
         editor.setIndentationForBufferRow(0, 2)
-        expect(editor.getText()).toBe("    1\n\t2")
-
-    describe "when the indentation level is a non-integer", ->
-      it "does not throw an exception", ->
-        editor.setSoftWrap(true)
-        editor.setText("\t1\n\t2")
-        editor.setCursorBufferPosition([0, 0])
-        editor.setIndentationForBufferRow(0, 2.1)
-        expect(editor.getText()).toBe("    1\n\t2")
+        expect(editor.getText()).toBe("    1\n	2")
 
   describe ".reloadGrammar()", ->
     beforeEach ->
@@ -3238,15 +2827,12 @@ describe "Editor", ->
 
     describe "when the grammar is added", ->
       it "retokenizes existing buffers that contain tokens that match the injection selector", ->
-        waitsForPromise ->
-          atom.workspace.open('sample.js').then (o) -> editor = o
+        editor = atom.project.openSync('sample.js')
+        editor.setText("// http://github.com")
 
-        runs ->
-          editor.setText("// http://github.com")
-
-          {tokens} = editor.lineForScreenRow(0)
-          expect(tokens[1].value).toBe " http://github.com"
-          expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
+        {tokens} = editor.lineForScreenRow(0)
+        expect(tokens[1].value).toBe " http://github.com"
+        expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
 
         waitsForPromise ->
           atom.packages.activatePackage('language-hyperlink')
@@ -3258,15 +2844,12 @@ describe "Editor", ->
 
       describe "when the grammar is updated", ->
         it "retokenizes existing buffers that contain tokens that match the injection selector", ->
-          waitsForPromise ->
-            atom.workspace.open('sample.js').then (o) -> editor = o
+          editor = atom.project.openSync('sample.js')
+          editor.setText("// SELECT * FROM OCTOCATS")
 
-          runs ->
-            editor.setText("// SELECT * FROM OCTOCATS")
-
-            {tokens} = editor.lineForScreenRow(0)
-            expect(tokens[1].value).toBe " SELECT * FROM OCTOCATS"
-            expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
+          {tokens} = editor.lineForScreenRow(0)
+          expect(tokens[1].value).toBe " SELECT * FROM OCTOCATS"
+          expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
 
           waitsForPromise ->
             atom.packages.activatePackage('package-with-injection-selector')
@@ -3283,93 +2866,3 @@ describe "Editor", ->
             {tokens} = editor.lineForScreenRow(0)
             expect(tokens[2].value).toBe "SELECT"
             expect(tokens[2].scopes).toEqual ["source.js", "comment.line.double-slash.js", "keyword.other.DML.sql"]
-
-  describe ".normalizeTabsInBufferRange()", ->
-    it "normalizes tabs depending on the editor's soft tab/tab length settings", ->
-      editor.setTabLength(1)
-      editor.setSoftTabs(true)
-      editor.setText('\t\t\t')
-      editor.normalizeTabsInBufferRange([[0, 0], [0, 1]])
-      expect(editor.getText()).toBe ' \t\t'
-
-      editor.setTabLength(2)
-      editor.normalizeTabsInBufferRange([[0, 0], [Infinity, Infinity]])
-      expect(editor.getText()).toBe '     '
-
-      editor.setSoftTabs(false)
-      editor.normalizeTabsInBufferRange([[0, 0], [Infinity, Infinity]])
-      expect(editor.getText()).toBe '     '
-
-  describe ".scrollToCursorPosition()", ->
-    it "scrolls the last cursor into view", ->
-      editor.setCursorScreenPosition([8, 8])
-      editor.setLineHeightInPixels(10)
-      editor.setDefaultCharWidth(10)
-      editor.setHeight(50)
-      editor.setWidth(50)
-      editor.setHorizontalScrollbarHeight(0)
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getScrollLeft()).toBe 0
-
-      editor.scrollToCursorPosition()
-      expect(editor.getScrollBottom()).toBe (9 + editor.getVerticalScrollMargin()) * 10
-      expect(editor.getScrollRight()).toBe (9 + editor.getHorizontalScrollMargin()) * 10
-
-  describe ".pageUp/Down()", ->
-    it "scrolls one screen height up or down and moves the cursor one page length", ->
-      editor.manageScrollPosition = true
-
-      editor.setLineHeightInPixels(10)
-      editor.setHeight(50)
-      expect(editor.getScrollHeight()).toBe 130
-      expect(editor.getCursorBufferPosition().row).toBe 0
-
-      editor.pageDown()
-      expect(editor.getScrollTop()).toBe 50
-      expect(editor.getCursorBufferPosition().row).toBe 5
-
-      editor.pageDown()
-      expect(editor.getScrollTop()).toBe 80
-      expect(editor.getCursorBufferPosition().row).toBe 10
-
-      editor.pageUp()
-      expect(editor.getScrollTop()).toBe 30
-      expect(editor.getCursorBufferPosition().row).toBe 5
-
-      editor.pageUp()
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getCursorBufferPosition().row).toBe 0
-
-  describe ".selectPageUp/Down()", ->
-    it "selects one screen height of text up or down", ->
-      editor.manageScrollPosition = true
-
-      editor.setLineHeightInPixels(10)
-      editor.setHeight(50)
-      expect(editor.getScrollHeight()).toBe 130
-      expect(editor.getCursorBufferPosition().row).toBe 0
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 30
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [5,0]]]
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 80
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [10,0]]]
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 80
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [12,2]]]
-
-      editor.moveCursorToBottom()
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 50
-      expect(editor.getSelectedBufferRanges()).toEqual [[[7,0], [12,2]]]
-
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getSelectedBufferRanges()).toEqual [[[2,0], [12,2]]]
-
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [12,2]]]

spec/editor-view-spec.coffee

@@ -7,38 +7,28 @@ path = require 'path'
 temp = require 'temp'
 
 describe "EditorView", ->
-  [buffer, editorView, editor, cachedEditor, cachedLineHeight, cachedCharWidth, fart] = []
+  [buffer, editorView, editor, cachedLineHeight, cachedCharWidth] = []
 
   beforeEach ->
-    atom.config.set 'core.useReactEditor', false
+    editor = atom.project.openSync('sample.js')
+    buffer = editor.buffer
+    editorView = new EditorView(editor)
+    editorView.lineOverdraw = 2
+    editorView.isFocused = true
+    editorView.enableKeymap()
+    editorView.calculateHeightInLines = ->
+      Math.ceil(@height() / @lineHeight)
+    editorView.attachToDom = ({ heightInLines, widthInChars } = {}) ->
+      heightInLines ?= @getEditor().getBuffer().getLineCount()
+      @height(getLineHeight() * heightInLines)
+      @width(getCharWidth() * widthInChars) if widthInChars
+      $('#jasmine-content').append(this)
 
     waitsForPromise ->
-      atom.workspace.open('sample.js').then (o) -> editor = o
+      atom.packages.activatePackage('language-text', sync: true)
 
     waitsForPromise ->
-      atom.workspace.open('sample.less').then (o) -> cachedEditor = o
-
-    runs ->
-      buffer = editor.buffer
-      editorView = new EditorView(editor)
-      editorView.lineOverdraw = 2
-      editorView.isFocused = true
-      editorView.enableKeymap()
-
-      editorView.calculateHeightInLines = ->
-        Math.ceil(@height() / @lineHeight)
-
-      editorView.attachToDom = ({ heightInLines, widthInChars } = {}) ->
-        heightInLines ?= @getEditor().getBuffer().getLineCount()
-        @height(getLineHeight() * heightInLines)
-        @width(getCharWidth() * widthInChars) if widthInChars
-        $('#jasmine-content').append(this)
-
-    waitsForPromise ->
-      atom.packages.activatePackage('language-text')
-
-    waitsForPromise ->
-      atom.packages.activatePackage('language-javascript')
+      atom.packages.activatePackage('language-javascript', sync: true)
 
   getLineHeight = ->
     return cachedLineHeight if cachedLineHeight?
@@ -51,7 +41,7 @@ describe "EditorView", ->
     cachedCharWidth
 
   calcDimensions = ->
-    editorForMeasurement = new EditorView({editor: cachedEditor})
+    editorForMeasurement = new EditorView(editor: atom.project.openSync('sample.js'))
     editorForMeasurement.attachToDom()
     cachedLineHeight = editorForMeasurement.lineHeight
     cachedCharWidth = editorForMeasurement.charWidth
@@ -115,23 +105,18 @@ describe "EditorView", ->
 
   describe "when the editor's file is modified on disk", ->
     it "triggers an alert", ->
-      fileChangeHandler = null
       filePath = path.join(temp.dir, 'atom-changed-file.txt')
       fs.writeFileSync(filePath, "")
+      editor = atom.project.openSync(filePath)
+      editorView.edit(editor)
+      editor.insertText("now the buffer is modified")
 
-      waitsForPromise ->
-        atom.workspace.open(filePath).then (o) -> editor = o
+      fileChangeHandler = jasmine.createSpy('fileChange')
+      editor.buffer.file.on 'contents-changed', fileChangeHandler
 
-      runs ->
-        editorView.edit(editor)
-        editor.insertText("now the buffer is modified")
+      spyOn(atom, "confirm")
 
-        fileChangeHandler = jasmine.createSpy('fileChange')
-        editor.buffer.file.on 'contents-changed', fileChangeHandler
-
-        spyOn(atom, "confirm")
-
-        fs.writeFileSync(filePath, "a file change")
+      fs.writeFileSync(filePath, "a file change")
 
       waitsFor "file to trigger contents-changed event", ->
         fileChangeHandler.callCount > 0
@@ -148,11 +133,8 @@ describe "EditorView", ->
     [newEditor, newBuffer] = []
 
     beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open('two-hundred.txt').then (o) -> newEditor = o
-
-      runs ->
-        newBuffer = newEditor.buffer
+      newEditor = atom.project.openSync('two-hundred.txt')
+      newBuffer = newEditor.buffer
 
     it "updates the rendered lines, cursors, selections, scroll position, and event subscriptions to match the given edit session", ->
       editorView.attachToDom(heightInLines: 5, widthInChars: 30)
@@ -188,24 +170,17 @@ describe "EditorView", ->
       expect(editorView.lineElementForScreenRow(6).text()).toMatch /^      currentgoodbye/
 
     it "triggers alert if edit session's buffer goes into conflict with changes on disk", ->
-      contentsConflictedHandler = null
       filePath = path.join(temp.dir, 'atom-changed-file.txt')
       fs.writeFileSync(filePath, "")
-      tempEditor = null
+      tempEditor = atom.project.openSync(filePath)
+      editorView.edit(tempEditor)
+      tempEditor.insertText("a buffer change")
 
-      waitsForPromise ->
-        atom.workspace.open(filePath).then (o) -> tempEditor = o
-
-      runs ->
-        editorView.edit(tempEditor)
-        tempEditor.insertText("a buffer change")
-
-        spyOn(atom, "confirm")
-
-        contentsConflictedHandler = jasmine.createSpy("contentsConflictedHandler")
-        tempEditor.on 'contents-conflicted', contentsConflictedHandler
-        fs.writeFileSync(filePath, "a file change")
+      spyOn(atom, "confirm")
 
+      contentsConflictedHandler = jasmine.createSpy("contentsConflictedHandler")
+      tempEditor.on 'contents-conflicted', contentsConflictedHandler
+      fs.writeFileSync(filePath, "a file change")
       waitsFor ->
         contentsConflictedHandler.callCount > 0
 
@@ -306,34 +281,26 @@ describe "EditorView", ->
     it "emits event when editor view view receives a new buffer", ->
       eventHandler = jasmine.createSpy('eventHandler')
       editorView.on 'editor:path-changed', eventHandler
-      waitsForPromise ->
-        atom.workspace.open(filePath).then (editor) ->
-          editorView.edit(editor)
-
-      runs ->
-        expect(eventHandler).toHaveBeenCalled()
+      editorView.edit(atom.project.openSync(filePath))
+      expect(eventHandler).toHaveBeenCalled()
 
     it "stops listening to events on previously set buffers", ->
       eventHandler = jasmine.createSpy('eventHandler')
       oldBuffer = editor.getBuffer()
-      newEditor = null
+      newEditor = atom.project.openSync(filePath)
+      editorView.on 'editor:path-changed', eventHandler
 
-      waitsForPromise ->
-        atom.workspace.open(filePath).then (o) -> newEditor = o
 
-      runs ->
-        editorView.on 'editor:path-changed', eventHandler
+      editorView.edit(newEditor)
+      expect(eventHandler).toHaveBeenCalled()
 
-        editorView.edit(newEditor)
-        expect(eventHandler).toHaveBeenCalled()
+      eventHandler.reset()
+      oldBuffer.saveAs(path.join(temp.dir, 'atom-bad.txt'))
+      expect(eventHandler).not.toHaveBeenCalled()
 
-        eventHandler.reset()
-        oldBuffer.saveAs(path.join(temp.dir, 'atom-bad.txt'))
-        expect(eventHandler).not.toHaveBeenCalled()
-
-        eventHandler.reset()
-        newEditor.getBuffer().saveAs(path.join(temp.dir, 'atom-new.txt'))
-        expect(eventHandler).toHaveBeenCalled()
+      eventHandler.reset()
+      newEditor.getBuffer().saveAs(path.join(temp.dir, 'atom-new.txt'))
+      expect(eventHandler).toHaveBeenCalled()
 
     it "loads the grammar for the new path", ->
       expect(editor.getGrammar().name).toBe 'JavaScript'
@@ -465,9 +432,9 @@ describe "EditorView", ->
           editorView.setFontFamily('sans-serif')
 
       it "positions the cursor to the clicked row and column", ->
-        {top, left} = editorView.pixelOffsetForScreenPosition([3, 30])
-        editorView.renderedLines.trigger mousedownEvent(pageX: left, pageY: top)
-        expect(editor.getCursorScreenPosition()).toEqual [3, 30]
+          {top, left} = editorView.pixelOffsetForScreenPosition([3, 30])
+          editorView.renderedLines.trigger mousedownEvent(pageX: left, pageY: top)
+          expect(editor.getCursorScreenPosition()).toEqual [3, 30]
 
     describe "double-click", ->
       it "selects the word under the cursor, and expands the selection wordwise in either direction on a subsequent shift-click", ->
@@ -497,21 +464,7 @@ describe "EditorView", ->
         editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [3, 12], originalEvent: {detail: 1}, shiftKey: true)
         expect(editor.getSelectedBufferRange()).toEqual [[3, 10], [3, 12]]
 
-      it "stops selecting by word when another selection is made", ->
-        expect(editor.getCursorScreenPosition()).toEqual(row: 0, column: 0)
-        editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 8], originalEvent: {detail: 1})
-        editorView.renderedLines.trigger 'mouseup'
-        editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 8], originalEvent: {detail: 2})
-        editorView.renderedLines.trigger 'mouseup'
-        expect(editor.getSelectedText()).toBe "quicksort"
-
-        editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [3, 10])
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [3, 12], which: 1)
-        editorView.renderedLines.trigger 'mouseup'
-
-        expect(editor.getSelectedBufferRange()).toEqual [[3, 10], [3, 12]]
-
-      describe "when double-clicking between a word and a non-word", ->
+      describe "when clicking between a word and a non-word", ->
         it "selects the word", ->
           expect(editor.getCursorScreenPosition()).toEqual(row: 0, column: 0)
           editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [1, 21], originalEvent: {detail: 1})
@@ -534,30 +487,6 @@ describe "EditorView", ->
           editorView.renderedLines.trigger 'mouseup'
           expect(editor.getSelectedText()).toBe "{"
 
-      describe "when double-clicking on whitespace", ->
-        it "selects all adjacent whitespace", ->
-          editor.setText("   some  text    ")
-          editor.setCursorBufferPosition([0, 2])
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 2], originalEvent: {detail: 1})
-          editorView.renderedLines.trigger 'mouseup'
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 2], originalEvent: {detail: 2})
-          editorView.renderedLines.trigger 'mouseup'
-          expect(editor.getSelectedBufferRange()).toEqual [[0, 0], [0, 3]]
-
-          editor.setCursorBufferPosition([0, 8])
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 8], originalEvent: {detail: 1})
-          editorView.renderedLines.trigger 'mouseup'
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 8], originalEvent: {detail: 2})
-          editorView.renderedLines.trigger 'mouseup'
-          expect(editor.getSelectedBufferRange()).toEqual [[0, 7], [0, 9]]
-
-          editor.setCursorBufferPosition([0, 14])
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 14], originalEvent: {detail: 1})
-          editorView.renderedLines.trigger 'mouseup'
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 14], originalEvent: {detail: 2})
-          editorView.renderedLines.trigger 'mouseup'
-          expect(editor.getSelectedBufferRange()).toEqual [[0, 13], [0, 17]]
-
     describe "triple/quardruple/etc-click", ->
       it "selects the line under the cursor", ->
         expect(editor.getCursorScreenPosition()).toEqual(row: 0, column: 0)
@@ -658,7 +587,7 @@ describe "EditorView", ->
         editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [4, 10])
 
         # moving changes selection
-        $(document).trigger mousemoveEvent(editorView: editorView, point: [5, 27], which: 1)
+        $(document).trigger mousemoveEvent(editorView: editorView, point: [5, 27])
 
         range = editor.getSelection().getScreenRange()
         expect(range.start).toEqual({row: 4, column: 10})
@@ -688,12 +617,12 @@ describe "EditorView", ->
         originalScrollTop = editorView.scrollTop()
 
         # moving changes selection
-        $(document).trigger mousemoveEvent(editorView: editorView, pageX: 0, pageY: -1, which: 1)
+        $(document).trigger mousemoveEvent(editorView: editorView, pageX: 0, pageY: -1)
         expect(editorView.scrollTop()).toBe originalScrollTop - editorView.lineHeight
 
         # every mouse move selects more text
         for x in [0..10]
-          $(document).trigger mousemoveEvent(editorView: editorView, pageX: 0, pageY: -1, which: 1)
+          $(document).trigger mousemoveEvent(editorView: editorView, pageX: 0, pageY: -1)
 
         expect(editorView.scrollTop()).toBe 0
 
@@ -704,7 +633,7 @@ describe "EditorView", ->
         event = mousedownEvent(editorView: editorView, point: [4, 10])
         event.originalEvent.which = 2
         editorView.renderedLines.trigger(event)
-        $(document).trigger mousemoveEvent(editorView: editorView, point: [5, 27], which: 1)
+        $(document).trigger mousemoveEvent(editorView: editorView, point: [5, 27])
         $(document).trigger 'mouseup'
 
         range = editor.getSelection().getScreenRange()
@@ -725,25 +654,6 @@ describe "EditorView", ->
         expect(range.start).toEqual({row: 4, column: 10})
         expect(range.end).toEqual({row: 4, column: 10})
 
-      describe "when the editor is hidden", ->
-        it "stops scrolling the editor", ->
-          editorView.vScrollMargin = 0
-          editorView.attachToDom(heightInLines: 5)
-          editorView.scrollToBottom()
-
-          spyOn(window, 'setInterval').andCallFake ->
-
-          editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [12, 0])
-          originalScrollTop = editorView.scrollTop()
-
-          $(document).trigger mousemoveEvent(editorView: editorView, pageX: 0, pageY: -1, which: 1)
-          expect(editorView.scrollTop()).toBe originalScrollTop - editorView.lineHeight
-
-          editorView.hide()
-
-          $(document).trigger mousemoveEvent(editorView: editorView, pageX: 100000, pageY: -1, which: 1)
-          expect(editorView.scrollTop()).toBe originalScrollTop - editorView.lineHeight
-
     describe "double-click and drag", ->
       it "selects the word under the cursor, then continues to select by word in either direction as the mouse is dragged", ->
         expect(editor.getCursorScreenPosition()).toEqual(row: 0, column: 0)
@@ -752,11 +662,11 @@ describe "EditorView", ->
         editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [0, 8], originalEvent: {detail: 2})
         expect(editor.getSelectedText()).toBe "quicksort"
 
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [1, 8], which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [1, 8])
         expect(editor.getSelectedBufferRange()).toEqual [[0, 4], [1, 10]]
         expect(editor.getCursorBufferPosition()).toEqual [1, 10]
 
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [0, 1], which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [0, 1])
         expect(editor.getSelectedBufferRange()).toEqual [[0, 0], [0, 13]]
         expect(editor.getCursorBufferPosition()).toEqual [0, 0]
 
@@ -781,12 +691,12 @@ describe "EditorView", ->
         expect(editor.getSelectedBufferRange()).toEqual [[4, 0], [5, 0]]
 
         # moving changes selection linewise
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [5, 27], which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [5, 27])
         expect(editor.getSelectedBufferRange()).toEqual [[4, 0], [6, 0]]
         expect(editor.getCursorBufferPosition()).toEqual [6, 0]
 
         # moving changes selection linewise
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [2, 27], which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [2, 27])
         expect(editor.getSelectedBufferRange()).toEqual [[2, 0], [5, 0]]
         expect(editor.getCursorBufferPosition()).toEqual [2, 0]
 
@@ -796,11 +706,11 @@ describe "EditorView", ->
     describe "meta-click and drag", ->
       it "adds an additional selection", ->
         editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [4, 10])
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [5, 27], which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [5, 27])
         editorView.renderedLines.trigger 'mouseup'
 
         editorView.renderedLines.trigger mousedownEvent(editorView: editorView, point: [6, 10], metaKey: true)
-        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [8, 27], metaKey: true, which: 1)
+        editorView.renderedLines.trigger mousemoveEvent(editorView: editorView, point: [8, 27], metaKey: true)
         editorView.renderedLines.trigger 'mouseup'
 
         selections = editor.getSelections()
@@ -1442,7 +1352,7 @@ describe "EditorView", ->
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
 
-          buffer.setTextInRange([[1,0], [3,0]], "1\n2\n3\n")
+          buffer.change([[1,0], [3,0]], "1\n2\n3\n")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
@@ -1455,21 +1365,21 @@ describe "EditorView", ->
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
 
-          buffer.setTextInRange([[2,0], [7,0]], "2\n3\n4\n5\n6\n7\n8\n9\n")
+          buffer.change([[2,0], [7,0]], "2\n3\n4\n5\n6\n7\n8\n9\n")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
 
       describe "when the change straddles the last rendered row", ->
         it "doesn't render rows that were not previously rendered", ->
-          buffer.setTextInRange([[2,0], [7,0]], "2\n3\n4\n5\n6\n7\n8\n")
+          buffer.change([[2,0], [7,0]], "2\n3\n4\n5\n6\n7\n8\n")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(0)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(6)
 
       describe "when the change the follows the last rendered row", ->
         it "does not change the rendered lines", ->
-          buffer.setTextInRange([[12,0], [12,0]], "12\n13\n14\n")
+          buffer.change([[12,0], [12,0]], "12\n13\n14\n")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(0)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(6)
@@ -1479,7 +1389,7 @@ describe "EditorView", ->
         setEditorWidthInChars(editorView, maxLineLength)
         widthBefore = editorView.renderedLines.width()
         expect(widthBefore).toBe editorView.scrollView.width() + 20
-        buffer.setTextInRange([[12,0], [12,0]], [1..maxLineLength*2].join(''))
+        buffer.change([[12,0], [12,0]], [1..maxLineLength*2].join(''))
         expect(editorView.renderedLines.width()).toBeGreaterThan widthBefore
 
     describe "when lines are removed", ->
@@ -1489,7 +1399,7 @@ describe "EditorView", ->
       it "sets the rendered screen line's width to either the max line length or the scollView's width (whichever is greater)", ->
         maxLineLength = editor.getMaxScreenLineLength()
         setEditorWidthInChars(editorView, maxLineLength)
-        buffer.setTextInRange([[12,0], [12,0]], [1..maxLineLength*2].join(''))
+        buffer.change([[12,0], [12,0]], [1..maxLineLength*2].join(''))
         expect(editorView.renderedLines.width()).toBeGreaterThan editorView.scrollView.width()
         widthBefore = editorView.renderedLines.width()
         buffer.delete([[12, 0], [12, Infinity]])
@@ -1502,7 +1412,7 @@ describe "EditorView", ->
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
 
-          buffer.setTextInRange([[1,0], [2,0]], "")
+          buffer.change([[1,0], [2,0]], "")
           expect(editorView.renderedLines.find(".line").length).toBe 6
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(11)
@@ -1514,21 +1424,21 @@ describe "EditorView", ->
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(12)
 
-          buffer.setTextInRange([[7,0], [11,0]], "1\n2\n")
+          buffer.change([[7,0], [11,0]], "1\n2\n")
           expect(editorView.renderedLines.find(".line").length).toBe 5
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(6)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(10)
 
       describe "when the change straddles the last rendered row", ->
         it "renders the correct rows", ->
-          buffer.setTextInRange([[2,0], [7,0]], "")
+          buffer.change([[2,0], [7,0]], "")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(0)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(6)
 
       describe "when the change the follows the last rendered row", ->
         it "does not change the rendered lines", ->
-          buffer.setTextInRange([[10,0], [12,0]], "")
+          buffer.change([[10,0], [12,0]], "")
           expect(editorView.renderedLines.find(".line").length).toBe 7
           expect(editorView.renderedLines.find(".line:first").text()).toBe buffer.lineForRow(0)
           expect(editorView.renderedLines.find(".line:last").text()).toBe buffer.lineForRow(6)
@@ -1586,18 +1496,14 @@ describe "EditorView", ->
 
     describe "when autoscrolling at the end of the document", ->
       it "renders lines properly", ->
-        waitsForPromise ->
-          atom.workspace.open('two-hundred.txt').then (editor) ->
-            editorView.edit(editor)
+        editorView.edit(atom.project.openSync('two-hundred.txt'))
+        editorView.attachToDom(heightInLines: 5.5)
 
-        runs ->
-          editorView.attachToDom(heightInLines: 5.5)
+        expect(editorView.renderedLines.find('.line').length).toBe 8
 
-          expect(editorView.renderedLines.find('.line').length).toBe 8
+        editor.moveCursorToBottom()
 
-          editor.moveCursorToBottom()
-
-          expect(editorView.renderedLines.find('.line').length).toBe 8
+        expect(editorView.renderedLines.find('.line').length).toBe 8
 
     describe "when line has a character that could push it to be too tall (regression)", ->
       it "does renders the line at a consistent height", ->
@@ -1611,7 +1517,7 @@ describe "EditorView", ->
         editorView.attachToDom()
 
         expect(atom.config.get("editor.showInvisibles")).toBeFalsy()
-        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs and spaces "
+        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs  and spaces "
 
         atom.config.set("editor.showInvisibles", true)
         space = editorView.invisibles?.space
@@ -1620,10 +1526,10 @@ describe "EditorView", ->
         expect(tab).toBeTruthy()
         eol = editorView.invisibles?.eol
         expect(eol).toBeTruthy()
-        expect(editorView.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab}and spaces#{space}#{eol}"
+        expect(editorView.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab} and spaces#{space}#{eol}"
 
         atom.config.set("editor.showInvisibles", false)
-        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs and spaces "
+        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs  and spaces "
 
       it "displays newlines as their own token outside of the other tokens scope", ->
         editorView.setShowInvisibles(true)
@@ -1636,7 +1542,7 @@ describe "EditorView", ->
         editorView.attachToDom()
         atom.config.set("editor.showInvisibles", true)
         atom.config.set("editor.invisibles", eol: ";", space: "_", tab: "tab")
-        expect(editorView.find(".line:first").text()).toBe "_tab_;"
+        expect(editorView.find(".line:first").text()).toBe "_tab _;"
 
       it "displays trailing carriage return using a visible non-empty value", ->
         editor.setText "a line that ends with a carriage return\r\n"
@@ -1657,7 +1563,7 @@ describe "EditorView", ->
           editor.setSoftWrap(true)
 
         it "doesn't show the end of line invisible at the end of lines broken due to wrapping", ->
-          editor.setText "a line that wraps "
+          editor.setText "a line that wraps"
           editorView.attachToDom()
           editorView.setWidthInChars(6)
           atom.config.set "editor.showInvisibles", true
@@ -1665,11 +1571,11 @@ describe "EditorView", ->
           expect(space).toBeTruthy()
           eol = editorView.invisibles?.eol
           expect(eol).toBeTruthy()
-          expect(editorView.renderedLines.find('.line:first').text()).toBe "a line "
-          expect(editorView.renderedLines.find('.line:last').text()).toBe "wraps#{space}#{eol}"
+          expect(editorView.renderedLines.find('.line:first').text()).toBe "a line#{space}"
+          expect(editorView.renderedLines.find('.line:last').text()).toBe "wraps#{eol}"
 
         it "displays trailing carriage return using a visible non-empty value", ->
-          editor.setText "a line that \r\n"
+          editor.setText "a line that\r\n"
           editorView.attachToDom()
           editorView.setWidthInChars(6)
           atom.config.set "editor.showInvisibles", true
@@ -1679,8 +1585,8 @@ describe "EditorView", ->
           expect(cr).toBeTruthy()
           eol = editorView.invisibles?.eol
           expect(eol).toBeTruthy()
-          expect(editorView.renderedLines.find('.line:first').text()).toBe "a line "
-          expect(editorView.renderedLines.find('.line:eq(1)').text()).toBe "that#{space}#{cr}#{eol}"
+          expect(editorView.renderedLines.find('.line:first').text()).toBe "a line#{space}"
+          expect(editorView.renderedLines.find('.line:eq(1)').text()).toBe "that#{cr}#{eol}"
           expect(editorView.renderedLines.find('.line:last').text()).toBe "#{eol}"
 
     describe "when editor.showIndentGuide is set to true", ->
@@ -1805,12 +1711,39 @@ describe "EditorView", ->
           expect(editorView.renderedLines.find('.line:eq(10) .indent-guide').text()).toBe "#{eol}   "
           expect(editorView.renderedLines.find('.line:eq(10) .invisible-character').text()).toBe eol
 
-    describe "when editor.showIndentGuide is set to false", ->
-      it "does not render the indent guide on whitespace only lines (regression)", ->
+  describe "marker rendering", ->
+    describe "individual marker view rendering", ->
+      beforeEach ->
         editorView.attachToDom()
-        editor.setText('    ')
-        atom.config.set('editor.showIndentGuide', false)
-        expect(editorView.renderedLines.find('.line:eq(0) .indent-guide').length).toBe 0
+
+      fit "renders one region for markers spanning a single line", ->
+        marker = editor.markBufferRange([[2, 7], [2, 25]])
+        markerView = editorView.markerViews[marker.id]
+        expect(markerView.regions.length).toBe 1
+        [region] = markerView.regions
+        expect(region.position().top).toBe(2 * lineHeight)
+        expect(region.position().left).toBe(7 * charWidth)
+        expect(region.height()).toBe lineHeight
+        expect(region.width()).toBe((25 - 7) * charWidth)
+
+      it "renders two regions for markers spanning two lines", ->
+
+      it "renders three regions for markers spanning more than two lines", ->
+
+
+    describe "multiple marker rendering", ->
+      [marker1, marker2, marker3, marker4, marker5] = []
+
+      beforeEach ->
+        editorView.lineOverdraw = 1
+        editorView.attachToDom(heightInLines: 2.5)
+        editorView.scrollTop(editorView.lineHeight * 5)
+
+        marker1 = editor.markScreenRange([[1, 1], [2, 2]], class: 'a') # above rendered lines
+        marker2 = editor.markScreenRange([[2, 5], [5, 1]], class: 'a') # overlaps first rendered line
+        marker3 = editor.markScreenRange([[6, 0], [7, 0]], class: 'a') # within rendered lines
+        marker4 = editor.markScreenRange([[8, 9], [10, 11]], class: 'a') # overlaps last rendered line
+        marker5 = editor.markScreenRange([[11, 5], [12, 0]], class: 'a') # overlaps last rendered line
 
   describe "when soft-wrap is enabled", ->
     beforeEach ->
@@ -1852,14 +1785,10 @@ describe "EditorView", ->
       expect(editor.bufferPositionForScreenPosition(editor.getCursorScreenPosition())).toEqual [3, 60]
 
     it "does not wrap the lines of any newly assigned buffers", ->
-      otherEditor = null
-      waitsForPromise ->
-        atom.workspace.open().then (o) -> otherEditor = o
-
-      runs ->
-        otherEditor.buffer.setText([1..100].join(''))
-        editorView.edit(otherEditor)
-        expect(editorView.renderedLines.find('.line').length).toBe(1)
+      otherEditor = atom.project.openSync()
+      otherEditor.buffer.setText([1..100].join(''))
+      editorView.edit(otherEditor)
+      expect(editorView.renderedLines.find('.line').length).toBe(1)
 
     it "unwraps lines when softwrap is disabled", ->
       editorView.toggleSoftWrap()
@@ -1888,15 +1817,15 @@ describe "EditorView", ->
       expect(editor.getCursorScreenPosition()).toEqual [11, 0]
 
     it "calls .setWidthInChars() when the editor view is attached because now its dimensions are available to calculate it", ->
-      otherEditorView = new EditorView(editor)
-      spyOn(otherEditorView, 'setWidthInChars')
+      otherEditor = new EditorView(editor: atom.project.openSync('sample.js'))
+      spyOn(otherEditor, 'setWidthInChars')
 
-      otherEditorView.editor.setSoftWrap(true)
-      expect(otherEditorView.setWidthInChars).not.toHaveBeenCalled()
+      otherEditor.editor.setSoftWrap(true)
+      expect(otherEditor.setWidthInChars).not.toHaveBeenCalled()
 
-      otherEditorView.simulateDomAttachment()
-      expect(otherEditorView.setWidthInChars).toHaveBeenCalled()
-      otherEditorView.remove()
+      otherEditor.simulateDomAttachment()
+      expect(otherEditor.setWidthInChars).toHaveBeenCalled()
+      otherEditor.remove()
 
     describe "when the editor view's width changes", ->
       it "updates the width in characters on the edit session", ->
@@ -2047,19 +1976,15 @@ describe "EditorView", ->
 
     describe "when the switching from an edit session for a long buffer to an edit session for a short buffer", ->
       it "updates the line numbers to reflect the shorter buffer", ->
-        emptyEditor = null
-        waitsForPromise ->
-          atom.workspace.open().then (o) -> emptyEditor = o
+        emptyEditor = atom.project.openSync(null)
+        editorView.edit(emptyEditor)
+        expect(editorView.gutter.lineNumbers.find('.line-number').length).toBe 1
 
-        runs ->
-          editorView.edit(emptyEditor)
-          expect(editorView.gutter.lineNumbers.find('.line-number').length).toBe 1
+        editorView.edit(editor)
+        expect(editorView.gutter.lineNumbers.find('.line-number').length).toBeGreaterThan 1
 
-          editorView.edit(editor)
-          expect(editorView.gutter.lineNumbers.find('.line-number').length).toBeGreaterThan 1
-
-          editorView.edit(emptyEditor)
-          expect(editorView.gutter.lineNumbers.find('.line-number').length).toBe 1
+        editorView.edit(emptyEditor)
+        expect(editorView.gutter.lineNumbers.find('.line-number').length).toBe 1
 
     describe "when the editor view is mini", ->
       it "hides the gutter", ->
@@ -2082,7 +2007,7 @@ describe "EditorView", ->
         tab = miniEditor.invisibles?.tab
         expect(tab).toBeTruthy()
         miniEditor.getEditor().setText(" a line with tabs\tand spaces ")
-        expect(miniEditor.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab}and spaces#{space}"
+        expect(miniEditor.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab} and spaces#{space}"
 
       it "doesn't show the indent guide", ->
         atom.config.set "editor.showIndentGuide", true
@@ -2279,13 +2204,10 @@ describe "EditorView", ->
 
   describe "folding", ->
     beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open('two-hundred.txt').then (o) -> editor = o
-
-      runs ->
-        buffer = editor.buffer
-        editorView.edit(editor)
-        editorView.attachToDom()
+      editor = atom.project.openSync('two-hundred.txt')
+      buffer = editor.buffer
+      editorView.edit(editor)
+      editorView.attachToDom()
 
     describe "when a fold-selection event is triggered", ->
       it "folds the lines covered by the selection into a single line with a fold class and marker", ->
@@ -2339,7 +2261,7 @@ describe "EditorView", ->
       it "adds/removes the 'fold-selected' class to the fold's line element and hides the cursor if it is on the fold line", ->
         editor.createFold(2, 4)
 
-        editor.setSelectedBufferRange([[1, 0], [2, 0]], preserveFolds: true, reversed: true)
+        editor.setSelectedBufferRange([[1, 0], [2, 0]], preserveFolds: true, isReversed: true)
         expect(editorView.lineElementForScreenRow(2)).toMatchSelector('.fold.fold-selected')
 
         editor.setSelectedBufferRange([[1, 0], [1, 1]], preserveFolds: true)
@@ -2415,20 +2337,16 @@ describe "EditorView", ->
       expect(editorView.getFirstVisibleScreenRow()).toBe(0)
 
   describe ".checkoutHead()", ->
-    [filePath] = []
+    [filePath, originalPathText] = []
 
     beforeEach ->
-      workingDirPath = temp.mkdirSync('atom-working-dir')
-      fs.copySync(path.join(__dirname, 'fixtures', 'git', 'working-dir'), workingDirPath)
-      fs.renameSync(path.join(workingDirPath, 'git.git'), path.join(workingDirPath, '.git'))
-      atom.project.setPath(workingDirPath)
-      filePath = atom.project.resolve('file.txt')
+      filePath = atom.project.resolve('git/working-dir/file.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
+      editor = atom.project.openSync(filePath)
+      editorView.edit(editor)
 
-      waitsForPromise ->
-        atom.workspace.open(filePath).then (o) -> editor = o
-
-      runs ->
-        editorView.edit(editor)
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
 
     it "restores the contents of the editor view to the HEAD revision", ->
       editor.setText('')
@@ -2443,7 +2361,7 @@ describe "EditorView", ->
         fileChangeHandler.callCount > 0
 
       runs ->
-        expect(editor.getText()).toBe('undefined')
+        expect(editor.getText()).toBe(originalPathText)
 
   describe ".pixelPositionForBufferPosition(position)", ->
     describe "when the editor view is detached", ->
@@ -2652,6 +2570,7 @@ describe "EditorView", ->
             expect(editor.getCursorBufferPosition()).toEqual [0, 0]
             expect(buffer.lineForRow(0)).toBe 'var quicksort = function () {'
             expect(buffer.lineForRow(13)).toBe 'var a = function() {'
+            editor.logScreenLines()
             expect(editor.isFoldedAtBufferRow(0)).toBe true
             expect(editor.isFoldedAtBufferRow(13)).toBe true
 
@@ -2898,7 +2817,7 @@ describe "EditorView", ->
 
   describe "when the escape key is pressed on the editor view", ->
     it "clears multiple selections if there are any, and otherwise allows other bindings to be handled", ->
-      atom.keymaps.add 'name', '.editor': {'escape': 'test-event'}
+      atom.keymap.bindKeys 'name', '.editor', {'escape': 'test-event'}
       testEventHandler = jasmine.createSpy("testEventHandler")
 
       editorView.on 'test-event', testEventHandler
@@ -2915,26 +2834,22 @@ describe "EditorView", ->
   describe "when the editor view is attached but invisible", ->
     describe "when the editor view's text is changed", ->
       it "redraws the editor view when it is next shown", ->
-        displayUpdatedHandler = null
         atom.workspaceView = new WorkspaceView
-        waitsForPromise ->
-          atom.workspaceView.open('sample.txt').then (o) -> editor = o
+        atom.workspaceView.openSync('sample.js')
+        atom.workspaceView.attachToDom()
+        editorView = atom.workspaceView.getActiveView()
 
-        runs ->
-          atom.workspaceView.attachToDom()
-          editorView = atom.workspaceView.getActiveView()
+        view = $$ -> @div id: 'view', tabindex: -1, 'View'
+        editorView.getPane().activateItem(view)
+        expect(editorView.isVisible()).toBeFalsy()
 
-          view = $$ -> @div id: 'view', tabindex: -1, 'View'
-          editorView.getPane().activateItem(view)
-          expect(editorView.isVisible()).toBeFalsy()
+        editor.setText('hidden changes')
+        editor.setCursorBufferPosition([0,4])
 
-          editor.setText('hidden changes')
-          editor.setCursorBufferPosition([0,4])
-
-          displayUpdatedHandler = jasmine.createSpy("displayUpdatedHandler")
-          editorView.on 'editor:display-updated', displayUpdatedHandler
-          editorView.getPane().activateItem(editorView.getModel())
-          expect(editorView.isVisible()).toBeTruthy()
+        displayUpdatedHandler = jasmine.createSpy("displayUpdatedHandler")
+        editorView.on 'editor:display-updated', displayUpdatedHandler
+        editorView.getPane().activateItem(editorView.getModel())
+        expect(editorView.isVisible()).toBeTruthy()
 
         waitsFor ->
           displayUpdatedHandler.callCount is 1
@@ -2974,17 +2889,14 @@ describe "EditorView", ->
   describe "when the editor view is removed", ->
     it "fires a editor:will-be-removed event", ->
       atom.workspaceView = new WorkspaceView
-      waitsForPromise ->
-        atom.workspace.open('sample.js')
+      atom.workspaceView.openSync('sample.js')
+      atom.workspaceView.attachToDom()
+      editorView = atom.workspaceView.getActiveView()
 
-      runs ->
-        atom.workspaceView.attachToDom()
-        editorView = atom.workspaceView.getActiveView()
-
-        willBeRemovedHandler = jasmine.createSpy('willBeRemovedHandler')
-        editorView.on 'editor:will-be-removed', willBeRemovedHandler
-        editorView.getPane().destroyActiveItem()
-        expect(willBeRemovedHandler).toHaveBeenCalled()
+      willBeRemovedHandler = jasmine.createSpy('willBeRemovedHandler')
+      editorView.on 'editor:will-be-removed', willBeRemovedHandler
+      editorView.getPane().destroyActiveItem()
+      expect(willBeRemovedHandler).toHaveBeenCalled()
 
   describe "when setInvisibles is toggled (regression)", ->
     it "renders inserted newlines properly", ->
@@ -2997,20 +2909,6 @@ describe "EditorView", ->
       for rowNumber in [1..5]
         expect(editorView.lineElementForScreenRow(rowNumber).text()).toBe buffer.lineForRow(rowNumber)
 
-    it "correctly calculates the position left for non-monospaced invisibles", ->
-      editorView.setShowInvisibles(true)
-      editorView.setInvisibles tab: '♘'
-      editor.setText('\tx')
-
-      editorView.setFontFamily('serif')
-      editorView.setFontSize(10)
-      editorView.attachToDom()
-      editorView.setWidthInChars(5)
-
-      expect(editorView.pixelPositionForScreenPosition([0, 0]).left).toEqual 0
-      expect(editorView.pixelPositionForScreenPosition([0, 1]).left).toEqual 10
-      expect(editorView.pixelPositionForScreenPosition([0, 2]).left).toEqual 13
-
   describe "when the window is resized", ->
     it "updates the active edit session with the current soft wrap column", ->
       editorView.attachToDom()
@@ -3039,30 +2937,6 @@ describe "EditorView", ->
         editorView.pixelPositionForScreenPosition([1, 5])
         expect(editorView.measureToColumn.callCount).toBe 0
 
-  describe "when stylesheets are changed", ->
-    afterEach ->
-      atom.themes.removeStylesheet 'line-height'
-      atom.themes.removeStylesheet 'char-width'
-
-    it "updates the editor if the line height or character width changes due to a stylesheet change", ->
-      editorView.attachToDom()
-      editor.setCursorScreenPosition([1, 3])
-      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 20, left: 30}
-      expect(editorView.getCursorView().position()).toEqual {top: 20, left: 30}
-
-      atom.themes.applyStylesheet 'line-height', """
-        .editor { line-height: 2; }
-      """
-
-      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 20, left: 30}
-      expect(editorView.getCursorView().position()).toEqual {top: 20, left: 30}
-
-      atom.themes.applyStylesheet 'char-width', """
-        .editor { letter-spacing: 2px; }
-      """
-      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 20, left: 36}
-      expect(editorView.getCursorView().position()).toEqual {top: 20, left: 36}
-
   describe "when the editor contains hard tabs", ->
     it "correctly calculates the the position left for a column", ->
       editor.setText('\ttest')

spec/fixtures/git/working-dir/file.txt

@@ -0,0 +1 @@
+undefined