Add core deprecation

Better save notifications

.node-version

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

.python-version

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

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.0"
+    "atom-package-manager": "0.116.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

benchmark/benchmark-helper.coffee

@@ -1,7 +1,8 @@
 require '../spec/spec-helper'
 
 path = require 'path'
-{$, Point} = require 'atom'
+{$} = require '../src/space-pen-extensions'
+{Point} = require 'atom'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Project = require '../src/project'

benchmark/benchmark-suite.coffee

@@ -1,5 +1,7 @@
 require './benchmark-helper'
-{$, _, WorkspaceView} = require 'atom'
+{$} = require '../src/space-pen-extensions'
+_ = require 'underscore-plus'
+{WorkspaceView} = require 'atom'
 TokenizedBuffer = require '../src/tokenized-buffer'
 
 describe "editorView.", ->

build/Gruntfile.coffee

@@ -202,9 +202,9 @@ module.exports = (grunt) ->
     'create-windows-installer':
       appDirectory: shellAppDir
       outputDirectory: path.join(buildDir, 'installer')
-      authors: 'The Atom Team & Community'
+      authors: 'GitHub Inc.'
       loadingGif: path.resolve(__dirname, '..', 'resources', 'win', 'loading.gif')
-      iconUrl: 'https://raw.githubusercontent.com/atom/atom/master/resources/atom.png'
+      iconUrl: 'https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico'
 
     shell:
       'kill-atom':

build/package.json

@@ -12,7 +12,7 @@
     "fs-plus": "2.x",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
-    "grunt-atom-shell-installer": "^0.7.0",
+    "grunt-atom-shell-installer": "^0.13.0",
     "grunt-cli": "~0.1.9",
     "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
     "grunt-contrib-coffee": "~0.9.0",
@@ -31,7 +31,7 @@
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
     "runas": "~1.0.1",
-    "tello": "1.0.3",
+    "tello": "1.0.4",
     "temp": "~0.8.1",
     "underscore-plus": "1.x",
     "unzip": "~0.1.9",

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 = []
@@ -149,10 +151,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/docs-task.coffee

@@ -6,12 +6,17 @@ _ = require 'underscore-plus'
 donna = require 'donna'
 tello = require 'tello'
 
+moduleBlacklist = [
+  'space-pen'
+]
+
 module.exports = (grunt) ->
   getClassesToInclude = ->
     modulesPath = path.resolve(__dirname, '..', '..', 'node_modules')
     classes = {}
     fs.traverseTreeSync modulesPath, (modulePath) ->
       return false if modulePath.match(/node_modules/g).length > 1 # dont need the dependencies of the dependencies
+      return false if path.basename(modulePath) in moduleBlacklist
       return true unless path.basename(modulePath) is 'package.json'
       return true unless fs.isFileSync(modulePath)
 

build/tasks/spec-task.coffee

@@ -11,6 +11,13 @@ module.exports = (grunt) ->
 
   packageSpecQueue = null
 
