Update style guide

Signed-off-by: Max Brunsfeld <maxbrunsfeld@gmail.com>

.node-version

@@ -1 +1 @@
-v0.10.21
+v0.10.33

.python-version

@@ -0,0 +1 @@
+2.7.6

CONTRIBUTING.md

@@ -87,6 +87,7 @@ For more information on how to work with Atom's official packages, see
     * :white_check_mark: `:white_check_mark:` when adding tests
     * :lock: `:lock:` when dealing with security
     * :arrow_up: `:arrow_up:` when upgrading dependencies
+    * :arrow_down: `:arrow_down:` when downgrading dependencies
 
 ## CoffeeScript Styleguide
 
@@ -98,6 +99,10 @@ For more information on how to work with Atom's official packages, see
 * 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.
+* Capitalize initialisms and acronyms in names, except for the first word, which
+  should be lower-case:
+  * `getURI` instead of `getUri`
+  * `uriToOpen` instead of `URIToOpen`
 
 ## Documentation Styleguide
 

README.md

@@ -2,7 +2,7 @@
 
 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.
 
-Visit [atom.io](https://atom.io) to learn more.
+Visit [atom.io](https://atom.io) to learn more or visit the [Atom forum](https://discuss.atom.io).
 
 Visit [issue #3684](https://github.com/atom/atom/issues/3684) to learn more
 about the Atom 1.0 roadmap.
@@ -17,16 +17,25 @@ Atom will automatically update when a new release is available.
 
 ### Windows
 
-Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).
+Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
 
-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.
+Atom will automatically update when a new release is available.
 
-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.
+You can also download an `atom-windows.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
+The `.zip` version will not automatically update.
+
+#### Uninstalling Chocolatey Version
+
+The recommended installation of Atom on Windows used to be using [Chocolatey](https://chocolatey.org/packages/Atom/).
+This is no longer recommended now that the Atom Windows installer & auto-updater
+exists.
+
+To switch from Chocolatey to the new installer:
+  * Upgrade to Atom 0.155 or above by running `cup Atom`
+  * Run `cuninst Atom` to uninstall the Chocolatey version of Atom
+    * This will not delete any of your installed packages or Atom config files.
+  * Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
+  * Double-click the downloaded file to install Atom
 
 ### Debian Linux (Ubuntu)
 

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.111.1"
+    "atom-package-manager": "0.119.0"
   }
 }

atom.sh

@@ -45,12 +45,12 @@ if [ $REDIRECT_STDERR ]; then
 fi
 
 if [ $OS == 'Mac' ]; then
-  ATOM_PATH=${ATOM_PATH:-/Applications} # Set ATOM_PATH unless it is already set
+  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'" | grep -v ShipIt | head -1 | xargs dirname)
+    ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
   fi
 
   # Exit if Atom can't be found

build/package.json

@@ -12,19 +12,19 @@
     "fs-plus": "2.x",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
-    "grunt-atom-shell-installer": "^0.12.0",
+    "grunt-atom-shell-installer": "^0.16.0",
     "grunt-cli": "~0.1.9",
     "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
-    "grunt-contrib-coffee": "~0.9.0",
+    "grunt-contrib-coffee": "~0.12.0",
     "grunt-contrib-csslint": "~0.1.2",
     "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.10.0",
+    "grunt-cson": "0.11.0",
     "grunt-download-atom-shell": "~0.10.0",
     "grunt-lesslint": "0.13.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",
     "harmony-collections": "~0.3.8",
-    "legal-eagle": "~0.6.0",
+    "legal-eagle": "~0.8.0",
     "minidump": "~0.8",
     "npm": "~1.4.5",
     "rcedit": "~0.3.0",

build/tasks/build-task.coffee

@@ -21,7 +21,9 @@ module.exports = (grunt) ->
 
     mkdir appDir
 
-    cp 'atom.sh', path.join(appDir, 'atom.sh')
+    if process.platform isnt 'win32'
+      cp 'atom.sh', path.join(appDir, 'atom.sh')
+
     cp 'package.json', path.join(appDir, 'package.json')
 
     packageDirectories = []
@@ -69,6 +71,7 @@ module.exports = (grunt) ->
       path.join('build', 'Release', 'obj')
       path.join('build', 'Release', '.deps')
       path.join('vendor', 'apm')
+      path.join('resources', 'linux')
       path.join('resources', 'mac')
       path.join('resources', 'win')
 
@@ -149,10 +152,10 @@ module.exports = (grunt) ->
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
     if process.platform is 'win32'
-      # 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'), ''
+      cp path.join('resources', 'win', 'atom.cmd'), path.join(shellAppDir, 'resources', 'cli', 'atom.cmd')
+      cp path.join('resources', 'win', 'atom.sh'), path.join(shellAppDir, 'resources', 'cli', 'atom.sh')
+      cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'resources', 'cli', 'atom.js')
+      cp path.join('resources', 'win', 'apm.sh'), path.join(shellAppDir, 'resources', 'cli', 'apm.sh')
 
     dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
     dependencies.push('copy-info-plist') if process.platform is 'darwin'

build/tasks/install-task.coffee

@@ -1,4 +1,3 @@
-fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'

build/tasks/publish-build-task.coffee

@@ -101,7 +101,7 @@ getAssets = ->
 logError = (message, error, details) ->
   grunt.log.error(message)
   grunt.log.error(error.message ? error) if error?
-  grunt.log.error(details) if details
+  grunt.log.error(require('util').inspect(details)) if details
 
 zipAssets = (buildDir, assets, callback) ->
   zip = (directory, sourcePath, assetName, callback) ->
@@ -142,7 +142,30 @@ getAtomDraftRelease = (callback) ->
             firstDraft.assets = assets
             callback(null, firstDraft)
       else
-        callback(new Error('No draft release in atom/atom repo'))
+        createAtomDraftRelease(callback)
+
+createAtomDraftRelease = (callback) ->
+  {version} = require('../../package.json')
+  options =
+    uri: 'https://api.github.com/repos/atom/atom/releases'
+    method: 'POST'
+    headers: defaultHeaders
+    json:
+      tag_name: "v#{version}"
+      name: version
+      draft: true
+      body: """
+        ### Notable Changes
+
+        * Something new
+      """
+
+  request options, (error, response, body='') ->
+    if error? or response.statusCode isnt 201
+      logError("Creating atom/atom draft release failed", error, body)
+      callback(error ? new Error(response.statusCode))
+    else
+      callback(null, body)
 
 deleteRelease = (release) ->
   options =

build/tasks/spec-task.coffee

@@ -11,6 +11,20 @@ module.exports = (grunt) ->
 
   packageSpecQueue = null
 
+  logDeprecations = (label, {stderr}={}) ->
+    return unless process.env.JANKY_SHA1
+    stderr ?= ''
+    deprecatedStart = stderr.indexOf('Calls to deprecated functions')
+    return if deprecatedStart is -1
+
+    grunt.log.error(label)
+    stderr = stderr.substring(deprecatedStart)
+    stderr = stderr.replace(/^\s*\[[^\]]+\]\s+/gm, '')
+    stderr = stderr.replace(/source: .*$/gm, '')
+    stderr = stderr.replace(/^"/gm, '')
+    stderr = stderr.replace(/",\s*$/gm, '')
+    grunt.log.error(stderr)
+
   getAppPath = ->
     contentsDir = grunt.config.get('atom.contentsDir')
     switch process.platform
@@ -54,6 +68,7 @@ module.exports = (grunt) ->
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
+        logDeprecations("#{path.basename(packagePath)} Specs", results)
         callback()
 
     modulesDirectory = path.resolve('node_modules')
@@ -87,6 +102,7 @@ module.exports = (grunt) ->
       else
         # TODO: Restore concurrency on Windows
         packageSpecQueue.concurrency = concurrency
+        logDeprecations('Core Specs', results)
 
       callback(null, error)
 

build/tasks/update-octicons-task.coffee

@@ -1,22 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'update-octicons', 'Update octicon font and LESS variables', ->
-    pathToOcticons = path.resolve('..', 'octicons')
-    if grunt.file.isDir(pathToOcticons)
-      # Copy font-file
-      fontSrc = path.join(pathToOcticons, 'octicons', 'octicons.woff')
-      fontDest = path.resolve('static', 'octicons.woff')
-      grunt.file.copy(fontSrc, fontDest)
-
-      # Update Octicon UTF codes
-      glyphsSrc = path.join(pathToOcticons, 'data', 'glyphs.yml')
-      output = []
-      for {css, code} in grunt.file.readYAML(glyphsSrc)
-        output.push "@#{css}: \"\\#{code}\";"
-
-      octiconUtfDest = path.resolve('static', 'variables', 'octicon-utf-codes.less')
-      grunt.file.write(octiconUtfDest, "#{output.join('\n')}\n")
-    else
-      grunt.log.error("octicons repo must be cloned to #{pathToOcticons}")
-      false

docs/advanced/keymaps.md

@@ -3,7 +3,7 @@
 ## Structure of a Keymap File
 
 Keymap files are encoded as JSON or CSON files containing nested hashes. They
-work much like stylesheets, but instead of applying style properties to elements
+work much like style sheets, but instead of applying style properties to elements
 matching the selector, they specify the meaning of keystrokes on elements
 matching the selector. Here is an example of some bindings that apply when
 keystrokes pass through `atom-text-editor` elements:

docs/apm-rest-api.md

@@ -30,8 +30,8 @@ All requests that take parameters require `application/json`.
 Parameters:
 
 - **page** (optional)
-- **sort** (optional, values: `created_at`, `updated_at`, `downloads`)
-- **direction** (optional, values: `asc`, `desc`)
+- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to `downloads`
+- **direction** (optional) - `asc` or `desc`. Defaults to `desc`. `stars` can only be ordered `desc`
 
 Returns a list of all packages in the following format:
 ```json
@@ -61,17 +61,18 @@ Link: <https://www.atom.io/api/packages?page=1>; rel="self",
 
 By default, results are sorted by download count, descending.
 
+### Searching packages
+
 #### GET /api/packages/search
 
 Parameters:
 
-- **q** String query to search
-- **sort** (optional, values: `created_at`, `updated_at`, `downloads`)
-- **direction** (optional, values: `asc`, `desc`)
+- **q** (required) - Search query
+- **page** (optional)
+- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to the relevance of the search query.
+- **direction** (optional) - `asc` or `desc`. Defaults to `desc`.
 
-Returns a list of all packages in the same format as `/api/packages`.
-
-By default, results sorted by relevance to search query.
+Returns results in the same format as [listing packages](#listing-packages).
 
 ### Showing package details
 

docs/build-instructions/linux.md

@@ -26,9 +26,17 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
 ### Arch
 
-* `sudo pacman -S base-devel git nodejs libgnome-keyring python2`
+* `sudo pacman -S gconf base-devel git nodejs libgnome-keyring python2`
 * `export PYTHON=/usr/bin/python2` before building Atom.
 
+### Slackware
+
+* `sbopkg -k -i node -i atom`
+
+### openSUSE
+
+* `sudo zypper install nodejs make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
+
 ## Instructions
 
 If you have problems with permissions don't forget to prefix with `sudo`
@@ -121,6 +129,15 @@ have Node.js installed, or node isn't identified as Node.js on your machine.
 If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
 your terminal may fix the issue.
 
+#### You can also use Alternatives
+
+On some variants (mostly Debian based distros) it's preferable for you to use
+Alternatives so that changes to the binary paths can be fixed or altered easily:
+
+```sh
+sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave /usr/bin/js js /usr/bin/nodejs
+```
+
 ### AttributeError: 'module' object has no attribute 'script_main'
 
 If you get following error with a big traceback while building Atom:
@@ -137,15 +154,6 @@ On Fedora you would do the following:
   sudo yum remove gyp
   ```
 
-#### You can also use Alternatives
-
-On some variants (mostly Debian based distros) it's preferable for you to use
-Alternatives so that changes to the binary paths can be fixed or altered easily:
-
-```sh
-sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave /usr/bin/js js /usr/bin/nodejs
-```
-
 ### Linux build error reports in atom/atom
 * Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Alinux&type=Issues)
   to get a list of reports about build errors on Linux.

docs/creating-a-package.md

@@ -15,7 +15,7 @@ my-package/
   menus/
   spec/
   snippets/
-  stylesheets/
+  styles/
   index.coffee
   package.json
 ```
@@ -38,10 +38,10 @@ In addition to the regular [npm package.json keys][npm-keys] available, Atom
 package.json files have their own additions.
 
 - `main` (**Required**): the path to the CoffeeScript file that's the entry point
-to your package
-- `stylesheets` (**Optional**): an Array of Strings identifying the order of the
+to your package.
+- `styles` (**Optional**): an Array of Strings identifying the order of the
 style sheets your package needs to load. If not specified, style sheets in the
-_stylesheets_ directory are added alphabetically.
+_styles_ directory are added alphabetically.
 - `keymaps`(**Optional**): an Array of Strings identifying the order of the
 key mappings your package needs to load. If not specified, mappings in the
 _keymaps_ directory are added alphabetically.
@@ -121,10 +121,10 @@ like you.
 
 ## Style Sheets
 
-Style sheets for your package should be placed in the _stylesheets_ directory.
+Style sheets for your package should be placed in the _styles_ directory.
 Any style sheets in this directory will be loaded and attached to the DOM when
-your package is activated. Style sheets can be written as CSS or [LESS] (but
-LESS is recommended).
+your package is activated. Style sheets can be written as CSS or [LESS], but
+LESS is recommended.
 
 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
@@ -138,7 +138,7 @@ taken from the active theme's [ui-variables.less][ui-variables]. For more
 information, see the [theme variables docs][theme-variables]. If you follow this
 guideline, your package will look good out of the box with any theme!
 
-An optional `stylesheets` array in your _package.json_ can list the style sheets
+An optional `styleSheets` array in your _package.json_ can list the style sheets
 by name to specify a loading order; otherwise, style sheets are loaded
 alphabetically.
 
@@ -418,8 +418,8 @@ all the other available commands.
 [underscore]: http://underscorejs.org/
 [jasmine]: http://jasmine.github.io
 [cson]: https://github.com/atom/season
-[less]: http://lesscss.org
-[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
+[LESS]: http://lesscss.org
+[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/styles/ui-variables.less
 [first-package]: your-first-package.html
 [convert-bundle]: converting-a-text-mate-bundle.html
 [convert-theme]: converting-a-text-mate-theme.html

docs/creating-a-theme.md

@@ -1,8 +1,8 @@
 # Creating a Theme
 
-Atom's interface is rendered using HTML, and it's styled via [LESS] (a superset
-of CSS). Don't worry if you haven't heard of LESS before; it's just like CSS,
-but with a few handy extensions.
+Atom's interface is rendered using HTML, and it's styled via [LESS] which is a
+superset of CSS. Don't worry if you haven't heard of LESS before; it's just like
+CSS, but with a few handy extensions.
 
 Atom supports two types of themes: _UI_ and _syntax_.  UI themes style
 elements such as the tree view, the tabs, drop-down lists, and the status bar.
@@ -42,10 +42,10 @@ _Motif_ theme listed in the _Syntax Theme_ drop-down. Select it from the menu to
 activate it, now when you open an editor you should see that your new
 _motif-syntax_ theme in action.
 
-Open up _stylesheets/colors.less_ to change the various colors variables which
+Open up _styles/colors.less_ to change the various colors variables which
 have been already been defined. For example, turn `@red` into `#f4c2c1`.
 
-Then open _stylesheets/base.less_ and modify the various selectors that have
+Then open _styles/base.less_ and modify the various selectors that have
 been already been defined. These selectors style different parts of code in the
 editor such as comments, strings and the line numbers in the gutter.
 
@@ -59,6 +59,8 @@ window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
 terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
 menu. When you edit your theme, changes will instantly be reflected!
 
+> Note: It's advised to _not_ specify a `font-family` in your syntax theme because it will override the Font Family field in Atom's settings. If you still like to recommend a font that goes well with your theme, we recommend you do so in your README.
+
 ## Creating an Interface Theme
 
 Interface themes **must** provide a `ui-variables.less` file which contains all
@@ -129,7 +131,7 @@ _styleguide_, or use the shortcut `cmd-ctrl-shift-g`.
 ![styleguide-img]
 
 [atomio]: http://atom.io/packages
-[less]: http://lesscss.org/
+[LESS]: http://lesscss.org/
 [git]: http://git-scm.com/
 [atom]: https://atom.io/
 [package.json]: ./creating-a-package.html#package-json

docs/customizing-atom.md

@@ -54,7 +54,7 @@ You can also use `apm` to find new packages to install:
 
 ## Customizing Key Bindings
 
-Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
+Atom keymaps work similarly to style sheets. Just as style sheets use selectors
 to apply styles to elements, Atom keymaps use selectors to associate keystrokes
 with events in specific contexts. Here's a small example, excerpted from Atom's
 built-in keymaps:
@@ -105,6 +105,7 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
 - `core`
   - `disabledPackages`: An array of package names to disable
   - `excludeVcsIgnoredPaths`: Don't search within files specified by _.gitignore_
+  - `followSymlinks`: Follow symlinks when searching and scanning root directory
   - `ignoredNames`: File names to ignore across all of Atom
   - `projectHome`: The directory where projects are assumed to be located
   - `themes`: An array of theme names to load, in cascading order

docs/debugging.md

@@ -3,7 +3,8 @@
 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 for linked packages](#check-for-linked-packages)
+* [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)
@@ -24,6 +25,16 @@ $ atom --version
 
 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 for linked packages
+
+If you develop or contribute to Atom packages, there may be left-over packages linked to your `~/.atom/packages` or `~/.atom/dev/packages` directories. You can use:
+
+```shell
+$ apm links
+```
+
+to list all linked development packages. You can remove the links using the `apm unlink` command. See `apm unlink --help` for details.
+
 ## 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.

docs/upgrading/upgrading-your-ui-theme.md

@@ -1,6 +1,6 @@
 # Upgrading Your UI Theme Or Package Selectors
 
-In addition to changes in Atom's scripting API, we'll also be making some breaking changes to Atom's DOM structure, requiring stylesheets and keymaps in both packages and themes to be updated.
+In addition to changes in Atom's scripting API, we'll also be making some breaking changes to Atom's DOM structure, requiring style sheets and keymaps in both packages and themes to be updated.
 
 ## Deprecation Cop
 
@@ -121,12 +121,12 @@ The selector features discussed above allow you to target shadow DOM content wit
 
 ```
 my-ui-theme/
-  stylesheets/
+  styles/
     index.less                   # loaded globally
     index.atom-text-editor.less  # loaded in the text editor shadow DOM
 ```
 
-Check out this [style sheet](https://github.com/atom/decoration-example/blob/master/stylesheets/decoration-example.atom-text-editor.less) from the decoration-example package for an example of context-targeting.
+Check out this [style sheet](https://github.com/atom/decoration-example/blob/master/styles/decoration-example.atom-text-editor.less) from the decoration-example package for an example of context-targeting.
 
 Inside a context-targeted style sheet, there's no need to use the `::shadow` or `/deep/` expressions. If you want to refer to the element containing the shadow root, you can use the `::host` pseudo-element.
 
@@ -134,4 +134,4 @@ During the transition phase, style sheets targeting the `atom-text-editor` conte
 
 [shadow-dom-101]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom
 [shadow-dom-201]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom-201#toc-style-cat-hat
-[find-and-replace]: https://github.com/atom/find-and-replace/blob/95351f261bc384960a69b66bf12eae8002da63f9/stylesheets/find-and-replace.less#L10
+[find-and-replace]: https://github.com/atom/find-and-replace/blob/95351f261bc384960a69b66bf12eae8002da63f9/styles/find-and-replace.less#L10

docs/writing-specs.md

@@ -127,3 +127,10 @@ describe "when a test is written", ->
     expect("apples").toEqual("apples")
     expect("oranges").not.toEqual("apples")
 ```
+
+### Running on CI
+
+It is now easy to run the specs in a CI environment like Travis and AppVeyor. See the
+[Travis CI For Your Packages](http://blog.atom.io/2014/04/25/ci-for-your-packages.html)
+and [AppVeyor CI For Your Packages](http://blog.atom.io/2014/07/28/windows-ci-for-your-packages.html)
+posts for more details.

dot-atom/keymap.cson

@@ -1,7 +1,7 @@
 # Your keymap
 #
-# Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
-# to apply styles to elements, Atom keymaps use selectors to associate
+# Atom keymaps work similarly to style sheets. Just as style sheets use
+# selectors to apply styles to elements, Atom keymaps use selectors to associate
 # keystrokes with events in specific contexts.
 #
 # You can create a new keybinding in this file by typing "key" and then hitting

exports/atom.coffee

@@ -40,11 +40,11 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   Object.defineProperty module.exports, '$', get: ->
     deprecate """
       Requiring `$` from `atom` is no longer supported.
-      If you are using `space-pen`, please require `$` from `space-pen`. Otherwise require `jquery` instead:
-        `{$} = require 'space-pen'`
+      If you are using `space-pen`, please require `$` from `atom-space-pen-views`. Otherwise require `jquery` instead:
+        `{$} = require 'atom-space-pen-views'`
         or
         `$ = require 'jquery'`
-      Add `"space-pen": "^4"` to your package dependencies.
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
       Or add `"jquery": "^2"` to your package dependencies.
     """
     $
@@ -52,27 +52,27 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   Object.defineProperty module.exports, '$$', get: ->
     deprecate """
       Requiring `$$` from `atom` is no longer supported.
-      Please require `space-pen` instead:
-        `{$$} = require 'space-pen'`
-      Add `"space-pen": "^4"` to your package dependencies.
+      Please require `atom-space-pen-views` instead:
+        `{$$} = require 'atom-space-pen-views'`
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     $$
 
   Object.defineProperty module.exports, '$$$', get: ->
     deprecate """
       Requiring `$$$` from `atom` is no longer supported.
-      Please require `space-pen` instead:
-        `{$$$} = require 'space-pen'`
-      Add `"space-pen": "^4"` to your package dependencies.
+      Please require `atom-space-pen-views` instead:
+        `{$$$} = require 'atom-space-pen-views'`
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     $$$
 
   Object.defineProperty module.exports, 'View', get: ->
     deprecate """
       Requiring `View` from `atom` is no longer supported.
-      Please require `space-pen` instead:
-        `{View} = require 'space-pen'`
-      Add `"space-pen": "^4"` to your package dependencies.
+      Please require `atom-space-pen-views` instead:
+        `{View} = require 'atom-space-pen-views'`
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     View
 
@@ -81,7 +81,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Requiring `EditorView` from `atom` is no longer supported.
       Please require `TextEditorView` from `atom-space-pen-view` instead:
         `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^0"` to your package dependencies.
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     require '../src/text-editor-view'
 
@@ -90,7 +90,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Requiring `TextEditorView` from `atom` is no longer supported.
       Please require `TextEditorView` from `atom-space-pen-view` instead:
         `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^0"` to your package dependencies.
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     require '../src/text-editor-view'
 
@@ -100,7 +100,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Please require `ScrollView` from `atom-space-pen-view` instead:
         `{ScrollView} = require 'atom-space-pen-views'`
       Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^0"` to your package dependencies.
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     require '../src/scroll-view'
 
@@ -110,7 +110,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Please require `SelectListView` from `atom-space-pen-view` instead:
         `{SelectListView} = require 'atom-space-pen-views'`
       Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^0"` to your package dependencies.
+      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
     """
     require '../src/select-list-view'
 

menus/darwin.cson

@@ -202,7 +202,7 @@
 ]
 
 'context-menu':
-  '.overlayer': [
+  'atom-text-editor, .overlayer': [
     {label: 'Undo', command: 'core:undo'}
     {label: 'Redo', command: 'core:redo'}
     {type: 'separator'}

menus/linux.cson

@@ -160,7 +160,7 @@
 ]
 
 'context-menu':
-  '.overlayer': [
+  'atom-text-editor, .overlayer': [
     {label: 'Undo', command: 'core:undo'}
     {label: 'Redo', command: 'core:redo'}
     {type: 'separator'}

menus/win32.cson

@@ -181,7 +181,7 @@
 ]
 
 'context-menu':
-  '.overlayer': [
+  'atom-text-editor, .overlayer': [
     {label: 'Undo', command: 'core:undo'}
     {label: 'Redo', command: 'core:redo'}
     {type: 'separator'}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.153.0",
+  "version": "0.171.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,23 +17,24 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.19.4",
+  "atomShellVersion": "0.20.5",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.3.0",
+    "atom-keymap": "^2.5.1",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
-    "coffee-script": "1.7.0",
-    "coffeestack": "0.7.0",
+    "coffee-script": "1.8.0",
+    "coffeestack": "0.8.0",
+    "color": "^0.7.3",
     "delegato": "^1",
     "emissary": "^1.3.1",
-    "event-kit": "0.8.1",
-    "first-mate": "^2.2.0",
+    "event-kit": "^1.0.1",
+    "first-mate": "^2.2.4",
     "fs-plus": "^2.3.2",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
-    "git-utils": "^2.1.5",
-    "grim": "0.12.0",
+    "git-utils": "^2.2",
+    "grim": "1.1.0",
     "guid": "0.0.10",
     "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.2",
@@ -45,7 +46,7 @@
     "nslog": "^1.0.1",
     "oniguruma": "^3.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.3.5",
+    "pathwatcher": "^2.5.0",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -53,98 +54,99 @@
     "reactionary-atom-fork": "^1.0.0",
     "runas": "1.0.1",
     "scandal": "1.0.3",
-    "scoped-property-store": "^0.15.0",
+    "scoped-property-store": "^0.16.2",
     "scrollbar-style": "^1.0.2",
-    "season": "^1.0.2",
+    "season": "^5.0.2",
     "semver": "2.2.1",
     "serializable": "^1",
+    "service-hub": "^0.1.0",
     "space-pen": "3.8.2",
     "temp": "0.7.0",
-    "text-buffer": "^3.8.2",
+    "text-buffer": "^3.8.4",
     "theorist": "^1.0.2",
-    "underscore-plus": "^1.6.1",
+    "underscore-plus": "^1.6.6",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.23.0",
-    "atom-dark-ui": "0.42.0",
-    "atom-light-syntax": "0.22.0",
-    "atom-light-ui": "0.36.0",
-    "base16-tomorrow-dark-theme": "0.22.0",
-    "base16-tomorrow-light-theme": "0.5.0",
-    "solarized-dark-syntax": "0.25.0",
-    "solarized-light-syntax": "0.13.0",
-    "archive-view": "0.40.0",
-    "autocomplete": "0.33.1",
-    "autoflow": "0.18.0",
-    "autosave": "0.18.0",
-    "background-tips": "0.17.0",
-    "bookmarks": "0.31.0",
-    "bracket-matcher": "0.63.0",
-    "command-palette": "0.30.0",
-    "deprecation-cop": "0.18.0",
-    "dev-live-reload": "0.35.0",
-    "encoding-selector": "0.8.0",
+    "atom-dark-ui": "0.43.0",
+    "atom-light-syntax": "0.24.0",
+    "atom-light-ui": "0.37.0",
+    "base16-tomorrow-dark-theme": "0.23.0",
+    "base16-tomorrow-light-theme": "0.6.0",
+    "solarized-dark-syntax": "0.30.0",
+    "solarized-light-syntax": "0.17.0",
+    "archive-view": "0.43.0",
+    "autocomplete": "0.41.0",
+    "autoflow": "0.20.0",
+    "autosave": "0.19.0",
+    "background-tips": "0.20.0",
+    "bookmarks": "0.33.0",
+    "bracket-matcher": "0.67.0",
+    "command-palette": "0.32.0",
+    "deprecation-cop": "0.25.0",
+    "dev-live-reload": "0.36.0",
+    "encoding-selector": "0.14.0",
     "exception-reporting": "0.21.0",
-    "find-and-replace": "0.149.0",
-    "fuzzy-finder": "0.60.0",
-    "git-diff": "0.44.0",
-    "go-to-line": "0.27.0",
-    "grammar-selector": "0.37.0",
-    "image-view": "0.42.0",
-    "incompatible-packages": "0.10.0",
-    "keybinding-resolver": "0.20.0",
-    "link": "0.28.0",
-    "markdown-preview": "0.110.0",
-    "metrics": "0.39.0",
-    "notifications": "0.6.0",
-    "open-on-github": "0.31.0",
-    "package-generator": "0.33.0",
-    "release-notes": "0.36.0",
-    "settings-view": "0.161.0",
-    "snippets": "0.57.0",
-    "spell-check": "0.44.0",
-    "status-bar": "0.50.0",
-    "styleguide": "0.30.0",
-    "symbols-view": "0.68.0",
-    "tabs": "0.57.0",
-    "timecop": "0.24.0",
-    "tree-view": "0.135.0",
-    "update-package-dependencies": "0.6.0",
+    "find-and-replace": "0.155.0",
+    "fuzzy-finder": "0.64.0",
+    "git-diff": "0.47.0",
+    "go-to-line": "0.30.0",
+    "grammar-selector": "0.42.0",
+    "image-view": "0.46.0",
+    "incompatible-packages": "0.19.0",
+    "keybinding-resolver": "0.25.0",
+    "link": "0.29.0",
+    "markdown-preview": "0.117.0",
+    "metrics": "0.40.0",
+    "notifications": "0.23.0",
+    "open-on-github": "0.32.0",
+    "package-generator": "0.36.0",
+    "release-notes": "0.45.0",
+    "settings-view": "0.169.0",
+    "snippets": "0.67.0",
+    "spell-check": "0.49.0",
+    "status-bar": "0.56.0",
+    "styleguide": "0.41.0",
+    "symbols-view": "0.77.0",
+    "tabs": "0.61.0",
+    "timecop": "0.26.0",
+    "tree-view": "0.147.0",
+    "update-package-dependencies": "0.7.0",
     "welcome": "0.21.0",
-    "whitespace": "0.27.0",
-    "wrap-guide": "0.24.0",
-    "language-c": "0.32.0",
-    "language-clojure": "0.9.0",
-    "language-coffee-script": "0.38.1",
-    "language-css": "0.23.1",
-    "language-gfm": "0.55.0",
-    "language-git": "0.9.0",
-    "language-go": "0.19.1",
-    "language-html": "0.26.1",
+    "whitespace": "0.28.0",
+    "wrap-guide": "0.29.0",
+    "language-c": "0.37.0",
+    "language-clojure": "0.10.0",
+    "language-coffee-script": "0.39.0",
+    "language-css": "0.26.0",
+    "language-gfm": "0.62.0",
+    "language-git": "0.10.0",
+    "language-go": "0.20.0",
+    "language-html": "0.28.0",
     "language-hyperlink": "0.12.2",
-    "language-java": "0.13.0",
-    "language-javascript": "0.47.0",
-    "language-json": "0.10.0",
-    "language-less": "0.19.0",
-    "language-make": "0.12.0",
+    "language-java": "0.14.0",
+    "language-javascript": "0.54.0",
+    "language-json": "0.11.0",
+    "language-less": "0.24.0",
+    "language-make": "0.13.0",
     "language-mustache": "0.11.0",
-    "language-objective-c": "0.12.0",
-    "language-perl": "0.9.0",
-    "language-php": "0.18.0",
-    "language-property-list": "0.7.0",
-    "language-python": "0.24.1",
-    "language-ruby": "0.44.0",
+    "language-objective-c": "0.15.0",
+    "language-perl": "0.10.0",
+    "language-php": "0.20.0",
+    "language-property-list": "0.8.0",
+    "language-python": "0.30.0",
+    "language-ruby": "0.47.0",
     "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.27.0",
-    "language-shellscript": "0.10.1",
-    "language-source": "0.8.0",
-    "language-sql": "0.11.0",
+    "language-sass": "0.31.0",
+    "language-shellscript": "0.12.0",
+    "language-source": "0.9.0",
+    "language-sql": "0.13.0",
     "language-text": "0.6.0",
-    "language-todo": "0.14.0",
-    "language-toml": "0.14.1",
-    "language-xml": "0.25.0",
-    "language-yaml": "0.20.1"
+    "language-todo": "0.15.0",
+    "language-toml": "0.15.0",
+    "language-xml": "0.27.0",
+    "language-yaml": "0.22.0"
   },
   "private": true,
   "scripts": {

resources/linux/debian/control.in

@@ -1,6 +1,6 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
+Depends: git, gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
 Suggests: libgnome-keyring0, gir1.2-gnomekeyring-1.0
 Section: <%= section %>
 Priority: optional

resources/win/apm.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../../app/apm/node_modules/atom-package-manager/lib/cli.js" "$@"

resources/win/atom.cmd

@@ -0,0 +1,22 @@
+@echo off
+
+SET EXPECT_OUTPUT=
+
+FOR %%a IN (%*) DO (
+  IF /I "%%a"=="-f"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--foreground" SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-h"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--help"       SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-t"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--test"       SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-v"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--version"    SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-w"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--wait"       SET EXPECT_OUTPUT=YES
+)
+
+IF "%EXPECT_OUTPUT%"=="YES" (
+  "%~dp0\..\..\atom.exe" %*
+) ELSE (
+  "%~dp0\..\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %*
+)

resources/win/atom.js

@@ -0,0 +1,9 @@
+var path  = require('path');
+var spawn = require('child_process').spawn;
+
+var atomCommandPath = path.resolve(__dirname, '..', '..', 'atom.exe');
+var arguments = process.argv.slice(2);
+arguments.unshift('--executed-from', process.cwd());
+var options = {detached: true, stdio: 'ignore'};
+spawn(atomCommandPath, arguments, options);
+process.exit(0);

resources/win/atom.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+while getopts ":fhtvw-:" opt; do
+  case "$opt" in
+    -)
+      case "${OPTARG}" in
+        foreground|help|test|version|wait)
+          EXPECT_OUTPUT=1
+        ;;
+      esac
+      ;;
+    f|h|t|v|w)
+      EXPECT_OUTPUT=1
+      ;;
+  esac
+done
+
+if [ $EXPECT_OUTPUT ]; then
+  "$0/../../../atom.exe" "$@"
+else
+  "$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../atom.js" "$@"
+fi

script/cibuild-atom-rpm

@@ -4,7 +4,9 @@ set -e
 
 docker build -t atom-rpm .
 docker run \
+ --rm \
  --env JANKY_SHA1="$JANKY_SHA1" \
  --env JANKY_BRANCH="$JANKY_BRANCH" \
  --env ATOM_ACCESS_TOKEN="$BUILD_ATOM_RPM_ACCESS_TOKEN" \
  atom-rpm /atom/script/rpmbuild
+docker rmi atom-rpm

spec/atom-reporter.coffee

@@ -38,7 +38,8 @@ module.exports =
 class AtomReporter extends View
   @content: ->
     @div class: 'spec-reporter', =>
-      @div outlet: "suites"
+      @div class: 'padded pull-right', =>
+        @button outlet: 'reloadButton', class: 'btn btn-small reload-button', 'Reload Specs'
       @div outlet: 'coreArea', class: 'symbol-area', =>
         @div outlet: 'coreHeader', class: 'symbol-header'
         @ul outlet: 'coreSummary', class: 'symbol-summary list-unstyled'
@@ -80,6 +81,8 @@ class AtomReporter extends View
     @on 'click', '.stack-trace', ->
       $(this).toggleClass('expanded')
 
+    @reloadButton.on 'click', -> require('ipc').send('call-window-method', 'restart')
+
   reportRunnerResults: (runner) ->
     @updateSpecCounts()
     @status.addClass('alert-success').removeClass('alert-info') if @failedCount is 0
@@ -114,7 +117,7 @@ class AtomReporter extends View
           @div class: 'result-message fail deprecation-message', =>
             @raw marked(deprecation.message)
 
-          for stack in deprecation.stacks
+          for stack in deprecation.getStacks()
             fullStack = stack.map ({functionName, location}) ->
               if functionName is '<unknown>'
                 "  at #{location}"

spec/atom-spec.coffee

@@ -54,6 +54,7 @@ describe "the `atom` global", ->
   describe "loading default config", ->
     it 'loads the default core config', ->
       expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
+      expect(atom.config.get('core.followSymlinks')).toBe false
       expect(atom.config.get('editor.showInvisibles')).toBe false
 
   describe "window onerror handler", ->

spec/buffered-process-spec.coffee

@@ -0,0 +1,75 @@
+ChildProcess = require 'child_process'
+path = require 'path'
+BufferedProcess  = require '../src/buffered-process'
+
+describe "BufferedProcess", ->
+  describe "when a bad command is specified", ->
+    [oldOnError] = []
+    beforeEach ->
+      oldOnError = window.onerror
+      window.onerror = jasmine.createSpy()
+
+    afterEach ->
+      window.onerror = oldOnError
+
+    describe "when there is an error handler specified", ->
+      it "calls the error handler and does not throw an exception", ->
+        process = new BufferedProcess
+          command: 'bad-command-nope'
+          args: ['nothing']
+          options: {}
+
+        errorSpy = jasmine.createSpy().andCallFake (error) -> error.handle()
+        process.onWillThrowError(errorSpy)
+
+        waitsFor -> errorSpy.callCount > 0
+
+        runs ->
+          expect(window.onerror).not.toHaveBeenCalled()
+          expect(errorSpy).toHaveBeenCalled()
+          expect(errorSpy.mostRecentCall.args[0].error.message).toContain 'spawn bad-command-nope ENOENT'
+
+    describe "when there is not an error handler specified", ->
+      it "calls the error handler and does not throw an exception", ->
+        process = new BufferedProcess
+          command: 'bad-command-nope'
+          args: ['nothing']
+          options: {}
+
+        waitsFor -> window.onerror.callCount > 0
+
+        runs ->
+          expect(window.onerror).toHaveBeenCalled()
+          expect(window.onerror.mostRecentCall.args[0]).toContain 'Failed to spawn command `bad-command-nope`'
+          expect(window.onerror.mostRecentCall.args[4].name).toBe 'BufferedProcessError'
+
+  describe "on Windows", ->
+    originalPlatform = null
+
+    beforeEach ->
+      # Prevent any commands from actually running and affecting the host
+      originalSpawn = ChildProcess.spawn
+      spyOn(ChildProcess, 'spawn').andCallFake ->
+        # Just spawn something that won't actually modify the host
+        if originalPlatform is 'win32'
+          originalSpawn('dir')
+        else
+          originalSpawn('ls')
+
+      originalPlatform = process.platform
+      Object.defineProperty process, 'platform', value: 'win32'
+
+    afterEach ->
+      Object.defineProperty process, 'platform', value: originalPlatform
+
+    describe "when the explorer command is spawned on Windows", ->
+      it "doesn't quote arguments of the form /root,C...", ->
+        new BufferedProcess({command: 'explorer.exe', args: ['/root,C:\\foo']})
+        expect(ChildProcess.spawn.argsForCall[0][1][2]).toBe '"explorer.exe /root,C:\\foo"'
+
+    it "spawns the command using a cmd.exe wrapper", ->
+      new BufferedProcess({command: 'dir'})
+      expect(path.basename(ChildProcess.spawn.argsForCall[0][0])).toBe 'cmd.exe'
+      expect(ChildProcess.spawn.argsForCall[0][1][0]).toBe '/s'
+      expect(ChildProcess.spawn.argsForCall[0][1][1]).toBe '/c'
+      expect(ChildProcess.spawn.argsForCall[0][1][2]).toBe '"dir"'

spec/display-buffer-spec.coffee

@@ -1085,6 +1085,12 @@ describe "DisplayBuffer", ->
         expect(oldProperties).toEqual decorationProperties
         expect(newProperties).toEqual type: 'gutter', class: 'two', id: decoration.id
 
+    describe "::getDecorations(properties)", ->
+      it "returns decorations matching the given optional properties", ->
+        expect(displayBuffer.getDecorations()).toEqual [decoration]
+        expect(displayBuffer.getDecorations(class: 'two').length).toEqual 0
+        expect(displayBuffer.getDecorations(class: 'one').length).toEqual 1
+
   describe "::setScrollTop", ->
     beforeEach ->
       displayBuffer.manageScrollPosition = true

spec/fixtures/packages/package-with-empty-keymap/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "package-with-empty-keymap",
+  "version": "1.0.0"
+}

spec/fixtures/packages/package-with-empty-menu/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "package-with-empty-menu",
+  "version": "1.0.0"
+}

spec/fixtures/packages/package-with-style-sheets-manifest/package.cson

@@ -0,0 +1 @@
+styleSheets: ['2', '1']

spec/fixtures/packages/package-with-stylesheets-manifest/package.cson

@@ -1 +1 @@
-stylesheets: ['2', '1']
+styleSheets: ['2', '1']

spec/fixtures/packages/theme-with-package-file/package.json

@@ -1,4 +1,4 @@
 {
   "theme": "ui",
-  "stylesheets": ["first.css", "second.less", "last.css"]
+  "styleSheets": ["first.css", "second.less", "last.css"]
 }

spec/fixtures/task-spec-handler.coffee

@@ -1,2 +1,3 @@
 module.exports = ->
+  emit("some-event", 1, 2, 3)
   'hello'

spec/git-spec.coffee

@@ -259,6 +259,10 @@ describe "GitRepository", ->
       editor.getBuffer().emitter.emit 'did-change-path'
       expect(statusHandler.callCount).toBe 1
 
+    it "stops listening to the buffer when the repository is destroyed (regression)", ->
+      atom.project.getRepositories()[0].destroy()
+      expect(-> editor.save()).not.toThrow()
+
   describe "when a project is deserialized", ->
     [buffer, project2] = []
 

spec/jasmine-helper.coffee

@@ -25,6 +25,9 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
         log(str)
       onComplete: (runner) ->
         fs.closeSync(logStream) if logStream?
+        if process.env.JANKY_SHA1
+          grim = require 'grim'
+          grim.logDeprecations() if grim.getDeprecationsLength() > 0
         atom.exit(runner.results().failedCount > 0 ? 1 : 0)
   else
     AtomReporter = require './atom-reporter'

spec/language-mode-spec.coffee

@@ -381,6 +381,23 @@ describe "LanguageMode", ->
         expect(languageMode.isFoldableAtBufferRow(3)).toBe false
         expect(languageMode.isFoldableAtBufferRow(4)).toBe true
 
+    describe ".foldAllAtIndentLevel(indentLevel)", ->
+      it "folds blocks of text at the given indentation level", ->
+        languageMode.foldAllAtIndentLevel(0)
+        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
+        expect(editor.getLastScreenRow()).toBe 0
+
+        languageMode.foldAllAtIndentLevel(1)
+        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
+        expect(editor.lineTextForScreenRow(1)).toBe "  var sort = function(items) {"
+        expect(editor.getLastScreenRow()).toBe 4
+
+        languageMode.foldAllAtIndentLevel(2)
+        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
+        expect(editor.lineTextForScreenRow(1)).toBe "  var sort = function(items) {"
+        expect(editor.lineTextForScreenRow(2)).toBe "    if (items.length <= 1) return items;"
+        expect(editor.getLastScreenRow()).toBe 9
+
   describe "folding with comments", ->
     beforeEach ->
       waitsForPromise ->

spec/notification-spec.coffee

@@ -16,3 +16,32 @@ describe "Notification", ->
     it "returns the icon specified", ->
       notification = new Notification('error', 'message!', icon: 'my-icon')
       expect(notification.getIcon()).toBe 'my-icon'
+
+  describe "dismissing notifications", ->
+    describe "when the notfication is dismissable", ->
+      it "calls a callback when the notification is dismissed", ->
+        dismissedSpy = jasmine.createSpy()
+        notification = new Notification('error', 'message', dismissable: true)
+        notification.onDidDismiss dismissedSpy
+
+        expect(notification.isDismissable()).toBe true
+        expect(notification.isDismissed()).toBe false
+
+        notification.dismiss()
+
+        expect(dismissedSpy).toHaveBeenCalled()
+        expect(notification.isDismissed()).toBe true
+
+    describe "when the notfication is not dismissable", ->
+      it "does nothing when ::dismiss() is called", ->
+        dismissedSpy = jasmine.createSpy()
+        notification = new Notification('error', 'message')
+        notification.onDidDismiss dismissedSpy
+
+        expect(notification.isDismissable()).toBe false
+        expect(notification.isDismissed()).toBe true
+
+        notification.dismiss()
+
+        expect(dismissedSpy).not.toHaveBeenCalled()
+        expect(notification.isDismissed()).toBe true

spec/package-spec.coffee

@@ -9,14 +9,14 @@ describe "Package", ->
       spyOn(atom, 'inDevMode').andReturn(false)
 
     it "does not activate it", ->
-      packagePath = atom.project.resolve('packages/package-with-incompatible-native-module')
+      packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-incompatible-native-module')
       pack = new Package(packagePath)
       expect(pack.isCompatible()).toBe false
       expect(pack.incompatibleModules[0].name).toBe 'native-module'
       expect(pack.incompatibleModules[0].path).toBe path.join(packagePath, 'node_modules', 'native-module')
 
     it "caches the incompatible native modules in local storage", ->
-      packagePath = atom.project.resolve('packages/package-with-incompatible-native-module')
+      packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-incompatible-native-module')
       cacheKey = null
       cacheItem = null
 
@@ -46,14 +46,14 @@ describe "Package", ->
     describe "when the theme contains a single style file", ->
       it "loads and applies css", ->
         expect($("atom-text-editor").css("padding-bottom")).not.toBe "1234px"
-        themePath = atom.project.resolve('packages/theme-with-index-css')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-with-index-css')
         theme = new ThemePackage(themePath)
         theme.activate()
         expect($("atom-text-editor").css("padding-top")).toBe "1234px"
 
       it "parses, loads and applies less", ->
         expect($("atom-text-editor").css("padding-bottom")).not.toBe "1234px"
-        themePath = atom.project.resolve('packages/theme-with-index-less')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-with-index-less')
         theme = new ThemePackage(themePath)
         theme.activate()
         expect($("atom-text-editor").css("padding-top")).toBe "4321px"
@@ -64,7 +64,7 @@ describe "Package", ->
         expect($("atom-text-editor").css("padding-right")).not.toBe("102px")
         expect($("atom-text-editor").css("padding-bottom")).not.toBe("103px")
 
-        themePath = atom.project.resolve('packages/theme-with-package-file')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-with-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
         expect($("atom-text-editor").css("padding-top")).toBe("101px")
@@ -77,7 +77,7 @@ describe "Package", ->
         expect($("atom-text-editor").css("padding-right")).not.toBe "20px"
         expect($("atom-text-editor").css("padding-bottom")).not.toBe "30px"
 
-        themePath = atom.project.resolve('packages/theme-without-package-file')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-without-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
         expect($("atom-text-editor").css("padding-top")).toBe "10px"
@@ -86,7 +86,7 @@ describe "Package", ->
 
     describe "reloading a theme", ->
       beforeEach ->
-        themePath = atom.project.resolve('packages/theme-with-package-file')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-with-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
 
@@ -97,7 +97,7 @@ describe "Package", ->
 
     describe "events", ->
       beforeEach ->
-        themePath = atom.project.resolve('packages/theme-with-package-file')
+        themePath = atom.project.getDirectories()[0]?.resolve('packages/theme-with-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
 

spec/pane-container-spec.coffee

@@ -129,7 +129,7 @@ describe "PaneContainer", ->
     beforeEach ->
       class TestItem
         shouldPromptToSave: -> true
-        getUri: -> 'test'
+        getURI: -> 'test'
 
       container = new PaneContainer
       container.getRoot().splitRight()

spec/pane-container-view-spec.coffee

@@ -16,7 +16,7 @@ describe "PaneContainerView", ->
       @content: -> @div tabindex: -1
       initialize: (@name) -> @text(@name)
       serialize: -> { deserializer: 'TestView', @name }
-      getUri: -> path.join(temp.dir, @name)
+      getURI: -> path.join(temp.dir, @name)
       save: -> @saved = true
       isEqual: (other) -> @name is other?.name
       onDidChangeTitle: -> new Disposable(->)

spec/pane-spec.coffee

@@ -9,7 +9,7 @@ describe "Pane", ->
   class Item extends Model
     @deserialize: ({name, uri}) -> new this(name, uri)
     constructor: (@name, @uri) ->
-    getUri: -> @uri
+    getURI: -> @uri
     getPath: -> @path
     serialize: -> {deserializer: 'Item', @name, @uri}
     isEqual: (other) -> @name is other?.name
@@ -231,18 +231,18 @@ describe "Pane", ->
         expect(pane.getActiveItem()).toBe item1
 
     describe "if the item is modified", ->
-      itemUri = null
+      itemURI = null
 
       beforeEach ->
         item1.shouldPromptToSave = -> true
         item1.save = jasmine.createSpy("save")
         item1.saveAs = jasmine.createSpy("saveAs")
-        item1.getUri = -> itemUri
+        item1.getURI = -> itemURI
 
       describe "if the [Save] option is selected", ->
         describe "when the item has a uri", ->
           it "saves the item before destroying it", ->
-            itemUri = "test"
+            itemURI = "test"
             spyOn(atom, 'confirm').andReturn(0)
             pane.destroyItem(item1)
 
@@ -252,7 +252,7 @@ describe "Pane", ->
 
         describe "when the item has no uri", ->
           it "presents a save-as dialog, then saves the item with the given uri before removing and destroying it", ->
-            itemUri = null
+            itemURI = null
 
             spyOn(atom, 'showSaveDialogSync').andReturn("/selected/path")
             spyOn(atom, 'confirm').andReturn(0)
@@ -404,15 +404,15 @@ describe "Pane", ->
         pane.saveActiveItemAs()
         expect(atom.showSaveDialogSync).not.toHaveBeenCalled()
 
-  describe "::itemForUri(uri)", ->
-    it "returns the item for which a call to .getUri() returns the given uri", ->
+  describe "::itemForURI(uri)", ->
+    it "returns the item for which a call to .getURI() returns the given uri", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D")])
       [item1, item2, item3] = pane.getItems()
       item1.uri = "a"
       item2.uri = "b"
-      expect(pane.itemForUri("a")).toBe item1
-      expect(pane.itemForUri("b")).toBe item2
-      expect(pane.itemForUri("bogus")).toBeUndefined()
+      expect(pane.itemForURI("a")).toBe item1
+      expect(pane.itemForURI("b")).toBe item2
+      expect(pane.itemForURI("bogus")).toBeUndefined()
 
   describe "::moveItem(item, index)", ->
     [pane, item1, item2, item3, item4] = []
@@ -589,7 +589,7 @@ describe "Pane", ->
       [item1, item2] = pane.getItems()
 
       item1.shouldPromptToSave = -> true
-      item1.getUri = -> "/test/path"
+      item1.getURI = -> "/test/path"
       item1.save = jasmine.createSpy("save")
 
       spyOn(atom, 'confirm').andReturn(0)
@@ -604,7 +604,7 @@ describe "Pane", ->
       [item1, item2] = pane.getItems()
 
       item1.shouldPromptToSave = -> true
-      item1.getUri = -> "/test/path"
+      item1.getURI = -> "/test/path"
       item1.save = jasmine.createSpy("save")
 
       spyOn(atom, 'confirm').andReturn(1)

spec/pane-view-spec.coffee

@@ -15,7 +15,7 @@ describe "PaneView", ->
     initialize: ({@id, @text}) ->
       @emitter = new Emitter
     serialize: -> { deserializer: 'TestView', @id, @text }
-    getUri: -> @id
+    getURI: -> @id
     isEqual: (other) -> other? and @id == other.id and @text == other.text
     changeTitle: ->
       @emitter.emit 'did-change-title', 'title'

spec/panel-spec.coffee

@@ -21,3 +21,7 @@ describe "Panel", ->
       panel.show()
       expect(panel.isVisible()).toBe true
       expect(spy).toHaveBeenCalledWith(true)
+
+      panel.destroy()
+      expect(panel.isVisible()).toBe false
+      expect(spy).toHaveBeenCalledWith(false)

spec/project-spec.coffee

@@ -4,12 +4,11 @@ Project = require '../src/project'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 path = require 'path'
-platform = require './spec-helper-platform'
 BufferedProcess = require '../src/buffered-process'
 
 describe "Project", ->
   beforeEach ->
-    atom.project.setPaths([atom.project.resolve('dir')])
+    atom.project.setPaths([atom.project.getDirectories()[0]?.resolve('dir')])
 
   describe "serialization", ->
     deserializedProject = null
@@ -110,7 +109,7 @@ describe "Project", ->
           expect(newBufferHandler).toHaveBeenCalledWith(editor.buffer)
 
     it "returns number of read bytes as progress indicator", ->
-      filePath = atom.project.resolve 'a'
+      filePath = atom.project.getDirectories()[0]?.resolve 'a'
       totalBytes = 0
       promise = atom.project.open(filePath)
       promise.progress (bytesRead) -> totalBytes = bytesRead
@@ -149,27 +148,6 @@ describe "Project", ->
           atom.project.bufferForPath("b").then (anotherBuffer) ->
             expect(anotherBuffer).not.toBe buffer
 
-  describe ".resolve(uri)", ->
-    describe "when passed an absolute or relative path", ->
-      it "returns an absolute path based on the atom.project's root", ->
-        absolutePath = require.resolve('./fixtures/dir/a')
-        expect(atom.project.resolve('a')).toBe absolutePath
-        expect(atom.project.resolve(absolutePath + '/../a')).toBe absolutePath
-        expect(atom.project.resolve('a/../a')).toBe absolutePath
-        expect(atom.project.resolve()).toBeUndefined()
-
-    describe "when passed a uri with a scheme", ->
-      it "does not modify uris that begin with a scheme", ->
-        expect(atom.project.resolve('http://zombo.com')).toBe 'http://zombo.com'
-
-    describe "when the project has no path", ->
-      it "returns undefined for relative URIs", ->
-        atom.project.setPaths([])
-        expect(atom.project.resolve('test.txt')).toBeUndefined()
-        expect(atom.project.resolve('http://github.com')).toBe 'http://github.com'
-        absolutePath = fs.absolute(__dirname)
-        expect(atom.project.resolve(absolutePath)).toBe absolutePath
-
   describe ".setPaths(path)", ->
     describe "when path is a file", ->
       it "sets its path to the files parent directory and updates the root directory", ->
@@ -195,290 +173,6 @@ describe "Project", ->
       expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
       expect(atom.project.getDirectories()[0].path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
 
-  describe ".replace()", ->
-    [filePath, commentFilePath, sampleContent, sampleCommentContent] = []
-
-    beforeEach ->
-      atom.project.setPaths([atom.project.resolve('../')])
-
-      filePath = atom.project.resolve('sample.js')
-      commentFilePath = atom.project.resolve('sample-with-comments.js')
-      sampleContent = fs.readFileSync(filePath).toString()
-      sampleCommentContent = fs.readFileSync(commentFilePath).toString()
-
-    afterEach ->
-      fs.writeFileSync(filePath, sampleContent)
-      fs.writeFileSync(commentFilePath, sampleCommentContent)
-
-    describe "when a file doesn't exist", ->
-      it "calls back with an error", ->
-        errors = []
-        missingPath = path.resolve('/not-a-file.js')
-        expect(fs.existsSync(missingPath)).toBeFalsy()
-
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'items', [missingPath], (result, error) ->
-            errors.push(error)
-
-        runs ->
-          expect(errors).toHaveLength 1
-          expect(errors[0].path).toBe missingPath
-
-    describe "when called with unopened files", ->
-      it "replaces properly", ->
-        results = []
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'items', [filePath], (result) ->
-            results.push(result)
-
-        runs ->
-          expect(results).toHaveLength 1
-          expect(results[0].filePath).toBe filePath
-          expect(results[0].replacements).toBe 6
-
-    describe "when a buffer is already open", ->
-      it "replaces properly and saves when not modified", ->
-        editor = null
-        results = []
-
-        waitsForPromise ->
-          atom.project.open('sample.js').then (o) -> editor = o
-
-        runs ->
-          expect(editor.isModified()).toBeFalsy()
-
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'items', [filePath], (result) ->
-            results.push(result)
-
-        runs ->
-          expect(results).toHaveLength 1
-          expect(results[0].filePath).toBe filePath
-          expect(results[0].replacements).toBe 6
-
-          expect(editor.isModified()).toBeFalsy()
-
-      it "does not replace when the path is not specified", ->
-        editor = null
-        results = []
-
-        waitsForPromise ->
-          atom.project.open('sample-with-comments.js').then (o) -> editor = o
-
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'items', [commentFilePath], (result) ->
-            results.push(result)
-
-        runs ->
-          expect(results).toHaveLength 1
-          expect(results[0].filePath).toBe commentFilePath
-
-      it "does NOT save when modified", ->
-        editor = null
-        results = []
-
-        waitsForPromise ->
-          atom.project.open('sample.js').then (o) -> editor = o
-
-        runs ->
-          editor.buffer.setTextInRange([[0,0],[0,0]], 'omg')
-          expect(editor.isModified()).toBeTruthy()
-
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'okthen', [filePath], (result) ->
-            results.push(result)
-
-        runs ->
-          expect(results).toHaveLength 1
-          expect(results[0].filePath).toBe filePath
-          expect(results[0].replacements).toBe 6
-
-          expect(editor.isModified()).toBeTruthy()
-
-  describe ".scan(options, callback)", ->
-    describe "when called with a regex", ->
-      it "calls the callback with all regex results in all files in the project", ->
-        results = []
-        waitsForPromise ->
-          atom.project.scan /(a)+/, (result) ->
-            results.push(result)
-
-        runs ->
-          expect(results).toHaveLength(3)
-          expect(results[0].filePath).toBe atom.project.resolve('a')
-          expect(results[0].matches).toHaveLength(3)
-          expect(results[0].matches[0]).toEqual
-            matchText: 'aaa'
-            lineText: 'aaa bbb'
-            lineTextOffset: 0
-            range: [[0, 0], [0, 3]]
-
-      it "works with with escaped literals (like $ and ^)", ->
-        results = []
-        waitsForPromise ->
-          atom.project.scan /\$\w+/, (result) -> results.push(result)
-
-        runs ->
-          expect(results.length).toBe 1
-
-          {filePath, matches} = results[0]
-          expect(filePath).toBe atom.project.resolve('a')
-          expect(matches).toHaveLength 1
-          expect(matches[0]).toEqual
-            matchText: '$bill'
-            lineText: 'dollar$bill'
-            lineTextOffset: 0
-            range: [[2, 6], [2, 11]]
-
-      it "works on evil filenames", ->
-        platform.generateEvilFiles()
-        atom.project.setPaths([path.join(__dirname, 'fixtures', 'evil-files')])
-        paths = []
-        matches = []
-        waitsForPromise ->
-          atom.project.scan /evil/, (result) ->
-            paths.push(result.filePath)
-            matches = matches.concat(result.matches)
-
-        runs ->
-          _.each(matches, (m) -> expect(m.matchText).toEqual 'evil')
-
-          if platform.isWindows()
-            expect(paths.length).toBe 3
-            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
-            expect(paths[1]).toMatch /file with spaces.txt$/
-            expect(path.basename(paths[2])).toBe "utfa\u0306.md"
-          else
-            expect(paths.length).toBe 5
-            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
-            expect(paths[1]).toMatch /file with spaces.txt$/
-            expect(paths[2]).toMatch /goddam\nnewlines$/m
-            expect(paths[3]).toMatch /quote".txt$/m
-            expect(path.basename(paths[4])).toBe "utfa\u0306.md"
-
-      it "ignores case if the regex includes the `i` flag", ->
-        results = []
-        waitsForPromise ->
-          atom.project.scan /DOLLAR/i, (result) -> results.push(result)
-
-        runs ->
-          expect(results).toHaveLength 1
-
-      describe "when the core.excludeVcsIgnoredPaths config is truthy", ->
-        [projectPath, ignoredPath] = []
-
-        beforeEach ->
-          sourceProjectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
-          projectPath = path.join(temp.mkdirSync("atom"))
-
-          writerStream = fstream.Writer(projectPath)
-          fstream.Reader(sourceProjectPath).pipe(writerStream)
-
-          waitsFor (done) ->
-            writerStream.on 'close', done
-            writerStream.on 'error', done
-
-          runs ->
-            fs.rename(path.join(projectPath, 'git.git'), path.join(projectPath, '.git'))
-            ignoredPath = path.join(projectPath, 'ignored.txt')
-            fs.writeFileSync(ignoredPath, 'this match should not be included')
-
-        afterEach ->
-          fs.removeSync(projectPath) if fs.existsSync(projectPath)
-
-        it "excludes ignored files", ->
-          atom.project.setPaths([projectPath])
-          atom.config.set('core.excludeVcsIgnoredPaths', true)
-          resultHandler = jasmine.createSpy("result found")
-          waitsForPromise ->
-            atom.project.scan /match/, (results) ->
-              resultHandler()
-
-          runs ->
-            expect(resultHandler).not.toHaveBeenCalled()
-
-      it "includes only files when a directory filter is specified", ->
-        projectPath = path.join(path.join(__dirname, 'fixtures', 'dir'))
-        atom.project.setPaths([projectPath])
-
-        filePath = path.join(projectPath, 'a-dir', 'oh-git')
-
-        paths = []
-        matches = []
-        waitsForPromise ->
-          atom.project.scan /aaa/, paths: ["a-dir#{path.sep}"], (result) ->
-            paths.push(result.filePath)
-            matches = matches.concat(result.matches)
-
-        runs ->
-          expect(paths.length).toBe 1
-          expect(paths[0]).toBe filePath
-          expect(matches.length).toBe 1
-
-      it "includes files and folders that begin with a '.'", ->
-        projectPath = temp.mkdirSync()
-        filePath = path.join(projectPath, '.text')
-        fs.writeFileSync(filePath, 'match this')
-        atom.project.setPaths([projectPath])
-        paths = []
-        matches = []
-        waitsForPromise ->
-          atom.project.scan /match this/, (result) ->
-            paths.push(result.filePath)
-            matches = matches.concat(result.matches)
-
-        runs ->
-          expect(paths.length).toBe 1
-          expect(paths[0]).toBe filePath
-          expect(matches.length).toBe 1
-
-      it "excludes values in core.ignoredNames", ->
-        projectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
-        ignoredNames = atom.config.get("core.ignoredNames")
-        ignoredNames.push("a")
-        atom.config.set("core.ignoredNames", ignoredNames)
-
-        resultHandler = jasmine.createSpy("result found")
-        waitsForPromise ->
-          atom.project.scan /dollar/, (results) ->
-            resultHandler()
-
-        runs ->
-          expect(resultHandler).not.toHaveBeenCalled()
-
-      it "scans buffer contents if the buffer is modified", ->
-        editor = null
-        results = []
-
-        waitsForPromise ->
-          atom.project.open('a').then (o) ->
-            editor = o
-            editor.setText("Elephant")
-
-        waitsForPromise ->
-          atom.project.scan /a|Elephant/, (result) -> results.push result
-
-        runs ->
-          expect(results).toHaveLength 3
-          resultForA = _.find results, ({filePath}) -> path.basename(filePath) == 'a'
-          expect(resultForA.matches).toHaveLength 1
-          expect(resultForA.matches[0].matchText).toBe 'Elephant'
-
-      it "ignores buffers outside the project", ->
-        editor = null
-        results = []
-
-        waitsForPromise ->
-          atom.project.open(temp.openSync().path).then (o) ->
-            editor = o
-            editor.setText("Elephant")
-
-        waitsForPromise ->
-          atom.project.scan /Elephant/, (result) -> results.push result
-
-        runs ->
-          expect(results).toHaveLength 0
-
   describe ".eachBuffer(callback)", ->
     beforeEach ->
       atom.project.bufferForPathSync('a')

spec/spec-helper.coffee

@@ -84,6 +84,10 @@ beforeEach ->
   atom.workspaceViewParentSelector = '#jasmine-content'
 
   window.resetTimeouts()
+  spyOn(_._, "now").andCallFake -> window.now
+  spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
+  spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
+
   atom.packages.packageStates = {}
 
   serializedWindowState = null
@@ -102,9 +106,9 @@ beforeEach ->
   spyOn(atom.menu, 'sendToBrowserProcess')
 
   # reset config before each spec; don't load or save from/to `config.json`
+  spyOn(Config::, 'load')
+  spyOn(Config::, 'save')
   config = new Config({resourcePath, configDirPath: atom.getConfigDirPath()})
-  spyOn(config, 'load')
-  spyOn(config, 'save')
   atom.config = config
   atom.loadConfig()
   config.set "core.destroyEmptyPanes", false
@@ -114,6 +118,7 @@ beforeEach ->
   config.set "core.disabledPackages", ["package-that-throws-an-exception",
     "package-with-broken-package-json", "package-with-broken-keymap"]
   config.set "editor.useShadowDOM", true
+  advanceClock(1000)
   config.load.reset()
   config.save.reset()
 
@@ -121,8 +126,6 @@ beforeEach ->
   TextEditorElement::setUpdatedSynchronously(true)
 
   spyOn(atom, "setRepresentedFilename")
-  spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
-  spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
   spyOn(pathwatcher.File.prototype, "detectResurrectionAfterDelay").andCallFake -> @detectResurrection()
   spyOn(TextEditor.prototype, "shouldPromptToSave").andReturn false
 
@@ -204,10 +207,10 @@ jasmine.attachToDOM = (element) ->
 
 deprecationsSnapshot = null
 jasmine.snapshotDeprecations = ->
-  deprecationsSnapshot = Grim.getDeprecations() # suppress deprecations!!
+  deprecationsSnapshot = _.clone(Grim.deprecations)
 
 jasmine.restoreDeprecationsSnapshot = ->
-  Grim.grimDeprecations = deprecationsSnapshot
+  Grim.deprecations = deprecationsSnapshot
 
 addCustomMatchers = (spec) ->
   spec.addMatchers

spec/squirrel-update-spec.coffee

@@ -0,0 +1,104 @@
+ChildProcess = require 'child_process'
+{EventEmitter} = require 'events'
+fs = require 'fs-plus'
+path = require 'path'
+temp = require 'temp'
+SquirrelUpdate = require '../src/browser/squirrel-update'
+
+describe "Windows squirrel updates", ->
+  tempHomeDirectory = null
+
+  beforeEach ->
+    # Prevent the actually home directory from being manipulated
+    tempHomeDirectory = temp.mkdirSync('atom-temp-home-')
+    spyOn(fs, 'getHomeDirectory').andReturn(tempHomeDirectory)
+
+    # Prevent any commands from actually running and affecting the host
+    originalSpawn = ChildProcess.spawn
+    spyOn(ChildProcess, 'spawn').andCallFake (command, args) ->
+      if path.basename(command) is 'Update.exe' and args?[0] is '--createShortcut'
+        fs.writeFileSync(path.join(tempHomeDirectory, 'Desktop', 'Atom.lnk'), '')
+
+      # Just spawn something that won't actually modify the host
+      if process.platform is 'win32'
+        originalSpawn('dir')
+      else
+        originalSpawn('ls')
+
+  it "ignores errors spawning Squirrel", ->
+    jasmine.unspy(ChildProcess, 'spawn')
+    spyOn(ChildProcess, 'spawn').andCallFake -> throw new Error("EBUSY")
+
+    app = quit: jasmine.createSpy('quit')
+    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+  it "quits the app on all squirrel events", ->
+    app = quit: jasmine.createSpy('quit')
+
+    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      app.quit.reset()
+      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-updated')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      app.quit.reset()
+      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-uninstall')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      app.quit.reset()
+      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-obsolete')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      expect(SquirrelUpdate.handleStartupEvent(app, '--not-squirrel')).toBe false
+
+  it "keeps the desktop shortcut deleted on updates if it was previously deleted after install", ->
+    desktopShortcutPath = path.join(tempHomeDirectory, 'Desktop', 'Atom.lnk')
+    expect(fs.existsSync(desktopShortcutPath)).toBe false
+
+    app = quit: jasmine.createSpy('quit')
+    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      app.quit.reset()
+      expect(fs.existsSync(desktopShortcutPath)).toBe true
+      fs.removeSync(desktopShortcutPath)
+      expect(fs.existsSync(desktopShortcutPath)).toBe false
+      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-updated')).toBe true
+
+    waitsFor ->
+      app.quit.callCount is 1
+
+    runs ->
+      expect(fs.existsSync(desktopShortcutPath)).toBe false
+
+  describe ".restartAtom", ->
+    it "quits the app and spawns a new one", ->
+      app = new EventEmitter()
+      app.quit = jasmine.createSpy('quit')
+
+      SquirrelUpdate.restartAtom(app)
+      expect(app.quit.callCount).toBe 1
+
+      expect(ChildProcess.spawn.callCount).toBe 0
+      app.emit('will-quit')
+      expect(ChildProcess.spawn.callCount).toBe 1
+      expect(path.basename(ChildProcess.spawn.argsForCall[0][0])).toBe 'atom.cmd'

spec/style-manager-spec.coffee

@@ -53,14 +53,16 @@ describe "StyleManager", ->
         expect(addEvents[0].getAttribute('source-path')).toBe '/foo/bar'
         expect(addEvents[0].textContent).toBe "a {color: yellow;}"
 
-    describe "when a group parameter is specified", ->
-      it "inserts the stylesheet at the end of any existing stylesheets for the same group", ->
-        manager.addStyleSheet("a {color: red}", group: 'a')
-        manager.addStyleSheet("a {color: blue}", group: 'b')
-        manager.addStyleSheet("a {color: green}", group: 'a')
+    describe "when a priority parameter is specified", ->
+      it "inserts the style sheet based on the priority", ->
+        manager.addStyleSheet("a {color: red}", priority: 1)
+        manager.addStyleSheet("a {color: blue}", priority: 0)
+        manager.addStyleSheet("a {color: green}", priority: 2)
+        manager.addStyleSheet("a {color: yellow}", priority: 1)
 
         expect(manager.getStyleElements().map (elt) -> elt.textContent).toEqual [
-          "a {color: red}"
-          "a {color: green}"
           "a {color: blue}"
+          "a {color: red}"
+          "a {color: yellow}"
+          "a {color: green}"
         ]

spec/styles-element-spec.coffee

@@ -32,16 +32,18 @@ describe "StylesElement", ->
     expect(element.children[initialChildCount].textContent).toBe "a {color: blue;}"
     expect(removedStyleElements).toEqual [addedStyleElements[0]]
 
-  it "orders style elements by group", ->
+  it "orders style elements by priority", ->
     initialChildCount = element.children.length
 
-    atom.styles.addStyleSheet("a {color: red}", group: 'a')
-    atom.styles.addStyleSheet("a {color: blue}", group: 'b')
-    atom.styles.addStyleSheet("a {color: green}", group: 'a')
+    atom.styles.addStyleSheet("a {color: red}", priority: 1)
+    atom.styles.addStyleSheet("a {color: blue}", priority: 0)
+    atom.styles.addStyleSheet("a {color: green}", priority: 2)
+    atom.styles.addStyleSheet("a {color: yellow}", priority: 1)
 
-    expect(element.children[initialChildCount].textContent).toBe "a {color: red}"
-    expect(element.children[initialChildCount + 1].textContent).toBe "a {color: green}"
-    expect(element.children[initialChildCount + 2].textContent).toBe "a {color: blue}"
+    expect(element.children[initialChildCount].textContent).toBe "a {color: blue}"
+    expect(element.children[initialChildCount + 1].textContent).toBe "a {color: red}"
+    expect(element.children[initialChildCount + 2].textContent).toBe "a {color: yellow}"
+    expect(element.children[initialChildCount + 3].textContent).toBe "a {color: green}"
 
   it "updates existing style nodes when style elements are updated", ->
     initialChildCount = element.children.length
@@ -105,3 +107,8 @@ describe "StylesElement", ->
 
       document.querySelector('#jasmine-content').appendChild(element)
       expect(element.firstChild.sheet.cssRules[0].selectorText).toBe ':host'
+
+    it "does not throw exceptions on rules with no selectors", ->
+      atom.styles.addStyleSheet """
+        @media screen {font-size: 10px;}
+      """, context: 'atom-text-editor'

spec/task-spec.coffee

@@ -20,3 +20,26 @@ describe "Task", ->
         expect(handlerResult).toBe 'hello'
         expect(childProcess.kill).toHaveBeenCalled()
         expect(processErrored).toBe false
+
+  it "calls listeners registered with ::on when events are emitted in the task", ->
+    task = new Task(require.resolve('./fixtures/task-spec-handler'))
+
+    eventSpy = jasmine.createSpy('eventSpy')
+    task.on("some-event", eventSpy)
+
+    waitsFor (done) -> task.start(done)
+
+    runs ->
+      expect(eventSpy).toHaveBeenCalledWith(1, 2, 3)
+
+  it "unregisters listeners when the Disposable returned by ::on is disposed", ->
+    task = new Task(require.resolve('./fixtures/task-spec-handler'))
+
+    eventSpy = jasmine.createSpy('eventSpy')
+    disposable = task.on("some-event", eventSpy)
+    disposable.dispose()
+
+    waitsFor (done) -> task.start(done)
+
+    runs ->
+      expect(eventSpy).not.toHaveBeenCalled()

spec/text-editor-component-spec.coffee

@@ -429,7 +429,7 @@ describe "TextEditorComponent", ->
       it "excludes the null byte from character measurement", ->
         editor.setText("a\0b")
         nextAnimationFrame()
-        expect(editor.pixelPositionForScreenPosition([0, Infinity]).left).toEqual 2 * charWidth
+        expect(wrapperNode.pixelPositionForScreenPosition([0, Infinity]).left).toEqual 2 * charWidth
 
     describe "when there is a fold", ->
       it "renders a fold marker on the folded line", ->
@@ -552,14 +552,29 @@ describe "TextEditorComponent", ->
       nextAnimationFrame()
       expect(lineNumbersNode.style.backgroundColor).toBe 'rgb(255, 0, 0)'
 
-    describe "when the editor.showLineNumbers config is false", ->
-      it "doesn't render any line numbers", ->
-        expect(component.refs.gutter).toBeDefined()
-        atom.config.set("editor.showLineNumbers", false)
-        expect(component.refs.gutter).not.toBeDefined()
-        atom.config.set("editor.showLineNumbers", true)
-        expect(component.refs.gutter).toBeDefined()
-        expect(component.lineNumberNodeForScreenRow(3)).toBeDefined()
+    it "hides or shows the gutter based on the '::isGutterVisible' property on the model and the global 'editor.showLineNumbers' config setting", ->
+      expect(component.refs.gutter?).toBe true
+
+      editor.setGutterVisible(false)
+      nextAnimationFrame()
+
+      expect(component.refs.gutter?).toBe false
+
+      atom.config.set("editor.showLineNumbers", false)
+      expect(nextAnimationFrame).toBe noAnimationFrame
+
+      expect(component.refs.gutter?).toBe false
+
+      editor.setGutterVisible(true)
+      expect(nextAnimationFrame).toBe noAnimationFrame
+
+      expect(component.refs.gutter?).toBe false
+
+      atom.config.set("editor.showLineNumbers", true)
+      nextAnimationFrame()
+
+      expect(component.refs.gutter?).toBe true
+      expect(component.lineNumberNodeForScreenRow(3)?).toBe true
 
     describe "fold decorations", ->
       describe "rendering fold decorations", ->
@@ -755,7 +770,6 @@ describe "TextEditorComponent", ->
       expect(cursorNode.offsetWidth).toBe charWidth
 
     it "blinks cursors when they aren't moving", ->
-      spyOn(_._, 'now').andCallFake -> window.now # Ensure _.debounce is based on our fake spec timeline
       cursorsNode = componentNode.querySelector('.cursors')
 
       expect(cursorsNode.classList.contains('blink-off')).toBe false
@@ -802,7 +816,7 @@ describe "TextEditorComponent", ->
       nextAnimationFrame()
       cursorNode = componentNode.querySelector('.cursor')
 
-      {left} = editor.pixelPositionForScreenPosition([1, 10])
+      {left} = wrapperNode.pixelPositionForScreenPosition([1, 10])
       expect(cursorNode.style['-webkit-transform']).toBe "translate(#{left}px, #{editor.getLineHeightInPixels()}px)"
 
   describe "selection rendering", ->
@@ -896,7 +910,7 @@ describe "TextEditorComponent", ->
       nextAnimationFrame()
       selectionNode = componentNode.querySelector('.region')
       expect(selectionNode.offsetTop).toBe editor.getLineHeightInPixels()
-      expect(selectionNode.offsetLeft).toBe editor.pixelPositionForScreenPosition([1, 6]).left
+      expect(selectionNode.offsetLeft).toBe wrapperNode.pixelPositionForScreenPosition([1, 6]).left
 
     it "will flash the selection when flash:true is passed to editor::setSelectedBufferRange", ->
       editor.setSelectedBufferRange([[1, 6], [1, 10]], flash: true)
@@ -1231,7 +1245,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([2, 5])
+        position = wrapperNode.pixelPositionForBufferPosition([2, 5])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1241,7 +1255,7 @@ describe "TextEditorComponent", ->
         editor.moveRight()
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([2, 7])
+        position = wrapperNode.pixelPositionForBufferPosition([2, 7])
 
         expect(overlay.style.left).toBe position.left + 'px'
         expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
@@ -1252,7 +1266,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([2, 10])
+        position = wrapperNode.pixelPositionForBufferPosition([2, 10])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1263,7 +1277,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([2, 5])
+        position = wrapperNode.pixelPositionForBufferPosition([2, 5])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1274,7 +1288,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', position: 'tail', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([2, 5])
+        position = wrapperNode.pixelPositionForBufferPosition([2, 5])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1304,7 +1318,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([0, 26])
+        position = wrapperNode.pixelPositionForBufferPosition([0, 26])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1313,7 +1327,7 @@ describe "TextEditorComponent", ->
         editor.insertText('a')
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([0, 27])
+        position = wrapperNode.pixelPositionForBufferPosition([0, 27])
 
         expect(overlay.style.left).toBe position.left - itemWidth + 'px'
         expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
@@ -1323,7 +1337,7 @@ describe "TextEditorComponent", ->
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([4, 0])
+        position = wrapperNode.pixelPositionForBufferPosition([4, 0])
 
         overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
         expect(overlay.style.left).toBe position.left + 'px'
@@ -1332,7 +1346,7 @@ describe "TextEditorComponent", ->
         editor.insertNewline()
         nextAnimationFrame()
 
-        position = editor.pixelPositionForBufferPosition([5, 0])
+        position = wrapperNode.pixelPositionForBufferPosition([5, 0])
 
         expect(overlay.style.left).toBe position.left + 'px'
         expect(overlay.style.top).toBe position.top - itemHeight + 'px'
@@ -1354,7 +1368,7 @@ describe "TextEditorComponent", ->
           decoration = editor.decorateMarker(marker, {type: 'overlay', item})
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([0, 2])
+          position = wrapperNode.pixelPositionForBufferPosition([0, 2])
 
           overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
           expect(overlay.style.left).toBe position.left + 'px'
@@ -1363,7 +1377,7 @@ describe "TextEditorComponent", ->
           editor.insertText('a')
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([0, 3])
+          position = wrapperNode.pixelPositionForBufferPosition([0, 3])
 
           expect(overlay.style.left).toBe position.left + 'px'
           expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
@@ -1373,7 +1387,7 @@ describe "TextEditorComponent", ->
           decoration = editor.decorateMarker(marker, {type: 'overlay', item})
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([1, 0])
+          position = wrapperNode.pixelPositionForBufferPosition([1, 0])
 
           overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
           expect(overlay.style.left).toBe position.left + 'px'
@@ -1382,7 +1396,7 @@ describe "TextEditorComponent", ->
           editor.insertNewline()
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([2, 0])
+          position = wrapperNode.pixelPositionForBufferPosition([2, 0])
 
           expect(overlay.style.left).toBe position.left + 'px'
           expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
@@ -1395,7 +1409,7 @@ describe "TextEditorComponent", ->
           decoration = editor.decorateMarker(marker, {type: 'overlay', item})
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([0, 28])
+          position = wrapperNode.pixelPositionForBufferPosition([0, 28])
 
           overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
           expect(overlay.style.left).toBe position.left + 'px'
@@ -1404,7 +1418,7 @@ describe "TextEditorComponent", ->
           editor.insertText('a')
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([0, 29])
+          position = wrapperNode.pixelPositionForBufferPosition([0, 29])
 
           expect(overlay.style.left).toBe position.left - itemWidth + 'px'
           expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
@@ -1415,7 +1429,7 @@ describe "TextEditorComponent", ->
           decoration = editor.decorateMarker(marker, {type: 'overlay', item})
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([6, 0])
+          position = wrapperNode.pixelPositionForBufferPosition([6, 0])
 
           overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
           expect(overlay.style.left).toBe position.left + 'px'
@@ -1424,7 +1438,7 @@ describe "TextEditorComponent", ->
           editor.insertNewline()
           nextAnimationFrame()
 
-          position = editor.pixelPositionForBufferPosition([7, 0])
+          position = wrapperNode.pixelPositionForBufferPosition([7, 0])
 
           expect(overlay.style.left).toBe position.left + 'px'
           expect(overlay.style.top).toBe position.top - itemHeight + 'px'
@@ -1612,6 +1626,22 @@ describe "TextEditorComponent", ->
         expect(nextAnimationFrame).toBe noAnimationFrame
         expect(editor.getSelectedScreenRange()).toEqual [[2, 4], [6, 8]]
 
+      describe "when the editor is destroyed while dragging", ->
+        it "cleans up the handlers for window.mouseup and window.mousemove", ->
+          linesNode.dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenPosition([2, 4]), which: 1))
+          linesNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenPosition([6, 8]), which: 1))
+          nextAnimationFrame()
+
+          spyOn(window, 'removeEventListener').andCallThrough()
+
+          linesNode.dispatchEvent(buildMouseEvent('mousemove', clientCoordinatesForScreenPosition([6, 10]), which: 1))
+          editor.destroy()
+          nextAnimationFrame()
+
+          call.args.pop() for call in window.removeEventListener.calls
+          expect(window.removeEventListener).toHaveBeenCalledWith('mouseup')
+          expect(window.removeEventListener).toHaveBeenCalledWith('mousemove')
+
     describe "when a line is folded", ->
       beforeEach ->
         editor.foldBufferRow 4
@@ -1908,7 +1938,8 @@ describe "TextEditorComponent", ->
         }
       """, context: 'atom-text-editor'
 
-      nextAnimationFrame()
+      nextAnimationFrame() # handle stylesheet change event
+      nextAnimationFrame() # perform requested update
 
       scrollbarCornerNode = componentNode.querySelector('.scrollbar-corner')
       expect(verticalScrollbarNode.offsetWidth).toBe 8
@@ -2031,8 +2062,6 @@ describe "TextEditorComponent", ->
         expect(component.mouseWheelScreenRow).toBe null
 
       it "clears the mouseWheelScreenRow after a delay even if the event does not cause scrolling", ->
-        spyOn(_._, 'now').andCallFake -> window.now # Ensure _.debounce is based on our fake spec timeline
-
         expect(editor.getScrollTop()).toBe 0
 
         lineNode = componentNode.querySelector('.line')
@@ -2488,7 +2517,8 @@ describe "TextEditorComponent", ->
 
   describe "when the 'mini' property is true", ->
     beforeEach ->
-      component.setProps(mini: true)
+      editor.setMini(true)
+      nextAnimationFrame()
 
     it "does not render the gutter", ->
       expect(componentNode.querySelector('.gutter')).toBeNull()
@@ -2576,9 +2606,9 @@ describe "TextEditorComponent", ->
 
     describe 'soft wrap settings', ->
       beforeEach ->
-        atom.config.set '.source.coffee', 'editor.softWrap', true
-        atom.config.set '.source.coffee', 'editor.preferredLineLength', 17
-        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', true
+        atom.config.set 'editor.softWrap', true, scopeSelector: '.source.coffee'
+        atom.config.set 'editor.preferredLineLength', 17, scopeSelector: '.source.coffee'
+        atom.config.set 'editor.softWrapAtPreferredLineLength', true, scopeSelector: '.source.coffee'
 
         editor.setEditorWidthInChars(20)
         coffeeEditor.setEditorWidthInChars(20)
@@ -2588,18 +2618,18 @@ describe "TextEditorComponent", ->
         expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
 
       it 'updates the wrapped lines when editor.preferredLineLength changes', ->
-        atom.config.set '.source.coffee', 'editor.preferredLineLength', 20
+        atom.config.set 'editor.preferredLineLength', 20, scopeSelector: '.source.coffee'
         expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
 
       it 'updates the wrapped lines when editor.softWrapAtPreferredLineLength changes', ->
-        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', false
+        atom.config.set 'editor.softWrapAtPreferredLineLength', false, scopeSelector: '.source.coffee'
         expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
 
       it 'updates the wrapped lines when editor.softWrap changes', ->
-        atom.config.set '.source.coffee', 'editor.softWrap', false
+        atom.config.set 'editor.softWrap', false, scopeSelector: '.source.coffee'
         expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if items.length <= 1'
 
-        atom.config.set '.source.coffee', 'editor.softWrap', true
+        atom.config.set 'editor.softWrap', true, scopeSelector: '.source.coffee'
         expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
 
       it 'updates the wrapped lines when the grammar changes', ->
@@ -2627,11 +2657,11 @@ describe "TextEditorComponent", ->
           tab: 'F'
           cr: 'E'
 
-        atom.config.set '.source.js', 'editor.showInvisibles', true
-        atom.config.set '.source.js', 'editor.invisibles', jsInvisibles
+        atom.config.set 'editor.showInvisibles', true, scopeSelector: '.source.js'
+        atom.config.set 'editor.invisibles', jsInvisibles, scopeSelector: '.source.js'
 
-        atom.config.set '.source.coffee', 'editor.showInvisibles', false
-        atom.config.set '.source.coffee', 'editor.invisibles', coffeeInvisibles
+        atom.config.set 'editor.showInvisibles', false, scopeSelector: '.source.coffee'
+        atom.config.set 'editor.invisibles', coffeeInvisibles, scopeSelector: '.source.coffee'
 
         editor.setText " a line with tabs\tand spaces \n"
         nextAnimationFrame()
@@ -2647,7 +2677,7 @@ describe "TextEditorComponent", ->
       it "re-renders the invisibles when the invisible settings change", ->
         jsGrammar = editor.getGrammar()
         editor.setGrammar(coffeeEditor.getGrammar())
-        atom.config.set '.source.coffee', 'editor.showInvisibles', true
+        atom.config.set 'editor.showInvisibles', true, scopeSelector: '.source.coffee'
         nextAnimationFrame()
         expect(component.lineNodeForScreenRow(0).textContent).toBe "#{coffeeInvisibles.space}a line with tabs#{coffeeInvisibles.tab}and spaces#{coffeeInvisibles.space}#{coffeeInvisibles.eol}"
 
@@ -2656,7 +2686,7 @@ describe "TextEditorComponent", ->
           space: 'E'
           tab: 'W'
           cr: 'I'
-        atom.config.set '.source.coffee', 'editor.invisibles', newInvisibles
+        atom.config.set 'editor.invisibles', newInvisibles, scopeSelector: '.source.coffee'
         nextAnimationFrame()
         expect(component.lineNodeForScreenRow(0).textContent).toBe "#{newInvisibles.space}a line with tabs#{newInvisibles.tab}and spaces#{newInvisibles.space}#{newInvisibles.eol}"
 
@@ -2666,8 +2696,8 @@ describe "TextEditorComponent", ->
 
     describe 'editor.showIndentGuide', ->
       beforeEach ->
-        atom.config.set '.source.js', 'editor.showIndentGuide', true
-        atom.config.set '.source.coffee', 'editor.showIndentGuide', false
+        atom.config.set 'editor.showIndentGuide', true, scopeSelector: '.source.js'
+        atom.config.set 'editor.showIndentGuide', false, scopeSelector: '.source.coffee'
 
       it "has an 'indent-guide' class when scoped editor.showIndentGuide is true, but not when scoped editor.showIndentGuide is false", ->
         line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
@@ -2688,7 +2718,7 @@ describe "TextEditorComponent", ->
         expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe true
         expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
 
-        atom.config.set '.source.js', 'editor.showIndentGuide', false
+        atom.config.set 'editor.showIndentGuide', false, scopeSelector: '.source.js'
 
         line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
         expect(line1LeafNodes[0].textContent).toBe '  '
@@ -2696,26 +2726,35 @@ describe "TextEditorComponent", ->
         expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
 
   describe "middle mouse paste on Linux", ->
-    it "pastes the previously selected text", ->
+    originalPlatform = null
+
+    beforeEach ->
+      originalPlatform = process.platform
+      Object.defineProperty process, 'platform', value: 'linux'
+
+    afterEach ->
+      Object.defineProperty process, 'platform', value: originalPlatform
+
+    it "pastes the previously selected text at the clicked location", ->
+      jasmine.unspy(window, 'setTimeout')
+      clipboardWrittenTo = false
       spyOn(require('ipc'), 'send').andCallFake (eventName, selectedText) ->
         if eventName is 'write-text-to-selection-clipboard'
           require('clipboard').writeText(selectedText, 'selection')
+          clipboardWrittenTo = true
 
       atom.clipboard.write('')
-      component.listenForMiddleMousePaste()
-
-      editor.setCursorBufferPosition([10, 0])
-      componentNode.querySelector('.scroll-view').dispatchEvent(buildMouseEvent('mouseup', which: 2))
-
-      expect(atom.clipboard.read()).toBe ''
-      expect(editor.lineTextForBufferRow(10)).toBe ''
-
+      component.trackSelectionClipboard()
       editor.setSelectedBufferRange([[1, 6], [1, 10]])
-      editor.setCursorBufferPosition([10, 0])
-      componentNode.querySelector('.scroll-view').dispatchEvent(buildMouseEvent('mouseup', which: 2))
 
-      expect(atom.clipboard.read()).toBe 'sort'
-      expect(editor.lineTextForBufferRow(10)).toBe 'sort'
+      waitsFor ->
+        clipboardWrittenTo
+
+      runs ->
+        componentNode.querySelector('.scroll-view').dispatchEvent(buildMouseEvent('mousedown', clientCoordinatesForScreenPosition([10, 0]), button: 1))
+        componentNode.querySelector('.scroll-view').dispatchEvent(buildMouseEvent('mouseup', clientCoordinatesForScreenPosition([10, 0]), which: 2))
+        expect(atom.clipboard.read()).toBe 'sort'
+        expect(editor.lineTextForBufferRow(10)).toBe 'sort'
 
   buildMouseEvent = (type, properties...) ->
     properties = extend({bubbles: true, cancelable: true}, properties...)
@@ -2728,14 +2767,14 @@ describe "TextEditorComponent", ->
     event
 
   clientCoordinatesForScreenPosition = (screenPosition) ->
-    positionOffset = editor.pixelPositionForScreenPosition(screenPosition)
+    positionOffset = wrapperNode.pixelPositionForScreenPosition(screenPosition)
     scrollViewClientRect = componentNode.querySelector('.scroll-view').getBoundingClientRect()
     clientX = scrollViewClientRect.left + positionOffset.left - editor.getScrollLeft()
     clientY = scrollViewClientRect.top + positionOffset.top - editor.getScrollTop()
     {clientX, clientY}
 
   clientCoordinatesForScreenRowInGutter = (screenRow) ->
-    positionOffset = editor.pixelPositionForScreenPosition([screenRow, 1])
+    positionOffset = wrapperNode.pixelPositionForScreenPosition([screenRow, 1])
     gutterClientRect = componentNode.querySelector('.gutter').getBoundingClientRect()
     clientX = gutterClientRect.left + positionOffset.left - editor.getScrollLeft()
     clientY = gutterClientRect.top + positionOffset.top - editor.getScrollTop()

spec/text-editor-element-spec.coffee

@@ -10,16 +10,26 @@ describe "TextEditorElement", ->
     jasmineContent = document.body.querySelector('#jasmine-content')
 
   describe "instantiation", ->
-    it "honors the mini attribute", ->
+    it "honors the 'mini' attribute", ->
       jasmineContent.innerHTML = "<atom-text-editor mini>"
       element = jasmineContent.firstChild
       expect(element.getModel().isMini()).toBe true
 
-    it "honors the placeholder-text attribute", ->
+    it "honors the 'placeholder-text' attribute", ->
       jasmineContent.innerHTML = "<atom-text-editor placeholder-text='testing'>"
       element = jasmineContent.firstChild
       expect(element.getModel().getPlaceholderText()).toBe 'testing'
 
+    it "honors the 'gutter-hidden' attribute", ->
+      jasmineContent.innerHTML = "<atom-text-editor gutter-hidden>"
+      element = jasmineContent.firstChild
+      expect(element.getModel().isGutterVisible()).toBe false
+
+    it "honors the text content", ->
+      jasmineContent.innerHTML = "<atom-text-editor>testing</atom-text-editor>"
+      element = jasmineContent.firstChild
+      expect(element.getModel().getText()).toBe 'testing'
+
   describe "when the model is assigned", ->
     it "adds the 'mini' attribute if .isMini() returns true on the model", ->
       element = new TextEditorElement
@@ -27,6 +37,34 @@ describe "TextEditorElement", ->
       element.setModel(model)
       expect(element.hasAttribute('mini')).toBe true
 
+  describe "when the editor is attached to the DOM", ->
+    describe "when the editor.useShadowDOM config option is true", ->
+      it "mounts the react component and unmounts when removed from the dom", ->
+        atom.config.set('editor.useShadowDOM', true)
+
+        element = new TextEditorElement
+        jasmine.attachToDOM(element)
+
+        component = element.component
+        expect(component.isMounted()).toBe true
+        element.remove()
+        expect(component.isMounted()).toBe false
+
+        jasmine.attachToDOM(element)
+        expect(element.component.isMounted()).toBe true
+
+    describe "when the editor.useShadowDOM config option is false", ->
+      it "mounts the react component and unmounts when removed from the dom", ->
+        atom.config.set('editor.useShadowDOM', false)
+
+        element = new TextEditorElement
+        jasmine.attachToDOM(element)
+
+        component = element.component
+        expect(component.isMounted()).toBe true
+        element.getModel().destroy()
+        expect(component.isMounted()).toBe false
+
   describe "focus and blur handling", ->
     describe "when the editor.useShadowDOM config option is true", ->
       it "proxies focus/blur events to/from the hidden input inside the shadow root", ->
@@ -65,6 +103,22 @@ describe "TextEditorElement", ->
         document.body.focus()
         expect(blurCalled).toBe true
 
+    describe "when focused while a parent node is being attached to the DOM", ->
+      class ElementThatFocusesChild extends HTMLDivElement
+        attachedCallback: ->
+          @firstChild.focus()
+
+      document.registerElement("element-that-focuses-child",
+        prototype: ElementThatFocusesChild.prototype
+      )
+
+      it "proxies the focus event to the hidden input", ->
+        element = new TextEditorElement
+        parentElement = document.createElement("element-that-focuses-child")
+        parentElement.appendChild(element)
+        jasmineContent.appendChild(parentElement)
+        expect(element.shadowRoot.activeElement).toBe element.shadowRoot.querySelector('input')
+
   describe "when the themes finish loading", ->
     [themeReloadCallback, initialThemeLoadComplete, element] = []
 
@@ -74,7 +128,7 @@ describe "TextEditorElement", ->
 
       spyOn(atom.themes, 'isInitialLoadComplete').andCallFake ->
         initialThemeLoadComplete
-      spyOn(atom.themes, 'onDidReloadAll').andCallFake (fn) ->
+      spyOn(atom.themes, 'onDidChangeActiveThemes').andCallFake (fn) ->
         themeReloadCallback = fn
 
       atom.config.set("editor.useShadowDOM", false)
@@ -99,6 +153,27 @@ describe "TextEditorElement", ->
       scrollbarWidth = verticalScrollbarNode.offsetWidth - verticalScrollbarNode.clientWidth
       expect(scrollbarWidth).toEqual(8)
 
+  describe "::onDidAttach and ::onDidDetach", ->
+    it "invokes callbacks when the element is attached and detached", ->
+      element = new TextEditorElement
+
+      attachedCallback = jasmine.createSpy("attachedCallback")
+      detachedCallback = jasmine.createSpy("detachedCallback")
+
+      element.onDidAttach(attachedCallback)
+      element.onDidDetach(detachedCallback)
+
+      jasmine.attachToDOM(element)
+
+      expect(attachedCallback).toHaveBeenCalled()
+      expect(detachedCallback).not.toHaveBeenCalled()
+
+      attachedCallback.reset()
+      element.remove()
+
+      expect(attachedCallback).not.toHaveBeenCalled()
+      expect(detachedCallback).toHaveBeenCalled()
+
   describe "::setUpdatedSynchronously", ->
     it "controls whether the text editor is updated synchronously", ->
       spyOn(window, 'requestAnimationFrame').andCallFake (fn) -> fn()
@@ -119,3 +194,13 @@ describe "TextEditorElement", ->
       element.getModel().setText("goodbye")
       expect(window.requestAnimationFrame).not.toHaveBeenCalled()
       expect(element.shadowRoot.textContent).toContain "goodbye"
+
+  describe "::getDefaultCharacterWidth", ->
+    it "returns null before the element is attached", ->
+      element = new TextEditorElement
+      expect(element.getDefaultCharacterWidth()).toBeNull()
+
+    it "returns the width of a character in the root scope", ->
+      element = new TextEditorElement
+      jasmine.attachToDOM(element)
+      expect(element.getDefaultCharacterWidth()).toBeGreaterThan(0)

spec/text-editor-spec.coffee

@@ -62,7 +62,6 @@ describe "TextEditor", ->
         atom.workspace.open('sample.less', initialLine: 5).then (o) -> editor = o
 
       runs ->
-        buffer = editor.buffer
         expect(editor.getLastCursor().getBufferPosition().row).toEqual 5
         expect(editor.getLastCursor().getBufferPosition().column).toEqual 0
 
@@ -74,10 +73,37 @@ describe "TextEditor", ->
         atom.workspace.open('sample.less', initialColumn: 8).then (o) -> editor = o
 
       runs ->
-        buffer = editor.buffer
         expect(editor.getLastCursor().getBufferPosition().row).toEqual 0
         expect(editor.getLastCursor().getBufferPosition().column).toEqual 8
 
+  describe "when the editor is reopened 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
+
+      waitsForPromise ->
+        atom.workspace.open('sample.less', initialLine: 4).then (o) -> editor = o
+
+      runs ->
+        expect(editor.getLastCursor().getBufferPosition().row).toEqual 4
+        expect(editor.getLastCursor().getBufferPosition().column).toEqual 0
+
+  describe "when the editor is reopened 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
+
+      waitsForPromise ->
+        atom.workspace.open('sample.less', initialColumn: 7).then (o) -> editor = o
+
+      runs ->
+        expect(editor.getLastCursor().getBufferPosition().row).toEqual 0
+        expect(editor.getLastCursor().getBufferPosition().column).toEqual 7
+
   describe ".copy()", ->
     it "returns a different edit session with the same initial state", ->
       editor.setSelectedBufferRange([[1, 2], [3, 4]])
@@ -192,12 +218,18 @@ describe "TextEditor", ->
         expect(editor.getCursorBufferPosition()).toEqual [1, 1]
 
       it "emits an event with the old position, new position, and the cursor that moved", ->
-        editor.onDidChangeCursorPosition positionChangedHandler = jasmine.createSpy()
+        cursorCallback = jasmine.createSpy('cursor-changed-position')
+        editorCallback = jasmine.createSpy('editor-changed-cursor-position')
+
+        editor.getLastCursor().onDidChangePosition(cursorCallback)
+        editor.onDidChangeCursorPosition(editorCallback)
 
         editor.setCursorBufferPosition([2, 4])
 
-        expect(positionChangedHandler).toHaveBeenCalled()
-        eventObject = positionChangedHandler.mostRecentCall.args[0]
+        expect(editorCallback).toHaveBeenCalled()
+        expect(cursorCallback).toHaveBeenCalled()
+        eventObject = editorCallback.mostRecentCall.args[0]
+        expect(cursorCallback.mostRecentCall.args[0]).toEqual(eventObject)
 
         expect(eventObject.oldBufferPosition).toEqual [0, 0]
         expect(eventObject.oldScreenPosition).toEqual [0, 0]
@@ -912,6 +944,15 @@ describe "TextEditor", ->
         editor.undo()
         expect(editor.getScrollTop()).toBe 0
 
+    describe '.logCursorScope()', ->
+      beforeEach ->
+        spyOn(atom.notifications, 'addInfo')
+
+      it 'opens a notification', ->
+        editor.logCursorScope()
+
+        expect(atom.notifications.addInfo).toHaveBeenCalled()
+
   describe "selection", ->
     selection = null
 
@@ -1321,7 +1362,7 @@ describe "TextEditor", ->
           coffeeEditor.selectWordsContainingCursors()
           expect(coffeeEditor.getSelectedBufferRange()).toEqual [[0, 6], [0, 15]]
 
-          atom.config.set '.source.coffee', 'editor.nonWordCharacters', 'qusort'
+          atom.config.set 'editor.nonWordCharacters', 'qusort', scopeSelector: '.source.coffee'
 
           coffeeEditor.setCursorBufferPosition [0, 9]
           coffeeEditor.selectWordsContainingCursors()
@@ -3270,7 +3311,7 @@ describe "TextEditor", ->
         atom.packages.unloadPackages()
 
       it 'returns correct values based on the scope of the set grammars', ->
-        atom.config.set '.source.coffee', 'editor.tabLength', 6
+        atom.config.set 'editor.tabLength', 6, scopeSelector: '.source.coffee'
 
         expect(editor.getTabLength()).toBe 2
         expect(coffeeEditor.getTabLength()).toBe 6
@@ -3292,12 +3333,12 @@ describe "TextEditor", ->
         expect(editor.getTabLength()).toBe 2
         expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 2
 
-        atom.config.set '.source.js', 'editor.tabLength', 6
+        atom.config.set 'editor.tabLength', 6, scopeSelector: '.source.js'
         expect(editor.getTabLength()).toBe 6
         expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 6
 
       it 'updates the tab length when the grammar changes', ->
-        atom.config.set '.source.coffee', 'editor.tabLength', 6
+        atom.config.set 'editor.tabLength', 6, scopeSelector: '.source.coffee'
 
         expect(editor.getTabLength()).toBe 2
         expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 2
@@ -3414,11 +3455,11 @@ describe "TextEditor", ->
         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.setCursorScreenPosition([0, 12])
             editor.insertNewline()
 
-            expect(buffer.lineForRow(0)).toBe '  var sort = function()'
-            expect(buffer.lineForRow(1)).toBe '   {}'
+            expect(buffer.lineForRow(0)).toBe '  var sort ='
+            expect(buffer.lineForRow(1)).toBe '   function() {}'
             expect(editor.getCursorScreenPosition()).toEqual [1, 2]
 
       describe "when inserted text matches a decrease indent pattern", ->
@@ -3467,8 +3508,8 @@ describe "TextEditor", ->
           atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
 
         runs ->
-          atom.config.set('.source.js', 'editor.autoIndent', true)
-          atom.config.set('.source.coffee', 'editor.autoIndent', false)
+          atom.config.set('editor.autoIndent', true, scopeSelector: '.source.js')
+          atom.config.set('editor.autoIndent', false, scopeSelector: '.source.coffee')
 
       afterEach: ->
         atom.packages.deactivatePackages()
@@ -3760,8 +3801,12 @@ describe "TextEditor", ->
     it "updates the grammar based on grammar overrides", ->
       expect(editor.getGrammar().name).toBe 'JavaScript'
       atom.grammars.setGrammarOverrideForPath(editor.getPath(), 'source.coffee')
+      callback = jasmine.createSpy('callback')
+      editor.onDidChangeGrammar(callback)
       editor.reloadGrammar()
       expect(editor.getGrammar().name).toBe 'CoffeeScript'
+      expect(callback.callCount).toBe 1
+      expect(callback.argsForCall[0][0]).toBe atom.grammars.grammarForScopeName('source.coffee')
 
   describe "when the editor's grammar has an injection selector", ->
     beforeEach ->

spec/theme-manager-spec.coffee

@@ -73,65 +73,90 @@ describe "ThemeManager", ->
 
   describe "when the core.themes config value changes", ->
     it "add/removes stylesheets to reflect the new config value", ->
-      themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+      themeManager.onDidChangeActiveThemes didChangeActiveThemesHandler = jasmine.createSpy()
       spyOn(atom.styles, 'getUserStyleSheetPath').andCallFake -> null
 
       waitsForPromise ->
         themeManager.activateThemes()
 
       runs ->
-        reloadHandler.reset()
+        didChangeActiveThemesHandler.reset()
         atom.config.set('core.themes', [])
 
       waitsFor ->
-        reloadHandler.callCount == 1
+        didChangeActiveThemesHandler.callCount == 1
 
       runs ->
-        reloadHandler.reset()
+        didChangeActiveThemesHandler.reset()
         expect($('style.theme')).toHaveLength 0
         atom.config.set('core.themes', ['atom-dark-ui'])
 
       waitsFor ->
-        reloadHandler.callCount == 1
+        didChangeActiveThemesHandler.callCount == 1
 
       runs ->
-        reloadHandler.reset()
-        expect($('style[group=theme]')).toHaveLength 2
-        expect($('style[group=theme]:eq(0)').attr('source-path')).toMatch /atom-dark-ui/
+        didChangeActiveThemesHandler.reset()
+        expect($('style[priority=1]')).toHaveLength 2
+        expect($('style[priority=1]:eq(0)').attr('source-path')).toMatch /atom-dark-ui/
         atom.config.set('core.themes', ['atom-light-ui', 'atom-dark-ui'])
 
       waitsFor ->
-        reloadHandler.callCount == 1
+        didChangeActiveThemesHandler.callCount == 1
 
       runs ->
-        reloadHandler.reset()
-        expect($('style[group=theme]')).toHaveLength 2
-        expect($('style[group=theme]:eq(0)').attr('source-path')).toMatch /atom-dark-ui/
-        expect($('style[group=theme]:eq(1)').attr('source-path')).toMatch /atom-light-ui/
+        didChangeActiveThemesHandler.reset()
+        expect($('style[priority=1]')).toHaveLength 2
+        expect($('style[priority=1]:eq(0)').attr('source-path')).toMatch /atom-dark-ui/
+        expect($('style[priority=1]:eq(1)').attr('source-path')).toMatch /atom-light-ui/
         atom.config.set('core.themes', [])
 
       waitsFor ->
-        reloadHandler.callCount == 1
+        didChangeActiveThemesHandler.callCount == 1
 
       runs ->
-        reloadHandler.reset()
-        expect($('style[group=theme]')).toHaveLength 2
+        didChangeActiveThemesHandler.reset()
+        expect($('style[priority=1]')).toHaveLength 2
         # atom-dark-ui has an directory path, the syntax one doesn't
         atom.config.set('core.themes', ['theme-with-index-less', 'atom-dark-ui'])
 
       waitsFor ->
-        reloadHandler.callCount == 1
+        didChangeActiveThemesHandler.callCount == 1
 
       runs ->
-        expect($('style[group=theme]')).toHaveLength 2
+        expect($('style[priority=1]')).toHaveLength 2
         importPaths = themeManager.getImportPaths()
         expect(importPaths.length).toBe 1
         expect(importPaths[0]).toContain 'atom-dark-ui'
 
+    it 'adds theme-* classes to the workspace for each active theme', ->
+      workspaceElement = atom.views.getView(atom.workspace)
+      themeManager.onDidChangeActiveThemes didChangeActiveThemesHandler = jasmine.createSpy()
+
+      waitsForPromise ->
+        themeManager.activateThemes()
+
+      runs ->
+        expect(workspaceElement).toHaveClass 'theme-atom-dark-ui'
+
+        themeManager.onDidChangeActiveThemes didChangeActiveThemesHandler = jasmine.createSpy()
+        atom.config.set('core.themes', ['theme-with-ui-variables', 'theme-with-syntax-variables'])
+
+      waitsFor ->
+        didChangeActiveThemesHandler.callCount > 0
+
+      runs ->
+        # `theme-` twice as it prefixes the name with `theme-`
+        expect(workspaceElement).toHaveClass 'theme-theme-with-ui-variables'
+        expect(workspaceElement).toHaveClass 'theme-theme-with-syntax-variables'
+        expect(workspaceElement).not.toHaveClass 'theme-atom-dark-ui'
+        expect(workspaceElement).not.toHaveClass 'theme-atom-dark-syntax'
+
   describe "when a theme fails to load", ->
     it "logs a warning", ->
       spyOn(console, 'warn')
-      expect(-> atom.packages.activatePackage('a-theme-that-will-not-be-found')).toThrow()
+      atom.packages.activatePackage('a-theme-that-will-not-be-found')
+      expect(console.warn.callCount).toBe 1
+      expect(console.warn.argsForCall[0][0]).toContain "Could not resolve 'a-theme-that-will-not-be-found'"
 
   describe "::requireStylesheet(path)", ->
     beforeEach ->
@@ -145,7 +170,7 @@ describe "ThemeManager", ->
       themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
       themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
 
-      cssPath = atom.project.resolve('css.css')
+      cssPath = atom.project.getDirectories()[0]?.resolve('css.css')
       lengthBefore = $('head style').length
 
       themeManager.requireStylesheet(cssPath)
@@ -169,7 +194,7 @@ describe "ThemeManager", ->
       $('head style[id*="css.css"]').remove()
 
     it "synchronously loads and parses less files at the given path and installs a style tag for it in the head", ->
-      lessPath = atom.project.resolve('sample.less')
+      lessPath = atom.project.getDirectories()[0]?.resolve('sample.less')
       lengthBefore = $('head style').length
       themeManager.requireStylesheet(lessPath)
       expect($('head style').length).toBe lengthBefore + 1
@@ -193,9 +218,9 @@ describe "ThemeManager", ->
 
     it "supports requiring css and less stylesheets without an explicit extension", ->
       themeManager.requireStylesheet path.join(__dirname, 'fixtures', 'css')
-      expect($('head style[source-path*="css.css"]').attr('source-path')).toBe themeManager.stringToId(atom.project.resolve('css.css'))
+      expect($('head style[source-path*="css.css"]').attr('source-path')).toBe themeManager.stringToId(atom.project.getDirectories()[0]?.resolve('css.css'))
       themeManager.requireStylesheet path.join(__dirname, 'fixtures', 'sample')
-      expect($('head style[source-path*="sample.less"]').attr('source-path')).toBe themeManager.stringToId(atom.project.resolve('sample.less'))
+      expect($('head style[source-path*="sample.less"]').attr('source-path')).toBe themeManager.stringToId(atom.project.getDirectories()[0]?.resolve('sample.less'))
 
       $('head style[id*="css.css"]').remove()
       $('head style[id*="sample.less"]').remove()
@@ -223,11 +248,9 @@ describe "ThemeManager", ->
 
       expect(stylesheetsChangedHandler).toHaveBeenCalled()
 
-  describe "base stylesheet loading", ->
+  describe "base style sheet loading", ->
     workspaceElement = null
     beforeEach ->
-      jasmine.snapshotDeprecations()
-
       workspaceElement = atom.views.getView(atom.workspace)
       jasmine.attachToDOM(workspaceElement)
       workspaceElement.appendChild document.createElement('atom-text-editor')
@@ -235,15 +258,12 @@ describe "ThemeManager", ->
       waitsForPromise ->
         themeManager.activateThemes()
 
-    beforeEach ->
-      jasmine.restoreDeprecationsSnapshot()
-
     it "loads the correct values from the theme's ui-variables file", ->
-      themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+      themeManager.onDidChangeActiveThemes didChangeActiveThemesHandler = jasmine.createSpy()
       atom.config.set('core.themes', ['theme-with-ui-variables', 'theme-with-syntax-variables'])
 
       waitsFor ->
-        reloadHandler.callCount > 0
+        didChangeActiveThemesHandler.callCount > 0
 
       runs ->
         # an override loaded in the base css
@@ -256,11 +276,11 @@ describe "ThemeManager", ->
 
     describe "when there is a theme with incomplete variables", ->
       it "loads the correct values from the fallback ui-variables", ->
-        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
+        themeManager.onDidChangeActiveThemes didChangeActiveThemesHandler = jasmine.createSpy()
         atom.config.set('core.themes', ['theme-with-incomplete-ui-variables', 'theme-with-syntax-variables'])
 
         waitsFor ->
-          reloadHandler.callCount > 0
+          didChangeActiveThemesHandler.callCount > 0
 
         runs ->
           # an override loaded in the base css
@@ -269,22 +289,6 @@ describe "ThemeManager", ->
           # from within the theme itself
           expect($("atom-text-editor").css("background-color")).toBe "rgb(0, 152, 255)"
 
-    describe "theme classes on the workspace", ->
-      it 'adds theme-* classes to the workspace for each active theme', ->
-        expect(workspaceElement).toHaveClass 'theme-atom-dark-ui'
-
-        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
-        atom.config.set('core.themes', ['theme-with-ui-variables', 'theme-with-syntax-variables'])
-
-        waitsFor ->
-          reloadHandler.callCount > 0
-
-        runs ->
-          # `theme-` twice as it prefixes the name with `theme-`
-          expect(workspaceElement).toHaveClass 'theme-theme-with-ui-variables'
-          expect(workspaceElement).toHaveClass 'theme-theme-with-syntax-variables'
-          expect(workspaceElement).not.toHaveClass 'theme-atom-dark-ui'
-          expect(workspaceElement).not.toHaveClass 'theme-atom-dark-syntax'
 
   describe "when the user stylesheet changes", ->
     beforeEach ->
@@ -358,7 +362,7 @@ describe "ThemeManager", ->
         themeManager.activateThemes()
 
     it 'uses the default dark UI and syntax themes and logs a warning', ->
-      activeThemeNames = themeManager.getActiveNames()
+      activeThemeNames = themeManager.getActiveThemeNames()
       expect(console.warn.callCount).toBe 2
       expect(activeThemeNames.length).toBe(2)
       expect(activeThemeNames).toContain('atom-dark-ui')
@@ -376,7 +380,7 @@ describe "ThemeManager", ->
           themeManager.activateThemes()
 
       it 'uses the enabled themes', ->
-        activeThemeNames = themeManager.getActiveNames()
+        activeThemeNames = themeManager.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
         expect(activeThemeNames).toContain('atom-light-ui')
         expect(activeThemeNames).toContain('atom-dark-syntax')
@@ -389,7 +393,7 @@ describe "ThemeManager", ->
           themeManager.activateThemes()
 
       it 'uses the default dark UI and syntax themes', ->
-        activeThemeNames = themeManager.getActiveNames()
+        activeThemeNames = themeManager.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
         expect(activeThemeNames).toContain('atom-dark-ui')
         expect(activeThemeNames).toContain('atom-dark-syntax')
@@ -402,7 +406,7 @@ describe "ThemeManager", ->
           themeManager.activateThemes()
 
       it 'uses the default dark UI theme', ->
-        activeThemeNames = themeManager.getActiveNames()
+        activeThemeNames = themeManager.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
         expect(activeThemeNames).toContain('atom-dark-ui')
         expect(activeThemeNames).toContain('atom-light-syntax')
@@ -415,7 +419,7 @@ describe "ThemeManager", ->
           themeManager.activateThemes()
 
       it 'uses the default dark syntax theme', ->
-        activeThemeNames = themeManager.getActiveNames()
+        activeThemeNames = themeManager.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
         expect(activeThemeNames).toContain('atom-light-ui')
         expect(activeThemeNames).toContain('atom-dark-syntax')

spec/view-registry-spec.coffee

@@ -14,14 +14,14 @@ describe "ViewRegistry", ->
         expect(registry.getView(node)).toBe node
 
     describe "when passed a SpacePen view", ->
-      it "returns the root node of the view with a __spacePenView property pointing at the SpacePen view", ->
+      it "returns the root node of the view with a .spacePenView property pointing at the SpacePen view", ->
         class TestView extends View
           @content: -> @div "Hello"
 
         view = new TestView
         node = registry.getView(view)
         expect(node.textContent).toBe "Hello"
-        expect(node.__spacePenView).toBe view
+        expect(node.spacePenView).toBe view
 
     describe "when passed a model object", ->
       describe "when a view provider is registered matching the object's constructor", ->
@@ -62,7 +62,7 @@ describe "ViewRegistry", ->
             node = registry.getView(model)
 
             expect(node.textContent).toBe "hello"
-            view = node.__spacePenView
+            view = node.spacePenView
             expect(view instanceof TestView).toBe true
             expect(view.model).toBe model
 

spec/workspace-spec.coffee

@@ -2,12 +2,16 @@ path = require 'path'
 temp = require 'temp'
 Workspace = require '../src/workspace'
 {View} = require '../src/space-pen-extensions'
+platform = require './spec-helper-platform'
+_ = require 'underscore-plus'
+fstream = require 'fstream'
+fs = require 'fs-plus'
 
 describe "Workspace", ->
   workspace = null
 
   beforeEach ->
-    atom.project.setPaths([atom.project.resolve('dir')])
+    atom.project.setPaths([atom.project.getDirectories()[0]?.resolve('dir')])
     atom.workspace = workspace = new Workspace
 
   describe "::open(uri, options)", ->
@@ -66,19 +70,19 @@ describe "Workspace", ->
 
               expect(openEvents).toEqual [
                 {
-                  uri: atom.project.resolve('a')
+                  uri: atom.project.getDirectories()[0]?.resolve('a')
                   item: editor1
                   pane: atom.workspace.getActivePane()
                   index: 0
                 }
                 {
-                  uri: atom.project.resolve('b')
+                  uri: atom.project.getDirectories()[0]?.resolve('b')
                   item: editor2
                   pane: atom.workspace.getActivePane()
                   index: 1
                 }
                 {
-                  uri: atom.project.resolve('a')
+                  uri: atom.project.getDirectories()[0]?.resolve('a')
                   item: editor1
                   pane: atom.workspace.getActivePane()
                   index: 0
@@ -92,7 +96,7 @@ describe "Workspace", ->
               workspace.open('a').then (o) -> editor = o
 
             runs ->
-              expect(editor.getUri()).toBe atom.project.resolve('a')
+              expect(editor.getURI()).toBe atom.project.getDirectories()[0]?.resolve('a')
               expect(workspace.getActivePaneItem()).toBe editor
               expect(workspace.getActivePane().items).toEqual [editor]
               expect(workspace.getActivePane().activate).toHaveBeenCalled()
@@ -226,7 +230,7 @@ describe "Workspace", ->
         workspace.addOpener(barOpener)
 
         waitsForPromise ->
-          pathToOpen = atom.project.resolve('a.foo')
+          pathToOpen = atom.project.getDirectories()[0]?.resolve('a.foo')
           workspace.open(pathToOpen, hey: "there").then (item) ->
             expect(item).toEqual { foo: pathToOpen, options: {hey: "there"} }
 
@@ -257,21 +261,21 @@ describe "Workspace", ->
 
       runs ->
         # does not reopen items with no uri
-        expect(workspace.getActivePaneItem().getUri()).toBeUndefined()
+        expect(workspace.getActivePaneItem().getURI()).toBeUndefined()
         pane.destroyActiveItem()
 
       waitsForPromise ->
         workspace.reopenItem()
 
       runs ->
-        expect(workspace.getActivePaneItem().getUri()).not.toBeUndefined()
+        expect(workspace.getActivePaneItem().getURI()).not.toBeUndefined()
 
         # destroy all items
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('file1')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('file1')
         pane.destroyActiveItem()
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('b')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('b')
         pane.destroyActiveItem()
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('a')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('a')
         pane.destroyActiveItem()
 
         # reopens items with uris
@@ -281,20 +285,20 @@ describe "Workspace", ->
         workspace.reopenItem()
 
       runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('a')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('a')
 
       # does not reopen items that are already open
       waitsForPromise ->
         workspace.open('b')
 
       runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('b')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('b')
 
       waitsForPromise ->
         workspace.reopenItem()
 
       runs ->
-        expect(workspace.getActivePaneItem().getUri()).toBe atom.project.resolve('file1')
+        expect(workspace.getActivePaneItem().getURI()).toBe atom.project.getDirectories()[0]?.resolve('file1')
 
   describe "::increase/decreaseFontSize()", ->
     it "increases/decreases the font size without going below 1", ->
@@ -553,3 +557,287 @@ describe "Workspace", ->
 
         expect(atom.workspace.panelForItem(item)).toBe panel
         expect(atom.workspace.panelForItem(itemWithNoPanel)).toBe null
+
+  describe "::scan(regex, options, callback)", ->
+    describe "when called with a regex", ->
+      it "calls the callback with all regex results in all files in the project", ->
+        results = []
+        waitsForPromise ->
+          atom.workspace.scan /(a)+/, (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength(3)
+          expect(results[0].filePath).toBe atom.project.getDirectories()[0]?.resolve('a')
+          expect(results[0].matches).toHaveLength(3)
+          expect(results[0].matches[0]).toEqual
+            matchText: 'aaa'
+            lineText: 'aaa bbb'
+            lineTextOffset: 0
+            range: [[0, 0], [0, 3]]
+
+      it "works with with escaped literals (like $ and ^)", ->
+        results = []
+        waitsForPromise ->
+          atom.workspace.scan /\$\w+/, (result) -> results.push(result)
+
+        runs ->
+          expect(results.length).toBe 1
+
+          {filePath, matches} = results[0]
+          expect(filePath).toBe atom.project.getDirectories()[0]?.resolve('a')
+          expect(matches).toHaveLength 1
+          expect(matches[0]).toEqual
+            matchText: '$bill'
+            lineText: 'dollar$bill'
+            lineTextOffset: 0
+            range: [[2, 6], [2, 11]]
+
+      it "works on evil filenames", ->
+        platform.generateEvilFiles()
+        atom.project.setPaths([path.join(__dirname, 'fixtures', 'evil-files')])
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.workspace.scan /evil/, (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          _.each(matches, (m) -> expect(m.matchText).toEqual 'evil')
+
+          if platform.isWindows()
+            expect(paths.length).toBe 3
+            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
+            expect(paths[1]).toMatch /file with spaces.txt$/
+            expect(path.basename(paths[2])).toBe "utfa\u0306.md"
+          else
+            expect(paths.length).toBe 5
+            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
+            expect(paths[1]).toMatch /file with spaces.txt$/
+            expect(paths[2]).toMatch /goddam\nnewlines$/m
+            expect(paths[3]).toMatch /quote".txt$/m
+            expect(path.basename(paths[4])).toBe "utfa\u0306.md"
+
+      it "ignores case if the regex includes the `i` flag", ->
+        results = []
+        waitsForPromise ->
+          atom.workspace.scan /DOLLAR/i, (result) -> results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+
+      describe "when the core.excludeVcsIgnoredPaths config is truthy", ->
+        [projectPath, ignoredPath] = []
+
+        beforeEach ->
+          sourceProjectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
+          projectPath = path.join(temp.mkdirSync("atom"))
+
+          writerStream = fstream.Writer(projectPath)
+          fstream.Reader(sourceProjectPath).pipe(writerStream)
+
+          waitsFor (done) ->
+            writerStream.on 'close', done
+            writerStream.on 'error', done
+
+          runs ->
+            fs.rename(path.join(projectPath, 'git.git'), path.join(projectPath, '.git'))
+            ignoredPath = path.join(projectPath, 'ignored.txt')
+            fs.writeFileSync(ignoredPath, 'this match should not be included')
+
+        afterEach ->
+          fs.removeSync(projectPath) if fs.existsSync(projectPath)
+
+        it "excludes ignored files", ->
+          atom.project.setPaths([projectPath])
+          atom.config.set('core.excludeVcsIgnoredPaths', true)
+          resultHandler = jasmine.createSpy("result found")
+          waitsForPromise ->
+            atom.workspace.scan /match/, (results) ->
+              resultHandler()
+
+          runs ->
+            expect(resultHandler).not.toHaveBeenCalled()
+
+      it "includes only files when a directory filter is specified", ->
+        projectPath = path.join(path.join(__dirname, 'fixtures', 'dir'))
+        atom.project.setPaths([projectPath])
+
+        filePath = path.join(projectPath, 'a-dir', 'oh-git')
+
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.workspace.scan /aaa/, paths: ["a-dir#{path.sep}"], (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          expect(paths.length).toBe 1
+          expect(paths[0]).toBe filePath
+          expect(matches.length).toBe 1
+
+      it "includes files and folders that begin with a '.'", ->
+        projectPath = temp.mkdirSync()
+        filePath = path.join(projectPath, '.text')
+        fs.writeFileSync(filePath, 'match this')
+        atom.project.setPaths([projectPath])
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.workspace.scan /match this/, (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          expect(paths.length).toBe 1
+          expect(paths[0]).toBe filePath
+          expect(matches.length).toBe 1
+
+      it "excludes values in core.ignoredNames", ->
+        projectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
+        ignoredNames = atom.config.get("core.ignoredNames")
+        ignoredNames.push("a")
+        atom.config.set("core.ignoredNames", ignoredNames)
+
+        resultHandler = jasmine.createSpy("result found")
+        waitsForPromise ->
+          atom.workspace.scan /dollar/, (results) ->
+            resultHandler()
+
+        runs ->
+          expect(resultHandler).not.toHaveBeenCalled()
+
+      it "scans buffer contents if the buffer is modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('a').then (o) ->
+            editor = o
+            editor.setText("Elephant")
+
+        waitsForPromise ->
+          atom.workspace.scan /a|Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 3
+          resultForA = _.find results, ({filePath}) -> path.basename(filePath) == 'a'
+          expect(resultForA.matches).toHaveLength 1
+          expect(resultForA.matches[0].matchText).toBe 'Elephant'
+
+      it "ignores buffers outside the project", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open(temp.openSync().path).then (o) ->
+            editor = o
+            editor.setText("Elephant")
+
+        waitsForPromise ->
+          atom.workspace.scan /Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 0
+
+  describe "::replace(regex, replacementText, paths, iterator)", ->
+    [filePath, commentFilePath, sampleContent, sampleCommentContent] = []
+
+    beforeEach ->
+      atom.project.setPaths([atom.project.getDirectories()[0]?.resolve('../')])
+
+      filePath = atom.project.getDirectories()[0]?.resolve('sample.js')
+      commentFilePath = atom.project.getDirectories()[0]?.resolve('sample-with-comments.js')
+      sampleContent = fs.readFileSync(filePath).toString()
+      sampleCommentContent = fs.readFileSync(commentFilePath).toString()
+
+    afterEach ->
+      fs.writeFileSync(filePath, sampleContent)
+      fs.writeFileSync(commentFilePath, sampleCommentContent)
+
+    describe "when a file doesn't exist", ->
+      it "calls back with an error", ->
+        errors = []
+        missingPath = path.resolve('/not-a-file.js')
+        expect(fs.existsSync(missingPath)).toBeFalsy()
+
+        waitsForPromise ->
+          atom.workspace.replace /items/gi, 'items', [missingPath], (result, error) ->
+            errors.push(error)
+
+        runs ->
+          expect(errors).toHaveLength 1
+          expect(errors[0].path).toBe missingPath
+
+    describe "when called with unopened files", ->
+      it "replaces properly", ->
+        results = []
+        waitsForPromise ->
+          atom.workspace.replace /items/gi, 'items', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+    describe "when a buffer is already open", ->
+      it "replaces properly and saves when not modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample.js').then (o) -> editor = o
+
+        runs ->
+          expect(editor.isModified()).toBeFalsy()
+
+        waitsForPromise ->
+          atom.workspace.replace /items/gi, 'items', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+          expect(editor.isModified()).toBeFalsy()
+
+      it "does not replace when the path is not specified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample-with-comments.js').then (o) -> editor = o
+
+        waitsForPromise ->
+          atom.workspace.replace /items/gi, 'items', [commentFilePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe commentFilePath
+
+      it "does NOT save when modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample.js').then (o) -> editor = o
+
+        runs ->
+          editor.buffer.setTextInRange([[0,0],[0,0]], 'omg')
+          expect(editor.isModified()).toBeTruthy()
+
+        waitsForPromise ->
+          atom.workspace.replace /items/gi, 'okthen', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+          expect(editor.isModified()).toBeTruthy()

spec/workspace-view-spec.coffee

@@ -3,6 +3,7 @@ Q = require 'q'
 path = require 'path'
 temp = require 'temp'
 TextEditorView = require '../src/text-editor-view'
+Pane = require '../src/pane'
 PaneView = require '../src/pane-view'
 Workspace = require '../src/workspace'
 
@@ -12,8 +13,8 @@ describe "WorkspaceView", ->
   beforeEach ->
     jasmine.snapshotDeprecations()
 
-    atom.project.setPaths([atom.project.resolve('dir')])
-    pathToOpen = atom.project.resolve('a')
+    atom.project.setPaths([atom.project.getDirectories()[0]?.resolve('dir')])
+    pathToOpen = atom.project.getDirectories()[0]?.resolve('a')
     atom.workspace = new Workspace
     atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView
     atom.workspaceView.enableKeymap()
@@ -92,11 +93,11 @@ describe "WorkspaceView", ->
           editorView2 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane atom-text-editor:eq(0)').view()
           editorView4 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane atom-text-editor:eq(1)').view()
 
-          expect(editorView1.getEditor().getPath()).toBe atom.project.resolve('a')
-          expect(editorView2.getEditor().getPath()).toBe atom.project.resolve('b')
-          expect(editorView3.getEditor().getPath()).toBe atom.project.resolve('../sample.js')
+          expect(editorView1.getEditor().getPath()).toBe atom.project.getDirectories()[0]?.resolve('a')
+          expect(editorView2.getEditor().getPath()).toBe atom.project.getDirectories()[0]?.resolve('b')
+          expect(editorView3.getEditor().getPath()).toBe atom.project.getDirectories()[0]?.resolve('../sample.js')
           expect(editorView3.getEditor().getCursorScreenPosition()).toEqual [2, 4]
-          expect(editorView4.getEditor().getPath()).toBe atom.project.resolve('../sample.txt')
+          expect(editorView4.getEditor().getPath()).toBe atom.project.getDirectories()[0]?.resolve('../sample.txt')
           expect(editorView4.getEditor().getCursorScreenPosition()).toEqual [0, 2]
 
           # ensure adjust pane dimensions is called
@@ -294,3 +295,39 @@ describe "WorkspaceView", ->
 
       modalContainer = workspaceElement.querySelector('atom-panel-container.modal')
       expect(modalContainer.parentNode).toBe workspaceElement
+
+  describe "::saveActivePaneItem()", ->
+    describe "when there is an error", ->
+      it "emits a warning notification when the file cannot be saved", ->
+        spyOn(Pane::, 'saveActiveItem').andCallFake ->
+          throw new Error("'/some/file' is a directory")
+
+        atom.notifications.onDidAddNotification addedSpy = jasmine.createSpy()
+        atom.workspace.saveActivePaneItem()
+        expect(addedSpy).toHaveBeenCalled()
+        expect(addedSpy.mostRecentCall.args[0].getType()).toBe 'warning'
+
+      it "emits a warning notification when the directory cannot be written to", ->
+        spyOn(Pane::, 'saveActiveItem').andCallFake ->
+          throw new Error("ENOTDIR, not a directory '/Some/dir/and-a-file.js'")
+
+        atom.notifications.onDidAddNotification addedSpy = jasmine.createSpy()
+        atom.workspace.saveActivePaneItem()
+        expect(addedSpy).toHaveBeenCalled()
+        expect(addedSpy.mostRecentCall.args[0].getType()).toBe 'warning'
+
+      it "emits a warning notification when the user does not have permission", ->
+        spyOn(Pane::, 'saveActiveItem').andCallFake ->
+          throw new Error("EACCES, permission denied '/Some/dir/and-a-file.js'")
+
+        atom.notifications.onDidAddNotification addedSpy = jasmine.createSpy()
+        atom.workspace.saveActivePaneItem()
+        expect(addedSpy).toHaveBeenCalled()
+        expect(addedSpy.mostRecentCall.args[0].getType()).toBe 'warning'
+
+      it "emits a warning notification when the file cannot be saved", ->
+        spyOn(Pane::, 'saveActiveItem').andCallFake ->
+          throw new Error("no one knows")
+
+        save = -> atom.workspace.saveActivePaneItem()
+        expect(save).toThrow()

src/atom.coffee

@@ -11,6 +11,7 @@ _ = require 'underscore-plus'
 {Emitter} = require 'event-kit'
 {Model} = require 'theorist'
 fs = require 'fs-plus'
+{convertStackTrace, convertLine} = require 'coffeestack'
 
 {$} = require './space-pen-extensions'
 WindowEventHandler = require './window-event-handler'
@@ -133,6 +134,9 @@ class Atom extends Model
   # Public: A {Clipboard} instance
   clipboard: null
 
+  # A {ServiceHub} instance
+  services: null
+
   # Public: A {ContextMenuManager} instance
   contextMenu: null
 
@@ -195,9 +199,16 @@ class Atom extends Model
     unless @inDevMode() or @inSpecMode()
       require('grim').deprecate = ->
 
+    sourceMapCache = {}
+
     window.onerror = =>
       @lastUncaughtError = Array::slice.call(arguments)
       [message, url, line, column, originalError] = @lastUncaughtError
+
+      convertedLine = convertLine(url, line, column, sourceMapCache)
+      {line, column} = convertedLine if convertedLine?
+      originalError.stack = convertStackTrace(originalError.stack, sourceMapCache) if originalError
+
       eventObject = {message, url, line, column, originalError}
 
       openDevTools = true
@@ -225,6 +236,7 @@ class Atom extends Model
     NotificationManager = require './notification-manager'
     PackageManager = require './package-manager'
     Clipboard = require './clipboard'
+    ServiceHub = require './service-hub'
     GrammarRegistry = require './grammar-registry'
     ThemeManager = require './theme-manager'
     StyleManager = require './style-manager'
@@ -260,6 +272,7 @@ class Atom extends Model
     @contextMenu = new ContextMenuManager({resourcePath, devMode})
     @menu = new MenuManager({resourcePath})
     @clipboard = new Clipboard()
+    @services = new ServiceHub
 
     @grammars = @deserializers.deserialize(@state.grammars ? @state.syntax) ? new GrammarRegistry()
 
@@ -267,7 +280,7 @@ class Atom extends Model
       deprecate "The atom.syntax global is deprecated. Use atom.grammars instead."
       @grammars
 
-    @subscribe @packages.onDidActivateAll => @watchThemes()
+    @subscribe @packages.onDidActivateInitialPackages => @watchThemes()
 
     Project = require './project'
     TextBuffer = require 'text-buffer'
@@ -328,6 +341,10 @@ class Atom extends Model
   inDevMode: ->
     @getLoadSettings().devMode
 
+  # Public: Is the current window in safe mode?
+  inSafeMode: ->
+    @getLoadSettings().safeMode
+
   # Public: Is the current window running specs?
   inSpecMode: ->
     @getLoadSettings().isSpec
@@ -704,7 +721,7 @@ class Atom extends Model
     @themes.load()
 
   watchThemes: ->
-    @themes.onDidReloadAll =>
+    @themes.onDidChangeActiveThemes =>
       # Only reload stylesheets from non-theme packages
       for pack in @packages.getActivePackages() when pack.getType() isnt 'theme'
         pack.reloadStylesheets?()

src/browser/atom-application.coffee

@@ -140,14 +140,18 @@ class AtomApplication
 
   # Registers basic application commands, non-idempotent.
   handleEvents: ->
+    getLoadSettings = =>
+      devMode: @focusedWindow()?.devMode
+      safeMode: @focusedWindow()?.safeMode
+
     @on 'application:run-all-specs', -> @runSpecs(exitWhenDone: false, resourcePath: global.devResourcePath, safeMode: @focusedWindow()?.safeMode)
     @on 'application:run-benchmarks', -> @runBenchmarks()
     @on 'application:quit', -> app.quit()
-    @on 'application:new-window', -> @openPath(windowDimensions: @focusedWindow()?.getDimensions())
+    @on 'application:new-window', -> @openPath(_.extend(windowDimensions: @focusedWindow()?.getDimensions(), getLoadSettings()))
     @on 'application:new-file', -> (@focusedWindow() ? this).openPath()
-    @on 'application:open', -> @promptForPath(type: 'all')
-    @on 'application:open-file', -> @promptForPath(type: 'file')
-    @on 'application:open-folder', -> @promptForPath(type: 'folder')
+    @on 'application:open', -> @promptForPath(_.extend(type: 'all', getLoadSettings()))
+    @on 'application:open-file', -> @promptForPath(_.extend(type: 'file', getLoadSettings()))
+    @on 'application:open-folder', -> @promptForPath(_.extend(type: 'folder', getLoadSettings()))
     @on 'application:open-dev', -> @promptForPath(devMode: true)
     @on 'application:open-safe', -> @promptForPath(safeMode: true)
     @on 'application:inspect', ({x,y, atomWindow}) ->
@@ -355,7 +359,7 @@ class AtomApplication
 
     if existingWindow?
       openedWindow = existingWindow
-      openedWindow.openPath(pathToOpen, initialLine)
+      openedWindow.openPath(pathToOpen, initialLine, initialColumn)
       if openedWindow.isMinimized()
         openedWindow.restore()
       else

src/browser/atom-window.coffee

@@ -18,7 +18,7 @@ class AtomWindow
   isSpec: null
 
   constructor: (settings={}) ->
-    {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone, @safeMode} = settings
+    {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone, @safeMode, @devMode} = settings
 
     # Normalize to make sure drive letter case is consistent on Windows
     @resourcePath = path.normalize(@resourcePath) if @resourcePath
@@ -38,6 +38,8 @@ class AtomWindow
     loadSettings.windowState ?= '{}'
     loadSettings.appVersion = app.getVersion()
     loadSettings.resourcePath = @resourcePath
+    loadSettings.devMode ?= false
+    loadSettings.safeMode ?= false
 
     # Only send to the first non-spec window created
     if @constructor.includeShellLoadTime and not @isSpec

src/browser/auto-update-manager.coffee

@@ -1,6 +1,7 @@
 autoUpdater = null
 _ = require 'underscore-plus'
 {EventEmitter} = require 'events'
+path = require 'path'
 
 IdleState = 'idle'
 CheckingState = 'checking'
@@ -51,8 +52,7 @@ class AutoUpdateManager
       @emitUpdateAvailableEvent(@getWindows()...)
 
     # Only released versions should check for updates.
-    unless /\w{7}/.test(@version)
-      @check(hidePopups: true)
+    @check(hidePopups: true) unless /\w{7}/.test(@version)
 
     switch process.platform
       when 'win32'
@@ -86,12 +86,24 @@ class AutoUpdateManager
   onUpdateNotAvailable: =>
     autoUpdater.removeListener 'error', @onUpdateError
     dialog = require 'dialog'
-    dialog.showMessageBox type: 'info', buttons: ['OK'], message: 'No update available.', detail: "Version #{@version} is the latest version."
+    dialog.showMessageBox
+      type: 'info'
+      buttons: ['OK']
+      icon: path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
+      message: 'No update available.'
+      title: 'No Update Available'
+      detail: "Version #{@version} is the latest version."
 
   onUpdateError: (event, message) =>
     autoUpdater.removeListener 'update-not-available', @onUpdateNotAvailable
     dialog = require 'dialog'
-    dialog.showMessageBox type: 'warning', buttons: ['OK'], message: 'There was an error checking for updates.', detail: message
+    dialog.showMessageBox
+      type: 'warning'
+      buttons: ['OK']
+      icon: path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
+      message: 'There was an error checking for updates.'
+      title: 'Update Error'
+      detail: message
 
   getWindows: ->
     global.atomApplication.windows

src/browser/auto-updater-win32.coffee

@@ -8,10 +8,8 @@ class AutoUpdater
   setFeedUrl: (@updateUrl) ->
 
   quitAndInstall: ->
-    console.log 'restarting new atom.exe'
-
     if SquirrelUpdate.existsSync()
-      SquirrelUpdate.restartAtom()
+      SquirrelUpdate.restartAtom(require('app'))
     else
       require('auto-updater').quitAndInstall()
 
@@ -46,7 +44,6 @@ class AutoUpdater
 
     @downloadUpdate (error, update) =>
       if error?
-        console.log "Failed to download: #{error.message} - #{error.code} - #{error.stdout}"
         @emit 'update-not-available'
         return
 
@@ -56,12 +53,9 @@ class AutoUpdater
 
       @installUpdate (error) =>
         if error?
-          console.log "Failed to update: #{error.message} - #{error.code} - #{error.stdout}"
           @emit 'update-not-available'
           return
 
-        console.log "Updated to #{update.version}"
-
         @emit 'update-available'
         @emit 'update-downloaded', {}, update.releaseNotes, update.version, new Date(), 'https://atom.io', => @quitAndInstall()
 

src/browser/main.coffee

@@ -26,7 +26,8 @@ fs.lstatSyncNoException = (pathToStat) ->
 start = ->
   if process.platform is 'win32'
     SquirrelUpdate = require './squirrel-update'
-    return if SquirrelUpdate.handleStartupEvent()
+    squirrelCommand = process.argv[1]
+    return if SquirrelUpdate.handleStartupEvent(app, squirrelCommand)
 
   args = parseCommandLine()