WIP: Transfer foreground/background color into shadow DOM

Refs #4086
💄
2014-11-11 16:59:36 -07:00 · 2014-11-11 16:58:38 -07:00
@@ -1 +1 @@
-v0.10.33
+v0.10.21
@@ -1 +0,0 @@
-2.7.6
@@ -87,7 +87,6 @@ For more information on how to work with Atom's official packages, see
    * :white_check_mark: `:white_check_mark:` when adding tests
    * :lock: `:lock:` when dealing with security
    * :arrow_up: `:arrow_up:` when upgrading dependencies
-    * :arrow_down: `:arrow_down:` when downgrading dependencies

 ## CoffeeScript Styleguide

@@ -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 or visit the [Atom forum](https://discuss.atom.io).
+Visit [atom.io](https://atom.io) to learn more.

 Visit [issue #3684](https://github.com/atom/atom/issues/3684) to learn more
 about the Atom 1.0 roadmap.
@@ -17,25 +17,16 @@ Atom will automatically update when a new release is available.

 ### Windows

-Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
+Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).

-Atom will automatically update when a new release is available.
+1. Install [chocolatey](https://chocolatey.org).
+2. Close and reopen your command prompt or PowerShell window.
+3. Run `cinst Atom`
+4. In the future run `cup Atom` to upgrade to the latest release.

-You can also download 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
+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.

 ### Debian Linux (Ubuntu)

@@ -6,6 +6,6 @@
    "url": "https://github.com/atom/atom.git"
  },
  "dependencies": {
-    "atom-package-manager": "0.117.0"
+    "atom-package-manager": "0.111.0"
  }
 }
@@ -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 -0 dirname)"
+    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs dirname)
  fi

  # Exit if Atom can't be found
@@ -1,8 +1,7 @@
 require '../spec/spec-helper'

 path = require 'path'
-{$} = require '../src/space-pen-extensions'
-{Point} = require 'atom'
+{$, Point} = require 'atom'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Project = require '../src/project'
@@ -1,7 +1,5 @@
 require './benchmark-helper'
-{$} = require '../src/space-pen-extensions'
-_ = require 'underscore-plus'
-{WorkspaceView} = require 'atom'
+{$, _, WorkspaceView} = require 'atom'
 TokenizedBuffer = require '../src/tokenized-buffer'

 describe "editorView.", ->
@@ -6,6 +6,7 @@ os = require 'os'
 # modules work under node v0.11.x.
 require 'vm-compatibility-layer'

+fm = require 'json-front-matter'
 _ = require 'underscore-plus'

 packageJson = require '../package.json'
@@ -21,9 +22,9 @@ module.exports = (grunt) ->
  grunt.loadNpmTasks('grunt-contrib-csslint')
  grunt.loadNpmTasks('grunt-contrib-coffee')
  grunt.loadNpmTasks('grunt-contrib-less')
+  grunt.loadNpmTasks('grunt-markdown')
  grunt.loadNpmTasks('grunt-shell')
  grunt.loadNpmTasks('grunt-download-atom-shell')
-  grunt.loadNpmTasks('grunt-atom-shell-installer')
  grunt.loadNpmTasks('grunt-peg')
  grunt.loadTasks('tasks')

@@ -193,19 +194,32 @@ module.exports = (grunt) ->
        'static/**/*.less'
      ]

+    markdown:
+      guides:
+        files: [
+          expand: true
+          cwd: 'docs'
+          src: '**/*.md'
+          dest: 'docs/output/'
+          ext: '.html'
+        ]
+        options:
+          template: 'docs/template.jst'
+          templateContext:
+            tag: "v#{major}.#{minor}"
+          markdownOptions:
+            gfm: true
+          preCompile: (src, context) ->
+            parsed = fm.parse(src)
+            _.extend(context, parsed.attributes)
+            parsed.body
+
    'download-atom-shell':
      version: packageJson.atomShellVersion
      outputDir: 'atom-shell'
      downloadDir: atomShellDownloadDir
      rebuild: true  # rebuild native modules after atom-shell is updated

-    'create-windows-installer':
-      appDirectory: shellAppDir
-      outputDirectory: path.join(buildDir, 'installer')
-      authors: 'GitHub Inc.'
-      loadingGif: path.resolve(__dirname, '..', 'resources', 'win', 'loading.gif')
-      iconUrl: 'https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico'
-
    shell:
      'kill-atom':
        command: killCommand
@@ -223,7 +237,6 @@ module.exports = (grunt) ->
  ciTasks.push('dump-symbols') if process.platform isnt 'win32'
  ciTasks.push('set-version', 'check-licenses', 'lint')
  ciTasks.push('mkdeb') if process.platform is 'linux'
-  ciTasks.push('create-windows-installer') if process.platform is 'win32'
  ciTasks.push('test') if process.platform is 'darwin'
  ciTasks.push('codesign')
  ciTasks.push('publish-build')
@@ -7,12 +7,11 @@
  },
  "dependencies": {
    "async": "~0.2.9",
-    "donna": "1.0.7",
+    "donna": "1.0.6",
    "formidable": "~1.0.14",
    "fs-plus": "2.x",
    "github-releases": "~0.2.0",
    "grunt": "~0.4.1",
-    "grunt-atom-shell-installer": "^0.16.0",
    "grunt-cli": "~0.1.9",
    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
    "grunt-contrib-coffee": "~0.9.0",
@@ -21,17 +20,21 @@
    "grunt-cson": "0.10.0",
    "grunt-download-atom-shell": "~0.10.0",
    "grunt-lesslint": "0.13.0",
+    "grunt-markdown": "~0.4.0",
    "grunt-peg": "~1.1.0",
    "grunt-shell": "~0.3.1",
    "harmony-collections": "~0.3.8",
-    "legal-eagle": "~0.6.0",
+    "json-front-matter": "~0.1.3",
+    "legal-eagle": "~0.4.0",
    "minidump": "~0.8",
+    "normalize-package-data": "0.2.12",
    "npm": "~1.4.5",
-    "rcedit": "~0.3.0",
+    "rcedit": "~0.1.2",
+    "read-package-json": "1.1.8",
    "request": "~2.27.0",
    "rimraf": "~2.2.2",
    "runas": "~1.0.1",
-    "tello": "1.0.4",
+    "tello": "1.0.3",
    "temp": "~0.8.1",
    "underscore-plus": "1.x",
    "unzip": "~0.1.9",
@@ -11,7 +11,6 @@ module.exports = (grunt) ->
    appDir = grunt.config.get('atom.appDir')

    rm shellAppDir
-    rm path.join(buildDir, 'installer')
    mkdir path.dirname(buildDir)

    if process.platform is 'darwin'
@@ -21,11 +20,8 @@ module.exports = (grunt) ->

    mkdir appDir

-    if process.platform isnt 'win32'
-      cp 'atom.sh', path.join(appDir, 'atom.sh')
-
+    cp 'atom.sh', path.join(appDir, 'atom.sh')
    cp 'package.json', path.join(appDir, 'package.json')
-    cp path.join('resources', 'atom.png'), path.join(appDir, 'atom.png')

    packageDirectories = []
    nonPackageDirectories = [
@@ -152,10 +148,10 @@ module.exports = (grunt) ->
          grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))

    if process.platform is 'win32'
-      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')
+      # Set up chocolatey ignore and gui files
+      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
+      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
+      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''

    dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
    dependencies.push('copy-info-plist') if process.platform is 'darwin'
@@ -1,3 +1,4 @@
+
 module.exports = (grunt) ->
  grunt.registerTask 'check-licenses', 'Report the licenses of all dependencies', ->
    legalEagle = require 'legal-eagle'
@@ -12,7 +13,7 @@ module.exports = (grunt) ->
    legalEagle options, (err, summary) ->
      if err?
        console.error(err)
-        process.exit 1
+        exit 1

      for key of summary
        delete summary[key] if key.match /^atom@/
@@ -36,7 +36,7 @@ module.exports = (grunt) ->
          spawn {cmd, args}, (error) ->
            return callback(error) if error?

-            setupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
+            setupExePath = path.join(grunt.config.get('atom.shellAppDir'), '..', 'Releases', 'setup.exe')
            if fs.isFileSync(setupExePath)
              args = [setupExePath]
              spawn {cmd, args}, (error) -> callback(error)
@@ -0,0 +1,46 @@
+fs = require 'fs'
+path = require 'path'
+_ = require 'underscore-plus'
+
+module.exports = (grunt) ->
+  {spawn, rm} = require('./task-helpers')(grunt)
+
+  grunt.registerTask 'create-installer', 'Create the Windows installer', ->
+    return unless process.platform is 'win32'
+
+    done = @async()
+
+    buildDir = grunt.config.get('atom.buildDir')
+    atomDir = path.join(buildDir, 'Atom')
+    releasesDir = path.join(buildDir, 'Releases')
+    atomGitHubToken = process.env.ATOM_ACCESS_TOKEN
+
+    packageInfo = grunt.file.readJSON(path.join(atomDir, 'resources', 'app', 'package.json'))
+    inputTemplate = grunt.file.read(path.join('build', 'windows', 'atom.nuspec.erb'))
+
+    # NB: Build server has some sort of stamp on the version number
+    packageInfo.version = packageInfo.version.replace(/-.*$/, '')
+
+    targetNuspecPath = path.join(buildDir, 'atom.nuspec')
+    grunt.file.write(targetNuspecPath, _.template(inputTemplate, packageInfo))
+
+    # We use the previous releases to build deltas for the current release,
+    # sync down the existing releases directory by rolling through GitHub releases
+    cmd = 'build/windows/SyncGitHubReleases.exe'
+    args = ['-r', releasesDir, '-u', 'https://github.com/atom/atom', '-t', atomGitHubToken]
+
+    spawn {cmd, args}, (error, result, code) ->
+      if error?
+        grunt.log.error "ATOM_ACCESS_TOKEN environment variable not set or invalid, can't download old releases; continuing anyways"
+
+      cmd = 'build/windows/nuget.exe'
+      args = ['pack', targetNuspecPath, '-BasePath', atomDir, '-OutputDirectory', buildDir]
+
+      spawn {cmd, args}, (error, result, code) ->
+        return done(error) if error?
+
+        pkgs = pkg for pkg in fs.readdirSync(buildDir) when path.extname(pkg) is '.nupkg'
+
+        cmd = 'build/windows/update.com'
+        args = ['--releasify', path.join(buildDir, pkgs), '-r', releasesDir, '-g', 'build/windows/install-spinner.gif']
+        spawn {cmd, args}, (error, result, code) -> done(error)
@@ -6,17 +6,12 @@ _ = 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)

@@ -1,3 +1,4 @@
+fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
@@ -54,11 +54,6 @@ module.exports = (gruntObject) ->
          uploadAssets(release, buildDir, assets, done)

 getAssets = ->
-  {cp} = require('./task-helpers')(grunt)
-
-  {version} = grunt.file.readJSON('package.json')
-  buildDir = grunt.config.get('atom.buildDir')
-
  switch process.platform
    when 'darwin'
      [
@@ -67,16 +62,16 @@ getAssets = ->
        {assetName: 'atom-api.json', sourcePath: 'atom-api.json'}
      ]
    when 'win32'