+  logDeprecations = (label, {stderr}={}) ->
+    if process.env.JANKY_SHA1 and stderr?.indexOf('Calls to deprecated functions') isnt -1
+      grunt.log.error(label)
+      stderr = stderr.replace(/^\[.*\] "/g, '')
+      stderr = stderr.replace(/source: .*$/g, '')
+      grunt.log.error(stderr)
+
   getAppPath = ->
     contentsDir = grunt.config.get('atom.contentsDir')
     switch process.platform
@@ -54,6 +61,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 +95,7 @@ module.exports = (grunt) ->
       else
         # TODO: Restore concurrency on Windows
         packageSpecQueue.concurrency = concurrency
+        logDeprecations('Core Specs', results)
 
       callback(null, error)
 

docs/advanced/configuration.md

@@ -11,32 +11,34 @@ value of a namespaced config key with `atom.config.get`:
 @showInvisibles() if atom.config.get "editor.showInvisibles"
 ```
 
-Or you can use the `::subscribe` with `atom.config.observe` to track changes
-from any view object.
+Or you can subscribe via `atom.config.observe` to track changes from any view
+object.
 
 ```coffeescript
+{View} = require 'space-pen'
+
 class MyView extends View
-  initialize: ->
-    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-      @adjustFontSize()
+  attached: ->
+    @fontSizeObserveSubscription =
+      atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+        @adjustFontSize()
+
+  detached: ->
+    @fontSizeObserveSubscription.dispose()
 ```
 
 The `atom.config.observe` method will call the given callback immediately with
 the current value for the specified key path, and it will also call it in the
-future whenever the value of that key path changes.
+future whenever the value of that key path changes. If you only want to invoke
+the callback when the next time the value changes, use `atom.config.onDidChange`
+instead.
 
-Subscriptions made with `::subscribe` are automatically canceled when the
-view is removed. You can cancel config subscriptions manually via the
-`off` method on the subscription object that `atom.config.observe` returns.
-
-```coffeescript
-fontSizeSubscription = atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-  @adjustFontSize()
-
-# ... later on
-
-fontSizeSubscription.off() # Stop observing
-```
+Subscription methods return *disposable* subscription objects. Note in the
+example above how we save the subscription to the `@fontSizeObserveSubscription`
+instance variable and dispose of it when the view is detached. To group multiple
+subscriptions together, you can add them all to a
+[`CompositeDisposable`][composite-disposable] that you dispose when the view is
+detached.
 
 ### Writing Config Settings
 
@@ -48,10 +50,9 @@ but you can programmatically write to it with `atom.config.set`:
 atom.config.set("core.showInvisibles", true)
 ```
 
-You can also use `setDefaults`, which will assign default values for keys that
-are always overridden by values assigned with `set`. Defaults are not written
-out to the the `config.json` file to prevent it from becoming cluttered.
+If you're exposing package configuration via specific key paths, you'll want to
+associate them with a schema in your package's main module. Read more about
+schemas in the [config API docs][config-api].
 
-```coffeescript
-atom.config.setDefaults("editor", fontSize: 18, showInvisibles: true)
-```
+[composite-disposable]: https://atom.io/docs/api/latest/CompositeDisposable
+[config-api]: https://atom.io/docs/api/latest/Config

docs/advanced/globals.md

@@ -1,34 +0,0 @@
-# Globals
-
-Atom exposes several services through singleton objects accessible via the
-`atom` global:
-
-* atom
-  * workspace:
-      Manipulate and query the state of the user interface for the current
-      window. Open editors, manipulate panes.
-  * workspaceView:
-      Similar to workspace, but provides access to the root of all views in the
-      current window.
-  * project:
-      Access the directory associated with the current window. Load editors,
-      perform project-wide searches, register custom openers for special file
-      types.
-  * config:
-      Read, write, and observe user configuration settings.
-  * keymap:
-      Add and query the currently active keybindings.
-  * deserializers:
-      Deserialize instances from their state objects and register deserializers.
-  * packages:
-      Activate, deactivate, and query user packages.
-  * themes:
-      Activate, deactivate, and query user themes.
-  * contextMenu:
-      Register context menus.
-  * menu:
-      Register application menus.
-  * pasteboard:
-      Read from and write to the system pasteboard.
-  * syntax:
-      Assign and query syntactically-scoped properties.

docs/advanced/view-system.md

@@ -1,58 +0,0 @@
-## Atom's View System
-
-### SpacePen Basics
-
-Atom's view system is built around the [SpacePen] view framework. SpacePen
-view objects inherit from the jQuery prototype, and wrap DOM nodes
-
-View objects are actually jQuery wrappers around DOM fragments, supporting all
-the typical jQuery traversal and manipulation methods. In addition, view objects
-have methods that are view-specific. For example, you could call both general
-and view-specific on the global `atom.workspaceView` instance:
-
-```coffeescript
-atom.workspaceView.find('atom-text-editor.active') # standard jQuery method
-atom.workspaceView.getActiveEditor()      # view-specific method
-```
-
-If you retrieve a jQuery wrapper for an element associated with a view, use the
-`.view()` method to retrieve the element's view object:
-
-```coffeescript
-# this is a plain jQuery object; you can't call view-specific methods
-editorElement = atom.workspaceView.find('atom-text-editor.active')
-
-# get the view object by calling `.view()` to call view-specific methods
-editorView = editorElement.view()
-editorView.setCursorBufferPosition([1, 2])
-```
-
-Refer to the [SpacePen] documentation for more details.
-
-### WorkspaceView
-
-The root of Atom's view hierarchy is a global called `atom.workspaceView`, which is a
-singleton instance of the `WorkspaceView` view class. The root view fills the entire
-window, and contains every other view. If you open Atom's inspector with
-`alt-cmd-i`, you can see the internal structure of `WorkspaceView`:
-
-![WorkspaceView in the inspector][workspaceview-inspector]
-
-#### Panes
-
-The `WorkspaceView` contains `prependToBottom/Top/Left/Right` and
-`appendToBottom/Top/Left/Right` methods, which are used to add Tool Panels. Tool
-panels are elements that take up screen real estate not devoted to text editing.
-In the example above, the `TreeView` is appended to the left, and the
-`CommandPanel` is appended to the top.
-
-```coffeescript
-# place a view to the left of the panes
-atom.workspaceView.appendToLeft(new MyView)
-
-# place a view below the panes
-atom.workspaceView.appendToBottom(new MyOtherView)
-```
-
-[spacepen]: http://github.com/nathansobo/space-pen
-[workspaceView-inspector]: https://f.cloud.github.com/assets/1424/1091631/1932c2d6-166b-11e3-8adf-9690fe82d3b8.png

docs/apm-rest-api.md

@@ -30,6 +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`)
 
 Returns a list of all packages in the following format:
 ```json
@@ -57,6 +59,20 @@ Link: <https://www.atom.io/api/packages?page=1>; rel="self",
       <https://www.atom.io/api/packages?page=2>; rel="next"
 ```
 
+By default, results are sorted by download count, descending.
+
+#### GET /api/packages/search
+
+Parameters:
+
+- **q** String query to search
+- **sort** (optional, values: `created_at`, `updated_at`, `downloads`)
+- **direction** (optional, values: `asc`, `desc`)
+
+Returns a list of all packages in the same format as `/api/packages`.
+
+By default, results sorted by relevance to search query.
+
 ### Showing package details
 
 #### GET /api/packages/:package_name

docs/build-instructions/linux.md

@@ -29,6 +29,10 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 * `sudo pacman -S base-devel git nodejs libgnome-keyring python2`
 * `export PYTHON=/usr/bin/python2` before building Atom.
 
+### Slackware
+
+* `sbopkg -k -i node -i atom`
+
 ## Instructions
 
 If you have problems with permissions don't forget to prefix with `sudo`
@@ -121,6 +125,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 +150,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

@@ -40,7 +40,7 @@ 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
-stylesheets your package needs to load. If not specified, stylesheets in the
+style sheets your package needs to load. If not specified, style sheets in the
 _stylesheets_ 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
@@ -119,27 +119,27 @@ Also, please collaborate with us if you need an API that doesn't exist. Our goal
 is to build out Atom's API organically based on the needs of package authors
 like you.
 
-## Stylesheets
+## Style Sheets
 
-Stylesheets for your package should be placed in the _stylesheets_ directory.
-Any stylesheets in this directory will be loaded and attached to the DOM when
-your package is activated. Stylesheets can be written as CSS or [LESS] (but LESS
-is recommended).
+Style sheets for your package should be placed in the _stylesheets_ 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).
 
 Ideally, you won't need much in the way of styling. We've provided a standard
 set of components which define both the colors and UI elements for any package
-that fits into Atom seamlessly. You can view all of Atom's UI components by opening
-the styleguide: open the command palette (`cmd-shift-P`) and search for _styleguide_,
-or just type `cmd-ctrl-shift-G`.
+that fits into Atom seamlessly. You can view all of Atom's UI components by
+opening the styleguide: open the command palette (`cmd-shift-P`) and search for
+_styleguide_, or just type `cmd-ctrl-shift-G`.
 
-If you _do_ need special styling, try to keep only structural styles in the package
-stylesheets. If you _must_ specify colors and sizing, these should be taken from
-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!
+If you _do_ need special styling, try to keep only structural styles in the
+package style sheets. If you _must_ specify colors and sizing, these should be
+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 stylesheets
-by name to specify a loading order; otherwise, stylesheets are loaded
+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.
 
 ## Keymaps
@@ -157,9 +157,9 @@ loaded in alphabetical order. An optional `keymaps` array in your _package.json_
 can specify which keymaps to load and in what order.
 
 
-Keybindings are executed by determining which element the keypress occurred on. In
-the example above, `changer:magic` command is executed when pressing `ctrl-V` on
-the `.tree-view-scroller` element.
+Keybindings are executed by determining which element the keypress occurred on.
+In the example above, `changer:magic` command is executed when pressing `ctrl-V`
+on the `.tree-view-scroller` element.
 
 See the [main keymaps documentation][keymaps] for more detailed information on
 how keymaps work.
@@ -195,7 +195,8 @@ with your package that aren't tied to a specific element:
 ```
 
 To add your own item to the application menu, simply create a top level `menu`
-key in any menu configuration file in _menus_. This can be a JSON or [CSON] file.
+key in any menu configuration file in _menus_. This can be a JSON or [CSON]
+file.
 
 The menu templates you specify are merged with all other templates provided
 by other packages in the order which they were loaded.

docs/customizing-atom.md

@@ -118,7 +118,6 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
       - `cr`: Carriage return (for Microsoft-style line endings)
       - `eol`: `\n` characters
       - `space`: Leading and trailing space characters
-  - `normalizeIndentOnPaste`: Enable/disable conversion of pasted tabs to spaces
   - `preferredLineLength`: Identifies the length of a line (defaults to `80`)
   - `showInvisibles`: Whether to render placeholders for invisible characters (defaults to `false`)
   - `showIndentGuide`: Show/hide indent indicators within the editor

docs/index.md

@@ -18,7 +18,6 @@
 * [Developing Node Modules](advanced/node-modules.md)
 * [Keymaps](advanced/keymaps.md)
 * [Serialization](advanced/serialization.md)
-* [View System](advanced/view-system.md)
 * [Scopes and Scope Descriptors](advanced/scopes-and-scope-descriptors.md)
 
 ### Upgrading to 1.0 APIs

docs/writing-specs.md

@@ -72,7 +72,7 @@ Writing Asynchronous specs can be tricky at first. Some examples.
         atom.workspace.open 'c.coffee'
 
     it "should be opened in an editor", ->
-      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'
+      expect(atom.workspace.getActiveTextEditor().getPath()).toContain 'c.coffee'
 
   ```
 

docs/your-first-package.md

@@ -49,7 +49,7 @@ Register the command in _lib/ascii-art.coffee_:
 ```coffeescript
 module.exports =
   activate: ->
-    atom.workspaceView.command "ascii-art:convert", => @convert()
+    atom.commands.add 'atom-workspace', "ascii-art:convert", => @convert()
 
   convert: ->
     # This assumes the active pane item is an editor
@@ -57,10 +57,10 @@ module.exports =
     editor.insertText('Hello, World!')
 ```
 
-The `atom.workspaceView.command` method takes a command name and a callback. The
-callback executes when the command is triggered. In this case, when the command
-is triggered the callback will call the `convert` method and insert 'Hello,
-World!'.
+The `atom.commands.add` method takes a selector, command name, and a callback.
+The callback executes when the command is triggered on an element matching the
+selector. In this case, when the command is triggered the callback will call the
+`convert` method and insert 'Hello, World!'.
 
 ## Reload the Package
 
@@ -95,13 +95,13 @@ you don't need it anymore. When finished, the file will look like this:
   'cmd-alt-a': 'ascii-art:convert'
 ```
 
-Notice `atom-text-editor` on the first line. Just like CSS, keymap selectors *scope* key
-bindings so they only apply to specific elements. In this case, our binding is
-only active for elements matching the `atom-text-editor` selector. If the Tree View has
-focus, pressing `cmd-alt-a` won't trigger the `ascii-art:convert` command. But
-if the editor has focus, the `ascii-art:convert` method *will* be triggered.
-More information on key bindings can be found in the
-[keymaps](advanced/keymaps.html) documentation.
+Notice `atom-text-editor` on the first line. Just like CSS, keymap selectors
+*scope* key bindings so they only apply to specific elements. In this case, our
+binding is only active for elements matching the `atom-text-editor` selector. If
+the Tree View has focus, pressing `cmd-alt-a` won't trigger the
+`ascii-art:convert` command. But if the editor has focus, the
+`ascii-art:convert` method *will* be triggered. More information on key bindings
+can be found in the [keymaps](advanced/keymaps.html) documentation.
 
 Now reload the window and verify that the key binding works! You can also verify
 that it **doesn't** work when the Tree View is focused.

exports/atom.coffee

@@ -6,6 +6,7 @@ module.exports =
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
   GitRepository: require '../src/git-repository'
+  Notification: require '../src/notification'
   Point: Point
   Range: Range
   Emitter: Emitter
@@ -32,7 +33,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   Object.defineProperty module.exports, 'WorkspaceView', get: ->
     deprecate """
       Requiring `WorkspaceView` from `atom` is no longer supported.
-      Use `atom.view.getView(atom.workspace)` instead.
+      Use `atom.views.getView(atom.workspace)` instead.
     """
     require '../src/workspace-view'
 
@@ -43,7 +44,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
         `{$} = require 'space-pen'`
         or
         `$ = require 'jquery'`
-      Add `"space-pen": "^3"` to your package dependencies.
+      Add `"space-pen": "^4"` to your package dependencies.
       Or add `"jquery": "^2"` to your package dependencies.
     """
     $
@@ -53,7 +54,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Requiring `$$` from `atom` is no longer supported.
       Please require `space-pen` instead:
         `{$$} = require 'space-pen'`
-      Add `"space-pen": "^3"` to your package dependencies.
+      Add `"space-pen": "^4"` to your package dependencies.
     """
     $$
 
@@ -62,7 +63,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Requiring `$$$` from `atom` is no longer supported.
       Please require `space-pen` instead:
         `{$$$} = require 'space-pen'`
-      Add `"space-pen": "^3"` to your package dependencies.
+      Add `"space-pen": "^4"` to your package dependencies.
     """
     $$$
 
@@ -71,7 +72,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
       Requiring `View` from `atom` is no longer supported.
       Please require `space-pen` instead:
         `{View} = require 'space-pen'`
-      Add `"space-pen": "^3"` to your package dependencies.
+      Add `"space-pen": "^4"` to your package dependencies.
     """
     View
 
@@ -118,8 +119,8 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
     require 'react-atom-fork'
 
   Object.defineProperty module.exports, 'Reactionary', get: ->
-    deprecate "Please require `reactionary` instead: `Reactionary = require 'reactionary'`. Add `\"reactionary\": \"^0.9\"` to your package dependencies."
-    require 'reactionary'
+    deprecate "Please require `reactionary-atom-fork` instead: `Reactionary = require 'reactionary-atom-fork'`. Add `\"reactionary-atom-fork\": \"^0.9\"` to your package dependencies."
+    require 'reactionary-atom-fork'
 
 Object.defineProperty module.exports, 'Git', get: ->
   deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"

menus/win32.cson

@@ -164,6 +164,9 @@
       { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
       { label: 'View &License', command: 'application:open-license' }
       { label: 'VERSION', enabled: false }
+      { label: 'Restart and Install Update', command: 'application:install-update', visible: false}
+      { label: 'Check for Update', command: 'application:check-for-update', visible: false}
+      { label: 'Downloading Update', enabled: false, visible: false}
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
       { label: 'Roadmap', command: 'application:open-roadmap' }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.147.0",
+  "version": "0.160.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,34 +17,35 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.19.2",
+  "atomShellVersion": "0.19.4",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.2.2",
+    "atom-keymap": "^2.3.0",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
     "delegato": "^1",
     "emissary": "^1.3.1",
-    "event-kit": "0.7.2",
+    "event-kit": "0.8.1",
     "first-mate": "^2.2.0",
-    "fs-plus": "^2.3.1",
+    "fs-plus": "^2.3.2",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
-    "git-utils": "^2.1.5",
+    "git-utils": "^2.2",
     "grim": "0.12.0",
     "guid": "0.0.10",
     "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.2",
     "jquery": "^2.1.1",
     "less-cache": "0.19.0",
+    "marked": "^0.3",
     "mixto": "^1",
     "mkdirp": "0.3.5",
     "nslog": "^1.0.1",
     "oniguruma": "^3.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.3.2",
+    "pathwatcher": "^2.3.5",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -52,96 +53,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.15.2",
     "scrollbar-style": "^1.0.2",
     "season": "^1.0.2",
     "semver": "2.2.1",
     "serializable": "^1",
-    "space-pen": "3.8.1",
+    "service-hub": "^0.1.0",
+    "space-pen": "3.8.2",
     "temp": "0.7.0",
-    "text-buffer": "^3.6.1",
+    "text-buffer": "^3.8.2",
     "theorist": "^1.0.2",
-    "underscore-plus": "^1.6.1",
+    "underscore-plus": "^1.6.3",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.22.0",
-    "atom-dark-ui": "0.39.0",
+    "atom-dark-syntax": "0.23.0",
+    "atom-dark-ui": "0.42.0",
     "atom-light-syntax": "0.22.0",
-    "atom-light-ui": "0.33.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.23.0",
+    "solarized-dark-syntax": "0.27.0",
     "solarized-light-syntax": "0.13.0",
-    "archive-view": "0.37.0",
-    "autocomplete": "0.33.0",
-    "autoflow": "0.18.0",
-    "autosave": "0.18.0",
-    "background-tips": "0.17.0",
-    "bookmarks": "0.30.0",
-    "bracket-matcher": "0.62.0",
-    "command-palette": "0.27.0",
-    "deprecation-cop": "0.13.0",
-    "dev-live-reload": "0.35.0",
-    "encoding-selector": "0.7.0",
-    "exception-reporting": "0.20.0",
-    "find-and-replace": "0.147.0",
-    "fuzzy-finder": "0.60.0",
-    "git-diff": "0.43.0",
-    "go-to-line": "0.26.0",
-    "grammar-selector": "0.37.0",
-    "image-view": "0.40.0",
-    "incompatible-packages": "0.10.0",
-    "keybinding-resolver": "0.20.0",
-    "link": "0.26.0",
-    "markdown-preview": "0.110.0",
-    "metrics": "0.38.0",
-    "open-on-github": "0.30.0",
-    "package-generator": "0.32.0",
-    "release-notes": "0.36.0",
-    "settings-view": "0.160.0",
-    "snippets": "0.56.0",
-    "spell-check": "0.43.0",
-    "status-bar": "0.46.0",
-    "styleguide": "0.30.0",
-    "symbols-view": "0.68.0",
-    "tabs": "0.56.0",
-    "timecop": "0.23.0",
-    "tree-view": "0.132.0",
-    "update-package-dependencies": "0.6.0",
-    "welcome": "0.19.0",
-    "whitespace": "0.26.0",
-    "wrap-guide": "0.24.0",
-    "language-c": "0.31.0",
-    "language-coffee-script": "0.37.0",
-    "language-css": "0.23.0",
-    "language-gfm": "0.53.0",
+    "archive-view": "0.40.0",
+    "autocomplete": "0.34.0",
+    "autoflow": "0.20.0",
+    "autosave": "0.19.0",
+    "background-tips": "0.18.0",
+    "bookmarks": "0.31.0",
+    "bracket-matcher": "0.64.0",
+    "command-palette": "0.30.0",
+    "deprecation-cop": "0.20.0",
+    "dev-live-reload": "0.36.0",
+    "encoding-selector": "0.12.0",
+    "exception-reporting": "0.21.0",
+    "find-and-replace": "0.152.0",
+    "fuzzy-finder": "0.62.0",
+    "git-diff": "0.45.0",
+    "go-to-line": "0.27.0",
+    "grammar-selector": "0.38.0",
+    "image-view": "0.44.0",
+    "incompatible-packages": "0.16.0",
+    "keybinding-resolver": "0.24.0",
+    "link": "0.28.0",
+    "markdown-preview": "0.112.0",
+    "metrics": "0.40.0",
+    "notifications": "0.18.0",
+    "open-on-github": "0.31.0",
+    "package-generator": "0.33.0",
+    "release-notes": "0.39.0",
+    "settings-view": "0.161.0",
+    "snippets": "0.59.0",
+    "spell-check": "0.45.0",
+    "status-bar": "0.53.0",
+    "styleguide": "0.36.0",
+    "symbols-view": "0.70.0",
+    "tabs": "0.58.0",
+    "timecop": "0.24.0",
+    "tree-view": "0.138.0",
+    "update-package-dependencies": "0.7.0",
+    "welcome": "0.21.0",
+    "whitespace": "0.27.0",
+    "wrap-guide": "0.26.0",
+    "language-c": "0.33.0",
+    "language-clojure": "0.9.0",
+    "language-coffee-script": "0.38.1",
+    "language-css": "0.24.0",
+    "language-gfm": "0.55.0",
     "language-git": "0.9.0",
-    "language-go": "0.19.0",
-    "language-html": "0.26.0",
-    "language-hyperlink": "0.12.0",
-    "language-java": "0.11.0",
-    "language-javascript": "0.43.0",
-    "language-json": "0.8.0",
-    "language-less": "0.18.0",
+    "language-go": "0.19.1",
+    "language-html": "0.26.1",
+    "language-hyperlink": "0.12.2",
+    "language-java": "0.13.0",
+    "language-javascript": "0.51.0",
+    "language-json": "0.10.0",
+    "language-less": "0.21.0",
     "language-make": "0.12.0",
-    "language-mustache": "0.10.0",
-    "language-objective-c": "0.11.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.23.0",
-    "language-ruby": "0.41.0",
+    "language-python": "0.26.0",
+    "language-ruby": "0.44.0",
     "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.25.0",
-    "language-shellscript": "0.10.0",
+    "language-sass": "0.28.0",
+    "language-shellscript": "0.10.1",
     "language-source": "0.8.0",
     "language-sql": "0.11.0",
     "language-text": "0.6.0",
-    "language-todo": "0.13.0",
-    "language-toml": "0.14.0",
-    "language-xml": "0.24.0",
-    "language-yaml": "0.19.0"
+    "language-todo": "0.15.0",
+    "language-toml": "0.14.1",
+    "language-xml": "0.25.0",
+    "language-yaml": "0.21.0"
   },
   "private": true,
   "scripts": {

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,6 +4,7 @@ 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" \

spec/atom-protocol-handler-spec.coffee

@@ -1,4 +1,4 @@
-{$} = require 'atom'
+{$} = require '../src/space-pen-extensions'
 
 describe '"atom" protocol URL', ->
   it 'sends the file relative in the package as response', ->

spec/atom-reporter.coffee

@@ -3,6 +3,7 @@ _ = require 'underscore-plus'
 {convertStackTrace} = require 'coffeestack'
 {View, $, $$} = require '../src/space-pen-extensions'
 grim = require 'grim'
+marked = require 'marked'
 
 sourceMaps = {}
 formatStackTrace = (spec, message='', stackTrace) ->
@@ -37,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'
@@ -79,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
@@ -110,7 +114,8 @@ class AtomReporter extends View
     for deprecation in deprecations
       @deprecationList.append $$ ->
         @div class: 'padded', =>
-          @div class: 'result-message fail deprecation-message', deprecation.message
+          @div class: 'result-message fail deprecation-message', =>
+            @raw marked(deprecation.message)
 
           for stack in deprecation.stacks
             fullStack = stack.map ({functionName, location}) ->

spec/atom-spec.coffee

@@ -1,13 +1,10 @@
-{$, $$, WorkspaceView}  = require 'atom'
+{$, $$}  = require '../src/space-pen-extensions'
 Exec = require('child_process').exec
 path = require 'path'
 Package = require '../src/package'
 ThemeManager = require '../src/theme-manager'
 
 describe "the `atom` global", ->
-  beforeEach ->
-    atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView
-
   describe 'window sizing methods', ->
     describe '::getPosition and ::setPosition', ->
       it 'sets the position of the window, and can retrieve the position just set', ->
@@ -33,10 +30,16 @@ describe "the `atom` global", ->
       version = '36b5518'
       expect(atom.isReleasedVersion()).toBe false
 
-  describe "window:update-available", ->
-    it "is triggered when the auto-updater sends the update-downloaded event", ->
+  describe "when an update becomes available", ->
+    subscription = null
+
+    afterEach ->
+      subscription?.dispose()
+
+    it "invokes onUpdateAvailable listeners", ->
       updateAvailableHandler = jasmine.createSpy("update-available-handler")
-      atom.workspaceView.on 'window:update-available', updateAvailableHandler
+      subscription = atom.onUpdateAvailable updateAvailableHandler
+
       autoUpdater = require('remote').require('auto-updater')
       autoUpdater.emit 'update-downloaded', null, "notes", "version"
 
@@ -44,11 +47,80 @@ describe "the `atom` global", ->
         updateAvailableHandler.callCount > 0
 
       runs ->
-        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
-        expect(notes).toBe 'notes'
-        expect(version).toBe 'version'
+        {releaseVersion, releaseNotes} = updateAvailableHandler.mostRecentCall.args[0]
+        expect(releaseVersion).toBe 'version'
+        expect(releaseNotes).toBe 'notes'
 
   describe "loading default config", ->
     it 'loads the default core config', ->
       expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
       expect(atom.config.get('editor.showInvisibles')).toBe false
+
+  describe "window onerror handler", ->
+    beforeEach ->
+      spyOn atom, 'openDevTools'
+      spyOn atom, 'executeJavaScriptInDevTools'
+
+    it "will open the dev tools when an error is triggered", ->
+      try
+        a + 1
+      catch e
+        window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+
+      expect(atom.openDevTools).toHaveBeenCalled()
+      expect(atom.executeJavaScriptInDevTools).toHaveBeenCalled()
+
+    describe "::onWillThrowError", ->
+      willThrowSpy = null
+      beforeEach ->
+        willThrowSpy = jasmine.createSpy()
+
+      it "is called when there is an error", ->
+        error = null
+        atom.onWillThrowError(willThrowSpy)
+        try
+          a + 1
+        catch e
+          error = e
+          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+
+        delete willThrowSpy.mostRecentCall.args[0].preventDefault
+        expect(willThrowSpy).toHaveBeenCalledWith
+          message: error.toString()
+          url: 'abc'
+          line: 2
+          column: 3
+          originalError: error
+
+      it "will not show the devtools when preventDefault() is called", ->
+        willThrowSpy.andCallFake (errorObject) -> errorObject.preventDefault()
+        atom.onWillThrowError(willThrowSpy)
+
+        try
+          a + 1
+        catch e
+          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+
+        expect(willThrowSpy).toHaveBeenCalled()
+        expect(atom.openDevTools).not.toHaveBeenCalled()
+        expect(atom.executeJavaScriptInDevTools).not.toHaveBeenCalled()
+
+    describe "::onDidThrowError", ->
+      didThrowSpy = null
+      beforeEach ->
+        didThrowSpy = jasmine.createSpy()
+
+      it "is called when there is an error", ->
+        error = null
+        atom.onDidThrowError(didThrowSpy)
+        try
+          a + 1
+        catch e
+          error = e
+          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+        expect(didThrowSpy).toHaveBeenCalledWith
+          message: error.toString()
+          url: 'abc'
+          line: 2
+          column: 3
+          originalError: error

spec/buffered-process-spec.coffee

@@ -0,0 +1,42 @@
+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'

spec/config-spec.coffee

@@ -4,7 +4,6 @@ CSON = require 'season'
 fs = require 'fs-plus'
 
 describe "Config", ->
-  dotAtomPath = path.join(temp.dir, 'dot-atom-dir')
   dotAtomPath = null
 
   beforeEach ->
@@ -128,6 +127,12 @@ describe "Config", ->
       expect(atom.config.get("foo")).toEqual 'a\\.b': 1, b: 2
 
   describe ".toggle(keyPath)", ->
+    beforeEach ->
+      jasmine.snapshotDeprecations()
+
+    afterEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it "negates the boolean value of the current key path value", ->
       atom.config.set('foo.a', 1)
       atom.config.toggle('foo.a')
@@ -246,23 +251,12 @@ describe "Config", ->
       atom.config.setDefaults("foo", bar: baz: 10)
       atom.config.set("foo.ok", 12)
 
+      jasmine.snapshotDeprecations()
       expect(atom.config.getSettings().foo).toEqual
         ok: 12
         bar:
           baz: 10
-
-    describe "when scoped settings are used", ->
-      it "returns all the scoped settings including all the defaults", ->
-        atom.config.setDefaults("foo", bar: baz: 10)
-        atom.config.set("foo.ok", 12)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings("default", ".source.coffee", foo: bar: omg: 'omg')
-
-        expect(atom.config.getSettings(".source.coffee").foo).toEqual
-          ok: 12
-          bar:
-            baz: 42
-            omg: 'omg'
+      jasmine.restoreDeprecationsSnapshot()
 
   describe ".pushAtKeyPath(keyPath, value)", ->
     it "pushes the given value to the array at the key path and updates observers", ->
@@ -298,6 +292,12 @@ describe "Config", ->
       expect(observeHandler).toHaveBeenCalledWith atom.config.get("foo.bar.baz")
 
   describe ".getPositiveInt(keyPath, defaultValue)", ->
+    beforeEach ->
+      jasmine.snapshotDeprecations()
+
+    afterEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it "returns the proper coerced value", ->
       atom.config.set('editor.preferredLineLength', 0)
       expect(atom.config.getPositiveInt('editor.preferredLineLength', 80)).toBe 1
@@ -470,7 +470,7 @@ describe "Config", ->
 
     it "does not fire the callback once the observe subscription is off'ed", ->
       observeHandler.reset() # clear the initial call
-      observeSubscription.off()
+      observeSubscription.dispose()
       atom.config.set('foo.bar.baz', "value 2")
       expect(observeHandler).not.toHaveBeenCalled()
 
@@ -554,11 +554,13 @@ describe "Config", ->
     describe "when the config file contains invalid cson", ->
       beforeEach ->
         spyOn(console, 'error')
+        spyOn(atom.notifications, 'addError')
         fs.writeFileSync(atom.config.configFilePath, "{{{{{")
 
       it "logs an error to the console and does not overwrite the config file on a subsequent save", ->
         atom.config.loadUserConfig()
         expect(console.error).toHaveBeenCalled()
+        expect(atom.notifications.addError.callCount).toBe 1
         atom.config.set("hair", "blonde") # trigger a save
         expect(atom.config.save).not.toHaveBeenCalled()
 
@@ -692,7 +694,6 @@ describe "Config", ->
             expect(atom.config.get(['.source.ruby'], 'foo.bar')).toBe 'baz'
             expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe true
 
-
     describe "when the config file changes to omit a setting with a default", ->
       it "resets the setting back to the default", ->
         fs.writeFileSync(atom.config.configFilePath, "foo: { baz: 'new'}")

spec/context-menu-manager-spec.coffee

@@ -1,4 +1,4 @@
-{$$} = require 'atom'
+{$$} = require '../src/space-pen-extensions'
 
 ContextMenuManager = require '../src/context-menu-manager'
 
@@ -151,24 +151,31 @@ describe "ContextMenuManager", ->
       shouldDisplay = false
       expect(contextMenu.templateForEvent(dispatchedEvent)).toEqual []
 
-    it "allows items to be specified in the legacy format for now", ->
-      contextMenu.add '.parent':
-        'A': 'a'
-        'Separator 1': '-'
-        'B':
-          'C': 'c'
-          'Separator 2': '-'
-          'D': 'd'
+    describe "when the menus are specified in a legacy format", ->
+      beforeEach ->
+        jasmine.snapshotDeprecations()
 
-      expect(contextMenu.templateForElement(parent)).toEqual [
-        {label: 'A', command: 'a'}
-        {type: 'separator'}
-        {
-          label: 'B'
-          submenu: [
-            {label: 'C', command: 'c'}
-            {type: 'separator'}
-            {label: 'D', command: 'd'}
-          ]
-        }
-      ]
+      afterEach ->
+        jasmine.restoreDeprecationsSnapshot()
+
+      it "allows items to be specified in the legacy format for now", ->
+        contextMenu.add '.parent':
+          'A': 'a'
+          'Separator 1': '-'
+          'B':
+            'C': 'c'
+            'Separator 2': '-'
+            'D': 'd'
+
+        expect(contextMenu.templateForElement(parent)).toEqual [
+          {label: 'A', command: 'a'}
+          {type: 'separator'}
+          {
+            label: 'B'
+            submenu: [
+              {label: 'C', command: 'c'}
+              {type: 'separator'}
+              {label: 'D', command: 'd'}
+            ]
+          }
+        ]

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-activation-commands/index.coffee

@@ -9,5 +9,6 @@ module.exports =
     atom.commands.add 'atom-workspace', 'activation-command', =>
       @activationCommandCallCount++
 
-    atom.workspaceView.getActiveView()?.command 'activation-command', =>
+    editorView = atom.views.getView(atom.workspace.getActiveTextEditor())?.__spacePenView
+    editorView?.command 'activation-command', =>
       @legacyActivationCommandCallCount++

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

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

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

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

spec/fixtures/packages/package-with-menus-manifest/menus/menu-3.cson

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

spec/git-spec.coffee

@@ -132,7 +132,7 @@ describe "GitRepository", ->
         atom.workspace.open(filePath)
 
       runs ->
-        editor = atom.workspace.getActiveEditor()
+        editor = atom.workspace.getActiveTextEditor()
 
     it "displays a confirmation dialog by default", ->
       spyOn(atom, 'confirm').andCallFake ({buttons}) -> buttons.OK()
@@ -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/notification-manager-spec.coffee

@@ -0,0 +1,57 @@
+NotificationManager = require '../src/notification-manager'
+
+describe "NotificationManager", ->
+  [manager] = []
+
+  beforeEach ->
+    manager = new NotificationManager
+
+  describe "the atom global", ->
+    it "has a notifications instance", ->
+      expect(atom.notifications instanceof NotificationManager).toBe true
+
+  describe "adding events", ->
+    addSpy = null
+
+    beforeEach ->
+      addSpy = jasmine.createSpy()
+      manager.onDidAddNotification(addSpy)
+
+    it "emits an event when a notification has been added", ->
+      manager.add('error', 'Some error!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'error'
+      expect(notification.getMessage()).toBe 'Some error!'
+      expect(notification.getIcon()).toBe 'someIcon'
+
+    it "emits a fatal error ::addFatalError has been called", ->
+      manager.addFatalError('Some error!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'fatal'
+
+    it "emits an error ::addError has been called", ->
+      manager.addError('Some error!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'error'
+
+    it "emits a warning notification ::addWarning has been called", ->
+      manager.addWarning('Something!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'warning'
+
+    it "emits an info notification ::addInfo has been called", ->
+      manager.addInfo('Something!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'info'
+
+    it "emits a success notification ::addSuccess has been called", ->
+      manager.addSuccess('Something!', icon: 'someIcon')
+      expect(addSpy).toHaveBeenCalled()
+      notification = addSpy.mostRecentCall.args[0]
+      expect(notification.getType()).toBe 'success'

spec/notification-spec.coffee

@@ -0,0 +1,47 @@
+Notification = require '../src/notification'
+
+describe "Notification", ->
+  [notification] = []
+
+  describe "::getTimestamp()", ->
+    it "returns a Date object", ->
+      notification = new Notification('error', 'message!')
+      expect(notification.getTimestamp() instanceof Date).toBe true
+
+  describe "::getIcon()", ->
+    it "returns a default when no icon specified", ->
+      notification = new Notification('error', 'message!')
+      expect(notification.getIcon()).toBe 'flame'
+
+    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-manager-spec.coffee

@@ -1,9 +1,10 @@
-{$, $$, WorkspaceView}  = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 Package = require '../src/package'
 
 describe "PackageManager", ->
+  workspaceElement = null
   beforeEach ->
-    atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView
+    workspaceElement = atom.views.getView(atom.workspace)
 
   describe "::loadPackage(name)", ->
     it "continues if the package has an invalid package.json", ->
@@ -97,21 +98,29 @@ describe "PackageManager", ->
             expect(atom.config.set('package-with-config-schema.numbers.one', '10')).toBe true
             expect(atom.config.get('package-with-config-schema.numbers.one')).toBe 10
 
-        it "still assigns configDefaults from the module though deprecated", ->
-          expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()
+        describe "when a package has configDefaults", ->
+          beforeEach ->
+            jasmine.snapshotDeprecations()
 
-          waitsForPromise ->
-            atom.packages.activatePackage('package-with-config-defaults')
+          afterEach ->
+            jasmine.restoreDeprecationsSnapshot()
 
-          runs ->
-            expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
-            expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
+          it "still assigns configDefaults from the module though deprecated", ->
+
+            expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()
+
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-config-defaults')
+
+            runs ->
+              expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
+              expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
 
         describe "when the package metadata includes `activationCommands`", ->
           [mainModule, promise, workspaceCommandListener] = []
 
           beforeEach ->
-            atom.workspaceView.attachToDom()
+            jasmine.attachToDOM(workspaceElement)
             mainModule = require './fixtures/packages/package-with-activation-commands/index'
             mainModule.legacyActivationCommandCallCount = 0
             mainModule.activationCommandCallCount = 0
@@ -125,29 +134,29 @@ describe "PackageManager", ->
 
           it "defers requiring/activating the main module until an activation event bubbles to the root view", ->
             expect(promise.isFulfilled()).not.toBeTruthy()
-            atom.workspaceView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+            workspaceElement.dispatchEvent(new CustomEvent('activation-command', bubbles: true))
 
             waitsForPromise ->
               promise
 
           it "triggers the activation event on all handlers registered during activation", ->
             waitsForPromise ->
-              atom.workspaceView.open()
+              atom.workspace.open()
 
             runs ->
-              editorView = atom.workspaceView.getActiveView()
+              editorView = atom.views.getView(atom.workspace.getActiveTextEditor()).__spacePenView
               legacyCommandListener = jasmine.createSpy("legacyCommandListener")
               editorView.command 'activation-command', legacyCommandListener
               editorCommandListener = jasmine.createSpy("editorCommandListener")
               atom.commands.add 'atom-text-editor', 'activation-command', editorCommandListener
-              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+              atom.commands.dispatch(editorView[0], 'activation-command')
               expect(mainModule.activate.callCount).toBe 1
               expect(mainModule.legacyActivationCommandCallCount).toBe 1
               expect(mainModule.activationCommandCallCount).toBe 1
               expect(legacyCommandListener.callCount).toBe 1
               expect(editorCommandListener.callCount).toBe 1
               expect(workspaceCommandListener.callCount).toBe 1
-              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+              atom.commands.dispatch(editorView[0], 'activation-command')
               expect(mainModule.legacyActivationCommandCallCount).toBe 2
               expect(mainModule.activationCommandCallCount).toBe 2
               expect(legacyCommandListener.callCount).toBe 2
@@ -349,8 +358,8 @@ describe "PackageManager", ->
             atom.packages.activatePackage('package-with-grammars')
 
           runs ->
-            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
-            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'
+            expect(atom.grammars.selectGrammar('a.alot').name).toBe 'Alot'
+            expect(atom.grammars.selectGrammar('a.alittle').name).toBe 'Alittle'
 
       describe "scoped-property loading", ->
         it "loads the scoped properties", ->
@@ -362,13 +371,13 @@ describe "PackageManager", ->
 
     describe "converted textmate packages", ->
       it "loads the package's grammars", ->
-        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+        expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
 
         waitsForPromise ->
           atom.packages.activatePackage('language-ruby')
 
         runs ->
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Ruby"
 
       it "loads the translated scoped properties", ->
         expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
@@ -454,8 +463,8 @@ describe "PackageManager", ->
 
         runs ->
           atom.packages.deactivatePackage('package-with-grammars')
-          expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
-          expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'
+          expect(atom.grammars.selectGrammar('a.alot').name).toBe 'Null Grammar'
+          expect(atom.grammars.selectGrammar('a.alittle').name).toBe 'Null Grammar'
 
       it "removes the package's keymaps", ->
         waitsForPromise ->
@@ -490,15 +499,15 @@ describe "PackageManager", ->
 
     describe "textmate packages", ->
       it "removes the package's grammars", ->
-        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+        expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
 
         waitsForPromise ->
           atom.packages.activatePackage('language-ruby')
 
         runs ->
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Ruby"
           atom.packages.deactivatePackage('language-ruby')
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
 
       it "removes the package's scoped properties", ->
         waitsForPromise ->
@@ -513,6 +522,7 @@ describe "PackageManager", ->
     themeActivator = null
 
     beforeEach ->
+      jasmine.snapshotDeprecations()
       spyOn(console, 'warn')
       atom.packages.loadPackages()
 
@@ -526,8 +536,9 @@ describe "PackageManager", ->
       atom.packages.deactivatePackages()
       atom.packages.unloadPackages()
 
-      Syntax = require '../src/syntax'
-      atom.syntax = window.syntax = new Syntax()
+      GrammarRegistry = require '../src/grammar-registry'
+      atom.grammars = window.syntax = new GrammarRegistry()
+      jasmine.restoreDeprecationsSnapshot()
 
     it "activates all the packages, and none of the themes", ->
       atom.packages.activate()

spec/package-spec.coffee

@@ -1,4 +1,4 @@
-{$} = require 'atom'
+{$} = require '../src/space-pen-extensions'
 path = require 'path'
 Package = require '../src/package'
 ThemePackage = require '../src/theme-package'

spec/pane-container-spec.coffee

@@ -148,3 +148,57 @@ describe "PaneContainer", ->
       saved = container.confirmClose()
       expect(saved).toBeFalsy()
       expect(atom.confirm).toHaveBeenCalled()
+
+  describe "::onDidAddPane(callback)", ->
+    it "invokes the given callback when panes are added", ->
+      container = new PaneContainer
+      events = []
+      container.onDidAddPane (event) -> events.push(event)
+
+      pane1 = container.getActivePane()
+      pane2 = pane1.splitRight()
+      pane3 = pane2.splitDown()
+
+      expect(events).toEqual [{pane: pane2}, {pane: pane3}]
+
+  describe "::onDidDestroyPane(callback)", ->
+    it "invokes the given callback when panes are destroyed", ->
+      container = new PaneContainer
+      events = []
+      container.onDidDestroyPane (event) -> events.push(event)
+
+      pane1 = container.getActivePane()
+      pane2 = pane1.splitRight()
+      pane3 = pane2.splitDown()
+
+      pane2.destroy()
+      pane3.destroy()
+
+      expect(events).toEqual [{pane: pane2}, {pane: pane3}]
+
+  describe "::onWillDestroyPaneItem() and ::onDidDestroyPaneItem", ->
+    it "invokes the given callbacks when an item will be destroyed on any pane", ->
+      container = new PaneContainer
+      pane1 = container.getRoot()
+      item1 = new Object
+      item2 = new Object
+      item3 = new Object
+
+      pane1.addItem(item1)
+      events = []
+      container.onWillDestroyPaneItem (event) -> events.push(['will', event])
+      container.onDidDestroyPaneItem (event) -> events.push(['did', event])
+      pane2 = pane1.splitRight(items: [item2, item3])
+
+      pane1.destroyItem(item1)
+      pane2.destroyItem(item3)
+      pane2.destroyItem(item2)
+
+      expect(events).toEqual [
+        ['will', {item: item1, pane: pane1, index: 0}]
+        ['did', {item: item1, pane: pane1, index: 0}]
+        ['will', {item: item3, pane: pane2, index: 1}]
+        ['did', {item: item3, pane: pane2, index: 1}]
+        ['will', {item: item2, pane: pane2, index: 0}]
+        ['did', {item: item2, pane: pane2, index: 0}]
+      ]

spec/pane-container-view-spec.coffee

@@ -3,7 +3,8 @@ temp = require 'temp'
 PaneContainer = require '../src/pane-container'
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{$, View, $$} = require 'atom'
+{Disposable} = require 'event-kit'
+{$, View, $$} = require '../src/space-pen-extensions'
 
 describe "PaneContainerView", ->
   [TestView, container, pane1, pane2, pane3, deserializerDisposable] = []
@@ -18,6 +19,8 @@ describe "PaneContainerView", ->
       getUri: -> path.join(temp.dir, @name)
       save: -> @saved = true
       isEqual: (other) -> @name is other?.name
+      onDidChangeTitle: -> new Disposable(->)
+      onDidChangeModified: -> new Disposable(->)
 
     container = atom.views.getView(atom.workspace.paneContainer).__spacePenView
     pane1 = container.getRoot()

spec/pane-view-spec.coffee

@@ -1,8 +1,8 @@
 PaneContainer = require '../src/pane-container'
 PaneView = require '../src/pane-view'
 fs = require 'fs-plus'
-{Emitter} = require 'event-kit'
-{$, View} = require 'atom'
+{Emitter, Disposable} = require 'event-kit'
+{$, View} = require '../src/space-pen-extensions'
 path = require 'path'
 temp = require 'temp'
 
@@ -21,8 +21,11 @@ describe "PaneView", ->
       @emitter.emit 'did-change-title', 'title'
     onDidChangeTitle: (callback) ->
       @emitter.on 'did-change-title', callback
+    onDidChangeModified: -> new Disposable(->)
 
   beforeEach ->
+    jasmine.snapshotDeprecations()
+
     deserializerDisposable = atom.deserializers.add(TestView)
     container = atom.views.getView(new PaneContainer).__spacePenView
     containerModel = container.model
@@ -41,6 +44,7 @@ describe "PaneView", ->
 
   afterEach ->
     deserializerDisposable.dispose()
+    jasmine.restoreDeprecationsSnapshot()
 
   describe "when the active pane item changes", ->
     it "hides all item views except the active one", ->
@@ -155,14 +159,19 @@ describe "PaneView", ->
       expect(view1.is(':visible')).toBe true
 
   describe "when the title of the active item changes", ->
-    describe 'when there is no onDidChangeTitle method', ->
+    describe 'when there is no onDidChangeTitle method (deprecated)', ->
       beforeEach ->
+        jasmine.snapshotDeprecations()
+
         view1.onDidChangeTitle = null
         view2.onDidChangeTitle = null
 
         pane.activateItem(view2)
         pane.activateItem(view1)
 
+      afterEach ->
+        jasmine.restoreDeprecationsSnapshot()
+
       it "emits pane:active-item-title-changed", ->
         activeItemTitleChangedHandler = jasmine.createSpy("activeItemTitleChangedHandler")
         pane.on 'pane:active-item-title-changed', activeItemTitleChangedHandler
@@ -220,7 +229,7 @@ describe "PaneView", ->
 
     beforeEach ->
       pane2Model = paneModel.splitRight() # Can't destroy the last pane, so we add another
-      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane2 = atom.views.getView(pane2Model).__spacePenView
 
     it "triggers a 'pane:removed' event with the pane", ->
       removedHandler = jasmine.createSpy("removedHandler")
@@ -253,7 +262,7 @@ describe "PaneView", ->
 
     beforeEach ->
       pane2Model = paneModel.splitRight(items: [pane.copyActiveItem()])
-      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane2 = atom.views.getView(pane2Model).__spacePenView
       expect(pane2Model.isActive()).toBe true
 
     it "adds or removes the .active class as appropriate", ->
@@ -300,8 +309,8 @@ describe "PaneView", ->
       pane2Model = pane1Model.splitRight(items: [pane1Model.copyActiveItem()])
       pane3Model = pane2Model.splitDown(items: [pane2Model.copyActiveItem()])
       pane2 = pane2Model._view
-      pane2 = containerModel.getView(pane2Model).__spacePenView
-      pane3 = containerModel.getView(pane3Model).__spacePenView
+      pane2 = atom.views.getView(pane2Model).__spacePenView
+      pane3 = atom.views.getView(pane3Model).__spacePenView
 
       expect(container.find('> atom-pane-axis.horizontal > atom-pane').toArray()).toEqual [pane1[0]]
       expect(container.find('> atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]

spec/panel-container-element-spec.coffee

@@ -1,11 +1,10 @@
-ViewRegistry = require '../src/view-registry'
 Panel = require '../src/panel'
 PanelElement = require '../src/panel-element'
 PanelContainer = require '../src/panel-container'
 PanelContainerElement = require '../src/panel-container-element'
 
 describe "PanelContainerElement", ->
-  [jasmineContent, element, container, viewRegistry] = []
+  [jasmineContent, element, container] = []
 
   class TestPanelContainerItem
     constructior: ->
@@ -13,25 +12,23 @@ describe "PanelContainerElement", ->
   class TestPanelContainerItemElement extends HTMLElement
     createdCallback: ->
       @classList.add('test-root')
-    setModel: (@model) ->
+    initialize: (@model) ->
+      this
+
   TestPanelContainerItemElement = document.registerElement 'atom-test-container-item-element', prototype: TestPanelContainerItemElement.prototype
 
   beforeEach ->
     jasmineContent = document.body.querySelector('#jasmine-content')
 
-    viewRegistry = new ViewRegistry
-    viewRegistry.addViewProvider
-      modelConstructor: Panel
-      viewConstructor: PanelElement
-    viewRegistry.addViewProvider
-      modelConstructor: PanelContainer
-      viewConstructor: PanelContainerElement
-    viewRegistry.addViewProvider
-      modelConstructor: TestPanelContainerItem
-      viewConstructor: TestPanelContainerItemElement
+    atom.views.addViewProvider Panel, (model) ->
+      new PanelElement().initialize(model)
+    atom.views.addViewProvider PanelContainer, (model) ->
+      new PaneContainerElement().initialize(model)
+    atom.views.addViewProvider TestPanelContainerItem, (model) ->
+      new TestPanelContainerItemElement().initialize(model)
 
-    container = new PanelContainer({viewRegistry, location: 'left'})
-    element = container.getView()
+    container = new PanelContainer({location: 'left'})
+    element = atom.views.getView(container)
     jasmineContent.appendChild(element)
 
   it 'has a location class with value from the model', ->
@@ -43,23 +40,38 @@ describe "PanelContainerElement", ->
     expect(element.parentNode).not.toBe jasmineContent
 
   describe "adding and removing panels", ->
+    it "allows panels to be inserted at any position", ->
+      panel1 = new Panel({item: new TestPanelContainerItem(), priority: 10})
+      panel2 = new Panel({item: new TestPanelContainerItem(), priority: 5})
+      panel3 = new Panel({item: new TestPanelContainerItem(), priority: 8})
+
+      container.addPanel(panel1)
+      container.addPanel(panel2)
+      container.addPanel(panel3)
+
+      expect(element.childNodes[2].getModel()).toBe(panel1)
+      expect(element.childNodes[1].getModel()).toBe(panel3)
+      expect(element.childNodes[0].getModel()).toBe(panel2)
+
     describe "when the container is at the left location", ->
       it "adds atom-panel elements when a new panel is added to the container; removes them when the panels are destroyed", ->
         expect(element.childNodes.length).toBe 0
 
-        panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
+        panel1 = new Panel({item: new TestPanelContainerItem()})
         container.addPanel(panel1)
         expect(element.childNodes.length).toBe 1
         expect(element.childNodes[0]).toHaveClass 'left'
+        expect(element.childNodes[0]).toHaveClass 'tool-panel' # legacy selector support
+        expect(element.childNodes[0]).toHaveClass 'panel-left' # legacy selector support
 
         expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'
 
-        panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
+        panel2 = new Panel({item: new TestPanelContainerItem()})
         container.addPanel(panel2)
         expect(element.childNodes.length).toBe 2
 
-        expect(panel1.getView().style.display).not.toBe 'none'
-        expect(panel2.getView().style.display).not.toBe 'none'
+        expect(atom.views.getView(panel1).style.display).not.toBe 'none'
+        expect(atom.views.getView(panel2).style.display).not.toBe 'none'
 
         panel1.destroy()
         expect(element.childNodes.length).toBe 1
@@ -69,24 +81,26 @@ describe "PanelContainerElement", ->
 
     describe "when the container is at the bottom location", ->
       beforeEach ->
-        container = new PanelContainer({viewRegistry, location: 'bottom'})
-        element = container.getView()
+        container = new PanelContainer({location: 'bottom'})
+        element = atom.views.getView(container)
         jasmineContent.appendChild(element)
 
       it "adds atom-panel elements when a new panel is added to the container; removes them when the panels are destroyed", ->
         expect(element.childNodes.length).toBe 0
 
-        panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem(), className: 'one'})
+        panel1 = new Panel({item: new TestPanelContainerItem(), className: 'one'})
         container.addPanel(panel1)
         expect(element.childNodes.length).toBe 1
         expect(element.childNodes[0]).toHaveClass 'bottom'
+        expect(element.childNodes[0]).toHaveClass 'tool-panel' # legacy selector support
+        expect(element.childNodes[0]).toHaveClass 'panel-bottom' # legacy selector support
         expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'
-        expect(panel1.getView()).toHaveClass 'one'
+        expect(atom.views.getView(panel1)).toHaveClass 'one'
 
-        panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem(), className: 'two'})
+        panel2 = new Panel({item: new TestPanelContainerItem(), className: 'two'})
         container.addPanel(panel2)
         expect(element.childNodes.length).toBe 2
-        expect(panel2.getView()).toHaveClass 'two'
+        expect(atom.views.getView(panel2)).toHaveClass 'two'
 
         panel1.destroy()
         expect(element.childNodes.length).toBe 1
@@ -96,23 +110,34 @@ describe "PanelContainerElement", ->
 
   describe "when the container is modal", ->
     beforeEach ->
-      container = new PanelContainer({viewRegistry, location: 'modal'})
-      element = container.getView()
+      container = new PanelContainer({location: 'modal'})
+      element = atom.views.getView(container)
       jasmineContent.appendChild(element)
 
     it "allows only one panel to be visible at a time", ->
-      panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
+      panel1 = new Panel({item: new TestPanelContainerItem()})
       container.addPanel(panel1)
 
-      expect(panel1.getView().style.display).not.toBe 'none'
+      expect(atom.views.getView(panel1).style.display).not.toBe 'none'
 
-      panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
+      panel2 = new Panel({item: new TestPanelContainerItem()})
       container.addPanel(panel2)
 
-      expect(panel1.getView().style.display).toBe 'none'
-      expect(panel2.getView().style.display).not.toBe 'none'
+      expect(atom.views.getView(panel1).style.display).toBe 'none'
+      expect(atom.views.getView(panel2).style.display).not.toBe 'none'
 
       panel1.show()
 
-      expect(panel1.getView().style.display).not.toBe 'none'
-      expect(panel2.getView().style.display).toBe 'none'
+      expect(atom.views.getView(panel1).style.display).not.toBe 'none'
+      expect(atom.views.getView(panel2).style.display).toBe 'none'
+
+    it "adds the 'modal' class to panels", ->
+      panel1 = new Panel({item: new TestPanelContainerItem()})
+      container.addPanel(panel1)
+
+      expect(atom.views.getView(panel1)).toHaveClass 'modal'
+
+      # legacy selector support
+      expect(atom.views.getView(panel1)).not.toHaveClass 'tool-panel'
+      expect(atom.views.getView(panel1)).toHaveClass 'overlay'
+      expect(atom.views.getView(panel1)).toHaveClass 'from-top'

spec/panel-container-spec.coffee

@@ -1,16 +1,14 @@
-ViewRegistry = require '../src/view-registry'
 Panel = require '../src/panel'
 PanelContainer = require '../src/panel-container'
 
 describe "PanelContainer", ->
-  [container, viewRegistry] = []
+  [container] = []
 
   class TestPanelItem
     constructior: ->
 
   beforeEach ->
-    viewRegistry = new ViewRegistry
-    container = new PanelContainer({viewRegistry})
+    container = new PanelContainer
 
   describe "::addPanel(panel)", ->
     it 'emits an onDidAddPanel event with the index the panel was inserted at', ->
@@ -46,7 +44,7 @@ describe "PanelContainer", ->
       [initialPanel] = []
       beforeEach ->
         # 'left' logic is the same as 'top'
-        container = new PanelContainer({viewRegistry, location: 'left'})
+        container = new PanelContainer({location: 'left'})
         initialPanel = new Panel(item: new TestPanelItem())
         container.addPanel(initialPanel)
 
@@ -75,7 +73,7 @@ describe "PanelContainer", ->
       [initialPanel] = []
       beforeEach ->
         # 'bottom' logic is the same as 'right'
-        container = new PanelContainer({viewRegistry, location: 'right'})
+        container = new PanelContainer({location: 'right'})
         initialPanel = new Panel(item: new TestPanelItem())
         container.addPanel(initialPanel)
 

spec/panel-element-spec.coffee

@@ -1,9 +1,8 @@
-ViewRegistry = require '../src/view-registry'
 Panel = require '../src/panel'
 PanelElement = require '../src/panel-element'
 
 describe "PanelElement", ->
-  [jasmineContent, element, panel, viewRegistry] = []
+  [jasmineContent, element, panel] = []
 
   class TestPanelItem
     constructior: ->
@@ -11,23 +10,22 @@ describe "PanelElement", ->
   class TestPanelItemElement extends HTMLElement
     createdCallback: ->
       @classList.add('test-root')
-    setModel: (@model) ->
+    initialize: (@model) ->
+      this
+
   TestPanelItemElement = document.registerElement 'atom-test-item-element', prototype: TestPanelItemElement.prototype
 
   beforeEach ->
     jasmineContent = document.body.querySelector('#jasmine-content')
 
-    viewRegistry = new ViewRegistry
-    viewRegistry.addViewProvider
-      modelConstructor: Panel
-      viewConstructor: PanelElement
-    viewRegistry.addViewProvider
-      modelConstructor: TestPanelItem
-      viewConstructor: TestPanelItemElement
+    atom.views.addViewProvider Panel, (model) ->
+      new PanelElement().initialize(model)
+    atom.views.addViewProvider TestPanelItem, (model) ->
+      new TestPanelItemElement().initialize(model)
 
   it 'removes the element when the panel is destroyed', ->
-    panel = new Panel({viewRegistry, item: new TestPanelItem})
-    element = panel.getView()
+    panel = new Panel({item: new TestPanelItem})
+    element = atom.views.getView(panel)
     jasmineContent.appendChild(element)
 
     expect(element.parentNode).toBe jasmineContent
@@ -36,15 +34,15 @@ describe "PanelElement", ->
 
   describe "changing panel visibility", ->
     it 'initially renders panel created with visibile: false', ->
-      panel = new Panel({viewRegistry, visible: false, item: new TestPanelItem})
-      element = panel.getView()
+      panel = new Panel({visible: false, item: new TestPanelItem})
+      element = atom.views.getView(panel)
       jasmineContent.appendChild(element)
 
       expect(element.style.display).toBe 'none'
 
     it 'hides and shows the panel element when Panel::hide() and Panel::show() are called', ->
-      panel = new Panel({viewRegistry, item: new TestPanelItem})
-      element = panel.getView()
+      panel = new Panel({item: new TestPanelItem})
+      element = atom.views.getView(panel)
       jasmineContent.appendChild(element)
 
       expect(element.style.display).not.toBe 'none'
@@ -57,8 +55,8 @@ describe "PanelElement", ->
 
   describe "when a class name is specified", ->
     it 'initially renders panel created with visibile: false', ->
-      panel = new Panel({viewRegistry, className: 'some classes', item: new TestPanelItem})
-      element = panel.getView()
+      panel = new Panel({className: 'some classes', item: new TestPanelItem})
+      element = atom.views.getView(panel)
       jasmineContent.appendChild(element)
 
       expect(element).toHaveClass 'some'

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

@@ -9,6 +9,7 @@ BufferedProcess = require '../src/buffered-process'
 
 describe "Project", ->
   beforeEach ->
+    atom.project.getRepo()
     atom.project.setPaths([atom.project.resolve('dir')])
 
   describe "serialization", ->
@@ -170,30 +171,30 @@ describe "Project", ->
         absolutePath = fs.absolute(__dirname)
         expect(atom.project.resolve(absolutePath)).toBe absolutePath
 
-  describe ".setPath(path)", ->
+  describe ".setPaths(path)", ->
     describe "when path is a file", ->
       it "sets its path to the files parent directory and updates the root directory", ->
         atom.project.setPaths([require.resolve('./fixtures/dir/a')])
         expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-        expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+        expect(atom.project.getDirectories()[0].path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
 
     describe "when path is a directory", ->
       it "sets its path to the directory and updates the root directory", ->
         directory = fs.absolute(path.join(__dirname, 'fixtures', 'dir', 'a-dir'))
         atom.project.setPaths([directory])
         expect(atom.project.getPaths()[0]).toEqual directory
-        expect(atom.project.getRootDirectory().path).toEqual directory
+        expect(atom.project.getDirectories()[0].path).toEqual directory
 
     describe "when path is null", ->
       it "sets its path and root directory to null", ->
         atom.project.setPaths([])
         expect(atom.project.getPaths()[0]?).toBeFalsy()
-        expect(atom.project.getRootDirectory()?).toBeFalsy()
+        expect(atom.project.getDirectories()[0]?).toBeFalsy()
 
     it "normalizes the path to remove consecutive slashes, ., and .. segments", ->
       atom.project.setPaths(["#{require.resolve('./fixtures/dir/a')}#{path.sep}b#{path.sep}#{path.sep}.."])
       expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-      expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+      expect(atom.project.getDirectories()[0].path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
 
   describe ".replace()", ->
     [filePath, commentFilePath, sampleContent, sampleCommentContent] = []

spec/select-list-view-spec.coffee

@@ -1,5 +1,5 @@
 SelectListView = require '../src/select-list-view'
-{$, $$} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 
 describe "SelectListView", ->
   [selectList, items, list, filterEditorView] = []

spec/space-pen-extensions-spec.coffee

@@ -1,4 +1,4 @@
-{View, $, $$} = require 'atom'
+{View, $, $$} = require '../src/space-pen-extensions'
 
 describe "SpacePen extensions", ->
   class TestView extends View

spec/spec-helper.coffee

@@ -9,12 +9,17 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Grim = require 'grim'
 KeymapManager = require '../src/keymap-extensions'
-{$, WorkspaceView, Workspace} = require 'atom'
+
+# FIXME: Remove jquery from this
+{$} = require '../src/space-pen-extensions'
+
 Config = require '../src/config'
 {Point} = require 'text-buffer'
 Project = require '../src/project'
+Workspace = require '../src/workspace'
 TextEditor = require '../src/text-editor'
 TextEditorView = require '../src/text-editor-view'
+TextEditorElement = require '../src/text-editor-element'
 TokenizedBuffer = require '../src/tokenized-buffer'
 TextEditorComponent = require '../src/text-editor-component'
 pathwatcher = require 'pathwatcher'
@@ -76,13 +81,15 @@ beforeEach ->
   atom.commands.restoreSnapshot(commandsToRestore)
   atom.styles.restoreSnapshot(styleElementsToRestore)
 
+  atom.workspaceViewParentSelector = '#jasmine-content'
+
   window.resetTimeouts()
   atom.packages.packageStates = {}
 
   serializedWindowState = null
 
   spyOn(atom, 'saveSync')
-  atom.syntax.clearGrammarOverrides()
+  atom.grammars.clearGrammarOverrides()
 
   spy = spyOn(atom.packages, 'resolvePackagePath').andCallFake (packageName) ->
     if specPackageName and packageName is specPackageName
@@ -111,8 +118,7 @@ beforeEach ->
   config.save.reset()
 
   # make editor display updates synchronous
-  spyOn(TextEditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
-  TextEditorComponent.performSyncUpdates = true
+  TextEditorElement::setUpdatedSynchronously(true)
 
   spyOn(atom, "setRepresentedFilename")
   spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
@@ -135,8 +141,9 @@ afterEach ->
   atom.menu.template = []
   atom.contextMenu.clear()
 
-  atom.workspaceView?.remove?()
-  atom.workspaceView = null
+  atom.workspace?.destroy()
+  atom.workspace = null
+  atom.__workspaceView = null
   delete atom.state.workspace
 
   atom.project?.destroy()
@@ -150,7 +157,7 @@ afterEach ->
 
   jasmine.unspy(atom, 'saveSync')
   ensureNoPathSubscriptions()
-  atom.syntax.clearObservers()
+  atom.grammars.clearObservers()
   waits(0) # yield to ui thread to make screen update more frequently
 
 ensureNoPathSubscriptions = ->
@@ -191,6 +198,17 @@ jasmine.unspy = (object, methodName) ->
   throw new Error("Not a spy") unless object[methodName].hasOwnProperty('originalValue')
   object[methodName] = object[methodName].originalValue
 
+jasmine.attachToDOM = (element) ->
+  jasmineContent = document.querySelector('#jasmine-content')
+  jasmineContent.appendChild(element) unless jasmineContent.contains(element)
+
+deprecationsSnapshot = null
+jasmine.snapshotDeprecations = ->
+  deprecationsSnapshot = Grim.getDeprecations() # suppress deprecations!!
+
+jasmine.restoreDeprecationsSnapshot = ->
+  Grim.grimDeprecations = deprecationsSnapshot
+
 addCustomMatchers = (spec) ->
   spec.addMatchers
     toBeInstanceOf: (expected) ->

spec/styles-element-spec.coffee

@@ -105,3 +105,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/syntax-spec.coffee

@@ -23,10 +23,10 @@ describe "the `syntax` global", ->
   describe "serialization", ->
     it "remembers grammar overrides by path", ->
       filePath = '/foo/bar/file.js'
-      expect(atom.syntax.selectGrammar(filePath).name).not.toBe 'Ruby'
-      atom.syntax.setGrammarOverrideForPath(filePath, 'source.ruby')
-      syntax2 = atom.deserializers.deserialize(atom.syntax.serialize())
-      syntax2.addGrammar(grammar) for grammar in atom.syntax.grammars when grammar isnt atom.syntax.nullGrammar
+      expect(atom.grammars.selectGrammar(filePath).name).not.toBe 'Ruby'
+      atom.grammars.setGrammarOverrideForPath(filePath, 'source.ruby')
+      syntax2 = atom.deserializers.deserialize(atom.grammars.serialize())
+      syntax2.addGrammar(grammar) for grammar in atom.grammars.grammars when grammar isnt atom.grammars.nullGrammar
       expect(syntax2.selectGrammar(filePath).name).toBe 'Ruby'
 
   describe ".selectGrammar(filePath)", ->
@@ -35,15 +35,15 @@ describe "the `syntax` global", ->
         atom.packages.activatePackage('language-git')
 
       runs ->
-        expect(atom.syntax.selectGrammar("file.js").name).toBe "JavaScript" # based on extension (.js)
-        expect(atom.syntax.selectGrammar(path.join(temp.dir, '.git', 'config')).name).toBe "Git Config" # based on end of the path (.git/config)
-        expect(atom.syntax.selectGrammar("Rakefile").name).toBe "Ruby" # based on the file's basename (Rakefile)
-        expect(atom.syntax.selectGrammar("curb").name).toBe "Null Grammar"
-        expect(atom.syntax.selectGrammar("/hu.git/config").name).toBe "Null Grammar"
+        expect(atom.grammars.selectGrammar("file.js").name).toBe "JavaScript" # based on extension (.js)
+        expect(atom.grammars.selectGrammar(path.join(temp.dir, '.git', 'config')).name).toBe "Git Config" # based on end of the path (.git/config)
+        expect(atom.grammars.selectGrammar("Rakefile").name).toBe "Ruby" # based on the file's basename (Rakefile)
+        expect(atom.grammars.selectGrammar("curb").name).toBe "Null Grammar"
+        expect(atom.grammars.selectGrammar("/hu.git/config").name).toBe "Null Grammar"
 
     it "uses the filePath's shebang line if the grammar cannot be determined by the extension or basename", ->
       filePath = require.resolve("./fixtures/shebang")
-      expect(atom.syntax.selectGrammar(filePath).name).toBe "Ruby"
+      expect(atom.grammars.selectGrammar(filePath).name).toBe "Ruby"
 
     it "uses the number of newlines in the first line regex to determine the number of lines to test against", ->
       waitsForPromise ->
@@ -51,28 +51,28 @@ describe "the `syntax` global", ->
 
       runs ->
         fileContent = "first-line\n<html>"
-        expect(atom.syntax.selectGrammar("dummy.coffee", fileContent).name).toBe "CoffeeScript"
+        expect(atom.grammars.selectGrammar("dummy.coffee", fileContent).name).toBe "CoffeeScript"
 
         fileContent = '<?xml version="1.0" encoding="UTF-8"?>'
-        expect(atom.syntax.selectGrammar("grammar.tmLanguage", fileContent).name).toBe "Null Grammar"
+        expect(atom.grammars.selectGrammar("grammar.tmLanguage", fileContent).name).toBe "Null Grammar"
 
         fileContent += '\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
-        expect(atom.syntax.selectGrammar("grammar.tmLanguage", fileContent).name).toBe "Property List (XML)"
+        expect(atom.grammars.selectGrammar("grammar.tmLanguage", fileContent).name).toBe "Property List (XML)"
 
     it "doesn't read the file when the file contents are specified", ->
       filePath = require.resolve("./fixtures/shebang")
       filePathContents = fs.readFileSync(filePath, 'utf8')
       spyOn(fs, 'read').andCallThrough()
-      expect(atom.syntax.selectGrammar(filePath, filePathContents).name).toBe "Ruby"
+      expect(atom.grammars.selectGrammar(filePath, filePathContents).name).toBe "Ruby"
       expect(fs.read).not.toHaveBeenCalled()
 
     it "allows the default grammar to be overridden for a path", ->
       filePath = '/foo/bar/file.js'
-      expect(atom.syntax.selectGrammar(filePath).name).not.toBe 'Ruby'
-      atom.syntax.setGrammarOverrideForPath(filePath, 'source.ruby')
-      expect(atom.syntax.selectGrammar(filePath).name).toBe 'Ruby'
-      atom.syntax.clearGrammarOverrideForPath(filePath)
-      expect(atom.syntax.selectGrammar(filePath).name).not.toBe 'Ruby'
+      expect(atom.grammars.selectGrammar(filePath).name).not.toBe 'Ruby'
+      atom.grammars.setGrammarOverrideForPath(filePath, 'source.ruby')
+      expect(atom.grammars.selectGrammar(filePath).name).toBe 'Ruby'
+      atom.grammars.clearGrammarOverrideForPath(filePath)
+      expect(atom.grammars.selectGrammar(filePath).name).not.toBe 'Ruby'
 
     describe "when multiple grammars have matching fileTypes", ->
       it "selects the grammar with the longest fileType match", ->
@@ -82,8 +82,8 @@ describe "the `syntax` global", ->
           scopeName: 'source1'
           fileTypes: ['test']
         )
-        grammar1 = atom.syntax.loadGrammarSync(grammarPath1)
-        expect(atom.syntax.selectGrammar('more.test', '')).toBe grammar1
+        grammar1 = atom.grammars.loadGrammarSync(grammarPath1)
+        expect(atom.grammars.selectGrammar('more.test', '')).toBe grammar1
 
         grammarPath2 = temp.path(suffix: '.json')
         fs.writeFileSync grammarPath2, JSON.stringify(
@@ -91,44 +91,17 @@ describe "the `syntax` global", ->
           scopeName: 'source2'
           fileTypes: ['test', 'more.test']
         )
-        grammar2 = atom.syntax.loadGrammarSync(grammarPath2)
-        expect(atom.syntax.selectGrammar('more.test', '')).toBe grammar2
+        grammar2 = atom.grammars.loadGrammarSync(grammarPath2)
+        expect(atom.grammars.selectGrammar('more.test', '')).toBe grammar2
 
     describe "when there is no file path", ->
       it "does not throw an exception (regression)", ->
-        expect(-> atom.syntax.selectGrammar(null, '#!/usr/bin/ruby')).not.toThrow()
-        expect(-> atom.syntax.selectGrammar(null, '')).not.toThrow()
-        expect(-> atom.syntax.selectGrammar(null, null)).not.toThrow()
+        expect(-> atom.grammars.selectGrammar(null, '#!/usr/bin/ruby')).not.toThrow()
+        expect(-> atom.grammars.selectGrammar(null, '')).not.toThrow()
+        expect(-> atom.grammars.selectGrammar(null, null)).not.toThrow()
 
   describe ".removeGrammar(grammar)", ->
     it "removes the grammar, so it won't be returned by selectGrammar", ->
-      grammar = atom.syntax.selectGrammar('foo.js')
-      atom.syntax.removeGrammar(grammar)
-      expect(atom.syntax.selectGrammar('foo.js').name).not.toBe grammar.name
-
-  describe ".getProperty(scopeDescriptor)", ->
-    it "returns the property with the most specific scope selector", ->
-      atom.syntax.addProperties(".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-      atom.syntax.addProperties(".source .string.quoted.double", foo: bar: baz: 22)
-      atom.syntax.addProperties(".source", foo: bar: baz: 11)
-
-      expect(atom.syntax.getProperty([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
-      expect(atom.syntax.getProperty([".source.js", ".string.quoted.double.js"], "foo.bar.baz")).toBe 22
-      expect(atom.syntax.getProperty([".source.js", ".variable.assignment.js"], "foo.bar.baz")).toBe 11
-      expect(atom.syntax.getProperty([".text"], "foo.bar.baz")).toBeUndefined()
-
-    it "favors the most recently added properties in the event of a specificity tie", ->
-      atom.syntax.addProperties(".source.coffee .string.quoted.single", foo: bar: baz: 42)
-      atom.syntax.addProperties(".source.coffee .string.quoted.double", foo: bar: baz: 22)
-
-      expect(atom.syntax.getProperty([".source.coffee", ".string.quoted.single"], "foo.bar.baz")).toBe 42
-      expect(atom.syntax.getProperty([".source.coffee", ".string.quoted.single.double"], "foo.bar.baz")).toBe 22
-
-  describe ".removeProperties(name)", ->
-    it "allows properties to be removed by name", ->
-      atom.syntax.addProperties("a", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-      atom.syntax.addProperties("b", ".source .string.quoted.double", foo: bar: baz: 22)
-
-      atom.syntax.removeProperties("b")
-      expect(atom.syntax.getProperty([".source.js", ".string.quoted.double.js"], "foo.bar.baz")).toBeUndefined()
-      expect(atom.syntax.getProperty([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
+      grammar = atom.grammars.selectGrammar('foo.js')
+      atom.grammars.removeGrammar(grammar)
+      expect(atom.grammars.selectGrammar('foo.js').name).not.toBe grammar.name

spec/text-editor-component-spec.coffee

@@ -37,9 +37,9 @@ describe "TextEditorComponent", ->
       wrapperView = new TextEditorView(editor, {lineOverdrawMargin})
       wrapperView.attachToDom()
       wrapperNode = wrapperView.element
+      wrapperNode.setUpdatedSynchronously(false)
 
       {component} = wrapperView
-      component.performSyncUpdates = false
       component.setFontFamily('monospace')
       component.setLineHeight(1.3)
       component.setFontSize(20)
@@ -302,7 +302,7 @@ describe "TextEditorComponent", ->
 
       it "interleaves invisible line-ending characters with indent guides on empty lines", ->
         component.setShowIndentGuide(true)
-        editor.setTextInBufferRange([[10, 0], [11, 0]], "\r\n", false)
+        editor.setTextInBufferRange([[10, 0], [11, 0]], "\r\n", normalizeLineEndings: false)
         nextAnimationFrame()
         expect(component.lineNodeForScreenRow(10).innerHTML).toBe '<span class="indent-guide"><span class="invisible-character">C</span><span class="invisible-character">E</span></span>'
 
@@ -1247,7 +1247,7 @@ describe "TextEditorComponent", ->
         expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
 
     describe "when the marker is not empty", ->
-      it "renders at the head of the marker", ->
+      it "renders at the head of the marker by default", ->
         marker = editor.displayBuffer.markBufferRange([[2, 5], [2, 10]], invalidate: 'never')
         decoration = editor.decorateMarker(marker, {type: 'overlay', item})
         nextAnimationFrame()
@@ -1269,6 +1269,17 @@ describe "TextEditorComponent", ->
         expect(overlay.style.left).toBe position.left + 'px'
         expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
 
+      it "renders at the tail of the marker when the 'position' option is 'tail'", ->
+        marker = editor.displayBuffer.markBufferRange([[2, 5], [2, 10]], invalidate: 'never')
+        decoration = editor.decorateMarker(marker, {type: 'overlay', position: 'tail', item})
+        nextAnimationFrame()
+
+        position = editor.pixelPositionForBufferPosition([2, 5])
+
+        overlay = component.getTopmostDOMNode().querySelector('atom-overlay')
+        expect(overlay.style.left).toBe position.left + 'px'
+        expect(overlay.style.top).toBe position.top + editor.getLineHeightInPixels() + 'px'
+
     describe "positioning the overlay when near the edge of the editor", ->
       [itemWidth, itemHeight] = []
       beforeEach ->
@@ -1897,7 +1908,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
@@ -2532,7 +2544,7 @@ describe "TextEditorComponent", ->
   describe "grammar data attributes", ->
     it "adds and updates the grammar data attribute based on the current grammar", ->
       expect(wrapperNode.dataset.grammar).toBe 'source js'
-      editor.setGrammar(atom.syntax.nullGrammar)
+      editor.setGrammar(atom.grammars.nullGrammar)
       expect(wrapperNode.dataset.grammar).toBe 'text plain null-grammar'
 
   describe "encoding data attributes", ->
@@ -2686,6 +2698,10 @@ describe "TextEditorComponent", ->
 
   describe "middle mouse paste on Linux", ->
     it "pastes the previously selected text", ->
+      spyOn(require('ipc'), 'send').andCallFake (eventName, selectedText) ->
+        if eventName is 'write-text-to-selection-clipboard'
+          require('clipboard').writeText(selectedText, 'selection')
+
       atom.clipboard.write('')
       component.listenForMiddleMousePaste()
 

spec/text-editor-element-spec.coffee

@@ -20,6 +20,11 @@ describe "TextEditorElement", ->
       element = jasmineContent.firstChild
       expect(element.getModel().getPlaceholderText()).toBe 'testing'
 
+    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
@@ -98,3 +103,55 @@ describe "TextEditorElement", ->
       verticalScrollbarNode = element.querySelector(".vertical-scrollbar")
       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()
+
+      element = new TextEditorElement
+      jasmine.attachToDOM(element)
+
+      element.setUpdatedSynchronously(false)
+      expect(element.isUpdatedSynchronously()).toBe false
+
+      element.getModel().setText("hello")
+      expect(window.requestAnimationFrame).toHaveBeenCalled()
+
+      expect(element.shadowRoot.textContent).toContain "hello"
+
+      window.requestAnimationFrame.reset()
+      element.setUpdatedSynchronously(true)
+      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

@@ -192,12 +192,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]
@@ -616,7 +622,7 @@ describe "TextEditor", ->
         describe "when invisible characters are enabled with hard tabs", ->
           it "moves to the first character of the current line without being confused by the invisible characters", ->
             atom.config.set('editor.showInvisibles', true)
-            buffer.setTextInRange([[1, 0], [1, Infinity]], '\t\t\ta', false)
+            buffer.setTextInRange([[1, 0], [1, Infinity]], '\t\t\ta', normalizeLineEndings: false)
 
             editor.setCursorScreenPosition [1,7]
             editor.moveToFirstCharacterOfLine()
@@ -2607,122 +2613,44 @@ describe "TextEditor", ->
               atom.clipboard.write(" z();")
               editor.setCursorBufferPosition([1, Infinity])
               editor.pasteText()
-
-              console.log JSON.stringify(editor.lineTextForBufferRow(1))
               expect(editor.lineTextForBufferRow(1)).toBe("    y(); z();")
 
-        describe "when `autoIndentOnPaste` is false and `normalizeIndentOnPaste` is true", ->
+        describe "when `autoIndentOnPaste` is false", ->
           beforeEach ->
             atom.config.set('editor.autoIndentOnPaste', false)
-            atom.config.set('editor.normalizeIndentOnPaste', true)
 
-          describe "when the inserted text contains no newlines", ->
-            it "does not adjust the indentation level of the text", ->
-              editor.setCursorBufferPosition([5, 2])
-              editor.insertText("foo", indentBasis: 5)
-              expect(editor.lineTextForBufferRow(5)).toBe "  foo    current = items.shift();"
+          describe "when the cursor is indented further than the original copied text", ->
+            it "increases the indentation of the copied lines to match", ->
+              editor.setSelectedBufferRange([[1, 2], [3, 0]])
+              editor.copySelectedText()
 
-            it "does not adjust the whitespace if there are preceding characters", ->
-              copyText(" foo")
-              editor.setCursorBufferPosition([5, 30])
+              editor.setCursorBufferPosition([5, 6])
               editor.pasteText()
 
-              expect(editor.lineTextForBufferRow(5)).toBe "      current = items.shift(); foo"
+              expect(editor.lineTextForBufferRow(5)).toBe "      var sort = function(items) {"
+              expect(editor.lineTextForBufferRow(6)).toBe "        if (items.length <= 1) return items;"
 
-          describe "when the inserted text contains newlines", ->
-            describe "when the cursor is preceded only by whitespace characters", ->
-              it "normalizes indented lines to each cursor's current indentation level", ->
-                editor.setSelectedBufferRanges([
-                  [[1,2], [3,0]],
-                  [[4,4], [6,0]]
-                ])
-                editor.copySelectedText()
-                expect(atom.clipboard.read()).toEqual """
-                  var sort = function(items) {
-                      if (items.length <= 1) return items;
+          describe "when the cursor is indented less far than the original copied text", ->
+            it "decreases the indentation of the copied lines to match", ->
+              editor.setSelectedBufferRange([[6, 6], [8, 0]])
+              editor.copySelectedText()
 
-                  while(items.length > 0) {
-                        current = items.shift();
-
-                """
-
-                editor.setCursorBufferPosition([0,0])
-                editor.insertNewlineAbove()
-                editor.setSelectedBufferRanges([
-                  [[0,0], [0,0]],
-                  [[1,0], [1,0]]
-                ])
-                editor.pasteText()
-
-                expect(editor.lineTextForBufferRow(0)).toBe "var sort = function(items) {"
-                console.log JSON.stringify(editor.lineTextForBufferRow(1))
-                expect(editor.lineTextForBufferRow(1)).toBe "  if (items.length <= 1) return items;"
-                expect(editor.lineTextForBufferRow(2)).toBe ""
-                expect(editor.lineTextForBufferRow(3)).toBe "while(items.length > 0) {"
-                expect(editor.lineTextForBufferRow(4)).toBe "  current = items.shift();"
-
-            describe "when the cursor is preceded by non-whitespace characters", ->
-              it "normalizes the indentation level of all lines based on the level of the existing first line", ->
-                copyText("    while (true) {\n      foo();\n    }\n", {startColumn: 0})
-                editor.setCursorBufferPosition([1, Infinity])
-                editor.pasteText()
-
-                expect(editor.lineTextForBufferRow(1)).toBe "  var sort = function(items) {while (true) {"
-                expect(editor.lineTextForBufferRow(2)).toBe "    foo();"
-                expect(editor.lineTextForBufferRow(3)).toBe "  }"
-                expect(editor.lineTextForBufferRow(4)).toBe ""
-
-          describe 'when scoped settings are used', ->
-            coffeeEditor = null
-            beforeEach ->
-              waitsForPromise ->
-                atom.packages.activatePackage('language-coffee-script')
-              waitsForPromise ->
-                atom.project.open('coffee.coffee', autoIndent: false).then (o) ->
-                  coffeeEditor = o
-
-              runs ->
-                atom.config.set('.source.js', 'editor.normalizeIndentOnPaste', true)
-                atom.config.set('.source.coffee', 'editor.normalizeIndentOnPaste', false)
-
-            afterEach: ->
-              atom.packages.deactivatePackages()
-              atom.packages.unloadPackages()
-
-            it "normalizes the indentation level based on scoped settings", ->
-              copyText("    while (true) {\n      foo();\n    }\n", {startColumn: 2, textEditor: coffeeEditor})
-              coffeeEditor.setCursorBufferPosition([4, 4])
-              coffeeEditor.pasteText()
-              expect(coffeeEditor.lineTextForBufferRow(4)).toBe "      while (true) {"
-              expect(coffeeEditor.lineTextForBufferRow(5)).toBe "      foo();"
-              expect(coffeeEditor.lineTextForBufferRow(6)).toBe "    }"
-
-              copyText("    while (true) {\n      foo();\n    }\n", {startColumn: 2})
-              editor.setCursorBufferPosition([3, 4])
+              editor.setCursorBufferPosition([1, 2])
               editor.pasteText()
-              expect(editor.lineTextForBufferRow(3)).toBe "    while (true) {"
-              expect(editor.lineTextForBufferRow(4)).toBe "      foo();"
-              expect(editor.lineTextForBufferRow(5)).toBe "    }"
 
-        describe "when `autoIndentOnPaste` and `normalizeIndentOnPaste` are both false", ->
-          beforeEach ->
-            atom.config.set('editor.normalizeIndentOnPaste', false)
-            atom.config.set("editor.autoIndentOnPaste", false)
+              expect(editor.lineTextForBufferRow(1)).toBe "  current < pivot ? left.push(current) : right.push(current);"
+              expect(editor.lineTextForBufferRow(2)).toBe "}"
 
-          it "does not auto-indent the pasted text", ->
-            atom.clipboard.write("console.log(x);\nconsole.log(y);\n")
-            editor.setCursorBufferPosition([5, 0])
-            editor.pasteText()
-            expect(editor.lineTextForBufferRow(5)).toBe("console.log(x);")
-            expect(editor.lineTextForBufferRow(6)).toBe("console.log(y);")
+          describe "when the first copied line has leading whitespace", ->
+            it "preserves the line's leading whitespace", ->
+              editor.setSelectedBufferRange([[4, 0], [6, 0]])
+              editor.copySelectedText()
 
-          it "does not normalize the indentation level of the text", ->
-            copyText("   function() {\nvar cool = 1;\n  }\n")
-            editor.setCursorBufferPosition([5, 2])
-            editor.pasteText()
-            expect(editor.lineTextForBufferRow(5)).toBe "     function() {"
-            expect(editor.lineTextForBufferRow(6)).toBe "var cool = 1;"
-            expect(editor.lineTextForBufferRow(7)).toBe "  }"
+              editor.setCursorBufferPosition([0, 0])
+              editor.pasteText()
+
+              expect(editor.lineTextForBufferRow(0)).toBe "    while(items.length > 0) {"
+              expect(editor.lineTextForBufferRow(1)).toBe "      current = items.shift();"
 
         describe 'when the clipboard has many selections', ->
           beforeEach ->
@@ -2747,6 +2675,39 @@ describe "TextEditor", ->
               expect(editor.lineTextForBufferRow(0)).toBe "var quicksort"
               expect(editor.lineTextForBufferRow(1)).toBe "sort = function () {"
 
+        describe "when a full line was cut", ->
+          beforeEach ->
+            editor.setCursorBufferPosition([2, 13])
+            editor.cutSelectedText()
+            editor.setCursorBufferPosition([2, 13])
+
+          it "pastes the line above the cursor and retains the cursor's column", ->
+            editor.pasteText()
+            expect(editor.lineTextForBufferRow(2)).toBe("    if (items.length <= 1) return items;")
+            expect(editor.lineTextForBufferRow(3)).toBe("    var pivot = items.shift(), current, left = [], right = [];")
+            expect(editor.getCursorBufferPosition()).toEqual([3, 13])
+
+        describe "when a full line was copied", ->
+          beforeEach ->
+            editor.setCursorBufferPosition([2, 13])
+            editor.copySelectedText()
+
+          describe "when there is a selection", ->
+            it "overwrites the selection as with any copied text", ->
+              editor.setSelectedBufferRange([[1, 2], [1, Infinity]])
+              editor.pasteText()
+              expect(editor.lineTextForBufferRow(1)).toBe("  if (items.length <= 1) return items;")
+              expect(editor.lineTextForBufferRow(2)).toBe("  ")
+              expect(editor.lineTextForBufferRow(3)).toBe("    if (items.length <= 1) return items;")
+              expect(editor.getCursorBufferPosition()).toEqual([2, 2])
+
+          describe "when there is no selection", ->
+            it "pastes the line above the cursor and retains the cursor's column", ->
+              editor.pasteText()
+              expect(editor.lineTextForBufferRow(2)).toBe("    if (items.length <= 1) return items;")
+              expect(editor.lineTextForBufferRow(3)).toBe("    if (items.length <= 1) return items;")
+              expect(editor.getCursorBufferPosition()).toEqual([3, 13])
+
     describe ".indentSelectedRows()", ->
       describe "when nothing is selected", ->
         describe "when softTabs is enabled", ->
@@ -3059,18 +3020,16 @@ describe "TextEditor", ->
         expect(editor.isFoldedAtBufferRow(1)).toBeFalsy()
         expect(editor.isFoldedAtBufferRow(2)).toBeTruthy()
 
-    describe "begin/commitTransaction()", ->
+    describe "::transact", ->
       it "restores the selection when the transaction is undone/redone", ->
         buffer.setText('1234')
         editor.setSelectedBufferRange([[0, 1], [0, 3]])
-        editor.beginTransaction()
 
-        editor.delete()
-        editor.moveToEndOfLine()
-        editor.insertText('5')
-        expect(buffer.getText()).toBe '145'
-
-        editor.commitTransaction()
+        editor.transact ->
+          editor.delete()
+          editor.moveToEndOfLine()
+          editor.insertText('5')
+          expect(buffer.getText()).toBe '145'
 
         editor.undo()
         expect(buffer.getText()).toBe '1234'
@@ -3377,17 +3336,17 @@ describe "TextEditor", ->
     it "switches to the better-matched grammar and re-tokenizes the buffer", ->
       editor.destroy()
 
-      jsGrammar = atom.syntax.selectGrammar('a.js')
-      atom.syntax.removeGrammar(jsGrammar)
+      jsGrammar = atom.grammars.selectGrammar('a.js')
+      atom.grammars.removeGrammar(jsGrammar)
 
       waitsForPromise ->
         atom.workspace.open('sample.js', autoIndent: false).then (o) -> editor = o
 
       runs ->
-        expect(editor.getGrammar()).toBe atom.syntax.nullGrammar
+        expect(editor.getGrammar()).toBe atom.grammars.nullGrammar
         expect(editor.tokenizedLineForScreenRow(0).tokens.length).toBe 1
 
-        atom.syntax.addGrammar(jsGrammar)
+        atom.grammars.addGrammar(jsGrammar)
         expect(editor.getGrammar()).toBe jsGrammar
         expect(editor.tokenizedLineForScreenRow(0).tokens.length).toBeGreaterThan 1
 
@@ -3438,6 +3397,15 @@ describe "TextEditor", ->
             editor.insertText('\n')
             expect(editor.indentationForBufferRow(1)).toBe 2
 
+        describe "when the line preceding the newline contains only whitespace", ->
+          it "bases the new line's indentation on only the preceding line", ->
+            editor.setCursorBufferPosition([6, Infinity])
+            editor.insertText("\n  ")
+            expect(editor.getCursorBufferPosition()).toEqual([7, 2])
+
+            editor.insertNewline()
+            expect(editor.lineTextForBufferRow(8)).toBe("  ")
+
         it "does not indent the line preceding the newline", ->
           editor.setCursorBufferPosition([2, 0])
           editor.insertText('  var this-line-should-be-indented-more\n')
@@ -3452,11 +3420,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", ->
@@ -3797,7 +3765,7 @@ describe "TextEditor", ->
 
     it "updates the grammar based on grammar overrides", ->
       expect(editor.getGrammar().name).toBe 'JavaScript'
-      atom.syntax.setGrammarOverrideForPath(editor.getPath(), 'source.coffee')
+      atom.grammars.setGrammarOverrideForPath(editor.getPath(), 'source.coffee')
       editor.reloadGrammar()
       expect(editor.getGrammar().name).toBe 'CoffeeScript'
 
@@ -3815,7 +3783,7 @@ describe "TextEditor", ->
         atom.packages.activatePackage('language-hyperlink')
 
       runs ->
-        grammar = atom.syntax.selectGrammar("text.js")
+        grammar = atom.grammars.selectGrammar("text.js")
         {tokens} = grammar.tokenizeLine("var i; // http://github.com")
 
         expect(tokens[0].value).toBe "var"

spec/theme-manager-spec.coffee

@@ -1,6 +1,6 @@
 path = require 'path'
 
-{$, $$, WorkspaceView} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 fs = require 'fs-plus'
 temp = require 'temp'
 
@@ -20,8 +20,12 @@ describe "ThemeManager", ->
 
   describe "theme getters and setters", ->
     beforeEach ->
+      jasmine.snapshotDeprecations()
       atom.packages.loadPackages()
 
+    afterEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it 'getLoadedThemes get all the loaded themes', ->
       themes = themeManager.getLoadedThemes()
       expect(themes.length).toBeGreaterThan(2)
@@ -70,7 +74,7 @@ describe "ThemeManager", ->
   describe "when the core.themes config value changes", ->
     it "add/removes stylesheets to reflect the new config value", ->
       themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
-      spyOn(themeManager, 'getUserStylesheetPath').andCallFake -> null
+      spyOn(atom.styles, 'getUserStyleSheetPath').andCallFake -> null
 
       waitsForPromise ->
         themeManager.activateThemes()
@@ -130,15 +134,24 @@ describe "ThemeManager", ->
       expect(-> atom.packages.activatePackage('a-theme-that-will-not-be-found')).toThrow()
 
   describe "::requireStylesheet(path)", ->
+    beforeEach ->
+      jasmine.snapshotDeprecations()
+
+    afterEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it "synchronously loads css at the given path and installs a style tag for it in the head", ->
+      atom.styles.onDidAddStyleElement styleElementAddedHandler = jasmine.createSpy("styleElementAddedHandler")
       themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
       themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
+
       cssPath = atom.project.resolve('css.css')
       lengthBefore = $('head style').length
 
       themeManager.requireStylesheet(cssPath)
       expect($('head style').length).toBe lengthBefore + 1
 
+      expect(styleElementAddedHandler).toHaveBeenCalled()
       expect(stylesheetAddedHandler).toHaveBeenCalled()
       expect(stylesheetsChangedHandler).toHaveBeenCalled()
 
@@ -148,8 +161,10 @@ describe "ThemeManager", ->
       expect(element[0].sheet).toBe stylesheetAddedHandler.argsForCall[0][0]
 
       # doesn't append twice
+      styleElementAddedHandler.reset()
       themeManager.requireStylesheet(cssPath)
       expect($('head style').length).toBe lengthBefore + 1
+      expect(styleElementAddedHandler).not.toHaveBeenCalled()
 
       $('head style[id*="css.css"]').remove()
 
@@ -192,6 +207,7 @@ describe "ThemeManager", ->
       disposable = themeManager.requireStylesheet(cssPath)
       expect($(document.body).css('font-weight')).toBe("bold")
 
+      atom.styles.onDidRemoveStyleElement styleElementRemovedHandler = jasmine.createSpy("styleElementRemovedHandler")
       themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
       themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
 
@@ -199,6 +215,7 @@ describe "ThemeManager", ->
 
       expect($(document.body).css('font-weight')).not.toBe("bold")
 
+      expect(styleElementRemovedHandler).toHaveBeenCalled()
       expect(stylesheetRemovedHandler).toHaveBeenCalled()
       stylesheet = stylesheetRemovedHandler.argsForCall[0][0]
       expect(stylesheet instanceof CSSStyleSheet).toBe true
@@ -207,14 +224,20 @@ describe "ThemeManager", ->
       expect(stylesheetsChangedHandler).toHaveBeenCalled()
 
   describe "base stylesheet loading", ->
+    workspaceElement = null
     beforeEach ->
-      atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView
-      atom.workspaceView.append $('<atom-text-editor>')
-      atom.workspaceView.attachToDom()
+      jasmine.snapshotDeprecations()
+
+      workspaceElement = atom.views.getView(atom.workspace)
+      jasmine.attachToDOM(workspaceElement)
+      workspaceElement.appendChild document.createElement('atom-text-editor')
 
       waitsForPromise ->
         themeManager.activateThemes()
 
+    beforeEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it "loads the correct values from the theme's ui-variables file", ->
       themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
       atom.config.set('core.themes', ['theme-with-ui-variables', 'theme-with-syntax-variables'])
@@ -224,7 +247,7 @@ describe "ThemeManager", ->
 
       runs ->
         # an override loaded in the base css
-        expect(atom.workspaceView.css("background-color")).toBe "rgb(0, 0, 255)"
+        expect(getComputedStyle(workspaceElement)["background-color"]).toBe "rgb(0, 0, 255)"
 
         # from within the theme itself
         expect($("atom-text-editor").css("padding-top")).toBe "150px"
@@ -241,14 +264,14 @@ describe "ThemeManager", ->
 
         runs ->
           # an override loaded in the base css
-          expect(atom.workspaceView.css("background-color")).toBe "rgb(0, 0, 255)"
+          expect(getComputedStyle(workspaceElement)["background-color"]).toBe "rgb(0, 0, 255)"
 
           # 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(atom.workspaceView).toHaveClass 'theme-atom-dark-ui'
+        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'])
@@ -258,22 +281,32 @@ describe "ThemeManager", ->
 
         runs ->
           # `theme-` twice as it prefixes the name with `theme-`
-          expect(atom.workspaceView).toHaveClass 'theme-theme-with-ui-variables'
-          expect(atom.workspaceView).toHaveClass 'theme-theme-with-syntax-variables'
-          expect(atom.workspaceView).not.toHaveClass 'theme-atom-dark-ui'
-          expect(atom.workspaceView).not.toHaveClass 'theme-atom-dark-syntax'
+          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 ->
+      jasmine.snapshotDeprecations()
+
+    afterEach ->
+      jasmine.restoreDeprecationsSnapshot()
+
     it "reloads it", ->
+      [styleElementAddedHandler, styleElementRemovedHandler] = []
       [stylesheetRemovedHandler, stylesheetAddedHandler, stylesheetsChangedHandler] = []
       userStylesheetPath = path.join(temp.mkdirSync("atom"), 'styles.less')
       fs.writeFileSync(userStylesheetPath, 'body {border-style: dotted !important;}')
-      spyOn(themeManager, 'getUserStylesheetPath').andReturn userStylesheetPath
+      spyOn(atom.styles, 'getUserStyleSheetPath').andReturn userStylesheetPath
 
       waitsForPromise ->
         themeManager.activateThemes()
 
       runs ->
+        atom.styles.onDidRemoveStyleElement styleElementRemovedHandler = jasmine.createSpy("styleElementRemovedHandler")
+        atom.styles.onDidAddStyleElement styleElementAddedHandler = jasmine.createSpy("styleElementAddedHandler")
+
         themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
         themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
         themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
@@ -288,14 +321,19 @@ describe "ThemeManager", ->
       runs ->
         expect($(document.body).css('border-style')).toBe 'dashed'
 
+        expect(styleElementRemovedHandler).toHaveBeenCalled()
+        expect(styleElementRemovedHandler.argsForCall[0][0].textContent).toContain 'dotted'
         expect(stylesheetRemovedHandler).toHaveBeenCalled()
         expect(stylesheetRemovedHandler.argsForCall[0][0].cssRules[0].style.border).toBe 'dotted'
 
+        expect(styleElementAddedHandler).toHaveBeenCalled()
+        expect(styleElementAddedHandler.argsForCall[0][0].textContent).toContain 'dashed'
         expect(stylesheetAddedHandler).toHaveBeenCalled()
         expect(stylesheetAddedHandler.argsForCall[0][0].cssRules[0].style.border).toBe 'dashed'
 
         expect(stylesheetsChangedHandler).toHaveBeenCalled()
 
+        styleElementRemovedHandler.reset()
         stylesheetRemovedHandler.reset()
         stylesheetsChangedHandler.reset()
         fs.removeSync(userStylesheetPath)
@@ -304,6 +342,8 @@ describe "ThemeManager", ->
         themeManager.loadUserStylesheet.callCount is 2
 
       runs ->
+        expect(styleElementRemovedHandler).toHaveBeenCalled()
+        expect(styleElementRemovedHandler.argsForCall[0][0].textContent).toContain 'dashed'
         expect(stylesheetRemovedHandler).toHaveBeenCalled()
         expect(stylesheetRemovedHandler.argsForCall[0][0].cssRules[0].style.border).toBe 'dashed'
         expect($(document.body).css('border-style')).toBe 'none'

spec/tokenized-buffer-spec.coffee

@@ -522,7 +522,7 @@ describe "TokenizedBuffer", ->
         buffer = atom.project.bufferForPathSync()
         buffer.setText "<div class='name'><%= User.find(2).full_name %></div>"
         tokenizedBuffer = new TokenizedBuffer({buffer})
-        tokenizedBuffer.setGrammar(atom.syntax.selectGrammar('test.erb'))
+        tokenizedBuffer.setGrammar(atom.grammars.selectGrammar('test.erb'))
         fullyTokenize(tokenizedBuffer)
 
         {tokens} = tokenizedBuffer.tokenizedLineForRow(0)

spec/tooltip-manager-spec.coffee

@@ -0,0 +1,79 @@
+TooltipManager = require '../src/tooltip-manager'
+{$} = require '../src/space-pen-extensions'
+
+describe "TooltipManager", ->
+  [manager, element] = []
+
+  beforeEach ->
+    manager = new TooltipManager
+    element = document.createElement('div')
+    element.classList.add('foo')
+    jasmine.attachToDOM(element)
+
+  hover = (element, fn) ->
+    $(element).trigger 'mouseenter'
+    advanceClock(manager.defaults.delay.show)
+    fn()
+    $(element).trigger 'mouseleave'
+    advanceClock(manager.defaults.delay.hide)
+
+  describe "::add(target, options)", ->
+    describe "when the target is an element", ->
+      it "creates a tooltip based on the given options when hovering over the target element", ->
+        manager.add element, title: "Title"
+        hover element, ->
+          expect(document.body.querySelector(".tooltip")).toHaveText("Title")
+
+    describe "when a keyBindingCommand is specified", ->
+      describe "when a title is specified", ->
+        it "appends the key binding corresponding to the command to the title", ->
+          atom.keymaps.add 'test',
+            '.foo': 'ctrl-x ctrl-y': 'test-command'
+            '.bar': 'ctrl-x ctrl-z': 'test-command'
+
+          manager.add element, title: "Title", keyBindingCommand: 'test-command'
+
+          hover element, ->
+            tooltipElement = document.body.querySelector(".tooltip")
+            expect(tooltipElement).toHaveText "Title ⌃X ⌃Y"
+
+      describe "when no title is specified", ->
+        it "shows the key binding corresponding to the command alone", ->
+          atom.keymaps.add 'test', '.foo': 'ctrl-x ctrl-y': 'test-command'
+
+          manager.add element, keyBindingCommand: 'test-command'
+
+          hover element, ->
+            tooltipElement = document.body.querySelector(".tooltip")
+            expect(tooltipElement).toHaveText "⌃X ⌃Y"
+
+      describe "when a keyBindingTarget is specified", ->
+        it "looks up the key binding relative to the target", ->
+          atom.keymaps.add 'test',
+            '.bar': 'ctrl-x ctrl-z': 'test-command'
+            '.foo': 'ctrl-x ctrl-y': 'test-command'
+
+          manager.add element, keyBindingCommand: 'test-command', keyBindingTarget: element
+
+          hover element, ->
+            tooltipElement = document.body.querySelector(".tooltip")
+            expect(tooltipElement).toHaveText "⌃X ⌃Y"
+
+        it "does not display the keybinding if there is nothing mapped to the specified keyBindingCommand", ->
+          manager.add element, title: 'A Title', keyBindingCommand: 'test-command', keyBindingTarget: element
+
+          hover element, ->
+            tooltipElement = document.body.querySelector(".tooltip")
+            expect(tooltipElement.textContent).toBe "A Title"
+
+    describe "when .dispose() is called on the returned disposable", ->
+      it "no longer displays the tooltip on hover", ->
+        disposable = manager.add element, title: "Title"
+
+        hover element, ->
+          expect(document.body.querySelector(".tooltip")).toHaveText("Title")
+
+        disposable.dispose()
+
+        hover element, ->
+          expect(document.body.querySelector(".tooltip")).toBeNull()

spec/view-registry-spec.coffee

@@ -25,47 +25,27 @@ describe "ViewRegistry", ->
 
     describe "when passed a model object", ->
       describe "when a view provider is registered matching the object's constructor", ->
-        describe "when the provider has a viewConstructor property", ->
-          it "constructs a view element and assigns the model on it", ->
-            class TestModel
+        it "constructs a view element and assigns the model on it", ->
+          class TestModel
 
-            class TestModelSubclass extends TestModel
+          class TestModelSubclass extends TestModel
 
-            class TestView
-              setModel: (@model) ->
+          class TestView
+            initialize: (@model) -> this
 
-            model = new TestModel
+          model = new TestModel
 
-            registry.addViewProvider
-              modelConstructor: TestModel
-              viewConstructor: TestView
+          registry.addViewProvider TestModel, (model) ->
+            new TestView().initialize(model)
 
-            view = registry.getView(model)
-            expect(view instanceof TestView).toBe true
-            expect(view.model).toBe model
+          view = registry.getView(model)
+          expect(view instanceof TestView).toBe true
+          expect(view.model).toBe model
 
-            subclassModel = new TestModelSubclass
-            view2 = registry.getView(subclassModel)
-            expect(view2 instanceof TestView).toBe true
-            expect(view2.model).toBe subclassModel
-
-        describe "when the provider has a createView method", ->
-          it "constructs a view element by calling the createView method with the model", ->
-            class TestModel
-            class TestView
-              setModel: (@model) ->
-
-            registry.addViewProvider
-              modelConstructor: TestModel
-              createView: (model) ->
-                view = new TestView
-                view.setModel(model)
-                view
-
-            model = new TestModel
-            view = registry.getView(model)
-            expect(view instanceof TestView).toBe true
-            expect(view.model).toBe model
+          subclassModel = new TestModelSubclass
+          view2 = registry.getView(subclassModel)
+          expect(view2 instanceof TestView).toBe true
+          expect(view2.model).toBe subclassModel
 
       describe "when no view provider is registered for the object's constructor", ->
         describe "when the object has a .getViewClass() method", ->
@@ -97,10 +77,10 @@ describe "ViewRegistry", ->
     it "returns a disposable that can be used to remove the provider", ->
       class TestModel
       class TestView
-        setModel: (@model) ->
-      disposable = registry.addViewProvider
-        modelConstructor: TestModel
-        viewConstructor: TestView
+        initialize: (@model) -> this
+
+      disposable = registry.addViewProvider TestModel, (model) ->
+        new TestView().initialize(model)
 
       expect(registry.getView(new TestModel) instanceof TestView).toBe true
       disposable.dispose()

spec/window-spec.coffee

@@ -1,4 +1,4 @@
-{$, $$} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 path = require 'path'
 TextEditor = require '../src/text-editor'
 WindowEventHandler = require '../src/window-event-handler'
@@ -95,13 +95,13 @@ describe "Window", ->
   describe ".unloadEditorWindow()", ->
     it "saves the serialized state of the window so it can be deserialized after reload", ->
       workspaceState = atom.workspace.serialize()
-      syntaxState = atom.syntax.serialize()
+      syntaxState = atom.grammars.serialize()
       projectState = atom.project.serialize()
 
       atom.unloadEditorWindow()
 
       expect(atom.state.workspace).toEqual workspaceState
-      expect(atom.state.syntax).toEqual syntaxState
+      expect(atom.state.grammars).toEqual syntaxState
       expect(atom.state.project).toEqual projectState
       expect(atom.saveSync).toHaveBeenCalled()
 
@@ -112,9 +112,9 @@ describe "Window", ->
 
       runs ->
         buffer = atom.workspace.getActivePaneItem().buffer
-        pane = atom.workspaceView.getActivePaneView()
-        pane.splitRight(pane.copyActiveItem())
-        expect(atom.workspaceView.find('atom-text-editor').length).toBe 2
+        pane = atom.workspace.getActivePane()
+        pane.splitRight(copyActiveItem: true)
+        expect(atom.workspace.getTextEditors().length).toBe 2
 
         atom.removeEditorWindow()
 
@@ -128,17 +128,15 @@ describe "Window", ->
         setData: (key, value) -> @data[key] = value
         getData: (key) -> @data[key]
 
-      event = $.Event(type)
-      event.originalEvent = { dataTransfer }
-      event.preventDefault = ->
-      event.stopPropagation = ->
+      event = new CustomEvent("drop")
+      event.dataTransfer = dataTransfer
       event
 
     describe "when a file is dragged to window", ->
       it "opens it", ->
         spyOn(atom, "open")
         event = buildDragEvent("drop", [ {path: "/fake1"}, {path: "/fake2"} ])
-        $(document).trigger(event)
+        document.dispatchEvent(event)
         expect(atom.open.callCount).toBe 1
         expect(atom.open.argsForCall[0][0]).toEqual pathsToOpen: ['/fake1', '/fake2']
 
@@ -146,7 +144,7 @@ describe "Window", ->
       it "does nothing", ->
         spyOn(atom, "open")
         event = buildDragEvent("drop", [])
-        $(document).trigger(event)
+        document.dispatchEvent(event)
         expect(atom.open).not.toHaveBeenCalled()
 
   describe "when a link is clicked", ->
@@ -259,24 +257,23 @@ describe "Window", ->
 
       describe "when the opened path exists", ->
         it "sets the project path to the opened path", ->
-          $(window).trigger('window:open-path', [{pathToOpen: __filename}])
-
+          atom.getCurrentWindow().send 'message', 'open-path', pathToOpen: __filename
           expect(atom.project.getPaths()[0]).toBe __dirname
 
       describe "when the opened path does not exist but its parent directory does", ->
         it "sets the project path to the opened path's parent directory", ->
-          $(window).trigger('window:open-path', [{pathToOpen: path.join(__dirname, 'this-path-does-not-exist.txt')}])
-
+          pathToOpen = path.join(__dirname, 'this-path-does-not-exist.txt')
+          atom.getCurrentWindow().send 'message', 'open-path', {pathToOpen}
           expect(atom.project.getPaths()[0]).toBe __dirname
 
     describe "when the opened path is a file", ->
       it "opens it in the workspace", ->
-        $(window).trigger('window:open-path', [{pathToOpen: __filename}])
+        atom.getCurrentWindow().send 'message', 'open-path', pathToOpen: __filename
 
         expect(atom.workspace.open.mostRecentCall.args[0]).toBe __filename
 
     describe "when the opened path is a directory", ->
       it "does not open it in the workspace", ->
-        $(window).trigger('window:open-path', [{pathToOpen: __dirname}])
+        atom.getCurrentWindow().send 'message', 'open-path', pathToOpen: __dirname
 
         expect(atom.workspace.open.callCount).toBe 0

spec/workspace-spec.coffee

@@ -356,7 +356,7 @@ describe "Workspace", ->
       atom.workspace.open('sample.coffee')
 
     runs ->
-      atom.workspace.getActiveEditor().setText """
+      atom.workspace.getActiveTextEditor().setText """
         i = /test/; #FIXME
       """
 
@@ -375,7 +375,7 @@ describe "Workspace", ->
   describe "document.title", ->
     describe "when the project has no path", ->
       it "sets the title to 'untitled'", ->
-        atom.project.setPath(undefined)
+        atom.project.setPaths([])
         expect(document.title).toBe 'untitled - Atom'
 
     describe "when the project has a path", ->
@@ -458,46 +458,98 @@ describe "Workspace", ->
       expect(atom.setDocumentEdited).toHaveBeenCalledWith(false)
 
   describe "adding panels", ->
-    class TestPanel
-      constructior: ->
+    class TestItem
+
+    class TestItemElement extends HTMLElement
+      constructor: ->
+      initialize: (@model) -> this
+      getModel: -> @model
+
+    beforeEach ->
+      atom.views.addViewProvider TestItem, (model) ->
+        new TestItemElement().initialize(model)
 
     describe '::addLeftPanel(model)', ->
       it 'adds a panel to the correct panel container', ->
+        expect(atom.workspace.getLeftPanels().length).toBe(0)
         atom.workspace.panelContainers.left.onDidAddPanel addPanelSpy = jasmine.createSpy()
-        panel = atom.workspace.addLeftPanel(item: new TestPanel())
+
+        model = new TestItem
+        panel = atom.workspace.addLeftPanel(item: model)
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
 
+        itemView = atom.views.getView(atom.workspace.getLeftPanels()[0].getItem())
+        expect(itemView instanceof TestItemElement).toBe(true)
+        expect(itemView.getModel()).toBe(model)
+
     describe '::addRightPanel(model)', ->
       it 'adds a panel to the correct panel container', ->
+        expect(atom.workspace.getRightPanels().length).toBe(0)
         atom.workspace.panelContainers.right.onDidAddPanel addPanelSpy = jasmine.createSpy()
-        panel = atom.workspace.addRightPanel(item: new TestPanel())
+
+        model = new TestItem
+        panel = atom.workspace.addRightPanel(item: model)
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
 
+        itemView = atom.views.getView(atom.workspace.getRightPanels()[0].getItem())
+        expect(itemView instanceof TestItemElement).toBe(true)
+        expect(itemView.getModel()).toBe(model)
+
     describe '::addTopPanel(model)', ->
       it 'adds a panel to the correct panel container', ->
+        expect(atom.workspace.getTopPanels().length).toBe(0)
         atom.workspace.panelContainers.top.onDidAddPanel addPanelSpy = jasmine.createSpy()
-        panel = atom.workspace.addTopPanel(item: new TestPanel())
+
+        model = new TestItem
+        panel = atom.workspace.addTopPanel(item: model)
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
 
+        itemView = atom.views.getView(atom.workspace.getTopPanels()[0].getItem())
+        expect(itemView instanceof TestItemElement).toBe(true)
+        expect(itemView.getModel()).toBe(model)
+
     describe '::addBottomPanel(model)', ->
       it 'adds a panel to the correct panel container', ->
+        expect(atom.workspace.getBottomPanels().length).toBe(0)
         atom.workspace.panelContainers.bottom.onDidAddPanel addPanelSpy = jasmine.createSpy()
-        panel = atom.workspace.addBottomPanel(item: new TestPanel())
+
+        model = new TestItem
+        panel = atom.workspace.addBottomPanel(item: model)
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
 
+        itemView = atom.views.getView(atom.workspace.getBottomPanels()[0].getItem())
+        expect(itemView instanceof TestItemElement).toBe(true)
+        expect(itemView.getModel()).toBe(model)
+
     describe '::addModalPanel(model)', ->
       it 'adds a panel to the correct panel container', ->
+        expect(atom.workspace.getModalPanels().length).toBe(0)
         atom.workspace.panelContainers.modal.onDidAddPanel addPanelSpy = jasmine.createSpy()
-        panel = atom.workspace.addModalPanel(item: new TestPanel())
+
+        model = new TestItem
+        panel = atom.workspace.addModalPanel(item: model)
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
-        expect(panel.getClassName()).toBe 'overlay from-top' # the default
+
+        itemView = atom.views.getView(atom.workspace.getModalPanels()[0].getItem())
+        expect(itemView instanceof TestItemElement).toBe(true)
+        expect(itemView.getModel()).toBe(model)
+
+    describe "::panelForItem(item)", ->
+      it "returns the panel associated with the item", ->
+        item = new TestItem
+        panel = atom.workspace.addLeftPanel(item: item)
+
+        itemWithNoPanel = new TestItem
+
+        expect(atom.workspace.panelForItem(item)).toBe panel
+        expect(atom.workspace.panelForItem(itemWithNoPanel)).toBe null

spec/workspace-view-spec.coffee

@@ -1,8 +1,9 @@
-{$, $$, WorkspaceView, View} = require 'atom'
+{$, $$, View} = require '../src/space-pen-extensions'
 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'
 
@@ -10,6 +11,8 @@ describe "WorkspaceView", ->
   pathToOpen = null
 
   beforeEach ->
+    jasmine.snapshotDeprecations()
+
     atom.project.setPaths([atom.project.resolve('dir')])
     pathToOpen = atom.project.resolve('a')
     atom.workspace = new Workspace
@@ -20,6 +23,9 @@ describe "WorkspaceView", ->
     waitsForPromise ->
       atom.workspace.open(pathToOpen)
 
+  afterEach ->
+    jasmine.restoreDeprecationsSnapshot()
+
   describe "@deserialize()", ->
     viewState = null
 
@@ -289,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'
@@ -33,6 +34,23 @@ class Atom extends Model
     startTime = Date.now()
     atom = @deserialize(@loadState(mode)) ? new this({mode, @version})
     atom.deserializeTimings.atom = Date.now() -  startTime
+
+    workspaceViewDeprecationMessage = """
+      atom.workspaceView is no longer available.
+      In most cases you will not need the view. See the Workspace docs for
+      alternatives: https://atom.io/docs/api/latest/Workspace.
+      If you do need the view, please use `atom.views.getView(atom.workspace)`,
+      which returns an HTMLElement.
+    """
+
+    Object.defineProperty atom, 'workspaceView',
+      get: ->
+        deprecate(workspaceViewDeprecationMessage)
+        atom.__workspaceView
+      set: (newValue) ->
+        deprecate(workspaceViewDeprecationMessage)
+        atom.__workspaceView = newValue
+
     atom
 
   # Deserializes the Atom environment from a state object
@@ -116,6 +134,9 @@ class Atom extends Model
   # Public: A {Clipboard} instance
   clipboard: null
 
+  # A {ServiceHub} instance
+  services: null
+
   # Public: A {ContextMenuManager} instance
   contextMenu: null
 
@@ -125,11 +146,17 @@ class Atom extends Model
   # Public: A {KeymapManager} instance
   keymaps: null
 
+  # Public: A {TooltipManager} instance
+  tooltips: null
+
+  # Experimental: A {NotificationManager} instance
+  notifications: null
+
   # Public: A {Project} instance
   project: null
 
-  # Public: A {Syntax} instance
-  syntax: null
+  # Public: A {GrammarRegistry} instance
+  grammars: null
 
   # Public: A {PackageManager} instance
   packages: null
@@ -137,6 +164,9 @@ class Atom extends Model
   # Public: A {ThemeManager} instance
   themes: null
 
+  # Public: A {StyleManager} instance
+  styles: null
+
   # Public: A {DeserializerManager} instance
   deserializers: null
 
@@ -146,9 +176,6 @@ class Atom extends Model
   # Public: A {Workspace} instance
   workspace: null
 
-  # Public: A {WorkspaceView} instance
-  workspaceView: null
-
   ###
   Section: Construction and Destruction
   ###
@@ -172,12 +199,29 @@ class Atom extends Model
     unless @inDevMode() or @inSpecMode()
       require('grim').deprecate = ->
 
+    sourceMapCache = {}
+
     window.onerror = =>
-      @openDevTools()
-      @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
       @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
+      eventObject.preventDefault = -> openDevTools = false
+
+      @emitter.emit 'will-throw-error', eventObject
+
+      if openDevTools
+        @openDevTools()
+        @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
+
       @emit 'uncaught-error', arguments...
-      @emitter.emit 'did-throw-error', arguments...
+      @emitter.emit 'did-throw-error', {message, url, line, column, originalError}
 
     @unsubscribe()
     @setBodyPlatformClass()
@@ -188,9 +232,12 @@ class Atom extends Model
     KeymapManager = require './keymap-extensions'
     ViewRegistry = require './view-registry'
     CommandRegistry = require './command-registry'
+    TooltipManager = require './tooltip-manager'
+    NotificationManager = require './notification-manager'
     PackageManager = require './package-manager'
     Clipboard = require './clipboard'
-    Syntax = require './syntax'
+    ServiceHub = require './service-hub'
+    GrammarRegistry = require './grammar-registry'
     ThemeManager = require './theme-manager'
     StyleManager = require './style-manager'
     ContextMenuManager = require './context-menu-manager'
@@ -213,6 +260,9 @@ class Atom extends Model
     @config = new Config({configDirPath, resourcePath})
     @keymaps = new KeymapManager({configDirPath, resourcePath})
     @keymap = @keymaps # Deprecated
+    @keymaps.subscribeToFileReadFailure()
+    @tooltips = new TooltipManager
+    @notifications = new NotificationManager
     @commands = new CommandRegistry
     @views = new ViewRegistry
     @packages = new PackageManager({devMode, configDirPath, resourcePath, safeMode})
@@ -222,8 +272,13 @@ class Atom extends Model
     @contextMenu = new ContextMenuManager({resourcePath, devMode})
     @menu = new MenuManager({resourcePath})
     @clipboard = new Clipboard()
+    @services = new ServiceHub
 
-    @syntax = @deserializers.deserialize(@state.syntax) ? new Syntax()
+    @grammars = @deserializers.deserialize(@state.grammars ? @state.syntax) ? new GrammarRegistry()
+
+    Object.defineProperty this, 'syntax', get: ->
+      deprecate "The atom.syntax global is deprecated. Use atom.grammars instead."
+      @grammars
 
     @subscribe @packages.onDidActivateAll => @watchThemes()
 
@@ -248,10 +303,31 @@ class Atom extends Model
   onDidBeep: (callback) ->
     @emitter.on 'did-beep', callback
 
+  # Extended: Invoke the given callback when there is an unhandled error, but
+  # before the devtools pop open
+  #
+  # * `callback` {Function} to be called whenever there is an unhandled error
+  #   * `event` {Object}
+  #     * `originalError` {Object} the original error object
+  #     * `message` {String} the original error object
+  #     * `url` {String} Url to the file where the error originated.
+  #     * `line` {Number}
+  #     * `column` {Number}
+  #     * `preventDefault` {Function} call this to avoid popping up the dev tools.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  onWillThrowError: (callback) ->
+    @emitter.on 'will-throw-error', callback
+
   # Extended: Invoke the given callback whenever there is an unhandled error.
   #
   # * `callback` {Function} to be called whenever there is an unhandled error
-  #   * `errorMessage` {String}
+  #   * `event` {Object}
+  #     * `originalError` {Object} the original error object
+  #     * `message` {String} the original error object
+  #     * `url` {String} Url to the file where the error originated.
+  #     * `line` {Number}
+  #     * `column` {Number}
   #
   # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
   onDidThrowError: (callback) ->
@@ -513,9 +589,9 @@ class Atom extends Model
     @displayWindow({maximize})
 
   unloadEditorWindow: ->
-    return if not @project and not @workspaceView
+    return if not @project
 
-    @state.syntax = @syntax.serialize()
+    @state.grammars = @grammars.serialize()
     @state.project = @project.serialize()
     @state.workspace = @workspace.serialize()
     @packages.deactivatePackages()
@@ -524,10 +600,10 @@ class Atom extends Model
     @windowState = null
 
   removeEditorWindow: ->
-    return if not @project and not @workspaceView
+    return if not @project
 
-    @workspaceView?.remove()
-    @workspaceView = null
+    @workspace?.destroy()
+    @workspace = null
     @project?.destroy()
     @project = null
 
@@ -540,7 +616,7 @@ class Atom extends Model
   # Essential: Visually and audibly trigger a beep.
   beep: ->
     shell.beep() if @config.get('core.audioBeep')
-    @workspaceView.trigger 'beep'
+    @__workspaceView?.trigger 'beep'
     @emitter.emit 'did-beep'
 
   # Essential: A flexible way to open a dialog akin to an alert dialog.
@@ -616,11 +692,13 @@ class Atom extends Model
 
     startTime = Date.now()
     @workspace = Workspace.deserialize(@state.workspace) ? new Workspace
-    @workspaceView = @views.getView(@workspace).__spacePenView
+
+    workspaceElement = @views.getView(@workspace)
+    @__workspaceView = workspaceElement.__spacePenView
     @deserializeTimings.workspace = Date.now() - startTime
 
-    @keymaps.defaultTarget = @workspaceView[0]
-    $(@workspaceViewParentSelector).append(@workspaceView)
+    @keymaps.defaultTarget = workspaceElement
+    document.querySelector(@workspaceViewParentSelector).appendChild(workspaceElement)
 
   deserializePackageStates: ->
     @packages.packageStates = @state.packageStates ? {}
@@ -717,6 +795,12 @@ class Atom extends Model
       else
         window[key] = value
 
+  onUpdateAvailable: (callback) ->
+    @emitter.on 'update-available', callback
+
+  updateAvailable: (details) ->
+    @emitter.emit 'update-available', details
+
   # Deprecated: Callers should be converted to use atom.deserializers
   registerRepresentationClass: ->
     deprecate("Callers should be converted to use atom.deserializers")

src/browser/atom-application.coffee

@@ -238,6 +238,11 @@ class AtomApplication
       win = BrowserWindow.fromWebContents(event.sender)
       win[method](args...)
 
+    clipboard = null
+    ipc.on 'write-text-to-selection-clipboard', (event, selectedText) ->
+      clipboard ?= require 'clipboard'
+      clipboard.writeText(selectedText, 'selection')
+
   # Public: Executes the given command.
   #
   # If it isn't handled globally, delegate to the currently focused window.

src/browser/atom-window.coffee

@@ -58,7 +58,7 @@ class AtomWindow
     @browserWindow.loadUrl @getUrl(loadSettings)
     @browserWindow.focusOnWebView() if @isSpec
 
-    @openPath(pathToOpen, initialLine, initialColumn)
+    @openPath(pathToOpen, initialLine, initialColumn) unless @isSpecWindow()
 
   getUrl: (loadSettingsObj) ->
     # Ignore the windowState when passing loadSettings via URL, since it could
@@ -143,10 +143,13 @@ class AtomWindow
   openPath: (pathToOpen, initialLine, initialColumn) ->
     if @loaded
       @focus()
-      @sendCommand('window:open-path', {pathToOpen, initialLine, initialColumn})
+      @sendMessage 'open-path', {pathToOpen, initialLine, initialColumn}
     else
       @browserWindow.once 'window:loaded', => @openPath(pathToOpen, initialLine, initialColumn)
 
+  sendMessage: (message, detail) ->
+    @browserWindow.webContents.send 'message', message, detail
+
   sendCommand: (command, args...) ->
     if @isSpecWindow()
       unless global.atomApplication.sendCommandToFirstResponder(command)
@@ -154,7 +157,6 @@ class AtomWindow
           when 'window:reload' then @reload()
           when 'window:toggle-dev-tools' then @toggleDevTools()
           when 'window:close' then @close()
-          when 'window:update-available' then @sendCommandToBrowserWindow(command, args...) # For spec testing
     else if @isWebViewFocused()
       @sendCommandToBrowserWindow(command, args...)
     else

src/browser/auto-update-manager.coffee

@@ -7,6 +7,7 @@ CheckingState = 'checking'
 DownladingState = 'downloading'
 UpdateAvailableState = 'update-available'
 NoUpdateAvailableState = 'no-update-available'
+UnsupportedState = 'unsupported'
 ErrorState = 'error'
 
 module.exports =
@@ -15,7 +16,12 @@ class AutoUpdateManager
 
   constructor: (@version) ->
     @state = IdleState
-    @feedUrl = "https://atom.io/api/updates?version=#{@version}"
+    if process.platform is 'win32'
+      # Squirrel for Windows can't handle query params
+      # https://github.com/Squirrel/Squirrel.Windows/issues/132
+      @feedUrl = 'https://atom.io/api/updates'
+    else
+      @feedUrl = "https://atom.io/api/updates?version=#{@version}"
 
     process.nextTick => @setupAutoUpdater()
 
@@ -48,10 +54,16 @@ class AutoUpdateManager
     unless /\w{7}/.test(@version)
       @check(hidePopups: true)
 
+    switch process.platform
+      when 'win32'
+        @setState(UnsupportedState) unless autoUpdater.supportsUpdates()
+      when 'linux'
+        @setState(UnsupportedState)
+
   emitUpdateAvailableEvent: (windows...) ->
     return unless @releaseVersion? and @releaseNotes
     for atomWindow in windows
-      atomWindow.sendCommand('window:update-available', [@releaseVersion, @releaseNotes])
+      atomWindow.sendMessage('update-available', {@releaseVersion, @releaseNotes})
 
   setState: (state) ->
     return if @state is state

src/browser/auto-updater-win32.coffee

@@ -1,6 +1,5 @@
 {EventEmitter} = require 'events'
 _ = require 'underscore-plus'
-shellAutoUpdater = require 'auto-updater'
 SquirrelUpdate = require './squirrel-update'
 
 class AutoUpdater
@@ -9,15 +8,10 @@ class AutoUpdater
   setFeedUrl: (@updateUrl) ->
 
   quitAndInstall: ->
-    unless SquirrelUpdate.existsSync()
-      shellAutoUpdater.quitAndInstall()
-      return
-
-    @installUpdate (error) ->
-      return if error?
-
-      SquirrelUpdate.spawn ['--processStart', 'atom.exe'], ->
-        shellAutoUpdater.quitAndInstall()
+    if SquirrelUpdate.existsSync()
+      SquirrelUpdate.restartAtom()
+    else
+      require('auto-updater').quitAndInstall()
 
   downloadUpdate: (callback) ->
     SquirrelUpdate.spawn ['--download', @updateUrl], (error, stdout) ->
@@ -36,6 +30,9 @@ class AutoUpdater
   installUpdate: (callback) ->
     SquirrelUpdate.spawn(['--update', @updateUrl], callback)
 
+  supportsUpdates: ->
+    SquirrelUpdate.existsSync()
+
   checkForUpdates: ->
     throw new Error('Update URL is not set') unless @updateUrl
 
@@ -47,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
 
@@ -57,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/context-menu.coffee

@@ -8,7 +8,7 @@ class ContextMenu
     menu.popup(@atomWindow.browserWindow)
 
   # It's necessary to build the event handlers in this process, otherwise
-  # closures are drug across processes and failed to be garbage collected
+  # closures are dragged across processes and failed to be garbage collected
   # appropriately.
   createClickHandlers: (template) ->
     for item in template

src/browser/main.coffee

@@ -13,6 +13,16 @@ process.on 'uncaughtException', (error={}) ->
   nslog(error.message) if error.message?
   nslog(error.stack) if error.stack?
 
+# Patch fs.statSyncNoException/fs.lstatSyncNoException to fail for non-strings
+# https://github.com/atom/atom-shell/issues/843
+{lstatSyncNoException, statSyncNoException} = fs
+fs.statSyncNoException = (pathToStat) ->
+  return false unless pathToStat and typeof pathToStat is 'string'
+  statSyncNoException(pathToStat)
+fs.lstatSyncNoException = (pathToStat) ->
+  return false unless pathToStat and typeof pathToStat is 'string'
+  lstatSyncNoException(pathToStat)
+
 start = ->
   if process.platform is 'win32'
     SquirrelUpdate = require './squirrel-update'

src/browser/squirrel-update.coffee

@@ -1,41 +1,204 @@
 app = require 'app'
 ChildProcess = require 'child_process'
-fs = require 'fs'
+fs = require 'fs-plus'
 path = require 'path'
 
-updateDotExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe')
+appFolder = path.resolve(process.execPath, '..')
+rootAtomFolder = path.resolve(appFolder, '..')
+binFolder = path.join(rootAtomFolder, 'bin')
+updateDotExe = path.join(rootAtomFolder, 'Update.exe')
 exeName = path.basename(process.execPath)
 
+if process.env.SystemRoot
+  system32Path = path.join(process.env.SystemRoot, 'System32')
+  regPath = path.join(system32Path, 'reg.exe')
+  setxPath = path.join(system32Path, 'setx.exe')
+else
+  regPath = 'reg.exe'
+  setxPath = 'setx.exe'
+
+# Registry keys used for context menu
+fileKeyPath = 'HKCU\\Software\\Classes\\*\\shell\\Atom'
+directoryKeyPath = 'HKCU\\Software\\Classes\\directory\\shell\\Atom'
+backgroundKeyPath = 'HKCU\\Software\\Classes\\directory\\background\\shell\\Atom'
+environmentKeyPath = 'HKCU\\Environment'
+
+# Spawn a command and invoke the callback when it completes with an error
+# and the output from standard out.
+spawn = (command, args, callback) ->
+  spawnedProcess = ChildProcess.spawn(command, args)
+
+  stdout = ''
+  spawnedProcess.stdout.on 'data', (data) -> stdout += data
+
+  error = null
+  spawnedProcess.on 'error', (processError) -> error ?= processError
+  spawnedProcess.on 'close', (code, signal) ->
+    error ?= new Error("Command failed: #{signal ? code}") if code isnt 0
+    error?.code ?= code
+    error?.stdout ?= stdout
+    callback?(error, stdout)
+
+# Spawn reg.exe and callback when it completes
+spawnReg = (args, callback) ->
+  spawn(regPath, args, callback)
+
+# Spawn setx.exe and callback when it completes
+spawnSetx = (args, callback) ->
+  spawn(setxPath, args, callback)
+
 # Spawn the Update.exe with the given arguments and invoke the callback when
 # the command completes.
-exports.spawn = (args, callback) ->
-  updateProcess = ChildProcess.spawn(updateDotExe, args)
+spawnUpdate = (args, callback) ->
+  spawn(updateDotExe, args, callback)
 
-  stdout = ''
-  updateProcess.stdout.on 'data', (data) -> stdout += data
+# Install the Open with Atom explorer context menu items via the registry.
+installContextMenu = (callback) ->
+  addToRegistry = (args, callback) ->
+    args.unshift('add')
+    args.push('/f')
+    spawnReg(args, callback)
 
-  error = null
-  updateProcess.on 'error', (processError) -> error ?= processError
-  updateProcess.on 'close', (code, signal) ->
-    error ?= new Error("Command failed: #{signal}") if code isnt 0
-    error?.code ?= code
-    error?.stdout ?= stdout
-    callback(error, stdout)
+  installMenu = (keyPath, arg, callback) ->
+    args = [keyPath, '/ve', '/d', 'Open with Atom']
+    addToRegistry args, ->
+      args = [keyPath, '/v', 'Icon', '/d', process.execPath]
+      addToRegistry args, ->
+        args = ["#{keyPath}\\command", '/ve', '/d', "#{process.execPath} \"#{arg}\""]
+        addToRegistry(args, callback)
 
-  undefined
+  installMenu fileKeyPath, '%1', ->
+    installMenu directoryKeyPath, '%1', ->
+      installMenu(backgroundKeyPath, '%V', callback)
+
+# Get the user's PATH environment variable registry value.
+getPath = (callback) ->
+  spawnReg ['query', environmentKeyPath, '/v', 'Path'], (error, stdout) ->
+    if error?
+      if error.code is 1
+        # The query failed so the Path does not exist yet in the registry
+        return callback(null, '')
+      else
+        return callback(error)
+
+    # Registry query output is in the form:
+    #
+    # HKEY_CURRENT_USER\Environment
+    #     Path    REG_SZ    C:\a\folder\on\the\path;C\another\folder
+    #
+
+    lines = stdout.split(/[\r\n]+/).filter (line) -> line
+    segments = lines[lines.length - 1]?.split('    ')
+    if segments[1] is 'Path' and segments.length >= 3
+      pathEnv = segments?[3..].join('    ')
+      callback(null, pathEnv)
+    else
+      callback(new Error('Registry query for PATH failed'))
+
+# Uninstall the Open with Atom explorer context menu items via the registry.
+uninstallContextMenu = (callback) ->
+  deleteFromRegistry = (keyPath, callback) ->
+    spawnReg(['delete', keyPath, '/f'], callback)
+
+  deleteFromRegistry fileKeyPath, ->
+    deleteFromRegistry directoryKeyPath, ->
+      deleteFromRegistry(backgroundKeyPath, callback)
+
+# Add atom and apm to the PATH
+#
+# This is done by adding .cmd shims to the root bin folder in the Atom
+# install directory that point to the newly installed versions inside
+# the versioned app directories.
+addCommandsToPath = (callback) ->
+  installCommands = (callback) ->
+    atomCommandPath = path.join(binFolder, 'atom.cmd')
+    relativeAtomPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'atom.cmd'))
+    atomCommand = "@echo off\r\n\"%~dp0\\#{relativeAtomPath}\" %*"
+
+    atomShCommandPath = path.join(binFolder, 'atom')
+    relativeAtomShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'atom.sh'))
+    atomShCommand = "#!/bin/sh\r\n\"$0/../#{relativeAtomShPath.replace(/\\/g, '/')}\" \"$@\""
+
+    apmCommandPath = path.join(binFolder, 'apm.cmd')
+    relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'app', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm.cmd'))
+    apmCommand = "@echo off\r\n\"%~dp0\\#{relativeApmPath}\" %*"
+
+    apmShCommandPath = path.join(binFolder, 'apm')
+    relativeApmShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'apm.sh'))
+    apmShCommand = "#!/bin/sh\r\n\"$0/../#{relativeApmShPath.replace(/\\/g, '/')}\" \"$@\""
+
+    fs.writeFile atomCommandPath, atomCommand, ->
+      fs.writeFile atomShCommandPath, atomShCommand, ->
+        fs.writeFile apmCommandPath, apmCommand, ->
+          fs.writeFile apmShCommandPath, apmShCommand, ->
+            callback()
+
+  addBinToPath = (pathSegments, callback) ->
+    pathSegments.push(binFolder)
+    newPathEnv = pathSegments.join(';')
+    spawnSetx(['Path', newPathEnv], callback)
+
+  installCommands (error) ->
+    return callback(error) if error?
+
+    getPath (error, pathEnv) ->
+      return callback(error) if error?
+
+      pathSegments = pathEnv.split(/;+/).filter (pathSegment) -> pathSegment
+      if pathSegments.indexOf(binFolder) is -1
+        addBinToPath(pathSegments, callback)
+      else
+        callback()
+
+# Remove atom and apm from the PATH
+removeCommandsFromPath = (callback) ->
+  getPath (error, pathEnv) ->
+    return callback(error) if error?
+
+    pathSegments = pathEnv.split(/;+/).filter (pathSegment) ->
+      pathSegment and pathSegment isnt binFolder
+    newPathEnv = pathSegments.join(';')
+
+    if pathEnv isnt newPathEnv
+      spawnSetx(['Path', newPathEnv], callback)
+    else
+      callback()
+
+# Create a desktop and start menu shortcut by using the command line API
+# provided by Squirrel's Update.exe
+createShortcut = (callback) ->
+  spawnUpdate(['--createShortcut', exeName], callback)
+
+# Remove the desktop and start menu shortcuts by using the command line API
+# provided by Squirrel's Update.exe
+removeShortcut = (callback) ->
+  spawnUpdate(['--removeShortcut', exeName], callback)
+
+exports.spawn = spawnUpdate
 
 # Is the Update.exe installed with Atom?
 exports.existsSync = ->
   fs.existsSync(updateDotExe)
 
+# Restart Atom using the version pointed to by the atom.cmd shim
+exports.restartAtom = ->
+  app.once 'will-quit', -> spawn(path.join(binFolder, 'atom.cmd'))
+  app.quit()
+
 # Handle squirrel events denoted by --squirrel-* command line arguments.
 exports.handleStartupEvent = ->
   switch process.argv[1]
     when '--squirrel-install', '--squirrel-updated'
-      exports.spawn ['--createShortcut', exeName], -> app.quit()
+      createShortcut ->
+        installContextMenu ->
+          addCommandsToPath ->
+            app.quit()
       true
     when '--squirrel-uninstall'
-      exports.spawn ['--removeShortcut', exeName], -> app.quit()
+      removeShortcut ->
+        uninstallContextMenu ->
+          removeCommandsFromPath ->
+            app.quit()
       true
     when '--squirrel-obsolete'
       app.quit()

src/buffered-process.coffee

@@ -1,5 +1,6 @@
 _ = require 'underscore-plus'
 ChildProcess = require 'child_process'
+{Emitter} = require 'event-kit'
 
 # Extended: A wrapper which provides standard error/output line buffering for
 # Node's ChildProcess.
@@ -17,6 +18,10 @@ ChildProcess = require 'child_process'
 # ```
 module.exports =
 class BufferedProcess
+  ###
+  Section: Construction
+  ###
+
   # Public: Runs the given command by spawning a new child process.
   #
   # * `options` An {Object} with the following keys:
@@ -39,6 +44,7 @@ class BufferedProcess
   #   * `exit` The callback {Function} which receives a single argument
   #            containing the exit status (optional).
   constructor: ({command, args, options, stdout, stderr, exit}={}) ->
+    @emitter = new Emitter
     options ?= {}
     # Related to joyent/node#2318
     if process.platform is "win32"
@@ -94,6 +100,41 @@ class BufferedProcess
         processExited = true
         triggerExitCallback()
 
+    @process.on 'error', (error) =>
+      handled = false
+      handle = -> handled = true
+
+      @emitter.emit 'will-throw-error', {error, handle}
+
+      if error.code is 'ENOENT' and error.syscall.indexOf('spawn') is 0
+        error = new Error("Failed to spawn command `#{command}`. Make sure `#{command}` is installed and on your PATH", error.path)
+        error.name = 'BufferedProcessError'
+
+      throw error unless handled
+
+  ###
+  Section: Event Subscription
+  ###
+
+  # Public: Will call your callback when an error will be raised by the process.
+  # Usually this is due to the command not being available or not on the PATH.
+  # You can call `handle()` on the object passed to your callback to indicate
+  # that you have handled this error.
+  #
+  # * `callback` {Function} callback
+  #   * `errorObject` {Object}
+  #     * `error` {Object} the error object
+  #     * `handle` {Function} call this to indicate you have handled the error.
+  #       The error will not be thrown if this function is called.
+  #
+  # Returns a {Disposable}
+  onWillThrowError: (callback) ->
+    @emitter.on 'will-throw-error', callback
+
+  ###
+  Section: Helper Methods
+  ###
+
   # Helper method to pass data line by line.
   #
   # * `stream` The Stream to read from.

src/command-registry.coffee

@@ -54,9 +54,10 @@ class CommandRegistry
   #
   # ## Arguments: Registering One Command
   #
-  # * `selector` A {String} containing a CSS selector matching elements on which
-  #   you want to handle the commands. The `,` combinator is not currently
-  #   supported.
+  # * `target` A {String} containing a CSS selector or a DOM element. If you
+  #   pass a selector, the command will be globally associated with all matching
+  #   elements. The `,` combinator is not currently supported. If you pass a
+  #   DOM element, the command will be associated with just that element.
   # * `commandName` A {String} containing the name of a command you want to
   #   handle such as `user:insert-date`.
   # * `callback` A {Function} to call when the given command is invoked on an
@@ -67,9 +68,11 @@ class CommandRegistry
   #
   # ## Arguments: Registering Multiple Commands
   #
-  # * `selector` A {String} containing a CSS selector matching elements on which
-  #   you want to handle the commands. The `,` combinator is not currently
-  #   supported.
+  # * `target` A {String} containing a CSS selector or a DOM element. If you
+  #   pass a selector, the commands will be globally associated with all
+  #   matching elements. The `,` combinator is not currently supported.
+  #   If you pass a DOM element, the command will be associated with just that
+  #   element.
   # * `commands` An {Object} mapping command names like `user:insert-date` to
   #   listener {Function}s.
   #

src/config-schema.coffee

@@ -119,9 +119,6 @@ module.exports =
       autoIndentOnPaste:
         type: 'boolean'
         default: true
-      normalizeIndentOnPaste:
-        type: 'boolean'
-        default: true
       nonWordCharacters:
         type: 'string'
         default: "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-"
@@ -152,7 +149,7 @@ module.exports =
         default: false
       undoGroupingInterval:
         type: 'integer'
-        default: 500
+        default: 300
         minimum: 0
         description: 'Time interval in milliseconds within which operations will be grouped together in the undo history'
       useHardwareAcceleration:

src/config.coffee

@@ -6,7 +6,7 @@ CSON = require 'season'
 path = require 'path'
 async = require 'async'
 pathWatcher = require 'pathwatcher'
-{deprecate} = require 'grim'
+Grim = require 'grim'
 
 ScopedPropertyStore = require 'scoped-property-store'
 ScopeDescriptor = require './scope-descriptor'
@@ -362,7 +362,7 @@ class Config
 
       message = ""
       message = "`callNow` was set to false. Use ::onDidChange instead. Note that ::onDidChange calls back with different arguments." if options.callNow == false
-      deprecate "Config::observe no longer supports options; see https://atom.io/docs/api/latest/Config. #{message}"
+      Grim.deprecate "Config::observe no longer supports options; see https://atom.io/docs/api/latest/Config. #{message}"
     else
       console.error 'An unsupported form of Config::observe is being used. See https://atom.io/docs/api/latest/Config for details'
       return
@@ -526,6 +526,9 @@ class Config
 
   # Extended: Restore the global setting at `keyPath` to its default value.
   #
+  # * `scopeSelector` (optional) {String}. eg. '.source.ruby'
+  #   See [the scopes docs](https://atom.io/docs/latest/advanced/scopes-and-scope-descriptors)
+  #   for more information.
   # * `keyPath` The {String} name of the key.
   #
   # Returns the new value.
@@ -601,18 +604,11 @@ class Config
       schema = schema.properties[key]
     schema
 
-  # Extended: Returns a new {Object} containing all of the global settings and
+  # Deprecated: Returns a new {Object} containing all of the global settings and
   # defaults. Returns the scoped settings when a `scopeSelector` is specified.
-  #
-  # * `scopeSelector` (optional) {String}. eg. '.source.ruby'
-  getSettings: (scopeSelector) ->
-    settings = _.deepExtend(@settings, @defaultSettings)
-
-    if scopeSelector?
-      scopedSettings = @scopedSettingsStore.propertiesForSelector(scopeSelector)
-      settings = _.deepExtend(scopedSettings, settings)
-
-    settings
+  getSettings: ->
+    Grim.deprecate "Use ::get(keyPath) instead"
+    _.deepExtend({}, @settings, @defaultSettings)
 
   # Extended: Get the {String} path to the config file being used.
   getUserConfigPath: ->
@@ -623,25 +619,25 @@ class Config
   ###
 
   getInt: (keyPath) ->
-    deprecate '''Config::getInt is no longer necessary. Use ::get instead.
+    Grim.deprecate '''Config::getInt is no longer necessary. Use ::get instead.
     Make sure the config option you are accessing has specified an `integer`
     schema. See the schema section of
     https://atom.io/docs/api/latest/Config for more info.'''
     parseInt(@get(keyPath))
 
   getPositiveInt: (keyPath, defaultValue=0) ->
-    deprecate '''Config::getPositiveInt is no longer necessary. Use ::get instead.
+    Grim.deprecate '''Config::getPositiveInt is no longer necessary. Use ::get instead.
     Make sure the config option you are accessing has specified an `integer`
     schema with `minimum: 1`. See the schema section of
     https://atom.io/docs/api/latest/Config for more info.'''
     Math.max(@getInt(keyPath), 0) or defaultValue
 
   toggle: (keyPath) ->
-    deprecate 'Config::toggle is no longer supported. Please remove from your code.'
+    Grim.deprecate 'Config::toggle is no longer supported. Please remove from your code.'
     @set(keyPath, !@get(keyPath))
 
   unobserve: (keyPath) ->
-    deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.'
+    Grim.deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.'
 
   ###
   Section: Internal methods used by core
@@ -721,21 +717,26 @@ class Config
       @configFileHasErrors = false
     catch error
       @configFileHasErrors = true
-      console.error "Failed to load user config '#{@configFilePath}'", error.message
-      console.error error.stack
+      @notifyFailure('Failed to load config.cson', error)
 
   observeUserConfig: ->
     try
       @watchSubscription ?= pathWatcher.watch @configFilePath, (eventType) =>
         @loadUserConfig() if eventType is 'change' and @watchSubscription?
     catch error
-      console.error "Failed to watch user config '#{@configFilePath}'", error.message
-      console.error error.stack
+      @notifyFailure('Failed to watch user config', error)
 
   unobserveUserConfig: ->
     @watchSubscription?.close()
     @watchSubscription = null
 
+  notifyFailure: (errorMessage, error) ->
+    message = "#{errorMessage}"
+    detail = error.stack
+    atom.notifications.addError(message, {detail, dismissable: true})
+    console.error message
+    console.error detail
+
   save: ->
     allSettings = global: @settings
     allSettings = _.extend allSettings, @scopedSettingsStore.propertiesForSource('user-config')

src/cursor.coffee

@@ -45,7 +45,7 @@ class Cursor extends Model
         cursor: this
 
       @emit 'moved', movedEvent
-      @emitter.emit 'did-change-position'
+      @emitter.emit 'did-change-position', movedEvent
       @editor.cursorMoved(movedEvent)
     @marker.onDidDestroy =>
       @destroyed = true
@@ -476,7 +476,7 @@ class Cursor extends Model
     endOfWordPosition or currentBufferPosition
 
   getMoveNextWordBoundaryBufferPosition: (options) ->
-    deprecate 'Use `::getNextWordBoundaryBufferPosition(options)` instead'
+    Grim.deprecate 'Use `::getNextWordBoundaryBufferPosition(options)` instead'
     @getNextWordBoundaryBufferPosition(options)
 
   # Public: Retrieves the buffer position of where the current word starts.
@@ -665,7 +665,7 @@ class Cursor extends Model
   autoscroll: (options) ->
     @editor.scrollToScreenRange(@getScreenRange(), options)
 
-  getBeginningOfNextParagraphBufferPosition: (editor) ->
+  getBeginningOfNextParagraphBufferPosition: ->
     start = @getBufferPosition()
     eof = @editor.getEofBufferPosition()
     scanRange = [start, eof]
@@ -679,8 +679,8 @@ class Cursor extends Model
         stop()
     @editor.screenPositionForBufferPosition(position)
 
-  getBeginningOfPreviousParagraphBufferPosition: (editor) ->
-    start = @editor.getCursorBufferPosition()
+  getBeginningOfPreviousParagraphBufferPosition: ->
+    start = @getBufferPosition()
 
     {row, column} = start
     scanRange = [[row-1, column], [0,0]]

src/display-buffer.coffee

@@ -883,12 +883,29 @@ class DisplayBuffer extends Model
   decorationForId: (id) ->
     @decorationsById[id]
 
-  getDecorations: ->
+  getDecorations: (propertyFilter) ->
     allDecorations = []
     for markerId, decorations of @decorationsByMarkerId
       allDecorations = allDecorations.concat(decorations) if decorations?
+    if propertyFilter?
+      allDecorations = allDecorations.filter (decoration) ->
+        for key, value of propertyFilter
+          return false unless decoration.properties[key] is value
+        true
     allDecorations
 
+  getLineDecorations: (propertyFilter) ->
+    @getDecorations(propertyFilter).filter (decoration) -> decoration.isType('line')
+
+  getGutterDecorations: (propertyFilter) ->
+    @getDecorations(propertyFilter).filter (decoration) -> decoration.isType('gutter')
+
+  getHighlightDecorations: (propertyFilter) ->
+    @getDecorations(propertyFilter).filter (decoration) -> decoration.isType('highlight')
+
+  getOverlayDecorations: (propertyFilter) ->
+    @getDecorations(propertyFilter).filter (decoration) -> decoration.isType('overlay')
+
   decorationsForScreenRowRange: (startScreenRow, endScreenRow) ->
     decorationsByMarkerId = {}
     for marker in @findMarkers(intersectsScreenRowRange: [startScreenRow, endScreenRow])

src/git-repository.coffee

@@ -1,9 +1,8 @@
 {basename, join} = require 'path'
 
 _ = require 'underscore-plus'
-{Subscriber} = require 'emissary'
 EmitterMixin = require('emissary').Emitter
-{Emitter} = require 'event-kit'
+{Emitter, Disposable, CompositeDisposable} = require 'event-kit'
 fs = require 'fs-plus'
 GitUtils = require 'git-utils'
 {deprecate} = require 'grim'
@@ -45,7 +44,6 @@ Task = require './task'
 module.exports =
 class GitRepository
   EmitterMixin.includeInto(this)
-  Subscriber.includeInto(this)
 
   @exists: (path) ->
     if git = @open(path)
@@ -75,6 +73,8 @@ class GitRepository
 
   constructor: (path, options={}) ->
     @emitter = new Emitter
+    @subscriptions = new CompositeDisposable
+
     @repo = GitUtils.open(path)
     unless @repo?
       throw new Error("No Git repository found searching path: #{path}")
@@ -88,13 +88,15 @@ class GitRepository
 
     refreshOnWindowFocus ?= true
     if refreshOnWindowFocus
-      {$} = require './space-pen-extensions'
-      @subscribe $(window), 'focus', =>
+      onWindowFocus = =>
         @refreshIndex()
         @refreshStatus()
 
+      window.addEventListener 'focus', onWindowFocus
+      @subscriptions.add new Disposable(-> window.removeEventListener 'focus', onWindowFocus)
+
     if @project?
-      @subscribe @project.eachBuffer (buffer) => @subscribeToBuffer(buffer)
+      @subscriptions.add @project.eachBuffer (buffer) => @subscribeToBuffer(buffer)
 
   # Public: Destroy this {GitRepository} object.
   #
@@ -109,7 +111,7 @@ class GitRepository
       @repo.release()
       @repo = null
 
-    @unsubscribe()
+    @subscriptions.dispose()
 
   ###
   Section: Event Subscription
@@ -403,10 +405,15 @@ class GitRepository
       if path = buffer.getPath()
         @getPathStatus(path)
 
-    @subscribe buffer.onDidSave(getBufferPathStatus)
-    @subscribe buffer.onDidReload(getBufferPathStatus)
-    @subscribe buffer.onDidChangePath(getBufferPathStatus)
-    @subscribe buffer.onDidDestroy => @unsubscribe(buffer)
+    bufferSubscriptions = new CompositeDisposable
+    bufferSubscriptions.add buffer.onDidSave(getBufferPathStatus)
+    bufferSubscriptions.add buffer.onDidReload(getBufferPathStatus)
+    bufferSubscriptions.add buffer.onDidChangePath(getBufferPathStatus)
+    bufferSubscriptions.add buffer.onDidDestroy =>
+      bufferSubscriptions.dispose()
+      @subscriptions.remove(bufferSubscriptions)
+    @subscriptions.add(bufferSubscriptions)
+    return
 
   # Subscribes to editor view event.
   checkoutHeadForEditor: (editor) ->

src/grammar-registry.coffee

@@ -2,7 +2,8 @@ _ = require 'underscore-plus'
 {deprecate} = require 'grim'
 {specificity} = require 'clear-cut'
 {Subscriber} = require 'emissary'
-{GrammarRegistry, ScopeSelector} = require 'first-mate'
+FirstMate = require 'first-mate'
+{ScopeSelector} = FirstMate
 ScopedPropertyStore = require 'scoped-property-store'
 PropertyAccessors = require 'property-accessors'
 
@@ -11,20 +12,22 @@ Token = require './token'
 
 # Extended: Syntax class holding the grammars used for tokenizing.
 #
-# An instance of this class is always available as the `atom.syntax` global.
+# An instance of this class is always available as the `atom.grammars` global.
 #
 # The Syntax class also contains properties for things such as the
 # language-specific comment regexes. See {::getProperty} for more details.
 module.exports =
-class Syntax extends GrammarRegistry
+class GrammarRegistry extends FirstMate.GrammarRegistry
   PropertyAccessors.includeInto(this)
   Subscriber.includeInto(this)
-  atom.deserializers.add(this)
 
   @deserialize: ({grammarOverridesByPath}) ->
-    syntax = new Syntax()
-    syntax.grammarOverridesByPath = grammarOverridesByPath
-    syntax
+    grammarRegistry = new GrammarRegistry()
+    grammarRegistry.grammarOverridesByPath = grammarOverridesByPath
+    grammarRegistry
+
+  atom.deserializers.add(this)
+  atom.deserializers.add(name: 'Syntax', deserialize: @deserialize) # Support old serialization
 
   constructor: ->
     super(maxTokensPerLine: 100)
@@ -34,6 +37,17 @@ class Syntax extends GrammarRegistry
 
   createToken: (value, scopes) -> new Token({value, scopes})
 
+  # Extended: Select a grammar for the given file path and file contents.
+  #
+  # This picks the best match by checking the file path and contents against
+  # each grammar.
+  #
+  # * `filePath` A {String} file path.
+  # * `fileContents` A {String} of text for the file path.
+  #
+  # Returns a {Grammar}, never null.
+  selectGrammar: (filePath, fileContents) -> super
+
   # Deprecated: Used by settings-view to display snippets for packages
   @::accessor 'propertyStore', ->
     deprecate("Do not use this. Use a public method on Config")

src/keymap-extensions.coffee

@@ -23,6 +23,10 @@ KeymapManager::loadUserKeymap = ->
   if fs.isFileSync(userKeymapPath)
     @loadKeymap(userKeymapPath, watch: true, suppressErrors: true)
 
+KeymapManager::subscribeToFileReadFailure = ->
+  this.onDidFailToReadFile (error) ->
+    atom.notifications.addError('Failed to load keymap.cson', {detail: error.stack, dismissable: true})
+
 # This enables command handlers registered via jQuery to call
 # `.abortKeyBinding()` on the `jQuery.Event` object passed to the handler.
 jQuery.Event::abortKeyBinding = ->

src/language-mode.coffee

@@ -244,14 +244,18 @@ class LanguageMode
   # bufferRow - A {Number} indicating the buffer row
   #
   # Returns a {Number}.
-  suggestedIndentForBufferRow: (bufferRow) ->
+  suggestedIndentForBufferRow: (bufferRow, options) ->
     currentIndentLevel = @editor.indentationForBufferRow(bufferRow)
     scopeDescriptor = @editor.scopeDescriptorForBufferPosition([bufferRow, 0])
     return currentIndentLevel unless increaseIndentRegex = @increaseIndentRegexForScopeDescriptor(scopeDescriptor)
 
     currentLine = @buffer.lineForRow(bufferRow)
-    precedingRow = @buffer.previousNonBlankRow(bufferRow)
-    return 0 unless precedingRow?
+    if options?.skipBlankLines ? true
+      precedingRow = @buffer.previousNonBlankRow(bufferRow)
+      return 0 unless precedingRow?
+    else
+      precedingRow = bufferRow - 1
+      return currentIndentLevel if precedingRow < 0
 
     precedingLine = @buffer.lineForRow(precedingRow)
     desiredIndentLevel = @editor.indentationForBufferRow(precedingRow)
@@ -285,7 +289,7 @@ class LanguageMode
   # bufferRow - The row {Number}.
   # options - An options {Object} to pass through to {TextEditor::setIndentationForBufferRow}.
   autoIndentBufferRow: (bufferRow, options) ->
-    indentLevel = @suggestedIndentForBufferRow(bufferRow)
+    indentLevel = @suggestedIndentForBufferRow(bufferRow, options)
     @editor.setIndentationForBufferRow(bufferRow, indentLevel, options)
 
   # Given a buffer row, this decreases the indentation.

src/notification-manager.coffee

@@ -0,0 +1,50 @@
+{Emitter, Disposable} = require 'event-kit'
+Notification = require '../src/notification'
+
+# Experimental: Allows messaging the user. This will likely change, dont use
+# quite yet!
+module.exports =
+class NotificationManager
+  constructor: ->
+    @notifications = []
+    @emitter = new Emitter
+
+  ###
+  Section: Events
+  ###
+
+  onDidAddNotification: (callback) ->
+    @emitter.on 'did-add-notification', callback
+
+  ###
+  Section: Adding Notifications
+  ###
+
+  addSuccess: (message, options) ->
+    @addNotification(new Notification('success', message, options))
+
+  addInfo: (message, options) ->
+    @addNotification(new Notification('info', message, options))
+
+  addWarning: (message, options) ->
+    @addNotification(new Notification('warning', message, options))
+
+  addError: (message, options) ->
+    @addNotification(new Notification('error', message, options))
+
+  addFatalError: (message, options) ->
+    @addNotification(new Notification('fatal', message, options))
+
+  add: (type, message, options) ->
+    @addNotification(new Notification(type, message, options))
+
+  addNotification: (notification) ->
+    @notifications.push(notification)
+    @emitter.emit('did-add-notification', notification)
+    notification
+
+  ###
+  Section: Getting Notifications
+  ###
+
+  getNotifications: -> @notifications

src/notification.coffee

@@ -0,0 +1,46 @@
+{Emitter} = require 'event-kit'
+
+# Experimental: This will likely change, do not use.
+module.exports =
+class Notification
+  constructor: (@type, @message, @options={}) ->
+    @emitter = new Emitter
+    @timestamp = new Date()
+    @dismissed = true
+    @dismissed = false if @isDismissable()
+
+  onDidDismiss: (callback) ->
+    @emitter.on 'did-dismiss', callback
+
+  getOptions: -> @options
+
+  getType: -> @type
+
+  getMessage: -> @message
+
+  getTimestamp: -> @timestamp
+
+  getDetail: -> @options.detail
+
+  isEqual: (other) ->
+    @getMessage() == other.getMessage() \
+      and @getType() == other.getType() \
+      and @getDetail() == other.getDetail()
+
+  dismiss: ->
+    return unless @isDismissable() and not @isDismissed()
+    @dismissed = true
+    @emitter.emit 'did-dismiss'
+
+  isDismissed: -> @dismissed
+
+  isDismissable: -> !!@options.dismissable
+
+  getIcon: ->
+    return @options.icon if @options.icon?
+    switch @type
+      when 'fatal' then 'bug'
+      when 'error' then 'flame'
+      when 'warning' then 'alert'
+      when 'info' then 'info'
+      when 'success' then 'check'

src/overlay-manager.coffee

@@ -7,9 +7,12 @@ class OverlayManager
     {editor, overlayDecorations, lineHeightInPixels} = props
 
     existingDecorations = null
-    for markerId, {isMarkerReversed, headPixelPosition, decorations} of overlayDecorations
+    for markerId, {headPixelPosition, tailPixelPosition, decorations} of overlayDecorations
       for decoration in decorations
-        @renderOverlay(editor, decoration, headPixelPosition, lineHeightInPixels)
+        pixelPosition =
+          if decoration.position is 'tail' then tailPixelPosition else headPixelPosition
+
+        @renderOverlay(editor, decoration, pixelPosition, lineHeightInPixels)
 
         existingDecorations ?= {}
         existingDecorations[decoration.id] = true

src/package.coffee

@@ -156,7 +156,7 @@ class Package
     catch e
       console.warn "Failed to activate package named '#{@name}'", e.stack
 
-    @activationDeferred.resolve()
+    @activationDeferred?.resolve()
 
   activateConfig: ->
     return if @configActivated
@@ -254,7 +254,7 @@ class Package
     grammarPaths = fs.listSync(grammarsDirPath, ['json', 'cson'])
     for grammarPath in grammarPaths
       try
-        grammar = atom.syntax.readGrammarSync(grammarPath)
+        grammar = atom.grammars.readGrammarSync(grammarPath)
         grammar.packageName = @name
         @grammars.push(grammar)
         grammar.activate()
@@ -268,7 +268,7 @@ class Package
     return Q() if @grammarsLoaded
 
     loadGrammar = (grammarPath, callback) =>
-      atom.syntax.readGrammar grammarPath, (error, grammar) =>
+      atom.grammars.readGrammar grammarPath, (error, grammar) =>
         if error?
           console.warn("Failed to load grammar: #{grammarPath}", error.stack ? error)
         else
@@ -338,7 +338,7 @@ class Package
   reloadStylesheets: ->
     oldSheets = _.clone(@stylesheets)
     @loadStylesheets()
-    @stylesheetDisposables.dispose()
+    @stylesheetDisposables?.dispose()
     @stylesheetDisposables = new CompositeDisposable
     @stylesheetsActivated = false
     @activateStylesheets()
@@ -408,6 +408,16 @@ class Package
           @activationCommands[selector].push(commands...)
 
     if @metadata.activationEvents?
+      deprecate """
+        Use `activationCommands` instead of `activationEvents` in your package.json
+        Commands should be grouped by selector as follows:
+        ```json
+          "activationCommands": {
+            "atom-workspace": ["foo:bar", "foo:baz"],
+            "atom-text-editor": ["foo:quux"]
+          }
+        ```
+      """
       if _.isArray(@metadata.activationEvents)
         for eventName in @metadata.activationEvents
           @activationCommands['atom-workspace'] ?= []

src/pane-axis-element.coffee

@@ -8,7 +8,7 @@ class PaneAxisElement extends HTMLElement
   detachedCallback: ->
     @subscriptions.dispose()
 
-  setModel: (@model) ->
+  initialize: (@model) ->
     @subscriptions.add @model.onDidAddChild(@childAdded.bind(this))
     @subscriptions.add @model.onDidRemoveChild(@childRemoved.bind(this))
     @subscriptions.add @model.onDidReplaceChild(@childReplaced.bind(this))
@@ -20,14 +20,15 @@ class PaneAxisElement extends HTMLElement
         @classList.add('horizontal', 'pane-row')
       when 'vertical'
         @classList.add('vertical', 'pane-column')
+    this
 
   childAdded: ({child, index}) ->
-    view = @model.getView(child)
+    view = atom.views.getView(child)
     @insertBefore(view, @children[index])
     callAttachHooks(view) # for backward compatibility with SpacePen views
 
   childRemoved: ({child}) ->
-    view = @model.getView(child)
+    view = atom.views.getView(child)
     view.remove()
 
   childReplaced:  ({index, oldChild, newChild}) ->

src/pane-axis.coffee

@@ -39,9 +39,6 @@ class PaneAxis extends Model
 
   getOrientation: -> @orientation
 
-  getView: (object) ->
-    @container.getView(object)
-
   getChildren: -> @children.slice()
 
   getPanes: ->

src/pane-container-element.coffee

@@ -11,15 +11,16 @@ class PaneContainerElement extends HTMLElement
     PaneContainerView ?= require './pane-container-view'
     @__spacePenView = new PaneContainerView(this)
 
-  setModel: (@model) ->
+  initialize: (@model) ->
     @subscriptions.add @model.observeRoot(@rootChanged.bind(this))
     @__spacePenView.setModel(@model)
+    this
 
   rootChanged: (root) ->
     focusedElement = document.activeElement if @hasFocus()
     @firstChild?.remove()
     if root?
-      view = @model.getView(root)
+      view = atom.views.getView(root)
       @appendChild(view)
       callAttachHooks(view)
       focusedElement?.focus()
@@ -45,7 +46,7 @@ class PaneContainerElement extends HTMLElement
       y = pointB.y - pointA.y
       Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))
 
-    paneView = @model.getView(@model.getActivePane())
+    paneView = atom.views.getView(@model.getActivePane())
     box = @boundingBoxForPaneView(paneView)
 
     paneViews = _.toArray(@querySelectorAll('atom-pane'))

src/pane-container-view.coffee

@@ -23,7 +23,7 @@ class PaneContainerView extends View
     @subscriptions.add @model.onDidChangeActivePaneItem(@onActivePaneItemChanged)
 
   getRoot: ->
-    view = @model.getView(@model.getRoot())
+    view = atom.views.getView(@model.getRoot())
     view.__spacePenView ? view
 
   onActivePaneItemChanged: (activeItem) =>
@@ -55,7 +55,7 @@ class PaneContainerView extends View
     @getActivePaneView()
 
   getActivePaneView: ->
-    @model.getView(@model.getActivePane()).__spacePenView
+    atom.views.getView(@model.getActivePane()).__spacePenView
 
   getActivePaneItem: ->
     @model.getActivePaneItem()
@@ -64,7 +64,7 @@ class PaneContainerView extends View
     @getActivePaneView()?.activeView
 
   paneForUri: (uri) ->
-    @model.getView(@model.paneForUri(uri)).__spacePenView
+    atom.views.getView(@model.paneForUri(uri)).__spacePenView
 
   focusNextPaneView: ->
     @model.activateNextPane()

src/pane-container.coffee

@@ -9,7 +9,6 @@ PaneAxisElement = require './pane-axis-element'
 PaneAxis = require './pane-axis'
 TextEditor = require './text-editor'
 TextEditorElement = require './text-editor-element'
-ViewRegistry = require './view-registry'
 ItemRegistry = require './item-registry'
 
 module.exports =
@@ -36,7 +35,6 @@ class PaneContainer extends Model
     @subscriptions = new CompositeDisposable
 
     @itemRegistry = new ItemRegistry
-    @viewRegistry = params?.viewRegistry ? new ViewRegistry
     @registerViewProviders()
 
     @setRoot(params?.root ? new Pane)
@@ -58,24 +56,14 @@ class PaneContainer extends Model
     activePaneId: @activePane.id
 
   registerViewProviders: ->
-    @viewRegistry.addViewProvider
-      modelConstructor: PaneContainer
-      viewConstructor: PaneContainerElement
-
-    @viewRegistry.addViewProvider
-      modelConstructor: PaneAxis
-      viewConstructor: PaneAxisElement
-
-    @viewRegistry.addViewProvider
-      modelConstructor: Pane
-      viewConstructor: PaneElement
-
-    @viewRegistry.addViewProvider
-      modelConstructor: TextEditor
-      viewConstructor: TextEditorElement
-
-  getView: (object) ->
-    @viewRegistry.getView(object)
+    atom.views.addViewProvider PaneContainer, (model) ->
+      new PaneContainerElement().initialize(model)
+    atom.views.addViewProvider PaneAxis, (model) ->
+      new PaneAxisElement().initialize(model)
+    atom.views.addViewProvider Pane, (model) ->
+      new PaneElement().initialize(model)
+    atom.views.addViewProvider TextEditor, (model) ->
+      new TextEditorElement().initialize(model)
 
   onDidChangeRoot: (fn) ->
     @emitter.on 'did-change-root', fn
@@ -91,6 +79,9 @@ class PaneContainer extends Model
     fn(pane) for pane in @getPanes()
     @onDidAddPane ({pane}) -> fn(pane)
 
+  onDidDestroyPane: (fn) ->
+    @emitter.on 'did-destroy-pane', fn
+
   onDidChangeActivePane: (fn) ->
     @emitter.on 'did-change-active-pane', fn
 
@@ -112,6 +103,9 @@ class PaneContainer extends Model
     fn(@getActivePaneItem())
     @onDidChangeActivePaneItem(fn)
 
+  onWillDestroyPaneItem: (fn) ->
+    @emitter.on 'will-destroy-pane-item', fn
+
   onDidDestroyPaneItem: (fn) ->
     @emitter.on 'did-destroy-pane-item', fn
 
@@ -193,11 +187,17 @@ class PaneContainer extends Model
   destroyEmptyPanes: ->
     pane.destroy() for pane in @getPanes() when pane.items.length is 0
 
-  paneItemDestroyed: (item) ->
-    @emitter.emit 'did-destroy-pane-item', item
+  willDestroyPaneItem: (event) ->
+    @emitter.emit 'will-destroy-pane-item', event
 
-  didAddPane: (pane) ->
-    @emitter.emit 'did-add-pane', pane
+  didDestroyPaneItem: (event) ->
+    @emitter.emit 'did-destroy-pane-item', event
+
+  didAddPane: (event) ->
+    @emitter.emit 'did-add-pane', event
+
+  didDestroyPane: (event) ->
+    @emitter.emit 'did-destroy-pane', event
 
   # Called by Model superclass when destroyed
   destroyed: ->

src/pane-element.coffee

@@ -43,18 +43,19 @@ class PaneElement extends HTMLElement
   createSpacePenShim: ->
     @__spacePenView = new PaneView(this)
 
-  getModel: -> @model
-
-  setModel: (@model) ->
+  initialize: (@model) ->
     @subscriptions.add @model.onDidActivate(@activated.bind(this))
     @subscriptions.add @model.observeActive(@activeStatusChanged.bind(this))
     @subscriptions.add @model.observeActiveItem(@activeItemChanged.bind(this))
     @subscriptions.add @model.onDidRemoveItem(@itemRemoved.bind(this))
     @subscriptions.add @model.onDidDestroy(@paneDestroyed.bind(this))
     @__spacePenView.setModel(@model)
+    this
+
+  getModel: -> @model
 
   activated: ->
-    @focus() unless @hasFocus()
+    @focus()
 
   activeStatusChanged: (active) ->
     if active
@@ -66,7 +67,7 @@ class PaneElement extends HTMLElement
     return unless item?
 
     hasFocus = @hasFocus()
-    itemView = @model.getView(item)
+    itemView = atom.views.getView(item)
 
     unless @itemViews.contains(itemView)
       @itemViews.appendChild(itemView)
@@ -94,14 +95,14 @@ class PaneElement extends HTMLElement
       itemView.style.display = 'none'
 
   itemRemoved: ({item, index, destroyed}) ->
-    if viewToRemove = @model.getView(item)
-      callRemoveHooks(viewToRemove)
+    if viewToRemove = atom.views.getView(item)
+      callRemoveHooks(viewToRemove) if destroyed
       viewToRemove.remove()
 
   paneDestroyed: ->
     @subscriptions.dispose()
 
-  getActiveView: -> @model.getView(@model.getActiveItem())
+  getActiveView: -> atom.views.getView(@model.getActiveItem())
 
   hasFocus: ->
     this is document.activeElement or @contains(document.activeElement)

src/pane-view.coffee

@@ -153,15 +153,15 @@ class PaneView extends View
   activeItemModifiedChanged: =>
     @trigger 'pane:active-item-modified-status-changed'
 
-  @::accessor 'activeView', -> @model.getView(@activeItem)?.__spacePenView
+  @::accessor 'activeView', -> atom.views.getView(@activeItem)?.__spacePenView
 
-  splitLeft: (items...) -> @model.getView(@model.splitLeft({items})).__spacePenView
+  splitLeft: (items...) -> atom.views.getView(@model.splitLeft({items})).__spacePenView
 
-  splitRight: (items...) -> @model.getView(@model.splitRight({items})).__spacePenView
+  splitRight: (items...) -> atom.views.getView(@model.splitRight({items})).__spacePenView
 
-  splitUp: (items...) -> @model.getView(@model.splitUp({items})).__spacePenView
+  splitUp: (items...) -> atom.views.getView(@model.splitUp({items})).__spacePenView
 
-  splitDown: (items...) -> @model.getView(@model.splitDown({items})).__spacePenView
+  splitDown: (items...) -> atom.views.getView(@model.splitDown({items})).__spacePenView
 
   getContainer: -> @closest('atom-pane-container').view()
 

src/pane.coffee

@@ -53,9 +53,6 @@ class Pane extends Model
     params.activeItem = find params.items, (item) -> item.getUri?() is activeItemUri
     params
 
-  getView: (object) ->
-    @container.getView(object)
-
   getParent: -> @parent
 
   setParent: (@parent) -> @parent
@@ -371,7 +368,7 @@ class Pane extends Model
     @items.splice(index, 1)
     @emit 'item-removed', item, index, destroyed
     @emitter.emit 'did-remove-item', {item, index, destroyed}
-    @container?.paneItemDestroyed(item) if destroyed
+    @container?.didDestroyPaneItem({item, index, pane: this}) if destroyed
     @destroy() if @items.length is 0 and atom.config.get('core.destroyEmptyPanes')
 
   # Public: Move the given item to the given index.
@@ -405,11 +402,14 @@ class Pane extends Model
   # If the item is active, the next item will be activated. If the item is the
   # last item, the pane will be destroyed if the `core.destroyEmptyPanes` config
   # setting is `true`.
+  #
+  # * `item` Item to destroy
   destroyItem: (item) ->
     index = @items.indexOf(item)
     if index isnt -1
       @emit 'before-item-destroyed', item
       @emitter.emit 'will-destroy-item', {item, index}
+      @container?.willDestroyPaneItem({item, index, pane: this})
       if @promptToSaveItem(item)
         @removeItem(item, true)
         item.destroy?()
@@ -536,6 +536,7 @@ class Pane extends Model
     @emitter.emit 'did-destroy'
     @emitter.dispose()
     item.destroy?() for item in @items.slice()
+    @container?.didDestroyPane(pane: this)
 
   ###
   Section: Splitting