-      assets = [{assetName: 'atom-windows.zip', sourcePath: 'Atom'}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg"]
-        cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
-        assets.push({assetName: squirrelAsset, sourcePath: assetName})
-      assets
+      [
+        {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
+      ]
    when 'linux'
+      buildDir = grunt.config.get('atom.buildDir')
      if process.arch is 'ia32'
        arch = 'i386'
      else
        arch = 'amd64'
+      {version} = grunt.file.readJSON('package.json')

      # Check for a Debian build
      sourcePath = "#{buildDir}/atom-#{version}-#{arch}.deb"
@@ -92,6 +87,7 @@ getAssets = ->
          arch = 'x86_64'
        assetName = "atom.#{arch}.rpm"

+      {cp} = require('./task-helpers')(grunt)
      cp sourcePath, path.join(buildDir, assetName)

      [
@@ -101,7 +97,7 @@ getAssets = ->
 logError = (message, error, details) ->
  grunt.log.error(message)
  grunt.log.error(error.message ? error) if error?
-  grunt.log.error(require('util').inspect(details)) if details
+  grunt.log.error(details) if details

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

 deleteRelease = (release) ->
  options =
@@ -11,20 +11,6 @@ module.exports = (grunt) ->

  packageSpecQueue = null

-  logDeprecations = (label, {stderr}={}) ->
-    return unless process.env.JANKY_SHA1
-    stderr ?= ''
-    deprecatedStart = stderr.indexOf('Calls to deprecated functions')
-    return if deprecatedStart.length is -1
-
-    grunt.log.error(label)
-    stderr = stderr.substring(deprecatedStart)
-    stderr = stderr.replace(/^\s*\[[^\]]+\]\s+/gm, '')
-    stderr = stderr.replace(/source: .*$/gm, '')
-    stderr = stderr.replace(/^"/gm, '')
-    stderr = stderr.replace(/",\s*$/gm, '')
-    grunt.log.error(stderr)
-
  getAppPath = ->
    contentsDir = grunt.config.get('atom.contentsDir')
    switch process.platform
@@ -68,7 +54,6 @@ 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')
@@ -102,7 +87,6 @@ module.exports = (grunt) ->
      else
        # TODO: Restore concurrency on Windows
        packageSpecQueue.concurrency = concurrency
-        logDeprecations('Core Specs', results)

      callback(null, error)

@@ -0,0 +1,22 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'update-octicons', 'Update octicon font and LESS variables', ->
+    pathToOcticons = path.resolve('..', 'octicons')
+    if grunt.file.isDir(pathToOcticons)
+      # Copy font-file
+      fontSrc = path.join(pathToOcticons, 'octicons', 'octicons.woff')
+      fontDest = path.resolve('static', 'octicons.woff')
+      grunt.file.copy(fontSrc, fontDest)
+
+      # Update Octicon UTF codes
+      glyphsSrc = path.join(pathToOcticons, 'data', 'glyphs.yml')
+      output = []
+      for {css, code} in grunt.file.readYAML(glyphsSrc)
+        output.push "@#{css}: \"\\#{code}\";"
+
+      octiconUtfDest = path.resolve('static', 'variables', 'octicon-utf-codes.less')
+      grunt.file.write(octiconUtfDest, "#{output.join('\n')}\n")
+    else
+      grunt.log.error("octicons repo must be cloned to #{pathToOcticons}")
+      false
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id><%= name %></id>
+        <version><%= version %></version>
+        <authors>The Atom Community</authors>
+        <owners>The Atom Community</owners>
+        <iconUrl>https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description><%= description %></description>
+    </metadata>
+    <files>
+        <file src="locales\**" target="lib\net45\locales" />
+        <file src="resources\**" target="lib\net45\resources" />
+        <file src="*.pak" target="lib\net45" />
+
+        <file src="atom.exe" target="lib\net45\atom.exe" />
+        <file src="atom.exe.gui" target="lib\net45\atom.exe.gui" />
+        <file src="chromiumcontent.dll" target="lib\net45\chromiumcontent.dll" />
+        <file src="d3dcompiler_43.dll" target="lib\net45\d3dcompiler_43.dll" />
+        <file src="ffmpegsumo.dll" target="lib\net45\ffmpegsumo.dll" />
+        <file src="icudtl.dat" target="lib\net45\icudtl.dat" />
+        <file src="libEGL.dll" target="lib\net45\libEGL.dll" />
+        <file src="libGLESv2.dll" target="lib\net45\libGLESv2.dll" />
+        <file src="LICENSE" target="lib\net45\LICENSE" />
+        <file src="msvcp120.dll" target="lib\net45\msvcp120.dll" />
+        <file src="msvcr120.dll" target="lib\net45\msvcr120.dll" />
+        <file src="vccorlib120.dll" target="lib\net45\vccorlib120.dll" />
+        <file src="version" target="lib\net45\version" />
+        <file src="xinput1_3.dll" target="lib\net45\xinput1_3.dll" />
+    </files>
+</package>
@@ -1,5 +1,60 @@
-# Welcome to the Atom Docs
+# Welcome to the Atom API Documentation

 ![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)

-TODO: Write when docs move to a dedicated repo.
+## FAQ
+
+### Where do I start?
+
+Check out [EditorView][EditorView] and [Editor][Editor] classes for a good
+overview of the main editor API.
+
+### How do I access these classes?
+
+Check out the [Atom][Atom] class docs to see what globals are available and
+what they provide.
+
+You can also require many of these classes in your package via:
+
+```coffee
+{EditorView} = require 'atom'
+```
+
+The classes available from `require 'atom'` are:
+  * [BufferedProcess][BufferedProcess]
+  * [BufferedNodeProcess][BufferedNodeProcess]
+  * [EditorView][EditorView]
+  * [Git][Git]
+  * [Point][Point]
+  * [Range][Range]
+  * [ScrollView][ScrollView]
+  * [SelectListView][SelectListView]
+  * [View][View]
+  * [WorkspaceView][WorkspaceView]
+  * [Workspace][Workspace]
+
+### How do I create a package?
+
+You probably want to read the [creating a package][creating-a-package]
+doc first and come back here when you are done.
+
+### Where are the node docs?
+
+Atom ships with node 0.11.10 and the comprehensive node API docs are available
+[here][node-docs].
+
+[Atom]: ../classes/Atom.html
+[BufferedProcess]: ../classes/BufferedProcess.html
+[BufferedNodeProcess]: ../classes/BufferedNodeProcess.html
+[Editor]: ../classes/Editor.html
+[EditorView]: ../classes/EditorView.html
+[Git]: ../classes/Git.html
+[Point]: ../classes/Point.html
+[Range]: ../classes/Range.html
+[ScrollView]: ../classes/ScrollView.html
+[SelectListView]: ../classes/SelectListView.html
+[View]: ../classes/View.html
+[WorkspaceView]: ../classes/WorkspaceView.html
+[Workspace]: ../classes/Workspace.html
+[creating-a-package]: https://atom.io/docs/latest/creating-a-package
+[node-docs]: http://nodejs.org/docs/v0.11.10/api
@@ -11,34 +11,32 @@ value of a namespaced config key with `atom.config.get`:
@showInvisibles() if atom.config.get "editor.showInvisibles"
 ```

-Or you can subscribe via `atom.config.observe` to track changes from any view
-object.
+Or you can use the `::subscribe` with `atom.config.observe` to track changes
+from any view object.

 ```coffeescript
-{View} = require 'space-pen'
-
 class MyView extends View
-  attached: ->
-    @fontSizeObserveSubscription =
-      atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-        @adjustFontSize()
-
-  detached: ->
-    @fontSizeObserveSubscription.dispose()
+  initialize: ->
+    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+      @adjustFontSize()
 ```

 The `atom.config.observe` method will call the given callback immediately with
 the current value for the specified key path, and it will also call it in the
-future whenever the value of that key path changes. If you only want to invoke
-the callback when the next time the value changes, use `atom.config.onDidChange`
-instead.
+future whenever the value of that key path changes.

-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.
+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
+```

 ### Writing Config Settings

@@ -50,9 +48,10 @@ but you can programmatically write to it with `atom.config.set`:
 atom.config.set("core.showInvisibles", true)
 ```

-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].
+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.

-[composite-disposable]: https://atom.io/docs/api/latest/CompositeDisposable
-[config-api]: https://atom.io/docs/api/latest/Config
+```coffeescript
+atom.config.setDefaults("editor", fontSize: 18, showInvisibles: true)
+```
@@ -0,0 +1,34 @@
+# 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.
@@ -16,7 +16,7 @@ keystrokes pass through `atom-text-editor` elements:
  'ctrl-shift-e': 'editor:select-to-end-of-line'
  'cmd-left': 'editor:move-to-first-character-of-line'

-'atom-text-editor:not([mini])'
+'atom-text-editor:not(.mini)'
  'cmd-alt-[': 'editor:fold-current-row'
  'cmd-alt-]': 'editor:unfold-current-row'
 ```
@@ -27,8 +27,8 @@ patterns* to *commands*. When an element with the `atom-text-editor` class is fo
 `editor:delete-to-beginning-of-line` is emitted on the `atom-text-editor` element.

 The second selector group also targets editors, but only if they don't have the
-`mini` attribute. In this example, the commands for code folding don't really
-make sense on mini-editors, so the selector restricts them to regular editors.
+`.mini` class. In this example, the commands for code folding don't really make
+sense on mini-editors, so the selector restricts them to regular editors.

 ### Keystroke Patterns

@@ -0,0 +1,58 @@
+## 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
@@ -30,8 +30,6 @@ All requests that take parameters require `application/json`.
 Parameters:

 - **page** (optional)
- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to `downloads`
- **direction** (optional) - `asc` or `desc`. Defaults to `desc`. `stars` can only be ordered `desc`

 Returns a list of all packages in the following format:
 ```json
@@ -59,21 +57,6 @@ 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.
-
-### Searching packages
-
-#### GET /api/packages/search
-
-Parameters:
-
- **q** (required) - Search query
- **page** (optional)
- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to the relevance of the search query.
- **direction** (optional) - `asc` or `desc`. Defaults to `desc`.
-
-Returns results in the same format as [listing packages](#listing-packages).
-
 ### Showing package details

 #### GET /api/packages/:package_name
@@ -26,17 +26,9 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

 ### Arch

-* `sudo pacman -S gconf base-devel git nodejs libgnome-keyring python2`
+* `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`
-
-### openSUSE
-
-* `sudo zypper install nodejs make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
-
 ## Instructions

 If you have problems with permissions don't forget to prefix with `sudo`
@@ -51,7 +43,7 @@ If you have problems with permissions don't forget to prefix with `sudo`
 2. Checkout the latest Atom release:

  ```sh
-  git fetch -p
+  git fetch
  git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
  ```

@@ -129,15 +121,6 @@ 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:
@@ -154,6 +137,15 @@ 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.
@@ -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
-style sheets your package needs to load. If not specified, style sheets in the
+stylesheets your package needs to load. If not specified, stylesheets 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.

-## Style Sheets
+## Stylesheets

-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).
+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).

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

-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
+An optional `stylesheets` array in your _package.json_ can list the stylesheets
+by name to specify a loading order; otherwise, stylesheets 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,8 +195,7 @@ 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.
@@ -59,8 +59,6 @@ window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
 terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
 menu. When you edit your theme, changes will instantly be reflected!

-> Note: It's advised to _not_ specify a `font-family` in your syntax theme because it will override the Font Family field in Atom's settings. If you still like to recommend a font that goes well with your theme, we recommend you do so in your README.
-
 ## Creating an Interface Theme

 Interface themes **must** provide a `ui-variables.less` file which contains all
@@ -63,7 +63,7 @@ built-in keymaps:
 'atom-text-editor':
  'enter': 'editor:newline'

-'atom-text-editor[mini] input':
+'atom-text-editor.mini input':
  'enter': 'core:confirm'
 ```

@@ -105,7 +105,6 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
 - `core`
  - `disabledPackages`: An array of package names to disable
  - `excludeVcsIgnoredPaths`: Don't search within files specified by _.gitignore_
-  - `followSymlinks`: Follow symlinks when searching and scanning root directory
  - `ignoredNames`: File names to ignore across all of Atom
  - `projectHome`: The directory where projects are assumed to be located
  - `themes`: An array of theme names to load, in cascading order
@@ -119,6 +118,7 @@ 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
@@ -3,8 +3,7 @@
 Atom provides several tools to help you understand unexpected behavior and debug problems. This guide describes some of those tools and a few approaches to help you debug and provide more helpful information when [submitting issues]:

 * [Update to the latest version](#update-to-the-latest-version)
-* [Check for linked packages](#check-for-linked-packages)
-* [Check Atom and package settings](#check-atom-and-package-settings)
+* [Check Atom and package settings](#check-atom-and-package-settings) 
 * [Check the keybindings](#check-the-keybindings)
 * [Check if the problem shows up in safe mode](#check-if-the-problem-shows-up-in-safe-mode)
 * [Check your config files](#check-your-config-files)
@@ -25,16 +24,6 @@ $ atom --version

 Head on over to the [list of releases][atom releases] and see if there's a more recent release. You can update to the most recent release by downloading Atom from the releases page, or with the in-app auto-updater. The in-app auto-updater checks for and downloads a new version after you restart Atom, or if you use the Atom > Check for Update menu option.

-## Check for linked packages
-
-If you develop or contribute to Atom packages, there may be left-over packages linked to your `~/.atom/packages` or `~/.atom/dev/packages` directories. You can use:
-
-```shell
-$ apm links
-```
-
-to list all linked development packages. You can remove the links using the `apm unlink` command. See `apm unlink --help` for details.
-
 ## Check Atom and package settings

 In some cases, unexpected behavior might be caused by misconfigured or unconfigured settings in Atom or in one of the packages.
@@ -18,9 +18,5 @@
 * [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
-
-* [Upgrading Your UI Theme Or Package Selectors](upgrading/upgrading-your-ui-theme.md)
-* [Upgrading Your Syntax Theme](upgrading/upgrading-your-syntax-theme.md)
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="../../assets/js/html5shiv.js"></script>
+      <script src="../../assets/js/respond.min.js"></script>
+    <![endif]-->
+
+    <title>Atom - <%= title %></title>
+    <style>
+      /*github.com style (c) Vasily Polovnyov <vast@whiteants.net>*/
+      pre code {
+        display: block; padding: 0.5em;
+        color: #333;
+        background: #f8f8ff
+      }
+      pre .comment,
+      pre .template_comment,
+      pre .diff .header,
+      pre .javadoc {
+        color: #998;
+        font-style: italic
+      }
+      pre .keyword,
+      pre .css .rule .keyword,
+      pre .winutils,
+      pre .javascript .title,
+      pre .nginx .title,
+      pre .subst,
+      pre .request,
+      pre .status {
+        color: #333;
+        font-weight: bold
+      }
+      pre .number,
+      pre .hexcolor,
+      pre .ruby .constant {
+        color: #099;
+      }
+      pre .string,
+      pre .tag .value,
+      pre .phpdoc,
+      pre .tex .formula {
+        color: #d14
+      }
+      pre .title,
+      pre .id {
+        color: #900;
+        font-weight: bold
+      }
+      pre .javascript .title,
+      pre .lisp .title,
+      pre .clojure .title,
+      pre .subst {
+        font-weight: normal
+      }
+      pre .class .title,
+      pre .haskell .type,
+      pre .vhdl .literal,
+      pre .tex .command {
+        color: #458;
+        font-weight: bold
+      }
+      pre .tag,
+      pre .tag .title,
+      pre .rules .property,
+      pre .django .tag .keyword {
+        color: #000080;
+        font-weight: normal
+      }
+      pre .attribute,
+      pre .variable,
+      pre .lisp .body {
+        color: #008080
+      }
+      pre .regexp {
+        color: #009926
+      }
+      pre .class {
+        color: #458;
+        font-weight: bold
+      }
+      pre .symbol,
+      pre .ruby .symbol .string,
+      pre .lisp .keyword,
+      pre .tex .special,
+      pre .prompt {
+        color: #990073
+      }
+      pre .built_in,
+      pre .lisp .title,
+      pre .clojure .built_in {
+        color: #0086b3
+      }
+      pre .preprocessor,
+      pre .pi,
+      pre .doctype,
+      pre .shebang,
+      pre .cdata {
+        color: #999;
+        font-weight: bold
+      }
+      pre .deletion {
+        background: #fdd
+      }
+      pre .addition {
+        background: #dfd
+      }
+      pre .diff .change {
+        background: #0086b3
+      }
+      pre .chunk {
+        color: #aaa
+      }
+
+      body {
+        padding-top: 50px;
+      }
+    </style>
+  </head>
+  <body>
+   <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="/<%= tag %>/index.html">Atom Documentation</a>
+        </div>
+        <div class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+            <li><a href="/docs/api/<%= tag %>/api/index.html">API</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+    <div class="container">
+      <%= content %>
+    </div>
+  </body>
+</html>
@@ -1,27 +0,0 @@
-# Upgrading Your Syntax Theme
-
-Text editor content is now rendered in the shadow DOM, which shields it from being styled by global style sheets to protect against accidental style pollution. For more background on the shadow DOM, check out the [Shadow DOM 101][shadow-dom-101] on HTML 5 Rocks.
-
-Syntax themes are specifically intended to style only text editor content, so they are automatically loaded directly into the text editor's shadow DOM when it is enabled. This happens automatically when the the theme's `package.json` contains a `theme: "syntax"` declaration, so you don't need to change anything to target the appropriate context.
-
-When theme style sheets are loaded into the text editor's shadow DOM, selectors intended to target the editor from the *outside* no longer make sense. Styles targeting the `.editor` and `.editor-colors` classes instead need to target the `:host` pseudo-element, which matches against the containing `atom-text-editor` node. Check out the [Shadow DOM 201][host-pseudo-element] article for more information about the `:host` pseudo-element.
-
-Here's an example from Atom's light syntax theme. Note that the previous selectors intended to target the editor from the outside have been retained to allow the theme to keep working during the transition phase when it is possible to disable the shadow DOM.
-
-```css
-.editor-colors, :host { /* :host added */
-  background-color: @syntax-background-color;
-  color: @syntax-text-color;
-}
-
-.editor, :host { /* :host added */
-  .invisible-character {
-    color: @syntax-invisible-character-color;
-  }
-
-  /* more nested selectors... */
-}
-```
-
-[shadow-dom-101]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom
-[host-pseudo-element]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom-201#toc-style-host
@@ -1,137 +0,0 @@
-# Upgrading Your UI Theme Or Package Selectors
-
-In addition to changes in Atom's scripting API, we'll also be making some breaking changes to Atom's DOM structure, requiring stylesheets and keymaps in both packages and themes to be updated.
-
-## Deprecation Cop
-
-Deprecation cop will list usages of deprecated selector patterns to guide you. You can access it via the command palette (`cmd-shift-p`, then search for `Deprecation`). It breaks the deprecations down by package:
-
-![dep-cop](https://cloud.githubusercontent.com/assets/69169/5078860/d38a5df4-6e64-11e4-95b6-eb585ee9bbfc.png)
-
-## Custom Tags
-
-Rather than adding classes to standard HTML elements to indicate their role, Atom now uses custom element names. For example, `<div class="workspace">` has now been replaced with `<atom-workspace>`. Selectors should be updated accordingly. Note that tag names have lower specificity than classes in CSS, so you'll need to take care in converting things.
-
-Old Selector        | New Selector
--------------------|--------------------------------
-`.editor`           | `atom-text-editor`
-`.editor.mini`      | `atom-text-editor[mini]`
-`.workspace`        | `atom-workspace`
-`.horizontal`       | `atom-workspace-axis.horizontal`
-`.vertical`         | `atom-workspace-axis.vertical`
-`.pane-container`   | `atom-pane-conatiner`
-`.pane`             | `atom-pane`
-`.tool-panel`       | `atom-panel`
-`.panel-top`        | `atom-panel.top`
-`.panel-bottom`     | `atom-panel.bottom`
-`.panel-left`       | `atom-panel.left`
-`.panel-right`      | `atom-panel.right`
-`.overlay`          | `atom-panel.modal`
-
-## Supporting the Shadow DOM
-
-Text editor content is now rendered in the shadow DOM, which shields it from being styled by global style sheets to protect against accidental style pollution. For more background on the shadow DOM, check out the [Shadow DOM 101][shadow-dom-101] on HTML 5 Rocks. If you need to style text editor content in a UI theme, you'll need to circumvent this protection for any rules that target the text editor's content. Some examples of the kinds of UI theme styles needing to be updated:
-
-* Highlight decorations
-* Gutter decorations
-* Line decorations
-* Scrollbar styling
-* Anything targeting a child selector of `.editor`
-
-During a transition phase, it will be possible to enable or disable the text editor's shadow DOM in the settings, so themes will need to be compatible with both approaches.
-
-### Shadow DOM Selectors
-
-Chromium provides two tools for bypassing shadow boundaries, the `::shadow` pseudo-element and the `/deep/` combinator. For an in-depth explanation of styling the shadow DOM, see the [Shadow DOM 201][shadow-dom-201] article on HTML 5 Rocks.
-
-#### ::shadow
-
-The `::shadow` pseudo-element allows you to bypass a single shadow root. For example, say you want to update a highlight decoration for a linter package. Initially, the style looks as follows:
-
-```css
-// Without shadow DOM support
-atom-text-editor .highlight.my-linter {
-  background: hotpink;
-}
-```
-
-In order for this style to apply with the shadow DOM enabled, you will need to add a second selector with the `::shadow` pseudo-element. You should leave the original selector in place so your theme continues to work with the shadow DOM disabled during the transition period.
-
-```css
-// With shadow DOM support
-atom-text-editor .highlight.my-linter,
-atom-text-editor::shadow .highlight.my-linter {
-  background: hotpink;
-}
-```
-
-Check out the [find-and-replace][find-and-replace] package for another example of using `::shadow` to pierce the shadow DOM.
-
-#### /deep/
-
-The `/deep/` combinator overrides *all* shadow boundaries, making it useful for rules you want to apply globally such as scrollbar styling. Here's a snippet containing scrollbar styling for the Atom Dark UI theme before shadow DOM support:
-
-```css
-// Without shadow DOM support
-.scrollbars-visible-always {
-  ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-  }
-
-  ::-webkit-scrollbar-track,
-  ::-webkit-scrollbar-corner {
-    background: @scrollbar-background-color;
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: @scrollbar-color;
-    border-radius: 5px;
-    box-shadow: 0 0 1px black inset;
-  }
-}
-```
-
-To style scrollbars even inside of the shadow DOM, each rule needs to be prefixed with `/deep/`. We use `/deep/` instead of `::shadow` because we don't care about the selector of the host element in this case. We just want our styling to apply everywhere.
-
-```css
-// With shadow DOM support using /deep/
-.scrollbars-visible-always {
-  /deep/ ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-  }
-
-  /deep/ ::-webkit-scrollbar-track,
-  /deep/ ::-webkit-scrollbar-corner {
-    background: @scrollbar-background-color;
-  }
-
-  /deep/ ::-webkit-scrollbar-thumb {
-    background: @scrollbar-color;
-    border-radius: 5px;
-    box-shadow: 0 0 1px black inset;
-  }
-}
-```
-
-### Context-Targeted Style Sheets
-
-The selector features discussed above allow you to target shadow DOM content with specific selectors, but Atom also allows you to target a specific shadow DOM context with an entire style sheet. The context into which a style sheet is loaded is based on the file name. If you want to load a style sheet into the editor, name it with the `.atom-text-editor.less` or `.atom-text-editor.css` extensions.
-
-```
-my-ui-theme/
-  stylesheets/
-    index.less                   # loaded globally
-    index.atom-text-editor.less  # loaded in the text editor shadow DOM
-```
-
-Check out this [style sheet](https://github.com/atom/decoration-example/blob/master/stylesheets/decoration-example.atom-text-editor.less) from the decoration-example package for an example of context-targeting.
-
-Inside a context-targeted style sheet, there's no need to use the `::shadow` or `/deep/` expressions. If you want to refer to the element containing the shadow root, you can use the `::host` pseudo-element.
-
-During the transition phase, style sheets targeting the `atom-text-editor` context will *also* be loaded globally. Make sure you update your selectors in a way that maintains compatibility with the shadow DOM being disabled. That means if you use a `::host` pseudo element, you should also include the same style rule matches against `atom-text-editor`.
-
-[shadow-dom-101]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom
-[shadow-dom-201]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom-201#toc-style-cat-hat
-[find-and-replace]: https://github.com/atom/find-and-replace/blob/95351f261bc384960a69b66bf12eae8002da63f9/stylesheets/find-and-replace.less#L10
@@ -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.getActiveTextEditor().getPath()).toContain 'c.coffee'
+      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'

  ```

@@ -49,7 +49,7 @@ Register the command in _lib/ascii-art.coffee_:
 ```coffeescript
 module.exports =
  activate: ->
-    atom.commands.add 'atom-workspace', "ascii-art:convert", => @convert()
+    atom.workspaceView.command "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.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!'.
+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!'.

 ## 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.
@@ -1,127 +1,35 @@
 {Point, Range} = require 'text-buffer'
-{Emitter, Disposable, CompositeDisposable} = require 'event-kit'
 {deprecate} = require 'grim'

 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
-  Disposable: Disposable
-  CompositeDisposable: CompositeDisposable

 # The following classes can't be used from a Task handler and should therefore
 # only be exported when not running as a child node process
 unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
-  module.exports.Task = require '../src/task'
-  module.exports.TextEditor = require '../src/text-editor'
-
  {$, $$, $$$, View} = require '../src/space-pen-extensions'

-  Object.defineProperty module.exports, 'Workspace', get: ->
-    deprecate """
-      Requiring `Workspace` from `atom` is no longer supported.
-      If you need this, please open an issue on
-      https://github.com/atom/atom/issues/new
-      And let us know what you are using it for.
-    """
-    require '../src/workspace'
-
-  Object.defineProperty module.exports, 'WorkspaceView', get: ->
-    deprecate """
-      Requiring `WorkspaceView` from `atom` is no longer supported.
-      Use `atom.views.getView(atom.workspace)` instead.
-    """
-    require '../src/workspace-view'
-
-  Object.defineProperty module.exports, '$', get: ->
-    deprecate """
-      Requiring `$` from `atom` is no longer supported.
-      If you are using `space-pen`, please require `$` from `atom-space-pen-views`. Otherwise require `jquery` instead:
-        `{$} = require 'atom-space-pen-views'`
-        or
-        `$ = require 'jquery'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-      Or add `"jquery": "^2"` to your package dependencies.
-    """
-    $
-
-  Object.defineProperty module.exports, '$$', get: ->
-    deprecate """
-      Requiring `$$` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{$$} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    $$
-
-  Object.defineProperty module.exports, '$$$', get: ->
-    deprecate """
-      Requiring `$$$` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{$$$} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    $$$
-
-  Object.defineProperty module.exports, 'View', get: ->
-    deprecate """
-      Requiring `View` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{View} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    View
-
-  Object.defineProperty module.exports, 'EditorView', get: ->
-    deprecate """
-      Requiring `EditorView` from `atom` is no longer supported.
-      Please require `TextEditorView` from `atom-space-pen-view` instead:
-        `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    require '../src/text-editor-view'
-
-  Object.defineProperty module.exports, 'TextEditorView', get: ->
-    deprecate """
-      Requiring `TextEditorView` from `atom` is no longer supported.
-      Please require `TextEditorView` from `atom-space-pen-view` instead:
-        `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    require '../src/text-editor-view'
-
-  Object.defineProperty module.exports, 'ScrollView', get: ->
-    deprecate """
-      Requiring `ScrollView` from `atom` is no longer supported.
-      Please require `ScrollView` from `atom-space-pen-view` instead:
-        `{ScrollView} = require 'atom-space-pen-views'`
-      Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    require '../src/scroll-view'
-
-  Object.defineProperty module.exports, 'SelectListView', get: ->
-    deprecate """
-      Requiring `SelectListView` from `atom` is no longer supported.
-      Please require `SelectListView` from `atom-space-pen-view` instead:
-        `{SelectListView} = require 'atom-space-pen-views'`
-      Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-    """
-    require '../src/select-list-view'
-
-  Object.defineProperty module.exports, 'React', get: ->
-    deprecate "Please require `react-atom-fork` instead: `React = require 'react-atom-fork'`. Add `\"react-atom-fork\": \"^0.11\"` to your package dependencies."
-    require 'react-atom-fork'
-
-  Object.defineProperty module.exports, 'Reactionary', get: ->
-    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'
+  module.exports.$ = $
+  module.exports.$$ = $$
+  module.exports.$$$ = $$$
+  module.exports.TextEditorView = require '../src/text-editor-view'
+  module.exports.ScrollView = require '../src/scroll-view'
+  module.exports.SelectListView = require '../src/select-list-view'
+  module.exports.Task = require '../src/task'
+  module.exports.View = View
+  module.exports.WorkspaceView = require '../src/workspace-view'
+  module.exports.Workspace = require '../src/workspace'
+  module.exports.React = require 'react-atom-fork'
+  module.exports.Reactionary = require 'reactionary-atom-fork'

 Object.defineProperty module.exports, 'Git', get: ->
  deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"
  module.exports.GitRepository
+
+Object.defineProperty module.exports, 'EditorView', get: ->
+  deprecate "Please require `TextEditorView` instead of `EditorView`: `{TextEditorView} = require 'atom'`"
+  module.exports.TextEditorView
@@ -5,7 +5,7 @@
  'shift-home': 'editor:select-to-first-character-of-line'
  'shift-end': 'editor:select-to-end-of-line'

-'atom-text-editor:not([mini])':
+'atom-text-editor:not(.mini)':
  # Atom Specific
  'ctrl-C': 'editor:copy-path'

@@ -15,13 +15,13 @@
  'shift-tab': 'editor:outdent-selected-rows'
  'ctrl-K': 'editor:delete-line'

-'.select-list atom-text-editor[mini]':
+'.select-list atom-text-editor.mini':
  'enter': 'core:confirm'

 '.tool-panel.panel-left, .tool-panel.panel-right':
  'escape': 'tool-panel:unfocus'

-'atom-text-editor !important, atom-text-editor[mini] !important':
+'atom-text-editor !important, atom-text-editor.mini !important':
  'escape': 'editor:consolidate-selections'

 # allow standard input fields to work correctly
@@ -112,7 +112,7 @@
  # Apple Specific
  'cmd-backspace': 'editor:delete-to-beginning-of-line'
  'cmd-shift-backspace': 'editor:delete-to-beginning-of-line'
-  'cmd-delete': 'editor:delete-to-end-of-line'
+  'cmd-delete': 'editor:delete-to-beginning-of-line'
  'ctrl-A': 'editor:select-to-first-character-of-line'
  'ctrl-E': 'editor:select-to-end-of-line'
  'cmd-left': 'editor:move-to-first-character-of-line'
@@ -136,7 +136,7 @@
  'cmd-l': 'editor:select-line'
  'ctrl-t': 'editor:transpose'

-'atom-workspace atom-text-editor:not([mini])':
+'atom-workspace atom-text-editor:not(.mini)':
  # Atom specific
  'alt-cmd-z': 'editor:checkout-head-revision'
  'cmd-<': 'editor:scroll-to-cursor'
@@ -101,7 +101,7 @@
  'ctrl-k ctrl-l': 'editor:lower-case'
  'ctrl-l': 'editor:select-line'

-'atom-workspace atom-text-editor:not([mini])':
+'atom-workspace atom-text-editor:not(.mini)':
  # Atom specific
  'alt-ctrl-z': 'editor:checkout-head-revision'
  'ctrl-<': 'editor:scroll-to-cursor'
@@ -98,7 +98,7 @@
  'ctrl-k ctrl-l': 'editor:lower-case'
  'ctrl-l': 'editor:select-line'

-'atom-workspace atom-text-editor:not([mini])':
+'atom-workspace atom-text-editor:not(.mini)':
  # Atom specific
  'alt-ctrl-z': 'editor:checkout-head-revision'
  'ctrl-<': 'editor:scroll-to-cursor'
@@ -202,7 +202,7 @@
 ]

 'context-menu':
-  'atom-text-editor, .overlayer': [
+  '.overlayer': [
    {label: 'Undo', command: 'core:undo'}
    {label: 'Redo', command: 'core:redo'}
    {type: 'separator'}
@@ -94,7 +94,6 @@
    submenu: [
      { label: '&Reload', command: 'window:reload' }
      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' }
      {
        label: 'Developer'
        submenu: [
@@ -160,7 +159,7 @@
 ]

 'context-menu':
-  'atom-text-editor, .overlayer': [
+  '.overlayer': [
    {label: 'Undo', command: 'core:undo'}
    {label: 'Redo', command: 'core:redo'}
    {type: 'separator'}
@@ -93,7 +93,6 @@
    submenu: [
      { label: '&Reload', command: 'window:reload' }
      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' }
      {
        label: 'Panes'
        submenu: [
@@ -163,10 +162,7 @@
    submenu: [
      { 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}
+      { label: "VERSION", enabled: false }
      { type: 'separator' }
      { label: '&Documentation', command: 'application:open-documentation' }
      { label: 'Roadmap', command: 'application:open-roadmap' }
@@ -181,7 +177,7 @@
 ]

 'context-menu':
-  'atom-text-editor, .overlayer': [
+  '.overlayer': [
    {label: 'Undo', command: 'core:undo'}
    {label: 'Redo', command: 'core:redo'}
    {type: 'separator'}
@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.168.0",
+  "version": "0.146.0",
  "description": "A hackable text editor for the 21st Century.",
  "main": "./src/browser/main.js",
  "repository": {
@@ -17,35 +17,33 @@
      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
    }
  ],
-  "atomShellVersion": "0.20.4",
+  "atomShellVersion": "0.19.1",
  "dependencies": {
    "async": "0.2.6",
-    "atom-keymap": "^2.3.3",
+    "atom-keymap": "^2.2.2",
    "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": "^1.0.1",
-    "first-mate": "^2.2.3",
-    "fs-plus": "^2.3.2",
+    "event-kit": "0.7.2",
+    "first-mate": "^2.2.0",
+    "fs-plus": "^2.3.1",
    "fstream": "0.1.24",
    "fuzzaldrin": "^2.1",
-    "git-utils": "^2.2",
-    "grim": "1.0.0",
+    "git-utils": "^2.1.5",
+    "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",
+    "less-cache": "0.17.0",
    "mixto": "^1",
    "mkdirp": "0.3.5",
    "nslog": "^1.0.1",
    "oniguruma": "^3.0.4",
    "optimist": "0.4.0",
-    "pathwatcher": "^2.3.7",
+    "pathwatcher": "^2.3.2",
    "property-accessors": "^1",
    "q": "^1.0.1",
    "random-words": "0.0.1",
@@ -53,99 +51,96 @@
    "reactionary-atom-fork": "^1.0.0",
    "runas": "1.0.1",
    "scandal": "1.0.3",
-    "scoped-property-store": "^0.16.2",
+    "scoped-property-store": "^0.15.0",
    "scrollbar-style": "^1.0.2",
    "season": "^1.0.2",
    "semver": "2.2.1",
    "serializable": "^1",
-    "service-hub": "^0.1.0",
-    "space-pen": "3.8.2",
+    "space-pen": "3.8.1",
    "temp": "0.7.0",
-    "text-buffer": "^3.8.4",
+    "text-buffer": "^3.6.0",
    "theorist": "^1.0.2",
-    "underscore-plus": "^1.6.6",
+    "underscore-plus": "^1.6.1",
    "vm-compatibility-layer": "0.1.0"
  },
  "packageDependencies": {
-    "atom-dark-syntax": "0.23.0",
-    "atom-dark-ui": "0.42.0",
-    "atom-light-syntax": "0.24.0",
-    "atom-light-ui": "0.36.0",
-    "base16-tomorrow-dark-theme": "0.23.0",
-    "base16-tomorrow-light-theme": "0.6.0",
-    "solarized-dark-syntax": "0.30.0",
-    "solarized-light-syntax": "0.17.0",
-    "archive-view": "0.43.0",
-    "autocomplete": "0.40.0",
-    "autoflow": "0.20.0",
-    "autosave": "0.19.0",
-    "background-tips": "0.20.0",
-    "bookmarks": "0.33.0",
-    "bracket-matcher": "0.67.0",
-    "command-palette": "0.32.0",
-    "deprecation-cop": "0.22.0",
-    "dev-live-reload": "0.36.0",
-    "encoding-selector": "0.14.0",
-    "exception-reporting": "0.21.0",
-    "find-and-replace": "0.155.0",
-    "fuzzy-finder": "0.64.0",
-    "git-diff": "0.47.0",
-    "go-to-line": "0.30.0",
-    "grammar-selector": "0.42.0",
-    "image-view": "0.46.0",
-    "incompatible-packages": "0.19.0",
-    "keybinding-resolver": "0.25.0",
-    "link": "0.28.0",
-    "markdown-preview": "0.116.0",
-    "metrics": "0.40.0",
-    "notifications": "0.23.0",
-    "open-on-github": "0.31.0",
-    "package-generator": "0.36.0",
-    "release-notes": "0.45.0",
-    "settings-view": "0.165.0",
-    "snippets": "0.66.0",
-    "spell-check": "0.49.0",
-    "status-bar": "0.56.0",
-    "styleguide": "0.39.0",
-    "symbols-view": "0.77.0",
-    "tabs": "0.61.0",
-    "timecop": "0.26.0",
-    "tree-view": "0.147.0",
-    "update-package-dependencies": "0.7.0",
-    "welcome": "0.21.0",
-    "whitespace": "0.28.0",
-    "wrap-guide": "0.29.0",
-    "language-c": "0.37.0",
-    "language-clojure": "0.10.0",
-    "language-coffee-script": "0.39.0",
-    "language-css": "0.26.0",
-    "language-gfm": "0.59.0",
-    "language-git": "0.10.0",
-    "language-go": "0.20.0",
-    "language-html": "0.28.0",
-    "language-hyperlink": "0.12.2",
-    "language-java": "0.14.0",
-    "language-javascript": "0.53.0",
-    "language-json": "0.11.0",
-    "language-less": "0.24.0",
-    "language-make": "0.13.0",
-    "language-mustache": "0.11.0",
-    "language-objective-c": "0.15.0",
-    "language-perl": "0.10.0",
-    "language-php": "0.20.0",
-    "language-property-list": "0.8.0",
-    "language-python": "0.29.0",
-    "language-ruby": "0.47.0",
+    "atom-dark-syntax": "0.21.0",
+    "atom-dark-ui": "0.35.0",
+    "atom-light-syntax": "0.21.0",
+    "atom-light-ui": "0.30.0",
+    "base16-tomorrow-dark-theme": "0.21.0",
+    "base16-tomorrow-light-theme": "0.4.0",
+    "solarized-dark-syntax": "0.22.0",
+    "solarized-light-syntax": "0.12.0",
+    "archive-view": "0.37.0",
+    "autocomplete": "0.33.0",
+    "autoflow": "0.18.0",
+    "autosave": "0.18.0",
+    "background-tips": "0.17.0",
+    "bookmarks": "0.30.0",
+    "bracket-matcher": "0.62.0",
+    "command-palette": "0.27.0",
+    "deprecation-cop": "0.11.0",
+    "dev-live-reload": "0.35.0",
+    "encoding-selector": "0.7.0",
+    "exception-reporting": "0.20.0",
+    "find-and-replace": "0.146.0",
+    "fuzzy-finder": "0.60.0",
+    "git-diff": "0.43.0",
+    "go-to-line": "0.26.0",
+    "grammar-selector": "0.37.0",
+    "image-view": "0.40.0",
+    "incompatible-packages": "0.10.0",
+    "keybinding-resolver": "0.20.0",
+    "link": "0.26.0",
+    "markdown-preview": "0.110.0",
+    "metrics": "0.38.0",
+    "open-on-github": "0.30.0",
+    "package-generator": "0.32.0",
+    "release-notes": "0.36.0",
+    "settings-view": "0.159.0",
+    "snippets": "0.56.0",
+    "spell-check": "0.43.0",
+    "status-bar": "0.46.0",
+    "styleguide": "0.30.0",
+    "symbols-view": "0.68.0",
+    "tabs": "0.55.0",
+    "timecop": "0.23.0",
+    "tree-view": "0.132.0",
+    "update-package-dependencies": "0.6.0",
+    "welcome": "0.19.0",
+    "whitespace": "0.26.0",
+    "wrap-guide": "0.23.0",
+    "language-c": "0.30.0",
+    "language-coffee-script": "0.37.0",
+    "language-css": "0.23.0",
+    "language-gfm": "0.53.0",
+    "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-make": "0.12.0",
+    "language-mustache": "0.10.0",
+    "language-objective-c": "0.11.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-ruby-on-rails": "0.18.0",
-    "language-sass": "0.30.0",
-    "language-shellscript": "0.12.0",
-    "language-source": "0.9.0",
-    "language-sql": "0.13.0",
+    "language-sass": "0.25.0",
+    "language-shellscript": "0.10.0",
+    "language-source": "0.8.0",
+    "language-sql": "0.11.0",
    "language-text": "0.6.0",
-    "language-todo": "0.15.0",
-    "language-toml": "0.15.0",
-    "language-xml": "0.26.0",
-    "language-yaml": "0.22.0"
+    "language-todo": "0.13.0",
+    "language-toml": "0.14.0",
+    "language-xml": "0.24.0",
+    "language-yaml": "0.19.0"
  },
  "private": true,
  "scripts": {
@@ -1,6 +1,6 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: git, gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
+Depends: gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
 Suggests: libgnome-keyring0, gir1.2-gnomekeyring-1.0
 Section: <%= section %>
 Priority: optional
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../../app/apm/node_modules/atom-package-manager/lib/cli.js" "$@"
@@ -1,22 +0,0 @@
-@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" %*
-)
@@ -1,9 +0,0 @@
-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);
@@ -1,22 +0,0 @@
-#!/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
@@ -4,9 +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" \
 atom-rpm /atom/script/rpmbuild
-docker rmi atom-rpm
@@ -34,9 +34,6 @@ exports.safeSpawn = function(command, args, options, callback) {
  var child = childProcess.spawn(command, args, options);
  child.stderr.pipe(process.stderr);
  child.stdout.pipe(process.stdout);
-  child.on('error', function(error) {
-    console.error('Command \'' + command + '\' failed: ' + error.message);
-  });
  child.on('exit', function(code) {
    if (code != 0)
      process.exit(code);
@@ -1,4 +1,4 @@
-{$} = require '../src/space-pen-extensions'
+{$} = require 'atom'

 describe '"atom" protocol URL', ->
  it 'sends the file relative in the package as response', ->
@@ -3,7 +3,6 @@ _ = require 'underscore-plus'
 {convertStackTrace} = require 'coffeestack'
 {View, $, $$} = require '../src/space-pen-extensions'
 grim = require 'grim'
-marked = require 'marked'

 sourceMaps = {}
 formatStackTrace = (spec, message='', stackTrace) ->
@@ -38,8 +37,7 @@ module.exports =
 class AtomReporter extends View
  @content: ->
    @div class: 'spec-reporter', =>
-      @div class: 'padded pull-right', =>
-        @button outlet: 'reloadButton', class: 'btn btn-small reload-button', 'Reload Specs'
+      @div outlet: "suites"
      @div outlet: 'coreArea', class: 'symbol-area', =>
        @div outlet: 'coreHeader', class: 'symbol-header'
        @ul outlet: 'coreSummary', class: 'symbol-summary list-unstyled'
@@ -81,8 +79,6 @@ class AtomReporter extends View
    @on 'click', '.stack-trace', ->
      $(this).toggleClass('expanded')

-    @reloadButton.on 'click', -> require('ipc').send('call-window-method', 'restart')
-
  reportRunnerResults: (runner) ->
    @updateSpecCounts()
    @status.addClass('alert-success').removeClass('alert-info') if @failedCount is 0
@@ -114,10 +110,9 @@ class AtomReporter extends View
    for deprecation in deprecations
      @deprecationList.append $$ ->
        @div class: 'padded', =>
-          @div class: 'result-message fail deprecation-message', =>
-            @raw marked(deprecation.message)
+          @div class: 'result-message fail deprecation-message', deprecation.message

-          for stack in deprecation.getStacks()
+          for stack in deprecation.stacks
            fullStack = stack.map ({functionName, location}) ->
              if functionName is '<unknown>'
                "  at #{location}"
@@ -1,10 +1,13 @@
-{$, $$}  = require '../src/space-pen-extensions'
+{$, $$, WorkspaceView}  = require 'atom'
 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', ->
@@ -30,16 +33,10 @@ describe "the `atom` global", ->
      version = '36b5518'
      expect(atom.isReleasedVersion()).toBe false

-  describe "when an update becomes available", ->
-    subscription = null
-
-    afterEach ->
-      subscription?.dispose()
-
-    it "invokes onUpdateAvailable listeners", ->
+  describe "window:update-available", ->
+    it "is triggered when the auto-updater sends the update-downloaded event", ->
      updateAvailableHandler = jasmine.createSpy("update-available-handler")
-      subscription = atom.onUpdateAvailable updateAvailableHandler
-
+      atom.workspaceView.on 'window:update-available', updateAvailableHandler
      autoUpdater = require('remote').require('auto-updater')
      autoUpdater.emit 'update-downloaded', null, "notes", "version"

@@ -47,81 +44,11 @@ describe "the `atom` global", ->
        updateAvailableHandler.callCount > 0

      runs ->
-        {releaseVersion, releaseNotes} = updateAvailableHandler.mostRecentCall.args[0]
-        expect(releaseVersion).toBe 'version'
-        expect(releaseNotes).toBe 'notes'
+        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
+        expect(notes).toBe 'notes'
+        expect(version).toBe 'version'

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

 ContextMenuManager = require '../src/context-menu-manager'

@@ -151,31 +151,24 @@ describe "ContextMenuManager", ->
      shouldDisplay = false
      expect(contextMenu.templateForEvent(dispatchedEvent)).toEqual []

-    describe "when the menus are specified in a legacy format", ->
-      beforeEach ->
-        jasmine.snapshotDeprecations()
+    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'

-      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'}
-            ]
-          }
-        ]
+      expect(contextMenu.templateForElement(parent)).toEqual [
+        {label: 'A', command: 'a'}
+        {type: 'separator'}
+        {
+          label: 'B'
+          submenu: [
+            {label: 'C', command: 'c'}
+            {type: 'separator'}
+            {label: 'D', command: 'd'}
+          ]
+        }
+      ]
@@ -1085,12 +1085,6 @@ 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
@@ -9,6 +9,5 @@ module.exports =
    atom.commands.add 'atom-workspace', 'activation-command', =>
      @activationCommandCallCount++

-    editorView = atom.views.getView(atom.workspace.getActiveTextEditor())?.__spacePenView
-    editorView?.command 'activation-command', =>
+    atom.workspaceView.getActiveView()?.command 'activation-command', =>
      @legacyActivationCommandCallCount++
@@ -1,4 +0,0 @@
-{
-  "name": "package-with-empty-keymap",
-  "version": "1.0.0"
-}
@@ -1,4 +0,0 @@
-{
-  "name": "package-with-empty-menu",
-  "version": "1.0.0"
-}
@@ -3,6 +3,5 @@
 ]

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

 'context-menu':
-  '.test-1': [
-    {label: 'Menu item 2', command: 'command-2'}
-  ]
+  '.test-1':
+    'Menu item 2': 'command-2'
@@ -1,4 +1,3 @@
 'context-menu':
-  '.test-1': [
-    {label: 'Menu item 3', command: 'command-3'}
-  ]
+  '.test-1':
+    'Menu item 3': 'command-3'
@@ -132,7 +132,7 @@ describe "GitRepository", ->
        atom.workspace.open(filePath)

      runs ->
-        editor = atom.workspace.getActiveTextEditor()
+        editor = atom.workspace.getActiveEditor()

    it "displays a confirmation dialog by default", ->
      spyOn(atom, 'confirm').andCallFake ({buttons}) -> buttons.OK()
@@ -259,10 +259,6 @@ 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] = []

@@ -25,9 +25,6 @@ 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'
@@ -96,13 +96,12 @@ describe "LanguageMode", ->
        buffer.setText("//this is a single line comment")
        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()

-    describe ".suggestedIndentForBufferRow", ->
-      it "bases indentation off of the previous non-blank line", ->
+    describe "suggestedIndentForBufferRow", ->
+      it "returns the suggested indentation based on auto-indent/outdent rules", ->
        expect(languageMode.suggestedIndentForBufferRow(0)).toBe 0
        expect(languageMode.suggestedIndentForBufferRow(1)).toBe 1
        expect(languageMode.suggestedIndentForBufferRow(2)).toBe 2
        expect(languageMode.suggestedIndentForBufferRow(9)).toBe 1
-        expect(languageMode.suggestedIndentForBufferRow(11)).toBe 1

    describe "rowRangeForParagraphAtBufferRow", ->
      describe "with code and comments", ->
@@ -381,23 +380,6 @@ describe "LanguageMode", ->
        expect(languageMode.isFoldableAtBufferRow(3)).toBe false
        expect(languageMode.isFoldableAtBufferRow(4)).toBe true

-    describe ".foldAllAtIndentLevel(indentLevel)", ->
-      it "folds blocks of text at the given indentation level", ->
-        languageMode.foldAllAtIndentLevel(0)
-        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
-        expect(editor.getLastScreenRow()).toBe 0
-
-        languageMode.foldAllAtIndentLevel(1)
-        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
-        expect(editor.lineTextForScreenRow(1)).toBe "  var sort = function(items) {"
-        expect(editor.getLastScreenRow()).toBe 4
-
-        languageMode.foldAllAtIndentLevel(2)
-        expect(editor.lineTextForScreenRow(0)).toBe "var quicksort = function () {"
-        expect(editor.lineTextForScreenRow(1)).toBe "  var sort = function(items) {"
-        expect(editor.lineTextForScreenRow(2)).toBe "    if (items.length <= 1) return items;"
-        expect(editor.getLastScreenRow()).toBe 9
-
  describe "folding with comments", ->
    beforeEach ->
      waitsForPromise ->
@@ -1,57 +0,0 @@
-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'
@@ -1,47 +0,0 @@
-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
@@ -1,38 +1,20 @@
-{$, $$} = require '../src/space-pen-extensions'
+{$, $$, WorkspaceView}  = require 'atom'
 Package = require '../src/package'

 describe "PackageManager", ->
-  workspaceElement = null
-
  beforeEach ->
-    workspaceElement = atom.views.getView(atom.workspace)
+    atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView

  describe "::loadPackage(name)", ->
-    beforeEach ->
+    it "continues if the package has an invalid package.json", ->
+      spyOn(console, 'warn')
      atom.config.set("core.disabledPackages", [])
+      expect(-> atom.packages.loadPackage("package-with-broken-package-json")).not.toThrow()

-    it "returns the package", ->
-      pack = atom.packages.loadPackage("package-with-index")
-      expect(pack instanceof Package).toBe true
-      expect(pack.metadata.name).toBe "package-with-index"
-
-    it "returns the package if it has an invalid keymap", ->
+    it "continues if the package has an invalid keymap", ->
      spyOn(console, 'warn')
-      pack = atom.packages.loadPackage("package-with-broken-keymap")
-      expect(pack instanceof Package).toBe true
-      expect(pack.metadata.name).toBe "package-with-broken-keymap"
-
-    it "returns null if the package has an invalid package.json", ->
-      spyOn(console, 'warn')
-      expect(atom.packages.loadPackage("package-with-broken-package-json")).toBeNull()
-      expect(console.warn.callCount).toBe(1)
-      expect(console.warn.argsForCall[0][0]).toContain("Failed to load package.json")
-
-    it "returns null if the package is not found in any package directory", ->
-      spyOn(console, 'warn')
-      expect(atom.packages.loadPackage("this-package-cannot-be-found")).toBeNull()
-      expect(console.warn.callCount).toBe(1)
-      expect(console.warn.argsForCall[0][0]).toContain("Could not resolve")
+      atom.config.set("core.disabledPackages", [])
+      expect(-> atom.packages.loadPackage("package-with-broken-keymap")).not.toThrow()

  describe "::unloadPackage(name)", ->
    describe "when the package is active", ->
@@ -115,29 +97,21 @@ 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

-        describe "when a package has configDefaults", ->
-          beforeEach ->
-            jasmine.snapshotDeprecations()
+        it "still assigns configDefaults from the module though deprecated", ->
+          expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()

-          afterEach ->
-            jasmine.restoreDeprecationsSnapshot()
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-config-defaults')

-          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
+          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 ->
-            jasmine.attachToDOM(workspaceElement)
+            atom.workspaceView.attachToDom()
            mainModule = require './fixtures/packages/package-with-activation-commands/index'
            mainModule.legacyActivationCommandCallCount = 0
            mainModule.activationCommandCallCount = 0
@@ -151,29 +125,29 @@ describe "PackageManager", ->

          it "defers requiring/activating the main module until an activation event bubbles to the root view", ->
            expect(promise.isFulfilled()).not.toBeTruthy()
-            workspaceElement.dispatchEvent(new CustomEvent('activation-command', bubbles: true))
+            atom.workspaceView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))

            waitsForPromise ->
              promise

          it "triggers the activation event on all handlers registered during activation", ->
            waitsForPromise ->
-              atom.workspace.open()
+              atom.workspaceView.open()

            runs ->
-              editorView = atom.views.getView(atom.workspace.getActiveTextEditor()).__spacePenView
+              editorView = atom.workspaceView.getActiveView()
              legacyCommandListener = jasmine.createSpy("legacyCommandListener")
              editorView.command 'activation-command', legacyCommandListener
              editorCommandListener = jasmine.createSpy("editorCommandListener")
              atom.commands.add 'atom-text-editor', 'activation-command', editorCommandListener
-              atom.commands.dispatch(editorView[0], 'activation-command')
+              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
              expect(mainModule.activate.callCount).toBe 1
              expect(mainModule.legacyActivationCommandCallCount).toBe 1
              expect(mainModule.activationCommandCallCount).toBe 1
              expect(legacyCommandListener.callCount).toBe 1
              expect(editorCommandListener.callCount).toBe 1
              expect(workspaceCommandListener.callCount).toBe 1
-              atom.commands.dispatch(editorView[0], 'activation-command')
+              editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
              expect(mainModule.legacyActivationCommandCallCount).toBe 2
              expect(mainModule.activationCommandCallCount).toBe 2
              expect(legacyCommandListener.callCount).toBe 2
@@ -214,30 +188,11 @@ describe "PackageManager", ->
          runs ->
            expect(pack.mainModule.activate).toHaveBeenCalledWith({someNumber: 77})

-      describe "when the package throws an error while loading", ->
-        it "logs a warning instead of throwing an exception", ->
-          atom.config.set("core.disabledPackages", [])
-          spyOn(console, "warn")
-          expect(-> atom.packages.activatePackage("package-that-throws-an-exception")).not.toThrow()
-          expect(console.warn).toHaveBeenCalled()
-
-      describe "when the package is not found", ->
-        it "rejects the promise", ->
-          atom.config.set("core.disabledPackages", [])
-
-          onSuccess = jasmine.createSpy('onSuccess')
-          onFailure = jasmine.createSpy('onFailure')
-          spyOn(console, 'warn')
-
-          atom.packages.activatePackage("this-doesnt-exist").then(onSuccess, onFailure)
-
-          waitsFor "promise to be rejected", ->
-            onFailure.callCount > 0
-
-          runs ->
-            expect(console.warn.callCount).toBe 1
-            expect(onFailure.mostRecentCall.args[0] instanceof Error).toBe true
-            expect(onFailure.mostRecentCall.args[0].message).toContain "Failed to load package 'this-doesnt-exist'"
+      it "logs warning instead of throwing an exception if the package fails to load", ->
+        atom.config.set("core.disabledPackages", [])
+        spyOn(console, "warn")
+        expect(-> atom.packages.activatePackage("package-that-throws-an-exception")).not.toThrow()
+        expect(console.warn).toHaveBeenCalled()

      describe "keymap loading", ->
        describe "when the metadata does not contain a 'keymaps' manifest", ->
@@ -273,14 +228,6 @@ describe "PackageManager", ->
              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-n', target:element1[0])[0].command).toBe 'keymap-2'
              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-y', target:element3[0])).toHaveLength 0

-        describe "when the keymap file is empty", ->
-          it "does not throw an error on activation", ->
-            waitsForPromise ->
-              atom.packages.activatePackage("package-with-empty-keymap")
-
-            runs ->
-              expect(atom.packages.isPackageActive("package-with-empty-keymap")).toBe true
-
      describe "menu loading", ->
        beforeEach ->
          atom.contextMenu.definitions = []
@@ -319,14 +266,6 @@ describe "PackageManager", ->
              expect(atom.contextMenu.templateForElement(element)[1].label).toBe "Menu item 1"
              expect(atom.contextMenu.templateForElement(element)[2]).toBeUndefined()

-        describe "when the menu file is empty", ->
-          it "does not throw an error on activation", ->
-            waitsForPromise ->
-              atom.packages.activatePackage("package-with-empty-menu")
-
-            runs ->
-              expect(atom.packages.isPackageActive("package-with-empty-menu")).toBe true
-
      describe "stylesheet loading", ->
        describe "when the metadata contains a 'stylesheets' manifest", ->
          it "loads stylesheets from the stylesheets directory as specified by the manifest", ->
@@ -410,35 +349,35 @@ describe "PackageManager", ->
            atom.packages.activatePackage('package-with-grammars')

          runs ->
-            expect(atom.grammars.selectGrammar('a.alot').name).toBe 'Alot'
-            expect(atom.grammars.selectGrammar('a.alittle').name).toBe 'Alittle'
+            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
+            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'

      describe "scoped-property loading", ->
        it "loads the scoped properties", ->
          waitsForPromise ->
-            atom.packages.activatePackage("package-with-settings")
+            atom.packages.activatePackage("package-with-scoped-properties")

          runs ->
-            expect(atom.config.get 'editor.increaseIndentPattern', scope: ['.source.omg']).toBe '^a'
+            expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'

    describe "converted textmate packages", ->
      it "loads the package's grammars", ->
-        expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
+        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"

        waitsForPromise ->
          atom.packages.activatePackage('language-ruby')

        runs ->
-          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Ruby"
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"

      it "loads the translated scoped properties", ->
-        expect(atom.config.get('editor.commentStart', scope: ['.source.ruby'])).toBeUndefined()
+        expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBeUndefined()

        waitsForPromise ->
          atom.packages.activatePackage('language-ruby')

        runs ->
-          expect(atom.config.get('editor.commentStart', scope: ['.source.ruby'])).toBe '# '
+          expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBe '# '

  describe "::deactivatePackage(id)", ->
    afterEach ->
@@ -515,8 +454,8 @@ describe "PackageManager", ->

        runs ->
          atom.packages.deactivatePackage('package-with-grammars')
-          expect(atom.grammars.selectGrammar('a.alot').name).toBe 'Null Grammar'
-          expect(atom.grammars.selectGrammar('a.alittle').name).toBe 'Null Grammar'
+          expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
+          expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'

      it "removes the package's keymaps", ->
        waitsForPromise ->
@@ -542,24 +481,24 @@ describe "PackageManager", ->

      it "removes the package's scoped-properties", ->
        waitsForPromise ->
-          atom.packages.activatePackage("package-with-settings")
+          atom.packages.activatePackage("package-with-scoped-properties")

        runs ->
-          expect(atom.config.get 'editor.increaseIndentPattern', scope: ['.source.omg']).toBe '^a'
-          atom.packages.deactivatePackage("package-with-settings")
-          expect(atom.config.get 'editor.increaseIndentPattern', scope: ['.source.omg']).toBeUndefined()
+          expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
+          atom.packages.deactivatePackage("package-with-scoped-properties")
+          expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()

    describe "textmate packages", ->
      it "removes the package's grammars", ->
-        expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
+        expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"

        waitsForPromise ->
          atom.packages.activatePackage('language-ruby')

        runs ->
-          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Ruby"
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
          atom.packages.deactivatePackage('language-ruby')
-          expect(atom.grammars.selectGrammar("file.rb").name).toBe "Null Grammar"
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"

      it "removes the package's scoped properties", ->
        waitsForPromise ->
@@ -567,14 +506,13 @@ describe "PackageManager", ->

        runs ->
          atom.packages.deactivatePackage('language-ruby')
-          expect(atom.config.get('editor.commentStart', scope: ['.source.ruby'])).toBeUndefined()
+          expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBeUndefined()

  describe "::activate()", ->
    packageActivator = null
    themeActivator = null

    beforeEach ->
-      jasmine.snapshotDeprecations()
      spyOn(console, 'warn')
      atom.packages.loadPackages()

@@ -588,9 +526,8 @@ describe "PackageManager", ->
      atom.packages.deactivatePackages()
      atom.packages.unloadPackages()

-      GrammarRegistry = require '../src/grammar-registry'
-      atom.grammars = window.syntax = new GrammarRegistry()
-      jasmine.restoreDeprecationsSnapshot()
+      Syntax = require '../src/syntax'
+      atom.syntax = window.syntax = new Syntax()

    it "activates all the packages, and none of the themes", ->
      atom.packages.activate()
@@ -604,9 +541,9 @@ describe "PackageManager", ->
      themes = themeActivator.mostRecentCall.args[0]
      expect(['theme']).toContain(theme.getType()) for theme in themes

-  describe "::enablePackage(id) and ::disablePackage(id)", ->
+  describe "::enablePackage() and ::disablePackage()", ->
    describe "with packages", ->
-      it "enables a disabled package", ->
+      it ".enablePackage() enables a disabled package", ->
        packageName = 'package-with-main'
        atom.config.pushAtKeyPath('core.disabledPackages', packageName)
        atom.packages.observeDisabledPackages()
@@ -624,7 +561,7 @@ describe "PackageManager", ->
          expect(activatedPackages).toContain(pack)
          expect(atom.config.get('core.disabledPackages')).not.toContain packageName

-      it "disables an enabled package", ->
+      it ".disablePackage() disables an enabled package", ->
        packageName = 'package-with-main'
        waitsForPromise ->
          atom.packages.activatePackage(packageName)
@@ -639,11 +576,6 @@ describe "PackageManager", ->
          expect(activatedPackages).not.toContain(pack)
          expect(atom.config.get('core.disabledPackages')).toContain packageName

-      it "returns null if the package cannot be loaded", ->
-        spyOn(console, 'warn')
-        expect(atom.packages.enablePackage("this-doesnt-exist")).toBeNull()
-        expect(console.warn.callCount).toBe 1
-
    describe "with themes", ->
      reloadedHandler = null

@@ -654,7 +586,7 @@ describe "PackageManager", ->
      afterEach ->
        atom.themes.deactivateThemes()

-      it "enables and disables a theme", ->
+      it ".enablePackage() and .disablePackage() enables and disables a theme", ->
        packageName = 'theme-with-package-file'

        expect(atom.config.get('core.themes')).not.toContain packageName
@@ -1,4 +1,4 @@
-{$} = require '../src/space-pen-extensions'
+{$} = require 'atom'
 path = require 'path'
 Package = require '../src/package'
 ThemePackage = require '../src/theme-package'
@@ -148,57 +148,3 @@ 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}]
-      ]
@@ -3,8 +3,7 @@ temp = require 'temp'
 PaneContainer = require '../src/pane-container'
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{Disposable} = require 'event-kit'
-{$, View, $$} = require '../src/space-pen-extensions'
+{$, View, $$} = require 'atom'

 describe "PaneContainerView", ->
  [TestView, container, pane1, pane2, pane3, deserializerDisposable] = []
@@ -19,8 +18,6 @@ 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()
@@ -1,8 +1,8 @@
 PaneContainer = require '../src/pane-container'
 PaneView = require '../src/pane-view'
 fs = require 'fs-plus'
-{Emitter, Disposable} = require 'event-kit'
-{$, View} = require '../src/space-pen-extensions'
+{Emitter} = require 'event-kit'
+{$, View} = require 'atom'
 path = require 'path'
 temp = require 'temp'

@@ -21,11 +21,8 @@ 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
@@ -44,7 +41,6 @@ describe "PaneView", ->

  afterEach ->
    deserializerDisposable.dispose()
-    jasmine.restoreDeprecationsSnapshot()

  describe "when the active pane item changes", ->
    it "hides all item views except the active one", ->
@@ -159,19 +155,14 @@ describe "PaneView", ->
      expect(view1.is(':visible')).toBe true

  describe "when the title of the active item changes", ->
-    describe 'when there is no onDidChangeTitle method (deprecated)', ->
+    describe 'when there is no onDidChangeTitle method', ->
      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
@@ -229,7 +220,7 @@ describe "PaneView", ->

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

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

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

    it "adds or removes the .active class as appropriate", ->
@@ -309,8 +300,8 @@ describe "PaneView", ->
      pane2Model = pane1Model.splitRight(items: [pane1Model.copyActiveItem()])
      pane3Model = pane2Model.splitDown(items: [pane2Model.copyActiveItem()])
      pane2 = pane2Model._view
-      pane2 = atom.views.getView(pane2Model).__spacePenView
-      pane3 = atom.views.getView(pane3Model).__spacePenView
+      pane2 = containerModel.getView(pane2Model).__spacePenView
+      pane3 = containerModel.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]]
@@ -1,10 +1,11 @@
+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] = []
+  [jasmineContent, element, container, viewRegistry] = []

  class TestPanelContainerItem
    constructior: ->
@@ -12,27 +13,29 @@ describe "PanelContainerElement", ->
  class TestPanelContainerItemElement extends HTMLElement
    createdCallback: ->
      @classList.add('test-root')
-    initialize: (@model) ->
-      this
-
+    setModel: (@model) ->
  TestPanelContainerItemElement = document.registerElement 'atom-test-container-item-element', prototype: TestPanelContainerItemElement.prototype

  beforeEach ->
    jasmineContent = document.body.querySelector('#jasmine-content')

-    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)
+    viewRegistry = new ViewRegistry
+    viewRegistry.addViewProvider
+      modelConstructor: Panel
+      viewConstructor: PanelElement
+    viewRegistry.addViewProvider
+      modelConstructor: PanelContainer
+      viewConstructor: PanelContainerElement
+    viewRegistry.addViewProvider
+      modelConstructor: TestPanelContainerItem
+      viewConstructor: TestPanelContainerItemElement

-    container = new PanelContainer({location: 'left'})
-    element = atom.views.getView(container)
+    container = new PanelContainer({viewRegistry, location: 'left'})
+    element = container.getView()
    jasmineContent.appendChild(element)

-  it 'has a location class with value from the model', ->
-    expect(element).toHaveClass 'left'
+  it 'has a location attribute with value from the model', ->
+    expect(element.getAttribute('location')).toBe 'left'

  it 'removes the element when the container is destroyed', ->
    expect(element.parentNode).toBe jasmineContent
@@ -40,38 +43,23 @@ 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({item: new TestPanelContainerItem()})
+        panel1 = new Panel({viewRegistry, 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].getAttribute('location')).toBe 'left'

        expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'

-        panel2 = new Panel({item: new TestPanelContainerItem()})
+        panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
        container.addPanel(panel2)
        expect(element.childNodes.length).toBe 2

-        expect(atom.views.getView(panel1).style.display).not.toBe 'none'
-        expect(atom.views.getView(panel2).style.display).not.toBe 'none'
+        expect(panel1.getView().style.display).not.toBe 'none'
+        expect(panel2.getView().style.display).not.toBe 'none'

        panel1.destroy()
        expect(element.childNodes.length).toBe 1
@@ -81,26 +69,24 @@ describe "PanelContainerElement", ->

    describe "when the container is at the bottom location", ->
      beforeEach ->
-        container = new PanelContainer({location: 'bottom'})
-        element = atom.views.getView(container)
+        container = new PanelContainer({viewRegistry, location: 'bottom'})
+        element = container.getView()
        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({item: new TestPanelContainerItem(), className: 'one'})
+        panel1 = new Panel({viewRegistry, 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].getAttribute('location')).toBe 'bottom'
        expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'
-        expect(atom.views.getView(panel1)).toHaveClass 'one'
+        expect(panel1.getView()).toHaveClass 'one'

-        panel2 = new Panel({item: new TestPanelContainerItem(), className: 'two'})
+        panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem(), className: 'two'})
        container.addPanel(panel2)
        expect(element.childNodes.length).toBe 2
-        expect(atom.views.getView(panel2)).toHaveClass 'two'
+        expect(panel2.getView()).toHaveClass 'two'

        panel1.destroy()
        expect(element.childNodes.length).toBe 1
@@ -110,34 +96,23 @@ describe "PanelContainerElement", ->

  describe "when the container is modal", ->
    beforeEach ->
-      container = new PanelContainer({location: 'modal'})
-      element = atom.views.getView(container)
+      container = new PanelContainer({viewRegistry, location: 'modal'})
+      element = container.getView()
      jasmineContent.appendChild(element)

    it "allows only one panel to be visible at a time", ->
-      panel1 = new Panel({item: new TestPanelContainerItem()})
+      panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
      container.addPanel(panel1)

-      expect(atom.views.getView(panel1).style.display).not.toBe 'none'
+      expect(panel1.getView().style.display).not.toBe 'none'

-      panel2 = new Panel({item: new TestPanelContainerItem()})
+      panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
      container.addPanel(panel2)

-      expect(atom.views.getView(panel1).style.display).toBe 'none'
-      expect(atom.views.getView(panel2).style.display).not.toBe 'none'
+      expect(panel1.getView().style.display).toBe 'none'
+      expect(panel2.getView().style.display).not.toBe 'none'

      panel1.show()

-      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'
+      expect(panel1.getView().style.display).not.toBe 'none'
+      expect(panel2.getView().style.display).toBe 'none'
@@ -1,14 +1,16 @@
+ViewRegistry = require '../src/view-registry'
 Panel = require '../src/panel'
 PanelContainer = require '../src/panel-container'

 describe "PanelContainer", ->
-  [container] = []
+  [container, viewRegistry] = []

  class TestPanelItem
    constructior: ->

  beforeEach ->
-    container = new PanelContainer
+    viewRegistry = new ViewRegistry
+    container = new PanelContainer({viewRegistry})

  describe "::addPanel(panel)", ->
    it 'emits an onDidAddPanel event with the index the panel was inserted at', ->
@@ -44,7 +46,7 @@ describe "PanelContainer", ->
      [initialPanel] = []
      beforeEach ->
        # 'left' logic is the same as 'top'
-        container = new PanelContainer({location: 'left'})
+        container = new PanelContainer({viewRegistry, location: 'left'})
        initialPanel = new Panel(item: new TestPanelItem())
        container.addPanel(initialPanel)

@@ -73,7 +75,7 @@ describe "PanelContainer", ->
      [initialPanel] = []
      beforeEach ->
        # 'bottom' logic is the same as 'right'
-        container = new PanelContainer({location: 'right'})
+        container = new PanelContainer({viewRegistry, location: 'right'})
        initialPanel = new Panel(item: new TestPanelItem())
        container.addPanel(initialPanel)

@@ -1,8 +1,9 @@
+ViewRegistry = require '../src/view-registry'
 Panel = require '../src/panel'
 PanelElement = require '../src/panel-element'

 describe "PanelElement", ->
-  [jasmineContent, element, panel] = []
+  [jasmineContent, element, panel, viewRegistry] = []

  class TestPanelItem
    constructior: ->
@@ -10,22 +11,23 @@ describe "PanelElement", ->
  class TestPanelItemElement extends HTMLElement
    createdCallback: ->
      @classList.add('test-root')
-    initialize: (@model) ->
-      this
-
+    setModel: (@model) ->
  TestPanelItemElement = document.registerElement 'atom-test-item-element', prototype: TestPanelItemElement.prototype

  beforeEach ->
    jasmineContent = document.body.querySelector('#jasmine-content')

-    atom.views.addViewProvider Panel, (model) ->
-      new PanelElement().initialize(model)
-    atom.views.addViewProvider TestPanelItem, (model) ->
-      new TestPanelItemElement().initialize(model)
+    viewRegistry = new ViewRegistry
+    viewRegistry.addViewProvider
+      modelConstructor: Panel
+      viewConstructor: PanelElement
+    viewRegistry.addViewProvider
+      modelConstructor: TestPanelItem
+      viewConstructor: TestPanelItemElement

  it 'removes the element when the panel is destroyed', ->
-    panel = new Panel({item: new TestPanelItem})
-    element = atom.views.getView(panel)
+    panel = new Panel({viewRegistry, item: new TestPanelItem})
+    element = panel.getView()
    jasmineContent.appendChild(element)

    expect(element.parentNode).toBe jasmineContent
@@ -34,15 +36,15 @@ describe "PanelElement", ->

  describe "changing panel visibility", ->
    it 'initially renders panel created with visibile: false', ->
-      panel = new Panel({visible: false, item: new TestPanelItem})
-      element = atom.views.getView(panel)
+      panel = new Panel({viewRegistry, visible: false, item: new TestPanelItem})
+      element = panel.getView()
      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({item: new TestPanelItem})
-      element = atom.views.getView(panel)
+      panel = new Panel({viewRegistry, item: new TestPanelItem})
+      element = panel.getView()
      jasmineContent.appendChild(element)

      expect(element.style.display).not.toBe 'none'
@@ -55,8 +57,8 @@ describe "PanelElement", ->

  describe "when a class name is specified", ->
    it 'initially renders panel created with visibile: false', ->
-      panel = new Panel({className: 'some classes', item: new TestPanelItem})
-      element = atom.views.getView(panel)
+      panel = new Panel({viewRegistry, className: 'some classes', item: new TestPanelItem})
+      element = panel.getView()
      jasmineContent.appendChild(element)

      expect(element).toHaveClass 'some'
@@ -21,7 +21,3 @@ describe "Panel", ->
      panel.show()
      expect(panel.isVisible()).toBe true
      expect(spy).toHaveBeenCalledWith(true)
-
-      panel.destroy()
-      expect(panel.isVisible()).toBe false
-      expect(spy).toHaveBeenCalledWith(false)
@@ -4,6 +4,7 @@ Project = require '../src/project'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 path = require 'path'
+platform = require './spec-helper-platform'
 BufferedProcess = require '../src/buffered-process'

 describe "Project", ->
@@ -169,30 +170,314 @@ describe "Project", ->
        absolutePath = fs.absolute(__dirname)
        expect(atom.project.resolve(absolutePath)).toBe absolutePath

-  describe ".setPaths(path)", ->
+  describe ".setPath(path)", ->
    describe "when path is a file", ->
      it "sets its path to the files parent directory and updates the root directory", ->
        atom.project.setPaths([require.resolve('./fixtures/dir/a')])
        expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-        expect(atom.project.getDirectories()[0].path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+        expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))

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

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

    it "normalizes the path to remove consecutive slashes, ., and .. segments", ->
      atom.project.setPaths(["#{require.resolve('./fixtures/dir/a')}#{path.sep}b#{path.sep}#{path.sep}.."])
      expect(atom.project.getPaths()[0]).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
-      expect(atom.project.getDirectories()[0].path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+      expect(atom.project.getRootDirectory().path).toEqual path.dirname(require.resolve('./fixtures/dir/a'))
+
+  describe ".replace()", ->
+    [filePath, commentFilePath, sampleContent, sampleCommentContent] = []
+
+    beforeEach ->
+      atom.project.setPaths([atom.project.resolve('../')])
+
+      filePath = atom.project.resolve('sample.js')
+      commentFilePath = atom.project.resolve('sample-with-comments.js')
+      sampleContent = fs.readFileSync(filePath).toString()
+      sampleCommentContent = fs.readFileSync(commentFilePath).toString()
+
+    afterEach ->
+      fs.writeFileSync(filePath, sampleContent)
+      fs.writeFileSync(commentFilePath, sampleCommentContent)
+
+    describe "when a file doesn't exist", ->
+      it "calls back with an error", ->
+        errors = []
+        missingPath = path.resolve('/not-a-file.js')
+        expect(fs.existsSync(missingPath)).toBeFalsy()
+
+        waitsForPromise ->
+          atom.project.replace /items/gi, 'items', [missingPath], (result, error) ->
+            errors.push(error)
+
+        runs ->
+          expect(errors).toHaveLength 1
+          expect(errors[0].path).toBe missingPath
+
+    describe "when called with unopened files", ->
+      it "replaces properly", ->
+        results = []
+        waitsForPromise ->
+          atom.project.replace /items/gi, 'items', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+    describe "when a buffer is already open", ->
+      it "replaces properly and saves when not modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample.js').then (o) -> editor = o
+
+        runs ->
+          expect(editor.isModified()).toBeFalsy()
+
+        waitsForPromise ->
+          atom.project.replace /items/gi, 'items', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+          expect(editor.isModified()).toBeFalsy()
+
+      it "does not replace when the path is not specified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample-with-comments.js').then (o) -> editor = o
+
+        waitsForPromise ->
+          atom.project.replace /items/gi, 'items', [commentFilePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe commentFilePath
+
+      it "does NOT save when modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('sample.js').then (o) -> editor = o
+
+        runs ->
+          editor.buffer.setTextInRange([[0,0],[0,0]], 'omg')
+          expect(editor.isModified()).toBeTruthy()
+
+        waitsForPromise ->
+          atom.project.replace /items/gi, 'okthen', [filePath], (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+          expect(results[0].filePath).toBe filePath
+          expect(results[0].replacements).toBe 6
+
+          expect(editor.isModified()).toBeTruthy()
+
+  describe ".scan(options, callback)", ->
+    describe "when called with a regex", ->
+      it "calls the callback with all regex results in all files in the project", ->
+        results = []
+        waitsForPromise ->
+          atom.project.scan /(a)+/, (result) ->
+            results.push(result)
+
+        runs ->
+          expect(results).toHaveLength(3)
+          expect(results[0].filePath).toBe atom.project.resolve('a')
+          expect(results[0].matches).toHaveLength(3)
+          expect(results[0].matches[0]).toEqual
+            matchText: 'aaa'
+            lineText: 'aaa bbb'
+            lineTextOffset: 0
+            range: [[0, 0], [0, 3]]
+
+      it "works with with escaped literals (like $ and ^)", ->
+        results = []
+        waitsForPromise ->
+          atom.project.scan /\$\w+/, (result) -> results.push(result)
+
+        runs ->
+          expect(results.length).toBe 1
+
+          {filePath, matches} = results[0]
+          expect(filePath).toBe atom.project.resolve('a')
+          expect(matches).toHaveLength 1
+          expect(matches[0]).toEqual
+            matchText: '$bill'
+            lineText: 'dollar$bill'
+            lineTextOffset: 0
+            range: [[2, 6], [2, 11]]
+
+      it "works on evil filenames", ->
+        platform.generateEvilFiles()
+        atom.project.setPaths([path.join(__dirname, 'fixtures', 'evil-files')])
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.project.scan /evil/, (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          _.each(matches, (m) -> expect(m.matchText).toEqual 'evil')
+
+          if platform.isWindows()
+            expect(paths.length).toBe 3
+            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
+            expect(paths[1]).toMatch /file with spaces.txt$/
+            expect(path.basename(paths[2])).toBe "utfa\u0306.md"
+          else
+            expect(paths.length).toBe 5
+            expect(paths[0]).toMatch /a_file_with_utf8.txt$/
+            expect(paths[1]).toMatch /file with spaces.txt$/
+            expect(paths[2]).toMatch /goddam\nnewlines$/m
+            expect(paths[3]).toMatch /quote".txt$/m
+            expect(path.basename(paths[4])).toBe "utfa\u0306.md"
+
+      it "ignores case if the regex includes the `i` flag", ->
+        results = []
+        waitsForPromise ->
+          atom.project.scan /DOLLAR/i, (result) -> results.push(result)
+
+        runs ->
+          expect(results).toHaveLength 1
+
+      describe "when the core.excludeVcsIgnoredPaths config is truthy", ->
+        [projectPath, ignoredPath] = []
+
+        beforeEach ->
+          sourceProjectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
+          projectPath = path.join(temp.mkdirSync("atom"))
+
+          writerStream = fstream.Writer(projectPath)
+          fstream.Reader(sourceProjectPath).pipe(writerStream)
+
+          waitsFor (done) ->
+            writerStream.on 'close', done
+            writerStream.on 'error', done
+
+          runs ->
+            fs.rename(path.join(projectPath, 'git.git'), path.join(projectPath, '.git'))
+            ignoredPath = path.join(projectPath, 'ignored.txt')
+            fs.writeFileSync(ignoredPath, 'this match should not be included')
+
+        afterEach ->
+          fs.removeSync(projectPath) if fs.existsSync(projectPath)
+
+        it "excludes ignored files", ->
+          atom.project.setPaths([projectPath])
+          atom.config.set('core.excludeVcsIgnoredPaths', true)
+          resultHandler = jasmine.createSpy("result found")
+          waitsForPromise ->
+            atom.project.scan /match/, (results) ->
+              resultHandler()
+
+          runs ->
+            expect(resultHandler).not.toHaveBeenCalled()
+
+      it "includes only files when a directory filter is specified", ->
+        projectPath = path.join(path.join(__dirname, 'fixtures', 'dir'))
+        atom.project.setPaths([projectPath])
+
+        filePath = path.join(projectPath, 'a-dir', 'oh-git')
+
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.project.scan /aaa/, paths: ["a-dir#{path.sep}"], (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          expect(paths.length).toBe 1
+          expect(paths[0]).toBe filePath
+          expect(matches.length).toBe 1
+
+      it "includes files and folders that begin with a '.'", ->
+        projectPath = temp.mkdirSync()
+        filePath = path.join(projectPath, '.text')
+        fs.writeFileSync(filePath, 'match this')
+        atom.project.setPaths([projectPath])
+        paths = []
+        matches = []
+        waitsForPromise ->
+          atom.project.scan /match this/, (result) ->
+            paths.push(result.filePath)
+            matches = matches.concat(result.matches)
+
+        runs ->
+          expect(paths.length).toBe 1
+          expect(paths[0]).toBe filePath
+          expect(matches.length).toBe 1
+
+      it "excludes values in core.ignoredNames", ->
+        projectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir')
+        ignoredNames = atom.config.get("core.ignoredNames")
+        ignoredNames.push("a")
+        atom.config.set("core.ignoredNames", ignoredNames)
+
+        resultHandler = jasmine.createSpy("result found")
+        waitsForPromise ->
+          atom.project.scan /dollar/, (results) ->
+            resultHandler()
+
+        runs ->
+          expect(resultHandler).not.toHaveBeenCalled()
+
+      it "scans buffer contents if the buffer is modified", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open('a').then (o) ->
+            editor = o
+            editor.setText("Elephant")
+
+        waitsForPromise ->
+          atom.project.scan /a|Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 3
+          resultForA = _.find results, ({filePath}) -> path.basename(filePath) == 'a'
+          expect(resultForA.matches).toHaveLength 1
+          expect(resultForA.matches[0].matchText).toBe 'Elephant'
+
+      it "ignores buffers outside the project", ->
+        editor = null
+        results = []
+
+        waitsForPromise ->
+          atom.project.open(temp.openSync().path).then (o) ->
+            editor = o
+            editor.setText("Elephant")
+
+        waitsForPromise ->
+          atom.project.scan /Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 0

  describe ".eachBuffer(callback)", ->
    beforeEach ->
@@ -1,5 +1,5 @@
 SelectListView = require '../src/select-list-view'
-{$, $$} = require '../src/space-pen-extensions'
+{$, $$} = require 'atom'

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

 describe "SpacePen extensions", ->
  class TestView extends View
@@ -9,17 +9,12 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Grim = require 'grim'
 KeymapManager = require '../src/keymap-extensions'
-
-# FIXME: Remove jquery from this
-{$} = require '../src/space-pen-extensions'
-
+{$, WorkspaceView, Workspace} = require 'atom'
 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'
@@ -81,19 +76,13 @@ beforeEach ->
  atom.commands.restoreSnapshot(commandsToRestore)
  atom.styles.restoreSnapshot(styleElementsToRestore)

-  atom.workspaceViewParentSelector = '#jasmine-content'
-
  window.resetTimeouts()
-  spyOn(_._, "now").andCallFake -> window.now
-  spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
-  spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
-
  atom.packages.packageStates = {}

  serializedWindowState = null

  spyOn(atom, 'saveSync')
-  atom.grammars.clearGrammarOverrides()
+  atom.syntax.clearGrammarOverrides()

  spy = spyOn(atom.packages, 'resolvePackagePath').andCallFake (packageName) ->
    if specPackageName and packageName is specPackageName
@@ -106,9 +95,9 @@ beforeEach ->
  spyOn(atom.menu, 'sendToBrowserProcess')

  # reset config before each spec; don't load or save from/to `config.json`
-  spyOn(Config::, 'load')
-  spyOn(Config::, 'save')
  config = new Config({resourcePath, configDirPath: atom.getConfigDirPath()})
+  spyOn(config, 'load')
+  spyOn(config, 'save')
  atom.config = config
  atom.loadConfig()
  config.set "core.destroyEmptyPanes", false
@@ -118,14 +107,16 @@ beforeEach ->
  config.set "core.disabledPackages", ["package-that-throws-an-exception",
    "package-with-broken-package-json", "package-with-broken-keymap"]
  config.set "editor.useShadowDOM", true
-  advanceClock(1000)
  config.load.reset()
  config.save.reset()

  # make editor display updates synchronous
-  TextEditorElement::setUpdatedSynchronously(true)
+  spyOn(TextEditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
+  TextEditorComponent.performSyncUpdates = true

  spyOn(atom, "setRepresentedFilename")
+  spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
+  spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
  spyOn(pathwatcher.File.prototype, "detectResurrectionAfterDelay").andCallFake -> @detectResurrection()
  spyOn(TextEditor.prototype, "shouldPromptToSave").andReturn false

@@ -144,9 +135,8 @@ afterEach ->
  atom.menu.template = []
  atom.contextMenu.clear()

-  atom.workspace?.destroy()
-  atom.workspace = null
-  atom.__workspaceView = null
+  atom.workspaceView?.remove?()
+  atom.workspaceView = null
  delete atom.state.workspace

  atom.project?.destroy()
@@ -160,7 +150,7 @@ afterEach ->

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

 ensureNoPathSubscriptions = ->
@@ -201,17 +191,6 @@ 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 = _.clone(Grim.deprecations)
-
-jasmine.restoreDeprecationsSnapshot = ->
-  Grim.deprecations = deprecationsSnapshot
-
 addCustomMatchers = (spec) ->
  spec.addMatchers
    toBeInstanceOf: (expected) ->
@@ -1,104 +0,0 @@
-ChildProcess = require 'child_process'
-{EventEmitter} = require 'events'
-fs = require 'fs-plus'
-path = require 'path'
-temp = require 'temp'
-SquirrelUpdate = require '../src/browser/squirrel-update'
-
-describe "Windows squirrel updates", ->
-  tempHomeDirectory = null
-
-  beforeEach ->
-    # Prevent the actually home directory from being manipulated
-    tempHomeDirectory = temp.mkdirSync('atom-temp-home-')
-    spyOn(fs, 'getHomeDirectory').andReturn(tempHomeDirectory)
-
-    # Prevent any commands from actually running and affecting the host
-    originalSpawn = ChildProcess.spawn
-    spyOn(ChildProcess, 'spawn').andCallFake (command, args) ->
-      if path.basename(command) is 'Update.exe' and args?[0] is '--createShortcut'
-        fs.writeFileSync(path.join(tempHomeDirectory, 'Desktop', 'Atom.lnk'), '')
-
-      # Just spawn something that won't actually modify the host
-      if process.platform is 'win32'
-        originalSpawn('dir')
-      else
-        originalSpawn('ls')
-
-  it "ignores errors spawning Squirrel", ->
-    jasmine.unspy(ChildProcess, 'spawn')
-    spyOn(ChildProcess, 'spawn').andCallFake -> throw new Error("EBUSY")
-
-    app = quit: jasmine.createSpy('quit')
-    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-  it "quits the app on all squirrel events", ->
-    app = quit: jasmine.createSpy('quit')
-
-    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      app.quit.reset()
-      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-updated')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      app.quit.reset()
-      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-uninstall')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      app.quit.reset()
-      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-obsolete')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      expect(SquirrelUpdate.handleStartupEvent(app, '--not-squirrel')).toBe false
-
-  it "keeps the desktop shortcut deleted on updates if it was previously deleted after install", ->
-    desktopShortcutPath = path.join(tempHomeDirectory, 'Desktop', 'Atom.lnk')
-    expect(fs.existsSync(desktopShortcutPath)).toBe false
-
-    app = quit: jasmine.createSpy('quit')
-    expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-install')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      app.quit.reset()
-      expect(fs.existsSync(desktopShortcutPath)).toBe true
-      fs.removeSync(desktopShortcutPath)
-      expect(fs.existsSync(desktopShortcutPath)).toBe false
-      expect(SquirrelUpdate.handleStartupEvent(app, '--squirrel-updated')).toBe true
-
-    waitsFor ->
-      app.quit.callCount is 1
-
-    runs ->
-      expect(fs.existsSync(desktopShortcutPath)).toBe false
-
-  describe ".restartAtom", ->
-    it "quits the app and spawns a new one", ->
-      app = new EventEmitter()
-      app.quit = jasmine.createSpy('quit')
-
-      SquirrelUpdate.restartAtom(app)
-      expect(app.quit.callCount).toBe 1
-
-      expect(ChildProcess.spawn.callCount).toBe 0
-      app.emit('will-quit')
-      expect(ChildProcess.spawn.callCount).toBe 1
-      expect(path.basename(ChildProcess.spawn.argsForCall[0][0])).toBe 'atom.cmd'
@@ -53,16 +53,14 @@ describe "StyleManager", ->
        expect(addEvents[0].getAttribute('source-path')).toBe '/foo/bar'
        expect(addEvents[0].textContent).toBe "a {color: yellow;}"

-    describe "when a priority parameter is specified", ->
-      it "inserts the style sheet based on the priority", ->
-        manager.addStyleSheet("a {color: red}", priority: 1)
-        manager.addStyleSheet("a {color: blue}", priority: 0)
-        manager.addStyleSheet("a {color: green}", priority: 2)
-        manager.addStyleSheet("a {color: yellow}", priority: 1)
+    describe "when a group parameter is specified", ->
+      it "inserts the stylesheet at the end of any existing stylesheets for the same group", ->
+        manager.addStyleSheet("a {color: red}", group: 'a')
+        manager.addStyleSheet("a {color: blue}", group: 'b')
+        manager.addStyleSheet("a {color: green}", group: 'a')

        expect(manager.getStyleElements().map (elt) -> elt.textContent).toEqual [
-          "a {color: blue}"
          "a {color: red}"
-          "a {color: yellow}"
          "a {color: green}"
+          "a {color: blue}"
        ]
@@ -32,18 +32,16 @@ describe "StylesElement", ->
    expect(element.children[initialChildCount].textContent).toBe "a {color: blue;}"
    expect(removedStyleElements).toEqual [addedStyleElements[0]]

-  it "orders style elements by priority", ->
+  it "orders style elements by group", ->
    initialChildCount = element.children.length

-    atom.styles.addStyleSheet("a {color: red}", priority: 1)
-    atom.styles.addStyleSheet("a {color: blue}", priority: 0)
-    atom.styles.addStyleSheet("a {color: green}", priority: 2)
-    atom.styles.addStyleSheet("a {color: yellow}", priority: 1)
+    atom.styles.addStyleSheet("a {color: red}", group: 'a')
+    atom.styles.addStyleSheet("a {color: blue}", group: 'b')
+    atom.styles.addStyleSheet("a {color: green}", group: 'a')

-    expect(element.children[initialChildCount].textContent).toBe "a {color: blue}"
-    expect(element.children[initialChildCount + 1].textContent).toBe "a {color: red}"
-    expect(element.children[initialChildCount + 2].textContent).toBe "a {color: yellow}"
-    expect(element.children[initialChildCount + 3].textContent).toBe "a {color: green}"
+    expect(element.children[initialChildCount].textContent).toBe "a {color: red}"
+    expect(element.children[initialChildCount + 1].textContent).toBe "a {color: green}"
+    expect(element.children[initialChildCount + 2].textContent).toBe "a {color: blue}"

  it "updates existing style nodes when style elements are updated", ->
    initialChildCount = element.children.length
@@ -76,39 +74,3 @@ describe "StylesElement", ->
    expect(element.children.length).toBe 2
    expect(element.children[0].textContent).toBe "a {color: red;}"
    expect(element.children[1].textContent).toBe "a {color: blue;}"
-
-  describe "atom-text-editor shadow DOM selector upgrades", ->
-    beforeEach ->
-      element.setAttribute('context', 'atom-text-editor')
-      spyOn(console, 'warn')
-
-    it "upgrades selectors containing .editor-colors", ->
-      atom.styles.addStyleSheet(".editor-colors {background: black;}", context: 'atom-text-editor')
-      expect(element.firstChild.sheet.cssRules[0].selectorText).toBe ':host'
-
-    it "upgrades selectors containing .editor", ->
-      atom.styles.addStyleSheet """
-        .editor {background: black;}
-        .editor.mini {background: black;}
-        .editor:focus {background: black;}
-      """, context: 'atom-text-editor'
-
-      expect(element.firstChild.sheet.cssRules[0].selectorText).toBe ':host'
-      expect(element.firstChild.sheet.cssRules[1].selectorText).toBe ':host(.mini)'
-      expect(element.firstChild.sheet.cssRules[2].selectorText).toBe ':host(:focus)'
-
-    it "defers selector upgrade until the element is attached", ->
-      element = new StylesElement
-      element.setAttribute('context', 'atom-text-editor')
-      element.initialize()
-
-      atom.styles.addStyleSheet ".editor {background: black;}", context: 'atom-text-editor'
-      expect(element.firstChild.sheet).toBeNull()
-
-      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'
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Nathan Sobo	f06c3402c3	WIP: Transfer foreground/background color into shadow DOM Refs #4086	2014-11-11 16:59:36 -07:00
Nathan Sobo	e3d70ebad0	💄	2014-11-11 16:58:38 -07:00