Show devtools console for all console errors

2014-06-23 12:58:26 +02:00
@@ -11,7 +11,6 @@ pairs:
  bo: Ben Ogle; benogle
  jr: Jason Rudolph; jasonrudolph
  jl: Jessica Lord; jlord
-  dh: Daniel Hengeveld; danielh
 email:
  domain: github.com
 #global: true
@@ -6,25 +6,10 @@ Visit [atom.io](https://atom.io) to learn more.

 ## Installing

-### Mac OS X
-
 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).

 Atom will automatically update when a new release is available.

-### Windows
-
-Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).
-
-1. Install [chocolatey](https://chocolatey.org).
-2. Close and reopen your command prompt or PowerShell window.
-3. Run `cinst Atom`
-4. In the future run `cup Atom` to upgrade to the latest release.
-
-You can also download a `.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
-The Windows version does not currently automatically update so you will need to
-manually upgrade to future releases by re-downloading the `.zip` file.
-
 ## Building

 * [Linux](docs/build-instructions/linux.md)
@@ -33,5 +18,4 @@ manually upgrade to future releases by re-downloading the `.zip` file.
 * [Windows](docs/build-instructions/windows.md)

 ## Developing
-
 Check out the [guides](https://atom.io/docs/latest) and the [API reference](https://atom.io/docs/api).
@@ -6,6 +6,6 @@
    "url": "https://github.com/atom/atom.git"
  },
  "dependencies": {
-    "atom-package-manager": "0.83.0"
+    "atom-package-manager": "0.69.0"
  }
 }
@@ -69,11 +69,6 @@ elif [ $OS == 'Linux' ]; then
  SCRIPT=$(readlink -f "$0")
  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-  DOT_ATOM_DIR="$HOME/.atom"
-
-  if [ ! -d "$DOT_ATOM_DIR" ]; then
-    mkdir -p "$DOT_ATOM_DIR"
-  fi

  : ${TMPDIR:=/tmp}

@@ -84,9 +79,9 @@ elif [ $OS == 'Linux' ]; then
    exit $?
  else
    (
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$DOT_ATOM_DIR/nohup.out" 2>&1
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$TMPDIR/atom-nohup.out" 2>&1
    if [ $? -ne 0 ]; then
-      cat "$DOT_ATOM_DIR/nohup.out"
+      cat "$TMPDIR/atom-nohup.out"
      exit $?
    fi
    ) &
@@ -39,28 +39,21 @@ module.exports = (grunt) ->
  tmpDir = os.tmpdir()
  appName = if process.platform is 'darwin' then 'Atom.app' else 'Atom'
  buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
-  installDir = grunt.option('install-dir')
-
-  home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
-  atomShellDownloadDir = path.join(home, '.atom', 'atom-shell')
-
+  atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
  symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
  shellAppDir = path.join(buildDir, appName)
  if process.platform is 'win32'
    contentsDir = shellAppDir
    appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= path.join(process.env.ProgramFiles, appName)
-    killCommand = 'taskkill /F /IM atom.exe'
+    installDir = path.join(process.env.ProgramFiles, appName)
  else if process.platform is 'darwin'
    contentsDir = path.join(shellAppDir, 'Contents')
    appDir = path.join(contentsDir, 'Resources', 'app')
-    installDir ?= path.join('/Applications', appName)
-    killCommand = 'pkill -9 Atom'
+    installDir = path.join('/Applications', appName)
  else
    contentsDir = shellAppDir
    appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
-    killCommand ='pkill -9 Atom'
+    installDir = process.env.INSTALL_PREFIX ? '/usr/local'

  coffeeConfig =
    glob_to_multiple:
@@ -96,8 +89,6 @@ module.exports = (grunt) ->
  csonConfig =
    options:
      rootObject: true
-      cachePath: path.join(home, '.atom', 'compile-cache', 'grunt-cson')
-
    glob_to_multiple:
      expand: true
      src: [
@@ -130,8 +121,6 @@ module.exports = (grunt) ->

    atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}

-    docsOutputDir: 'docs/output/api'
-
    coffee: coffeeConfig

    less: lessConfig
@@ -221,7 +210,7 @@ module.exports = (grunt) ->

    shell:
      'kill-atom':
-        command: killCommand
+        command: 'pkill -9 Atom'
        options:
          stdout: false
          stderr: false
@@ -13,11 +13,11 @@
    "github-releases": "~0.2.0",
    "grunt": "~0.4.1",
    "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
-    "grunt-contrib-coffee": "~0.9.0",
+    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
    "grunt-contrib-csslint": "~0.1.2",
+    "grunt-contrib-coffee": "~0.9.0",
    "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.10.0",
+    "grunt-cson": "0.8.0",
    "grunt-download-atom-shell": "~0.8.0",
    "grunt-lesslint": "0.13.0",
    "grunt-markdown": "~0.4.0",
@@ -27,15 +27,15 @@
    "json-front-matter": "~0.1.3",
    "legal-eagle": "~0.4.0",
    "minidump": "~0.7",
-    "normalize-package-data": "0.2.12",
-    "npm": "~1.4.5",
-    "rcedit": "~0.1.2",
    "read-package-json": "1.1.8",
+    "normalize-package-data": "0.2.12",
+    "rcedit": "~0.1.2",
    "request": "~2.27.0",
    "rimraf": "~2.2.2",
    "runas": "0.5.x",
    "underscore-plus": "1.x",
    "unzip": "~0.1.9",
-    "vm-compatibility-layer": "~0.1.0"
+    "vm-compatibility-layer": "~0.1.0",
+    "npm": "~1.4.5"
  }
 }
@@ -14,9 +14,9 @@ module.exports = (grunt) ->
    mkdir path.dirname(buildDir)

    if process.platform is 'darwin'
-      cp 'atom-shell/Atom.app', shellAppDir, filter: /default_app/
+      cp 'atom-shell/Atom.app', shellAppDir
    else
-      cp 'atom-shell', shellAppDir, filter: /default_app/
+      cp 'atom-shell', shellAppDir

    mkdir appDir

@@ -45,45 +45,19 @@ module.exports = (grunt) ->
      path.join('git-utils', 'deps')
      path.join('oniguruma', 'deps')
      path.join('less', 'dist')
+      path.join('less', 'test')
      path.join('bootstrap', 'docs')
-      path.join('bootstrap', '_config.yml')
-      path.join('bootstrap', '_includes')
-      path.join('bootstrap', '_layouts')
-      path.join('npm', 'doc')
-      path.join('npm', 'html')
-      path.join('npm', 'man')
-      path.join('npm', 'node_modules', '.bin', 'beep')
-      path.join('npm', 'node_modules', '.bin', 'clear')
-      path.join('npm', 'node_modules', '.bin', 'starwars')
+      path.join('bootstrap', 'examples')
      path.join('pegjs', 'examples')
+      path.join('plist', 'tests')
+      path.join('xmldom', 'test')
      path.join('jasmine-reporters', 'ext')
-      path.join('jasmine-node', 'node_modules', 'gaze')
-      path.join('jasmine-node', 'spec')
-      path.join('node_modules', 'nan')
-      path.join('build', 'binding.Makefile')
-      path.join('build', 'config.gypi')
-      path.join('build', 'gyp-mac-tool')
-      path.join('build', 'Makefile')
      path.join('build', 'Release', 'obj.target')
      path.join('build', 'Release', 'obj')
      path.join('build', 'Release', '.deps')
      path.join('vendor', 'apm')
      path.join('resources', 'mac')
      path.join('resources', 'win')
-
-      # These are only require in dev mode when the grammar isn't precompiled
-      path.join('atom-keymap', 'node_modules', 'loophole')
-      path.join('atom-keymap', 'node_modules', 'pegjs')
-      path.join('atom-keymap', 'node_modules', '.bin', 'pegjs')
-      path.join('snippets', 'node_modules', 'loophole')
-      path.join('snippets', 'node_modules', 'pegjs')
-      path.join('snippets', 'node_modules', '.bin', 'pegjs')
-
-      '.DS_Store'
-      '.jshintrc'
-      '.npmignore'
-      '.pairs'
-      '.travis.yml'
    ]
    ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath)

@@ -91,56 +65,21 @@ module.exports = (grunt) ->
    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep)}.*"
    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.*\\.pdb"

-    # Ignore *.cc and *.h files from native modules
-    ignoredPaths.push "#{_.escapeRegExp(path.join('ctags', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('git-utils', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('keytar', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('nslog', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('oniguruma', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('pathwatcher', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('runas', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('scrollbar-style', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'src') + path.sep)}.*\\.(cc|h)*"
-
-    # Ignore build files
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}binding\\.gyp$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}.+\\.target.mk$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}linker\\.lock$"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.+\\.node\\.dSYM"
-
    # Hunspell dictionaries are only not needed on OS X.
    if process.platform is 'darwin'
      ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
    ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
-
-    testFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}te?sts?#{_.escapeRegExp(path.sep)}")
-    exampleFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}examples?#{_.escapeRegExp(path.sep)}")
-    benchmarkFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}benchmarks?#{_.escapeRegExp(path.sep)}")
-
    nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
-    filterNodeModule = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      nodeModulesFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
    packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")
-    filterPackage = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      packageFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
    for directory in nonPackageDirectories
-      cp directory, path.join(appDir, directory), filter: filterNodeModule
-
+      cp directory, path.join(appDir, directory), filter: nodeModulesFilter
    for directory in packageDirectories
-      cp directory, path.join(appDir, directory), filter: filterPackage
+      cp directory, path.join(appDir, directory), filter: packageFilter

    cp 'spec', path.join(appDir, 'spec')
    cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
    cp 'static', path.join(appDir, 'static')
-    cp 'apm', path.join(appDir, 'apm'), filter: filterNodeModule
+    cp 'apm', path.join(appDir, 'apm'), filter: nodeModulesFilter

    if process.platform is 'darwin'
      grunt.file.recurse path.join('resources', 'mac'), (sourcePath, rootDirectory, subDirectory='', filename) ->
@@ -151,11 +90,6 @@ module.exports = (grunt) ->
      cp path.join('resources', 'win', 'msvcp100.dll'), path.join(shellAppDir, 'msvcp100.dll')
      cp path.join('resources', 'win', 'msvcr100.dll'), path.join(shellAppDir, 'msvcr100.dll')

-      # Set up chocolatey ignore and gui files
-      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
-      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
-      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
-
    dependencies = ['compile', "generate-license:save"]
    dependencies.push('copy-info-plist') if process.platform is 'darwin'
    dependencies.push('set-exe-icon') if process.platform is 'win32'
@@ -1,12 +1,12 @@
-path = require 'path'
-
 module.exports = (grunt) ->
  {spawn} = require('./task-helpers')(grunt)

  grunt.registerTask 'codesign', 'Codesign the app', ->
+    return unless process.platform is 'darwin'
+
    done = @async()

-    if process.platform is 'darwin' and process.env.XCODE_KEYCHAIN
+    if process.env.XCODE_KEYCHAIN
      unlockKeychain (error) ->
        if error?
          done(error)
@@ -22,15 +22,6 @@ module.exports = (grunt) ->
    spawn {cmd, args}, (error) -> callback(error)

  signApp = (callback) ->
-    switch process.platform
-      when 'darwin'
-        cmd = 'codesign'
-        args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
-        spawn {cmd, args}, (error) -> callback(error)
-      when 'win32'
-        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
-          cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
-          args = [path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
-          spawn {cmd, args}, (error) -> callback(error)
-      else
-        callback()
+    cmd = 'codesign'
+    args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+    spawn {cmd, args}, (error) -> callback(error)
@@ -15,17 +15,15 @@ module.exports = (grunt) ->
  grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
    done = @async()

-    docsOutputDir = grunt.config.get('docsOutputDir')
-
    downloadIncludes (error, includePaths) ->
      if error?
        done(error)
      else
-        rm(docsOutputDir)
+        rm('docs/output/api')
        args = [
          commonArgs...
          '--title', 'Atom API Documentation'
-          '-o', docsOutputDir
+          '-o', 'docs/output/api'
          '-r', 'docs/README.md'
          '--stability', '1'
          'src/'
@@ -4,13 +4,17 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 runas = null

+fillTemplate = (filePath, data) ->
+  template = _.template(String(fs.readFileSync(filePath + '.in')))
+  filled = template(data)
+  fs.writeFileSync(filePath, filled)
+
 module.exports = (grunt) ->
  {cp, mkdir, rm} = require('./task-helpers')(grunt)

  grunt.registerTask 'install', 'Install the built application', ->
    installDir = grunt.config.get('atom.installDir')
    shellAppDir = grunt.config.get('atom.shellAppDir')
-
    if process.platform is 'win32'
      runas ?= require 'runas'
      copyFolder = path.resolve 'script', 'copy-folder.cmd'
@@ -28,6 +32,7 @@ module.exports = (grunt) ->
      shareDir = path.join(installDir, 'share', 'atom')

      iconName = path.join(shareDir,'resources','app','resources','atom.png')
+      desktopFile = path.join('resources', 'linux', 'Atom.desktop')

      mkdir binDir
      cp 'atom.sh', path.join(binDir, 'atom')
@@ -35,19 +40,13 @@ module.exports = (grunt) ->
      mkdir path.dirname(shareDir)
      cp shellAppDir, shareDir

-      # Create Atom.desktop if installation not in temporary folder
+      # Create Atom.desktop if installation in '/usr/local'
+      applicationsDir = path.join('/usr','share','applications')
      tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
-      if installDir.indexOf(tmpDir) isnt 0
-        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
-        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')
-
+      if installDir.indexOf(tmpDir) isnt 0 and fs.isDirectorySync(applicationsDir)
        {description} = grunt.file.readJSON('package.json')
-        iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-        installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/atom/atom"
-        template = _.template(String(fs.readFileSync(desktopFile)))
-        filled = template({description, installDir, iconName})
-
-        grunt.file.write(desktopInstallFile, filled)
+        fillTemplate(desktopFile, {description, installDir, iconName})
+        cp desktopFile, path.join(applicationsDir,'Atom.desktop')

      # Create relative symbol link for apm.
      process.chdir(binDir)
@@ -2,17 +2,14 @@ fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'

+fillTemplate = (filePath, data) ->
+  template = _.template(String(fs.readFileSync(filePath + '.in')))
+  filled = template(data)
+  fs.writeFileSync(filePath, filled)
+
 module.exports = (grunt) ->
  {spawn} = require('./task-helpers')(grunt)

-  fillTemplate = (filePath, data) ->
-    template = _.template(String(fs.readFileSync("#{filePath}.in")))
-    filled = template(data)
-
-    outputPath = path.join(grunt.config.get('atom.buildDir'), path.basename(filePath))
-    grunt.file.write(outputPath, filled)
-    outputPath
-
  grunt.registerTask 'mkdeb', 'Create debian package', ->
    done = @async()

@@ -30,11 +27,13 @@ module.exports = (grunt) ->
    iconName = 'atom'
    data = {name, version, description, section, arch, maintainer, installDir, iconName}

-    controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
-    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
+    control = path.join('resources', 'linux', 'debian', 'control')
+    fillTemplate(control, data)
+    desktop = path.join('resources', 'linux', 'Atom.desktop')
+    fillTemplate(desktop, data)
    icon = path.join('resources', 'atom.png')
    buildDir = grunt.config.get('atom.buildDir')

    cmd = path.join('script', 'mkdeb')
-    args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
+    args = [version, arch, control, desktop, icon, buildDir]
    spawn({cmd, args}, done)
@@ -1,21 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-build-filetypes', 'Log counts for each filetype in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    types = {}
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      extension = path.extname(fileName) or fileName
-      types[extension] ?= 0
-      types[extension]++
-
-    extensions = Object.keys(types).sort (extension1, extension2) ->
-      diff = types[extension2] - types[extension1]
-      if diff is 0
-        extension1.toLowerCase().localeCompare(extension2.toLowerCase())
-      else
-        diff
-
-    extensions.forEach (extension) ->
-      grunt.log.error "#{extension}: #{types[extension]}"
@@ -1,18 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-long-paths', 'Log long paths in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    longPaths = []
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      if relativePath
-        fullPath = path.join(relativePath, fileName)
-      else
-        fullPath = fileName
-      longPaths.push(fullPath) if fullPath.length >= 200
-
-    longPaths.sort (longPath1, longPath2) -> longPath2.length - longPath1.length
-
-    longPaths.forEach (longPath) ->
-      grunt.log.error "#{longPath.length} character path: #{longPath}"
@@ -9,12 +9,10 @@ module.exports = (grunt) ->
      ['atom-dark-ui', 'atom-light-syntax']
      ['atom-dark-ui', 'solarized-dark-syntax']
      ['atom-dark-ui', 'base16-tomorrow-dark-theme']
-      ['atom-dark-ui', 'base16-tomorrow-light-theme']
      ['atom-light-ui', 'atom-light-syntax']
      ['atom-light-ui', 'atom-dark-syntax']
      ['atom-light-ui', 'solarized-dark-syntax']
      ['atom-light-ui', 'base16-tomorrow-dark-theme']
-      ['atom-light-ui', 'base16-tomorrow-light-theme']
    ]

    directory = path.join(grunt.config.get('atom.appDir'), 'less-compile-cache')
@@ -9,6 +9,16 @@ request = require 'request'

 grunt = null

+if process.platform is 'darwin'
+  assets = [
+    {assetName: 'atom-mac.zip', sourceName: 'Atom.app'}
+    {assetName: 'atom-mac-symbols.zip', sourceName: 'Atom.breakpad.syms'}
+  ]
+else
+  assets = [
+    {assetName: 'atom-windows.zip', sourceName: 'Atom'}
+  ]
+
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -20,19 +30,11 @@ module.exports = (gruntObject) ->

  grunt.registerTask 'publish-build', 'Publish the built app', ->
    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
-    tasks = ['upload-assets']
-    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    grunt.task.run(tasks)

-  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
-    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))
-
-  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
    done = @async()
    buildDir = grunt.config.get('atom.buildDir')
-    assets = getAssets()

-    zipAssets buildDir, assets, (error) ->
+    zipApps buildDir, assets, (error) ->
      return done(error) if error?
      getAtomDraftRelease (error, release) ->
        return done(error) if error?
@@ -41,38 +43,26 @@ module.exports = (gruntObject) ->
          return done(error) if error?
          uploadAssets(release, buildDir, assets, done)

-getAssets = ->
-  if process.platform is 'darwin'
-    [
-      {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
-      {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
-      {assetName: 'atom-docs.zip', sourcePath: 'atom-docs'}
-    ]
-  else
-    [
-      {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
-    ]
-
 logError = (message, error, details) ->
  grunt.log.error(message)
  grunt.log.error(error.message ? error) if error?
  grunt.log.error(details) if details

-zipAssets = (buildDir, assets, callback) ->
-  zip = (directory, sourcePath, assetName, callback) ->
+zipApps = (buildDir, assets, callback) ->
+  zip = (directory, sourceName, assetName, callback) ->
    if process.platform is 'win32'
-      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} #{sourcePath}"
+      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} #{sourceName}"
    else
-      zipCommand = "zip -r --symlinks #{assetName} #{sourcePath}"
+      zipCommand = "zip -r --symlinks #{assetName} #{sourceName}"
    options = {cwd: directory, maxBuffer: Infinity}
    child_process.exec zipCommand, options, (error, stdout, stderr) ->
-      logError("Zipping #{sourcePath} failed", error, stderr) if error?
+      logError("Zipping #{sourceName} failed", error, stderr) if error?
      callback(error)

  tasks = []
-  for {assetName, sourcePath} in assets
+  for {assetName, sourceName} in assets
    fs.removeSync(path.join(buildDir, assetName))
-    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
+    tasks.push(zip.bind(this, buildDir, sourceName, assetName))
  async.parallel(tasks, callback)

 getAtomDraftRelease = (callback) ->
@@ -137,7 +127,7 @@ uploadAssets = (release, buildDir, assets, callback) ->
    fs.createReadStream(assetPath).pipe(assetRequest)

  tasks = []
-  for {assetName} in assets
+  for {assetName, sourceName} in assets
    assetPath = path.join(buildDir, assetName)
    tasks.push(upload.bind(this, release, assetName, assetPath))
  async.parallel(tasks, callback)
@@ -53,7 +53,9 @@ module.exports = (grunt) ->
      continue unless isAtomPackage(packagePath)
      packageSpecQueue.push(packagePath)

-    packageSpecQueue.concurrency = 1
+    # TODO: Restore concurrency on Windows
+    packageSpecQueue.concurrency = 1 unless process.platform is 'win32'
+
    packageSpecQueue.drain = -> callback(null, failedPackages)

  runCoreSpecs = (callback) ->
@@ -103,9 +105,4 @@ module.exports = (grunt) ->
      failures.push "atom core" if coreSpecFailed

      grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
-
-      if process.platform is 'win32' and process.env.JANKY_SHA1
-        # Package specs are still flaky on Windows CI
-        done(!coreSpecFailed)
-      else
-        done(!coreSpecFailed and failedPackages.length == 0)
+      done(!coreSpecFailed and failedPackages.length == 0)
@@ -7,7 +7,7 @@ module.exports = (grunt) ->
      grunt.fatal("Cannot copy non-existent #{source.cyan} to #{destination.cyan}")

    copyFile = (sourcePath, destinationPath) ->
-      return if filter?(sourcePath) or filter?.test?(sourcePath)
+      return if filter?.test(sourcePath)

      stats = fs.lstatSync(sourcePath)
      if stats.isSymbolicLink()
@@ -11,31 +11,41 @@ value of a namespaced config key with `atom.config.get`:
@showInvisibles() if atom.config.get "editor.showInvisibles"
 ```

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

 ```coffeescript
 class MyView extends View
  initialize: ->
-    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+    @observeConfig 'editor.fontSize', () =>
      @adjustFontSize()
 ```

-The `atom.config.observe` method will call the given callback immediately with
-the current value for the specified key path, and it will also call it in the
-future whenever the value of that key path changes.
+The `::observeConfig` method will call the given callback immediately with the
+current value for the specified key path, and it will also call it in the future
+whenever the value of that key path changes.

-Subscriptions made with `::subscribe` are automatically canceled when the
+Subscriptions made with `observeConfig` are automatically canceled when the
 view is removed. You can cancel config subscriptions manually via the
-`off` method on the subscription object that `atom.config.observe` returns.
+`unobserveConfig` method.

 ```coffeescript
-fontSizeSubscription = atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-  @adjustFontSize()
+view1.unobserveConfig() # unobserve all properties
+```

-# ... later on
+You can add the ability to observe config values to non-view classes by
+extending their prototype with the `ConfigObserver` mixin:

-fontSizeSubscription.off() # Stop observing
+```coffeescript
+{ConfigObserver} = require 'atom'
+
+class MyClass
+  ConfigObserver.includeInto(this)
+  
+  constructor: ->
+    @observeConfig 'editor.showInvisibles', -> # ...
+
+  destroy: ->
+    @unobserveConfig()
 ```

 ### Writing Config Settings
@@ -1,4 +1,4 @@
-# Atom.io package and update API
+## Atom.io package and update API

 This guide describes the web API used by [apm](https://github.com/atom/apm) and
 Atom. The vast majority of use cases are met by the `apm` command-line tool,
@@ -8,8 +8,6 @@ and making sure you have pushed your git tag. In fact, Atom itself shells out to
 uses `apm`, see the [PackageManager class](https://github.com/atom/settings-view/blob/master/lib/package-manager.coffee)
 in the `settings-view` package.

-*This API should be considered pre-release and is subject to change (though significant breaking changes are unlikely).*
-
 ### Authorization

 For calls to the API that require authentication, provide a valid token from your
@@ -19,18 +17,12 @@ For calls to the API that require authentication, provide a valid token from you

 All requests that take parameters require `application/json`.

-# API Resources
+## Resources

-## Packages
-
-### Listing packages
+### Packages

 #### GET /api/packages

-Parameters:
-
- **page** (optional)
-
 Returns a list of all packages in the following format:
 ```json
  [
@@ -48,17 +40,6 @@ Returns a list of all packages in the following format:
  ]
 ```

-Results are paginated 30 at a time, and links to the next and last pages are
-provided in the `Link` header:
-
-```
-Link: <https://www.atom.io/api/packages?page=1>; rel="self",
-      <https://www.atom.io/api/packages?page=41>; rel="last",
-      <https://www.atom.io/api/packages?page=2>; rel="next"
-```
-
-### Showing package details
-
 #### GET /api/packages/:package_name

 Returns package details and versions for a single package
@@ -87,8 +68,6 @@ Returns:
  }
 ```

-### Creating a package
-
 #### POST /api/packages

 Create a new package; requires authentication.
@@ -113,7 +92,6 @@ Returns:
  - The package.json at owner/repo isn't valid
 - **409** - A package by that name already exists

-### Deleting a package

 #### DELETE /api/packages/:package_name

@@ -125,13 +103,6 @@ Returns:
 - **400** - Repository is inaccessible
 - **401** - Unauthorized

-### Renaming a package
-
-Packages are renamed by publishing a new version with the name changed in `package.json`
-See [Creating a new package version](#creating-a-new-package-version) for details.
-
-Requests made to the previous name will forward to the new name.
-
 ### Package Versions

 #### GET /api/packages/:package_name/versions/:version_name
@@ -173,9 +144,7 @@ Returns `package.json` with `dist` key added for e.g. tarball download:

 #### POST /api/packages/:package_name/versions

-Creates a new package version from a git tag; requires authentication. If `rename`
-is not `true`, the `name` field in `package.json` *must* match the current package
-name.
+Creates a new package version from a git tag; requires authentication.

 #### Parameters

@@ -183,15 +152,14 @@ name.
  that the version name will not be taken from the tag, but from the `version`
  key in the `package.json` file at that ref. The authenticating user *must* have
  access to the package repository.
- **rename** - Boolean indicating whether this version contains a new name for the package.

 #### Returns

 - **201** - Successfully created. Returns created version.
- **400** - Git tag not found / Repository inaccessible / package.json invalid
+- **400** - Git tag not found / Repository inaccessible
 - **409** - Version exists

-### Deleting a version
+### Delete a version

 #### DELETE /api/packages/:package_name/versions/:version_name

@@ -204,9 +172,7 @@ you'll need to increment the version when republishing.
 Returns 204 No Content


-## Stars
-
-### Listing user stars
+### Stars

 #### GET /api/users/:login/stars

@@ -220,40 +186,19 @@ List the authenticated user's starred packages; requires authentication.

 Return value is similar to **GET /api/packages**

-### Starring a package
-
 #### POST /api/packages/:name/star

 Star a package; requires authentication.

 Returns a package.

-### Unstarring a package
-
 #### DELETE /api/packages/:name/star

 Unstar a package; requires authentication.

 Returns 204 No Content.

-### Listing a package's stargazers
-
-#### GET /api/packages/:name/stargazers
-
-List the users that have starred a package.
-
-Returns a list of user objects:
-
-```json
-[
-  {"login":"aperson"},
-  {"login":"anotherperson"},
-]
-```
-
-## Atom updates
-
-### Listing Atom updates
+### Atom updates

 #### GET /api/updates

@@ -261,10 +206,10 @@ Atom update feed, following the format expected by [Squirrel](https://github.com

 Returns:

-```json
+```
 {
    "name": "0.96.0",
-    "notes": "[HTML release notes]",
+    "notes": "[HTML release notes]"
    "pub_date": "2014-05-19T15:52:06.000Z",
    "url": "https://www.atom.io/api/updates/download"
 }
@@ -6,39 +6,34 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

  * OS with 64-bit or 32-bit architecture
  * C++ toolchain
-  * git
+    * on Ubuntu/Debian: `sudo apt-get install build-essential`
+    * on Fedora: `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel`
  * [node.js](http://nodejs.org/download/) v0.10.x
-  * [npm](http://www.npmjs.org/) v1.4.x (bundled with node.js)
-    * `npm -v` to check the version.
-    * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2.
-      * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
+    * [Ubuntu/Debian/Mint instructions](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os)
+    * [Fedora instructions](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora)
+  * [npm](http://www.npmjs.org/) v1.4.x
+    * `npm` comes with node.js so no explicit installation is needed here.
+    * You can check `npm` 1.4 or above is installed by running `npm -v`.
  * libgnome-keyring-dev
-
-### Ubuntu / Debian
-* `sudo apt-get install build-essential git libgnome-keyring-dev`
-* Instructions for  [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
-
-### Fedora
-* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel`
-* Instructions for [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).
-
-### Arch
-* `sudo pacman -S base-devel git nodejs libgnome-keyring`
-* `export PYTHON=/usr/bin/python2` before building Atom.
+    * on Ubuntu/Debian: `sudo apt-get install libgnome-keyring-dev`
+    * on Fedora: `sudo yum --assumeyes install libgnome-keyring-devel`
+    * on other distributions refer to the manual on how to install packages
+  * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses Python 2
+    * This command may require `sudo` depending on how you have
+      [configured npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
+  * Git
+    * on Ubuntu/Debian: `sudo apt-get install git`
+    * on Fedora: `sudo yum install git-core`

 ## Instructions

-If you have problems with permissions don't forget to prefix with `sudo`
-
  ```sh
  git clone https://github.com/atom/atom
  cd atom
  script/build # Creates application at $TMPDIR/atom-build/Atom
  sudo script/grunt install # Installs command to /usr/local/bin/atom
-  script/grunt mkdeb # Generates a .deb package at $TMPDIR/atom-build, e.g. /tmp/atom-build
+  script/grunt mkdeb # Generates a .deb package at $TMPDIR/atom-build
  ```
-  
-To run `atom` and `apm` from a terminal open atom's command palette `ctrl+shift+p` and run `Window: Install Shell Commands`

 ## Troubleshooting

@@ -66,13 +61,6 @@ and restart Atom.  If Atom now works fine, you can make this setting permanent:

 See also https://github.com/atom/atom/issues/2082.

-### /usr/bin/env: node: No such file or directory
-
-If you get this notice when attempting to `script/build`, you either do not
-have nodejs installed, or node isn't identified as nodejs on your machine.
-If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
-your terminal may fix the issue.
-
 ### Linux build error reports in atom/atom
 * Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Alinux&type=Issues)
  to get a list of reports about build errors on Linux.
@@ -35,14 +35,10 @@

 ## Why do I have to use GitHub for Windows?

-You don't. You can use your existing Git! GitHub for Windows's Git Shell is just
-easier to set up. 
-
-If you _prefer_ using your existing Git installation, make sure git's cmd directory is in your PATH env variable (e.g. `C:\Program Files (x86)\Git\cmd`) before you open your powershell or command window.
-Note that you may have to open your command window as administrator. For powershell that doesn't seem to always be the case, though.
-
-If none of this works, do install Github for Windows and use its Git shell. Makes life easier.
-
+You don't, You can use your existing Git! GitHub for Windows's Git Shell is just
+easier to set up. You need to have Posix tools in your `%PATH%` (i.e. `grep`,
+`sed`, et al.), which isn't the default configuration when you install Git. To
+fix this, you probably need to fiddle with your system PATH.

 ## Troubleshooting

@@ -66,11 +62,5 @@ If none of this works, do install Github for Windows and use its Git shell. Make
    * https://github.com/TooTallNate/node-gyp/issues/297
    * https://code.google.com/p/gyp/issues/detail?id=393

-* Other `node-gyp` errors on first build attempt, even though the right node and python versions are installed.
-  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.
-
-
 ### Windows build error reports in atom/atom
-* If all fails, use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows, and see if yours has already been reported.
-
-* If it hasn't, please open a new issue with your Windows version 32/64bit and a print/screenshot of your build output, incl. the node and python versions.
+* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows.
@@ -227,16 +227,15 @@ or one of its parents has the `tree-view` class applied to it.

 You can also add separators and submenus to your context menus. To add a
 submenu, pass in another object instead of a command. To add a separator, use
-`-` for the command of the item.
+`-` for the name and command of the item.

 ```coffeescript
 'context-menu':
  '.workspace':
    'Inspect Element': 'core:inspect'
-    'Separator': '-'
+    '-': '-'
    'Text':
      'Select All': 'core:select-all'
-      'Another Separator': '-'
      'Deleted Selected Text': 'core:delete'
 ```

@@ -169,7 +169,7 @@ For example, to change the color of the cursor, you could add the following
 rule to your _~/.atom/styles.less_ file:

 ```less
-.editor.is-focused .cursor {
+.editor .cursor {
  border-color: pink;
 }
 ```
@@ -38,7 +38,7 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec

 0. Add one or more expectations

-  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Expectations) about them. Below is a simple example.
+  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/2.0/introduction.html#section-Expectations) about them. Below is a simple example.

  ```coffee
  describe "when a test is written", ->
@@ -47,74 +47,6 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec
      expect("oranges").not.toEqual("apples")
  ```

-## Asynchronous specs
-
-Writing Asynchronous specs can be tricky at first. Some examples.
-
-0. Promises
-
-  Working with promises is rather easy in Atom. You can use our `waitsForPromise` function.
-
-  ```coffee
-    describe "when we open a file", ->
-      it "should be opened in an editor", ->
-        waitsForPromise ->
-          atom.workspace.open('c.coffee').then (editor) ->
-            expect(editor.getPath()).toContain 'c.coffee'
-  ```
-
-  This method can be used in the `describe`, `it`, `beforeEach` and `afterEach` functions.
-
-  ```coffee
-  describe "when we open a file", ->
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open 'c.coffee'
-
-    it "should be opened in an editor", ->
-      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'
-
-  ```
-
-  If you need to wait for multiple promises use a new `waitsForPromise` function for each promise. (Caution: Without `beforeEach` this example will fail!)
-
-  ```coffee
-  describe "waiting for the packages to load", ->
-
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open('sample.js')
-      waitsForPromise ->
-        atom.packages.activatePackage('tabs')
-      waitsForPromise ->
-        atom.packages.activatePackage('tree-view')
-
-    it 'should have waited long enough', ->
-      expect(atom.packages.isPackageActive('tabs')).toBe true
-      expect(atom.packages.isPackageActive('tree-view')).toBe true
-  ```
-
-0. Asynchronous functions with callbacks
-
-  Specs for asynchronous functions can be done using the `waitsFor` and `runs` functions. A simple example.
-
-  ```coffee
-  describe "fs.readdir(path, cb)", ->
-    it "is async", ->
-      spy = jasmine.createSpy('fs.readdirSpy')
-
-      fs.readdir('/tmp/example', spy)
-      waitsFor ->
-        spy.callCount > 0
-      runs ->
-        exp = [null, ['example.coffee']]
-        expect(spy.mostRecentCall.args).toEqual exp
-        expect(spy).toHaveBeenCalledWith(null, ['example.coffee'])
-  ```
-
-For a more detailed documentation on asynchronous tests please visit the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Asynchronous_Support).
-
-
 ## Running specs

 Most of the time you'll want to run specs by triggering the `window:run-package-specs` command. This command is not only to run package specs, it is also for Atom core specs. This will run all the specs in the current project's spec directory. If you want to run the Atom core specs and **all** the default package specs trigger the `window:run-all-specs` command.
@@ -15,10 +15,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
  module.exports.$ = $
  module.exports.$$ = $$
  module.exports.$$$ = $$$
-  if atom.config.get('core.useReactMiniEditors')
-    module.exports.EditorView = require '../src/react-editor-view'
-  else
-    module.exports.EditorView = require '../src/editor-view'
+  module.exports.EditorView = require '../src/editor-view'
  module.exports.ScrollView = require '../src/scroll-view'
  module.exports.SelectListView = require '../src/select-list-view'
  module.exports.Task = require '../src/task'
@@ -69,8 +69,6 @@
  'cmd-}': 'pane:show-next-item'
  'cmd-alt-left': 'pane:show-previous-item'
  'cmd-alt-right': 'pane:show-next-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
  'ctrl-tab': 'pane:show-next-item'
  'ctrl-shift-tab': 'pane:show-previous-item'
  'cmd-=': 'window:increase-font-size'
@@ -26,7 +26,6 @@
  'ctrl-w': 'core:close'
  'ctrl-z': 'core:undo'
  'ctrl-y': 'core:redo'
-  'ctrl-shift-z': 'core:redo'
  'ctrl-x': 'core:cut'
  'ctrl-c': 'core:copy'
  'ctrl-v': 'core:paste'
@@ -39,15 +38,13 @@
  'shift-pageup': 'core:select-page-up'
  'shift-pagedown': 'core:select-page-down'
  'delete': 'core:delete'
-  'shift-delete': 'core:cut'
+  'shift-delete': 'core:delete'
  'pageup': 'core:page-up'
  'pagedown': 'core:page-down'
  'backspace': 'core:backspace'
  'shift-backspace': 'core:backspace'
  'ctrl-tab': 'pane:show-next-item'
  'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
  'ctrl-shift-up': 'core:move-up'
  'ctrl-shift-down': 'core:move-down'
  'ctrl-=': 'window:increase-font-size'
@@ -96,7 +93,6 @@
  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
  'ctrl-k ctrl-u': 'editor:upper-case'
  'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'

 '.workspace .editor:not(.mini)':
  # Atom specific
@@ -18,7 +18,6 @@
  'F11': 'window:toggle-full-screen'

  # Sublime Parity
-  'ctrl-,': 'application:show-settings'
  'ctrl-N': 'application:new-window'
  'ctrl-W': 'window:close'
  'ctrl-o': 'application:open-file'
@@ -27,9 +26,7 @@
  'ctrl-s': 'core:save'
  'ctrl-S': 'core:save-as'
  'ctrl-w': 'core:close'
-  'ctrl-f4': 'core:close'
  'ctrl-z': 'core:undo'
-  'ctrl-shift-z': 'core:redo'
  'ctrl-y': 'core:redo'
  'ctrl-x': 'core:cut'
  'ctrl-c': 'core:copy'
@@ -43,15 +40,13 @@
  'shift-pageup': 'core:select-page-up'
  'shift-pagedown': 'core:select-page-down'
  'delete': 'core:delete'
-  'shift-delete': 'core:cut'
+  'shift-delete': 'core:delete'
  'pageup': 'core:page-up'
  'pagedown': 'core:page-down'
  'backspace': 'core:backspace'
  'shift-backspace': 'core:backspace'
  'ctrl-tab': 'pane:show-next-item'
  'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
  'ctrl-shift-up': 'core:move-up'
  'ctrl-shift-down': 'core:move-down'
  'ctrl-alt-up': 'editor:add-selection-above'
@@ -85,15 +80,12 @@
  'ctrl-delete': 'editor:delete-to-end-of-word'
  'ctrl-home': 'core:move-to-top'
  'ctrl-end': 'core:move-to-bottom'
-  'ctrl-shift-home': 'core:select-to-top'
-  'ctrl-shift-end': 'core:select-to-bottom'

  # Sublime Parity
  'ctrl-a': 'core:select-all'
  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
  'ctrl-k ctrl-u': 'editor:upper-case'
  'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'

 '.workspace .editor:not(.mini)':
  # Atom specific
@@ -37,7 +37,7 @@
      { label: 'Save As...', command: 'core:save-as' }
      { label: 'Save All', command: 'window:save-all' }
      { type: 'separator' }
-      { label: 'Close Tab', command: 'core:close' }
+      { label: 'Close Buffer', command: 'core:close' }
      { label: 'Close Pane', command: 'pane:close' }
      { label: 'Close Window', command: 'window:close' }
    ]
@@ -14,8 +14,8 @@
      { label: 'Save &As...', command: 'core:save-as' }
      { label: 'Save A&ll', command: 'window:save-all' }
      { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
      { label: 'Clos&e Window', command: 'window:close' }
      { type: 'separator' }
      { label: 'Quit', command: 'application:quit' }
@@ -9,18 +9,13 @@
      { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
      { type: 'separator' }
      { label: 'Se&ttings', command: 'application:show-settings' }
-      { label: 'Open Your Config', command: 'application:open-your-config' }
-      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
-      { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
-      { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
-      { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
      { type: 'separator' }
      { label: '&Save', command: 'core:save' }
      { label: 'Save &As...', command: 'core:save-as' }
      { label: 'Save A&ll', command: 'window:save-all' }
      { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
      { label: 'Clos&e Window', command: 'window:close' }
      { type: 'separator' }
      { label: 'E&xit', command: 'application:quit' }
@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.118.0",
+  "version": "0.107.0",
  "description": "A hackable text editor for the 21st Century.",
  "main": "./src/browser/main.js",
  "repository": {
@@ -17,38 +17,38 @@
      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
    }
  ],
-  "atomShellVersion": "0.13.3",
+  "atomShellVersion": "0.13.2",
  "dependencies": {
    "async": "0.2.6",
-    "atom-keymap": "^0.28.0",
+    "atom-keymap": "^0.27.0",
    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
    "clear-cut": "0.4.0",
    "coffee-script": "1.7.0",
    "coffeestack": "0.7.0",
    "delegato": "^1",
    "emissary": "^1.2.1",
-    "first-mate": "^1.7.1",
-    "fs-plus": "^2.2.4",
+    "first-mate": "^1.7",
+    "fs-plus": "^2.2.3",
    "fstream": "0.1.24",
    "fuzzaldrin": "^1.1",
-    "git-utils": "^1.6",
+    "git-utils": "^1.3",
    "grim": "0.11.0",
    "guid": "0.0.10",
    "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.13.0",
+    "less-cache": "0.12.0",
    "mixto": "^1",
    "mkdirp": "0.3.5",
    "nslog": "0.5.0",
    "oniguruma": "^1.0.6",
    "optimist": "0.4.0",
-    "pathwatcher": "^1.5",
+    "pathwatcher": "^1.3.2",
    "property-accessors": "^1",
    "q": "^1.0.1",
    "random-words": "0.0.1",
    "react-atom-fork": "^0.10.0",
    "reactionary-atom-fork": "^0.9.0",
-    "runas": "0.5.4",
-    "scandal": "0.16.0",
+    "runas": "^0.5",
+    "scandal": "0.15.3",
    "scoped-property-store": "^0.9.0",
    "scrollbar-style": "^0.4.0",
    "season": "^1.0.2",
@@ -62,82 +62,80 @@
    "vm-compatibility-layer": "0.1.0"
  },
  "packageDependencies": {
-    "atom-dark-syntax": "0.19.0",
-    "atom-dark-ui": "0.32.0",
-    "atom-light-syntax": "0.20.0",
-    "atom-light-ui": "0.28.0",
-    "base16-tomorrow-dark-theme": "0.20.0",
-    "base16-tomorrow-light-theme": "0.3.0",
-    "solarized-dark-syntax": "0.21.0",
-    "solarized-light-syntax": "0.11.0",
-    "archive-view": "0.34.0",
+    "atom-dark-syntax": "0.17.0",
+    "atom-dark-ui": "0.29.0",
+    "atom-light-syntax": "0.18.0",
+    "atom-light-ui": "0.25.0",
+    "base16-tomorrow-dark-theme": "0.17.0",
+    "solarized-dark-syntax": "0.18.0",
+    "solarized-light-syntax": "0.9.0",
+    "archive-view": "0.33.0",
    "autocomplete": "0.28.0",
    "autoflow": "0.17.0",
    "autosave": "0.14.0",
-    "background-tips": "0.15.0",
-    "bookmarks": "0.27.0",
-    "bracket-matcher": "0.48.0",
-    "command-palette": "0.24.0",
+    "background-tips": "0.14.0",
+    "bookmarks": "0.25.0",
+    "bracket-matcher": "0.47.0",
+    "command-palette": "0.23.0",
    "deprecation-cop": "0.7.0",
-    "dev-live-reload": "0.32.0",
+    "dev-live-reload": "0.31.0",
    "exception-reporting": "0.18.0",
    "feedback": "0.33.0",
-    "find-and-replace": "0.127.0",
-    "fuzzy-finder": "0.57.0",
-    "git-diff": "0.37.0",
+    "find-and-replace": "0.120.0",
+    "fuzzy-finder": "0.55.0",
+    "git-diff": "0.34.0",
    "go-to-line": "0.23.0",
    "grammar-selector": "0.27.0",
-    "image-view": "0.36.0",
+    "image-view": "0.35.0",
    "keybinding-resolver": "0.18.0",
    "link": "0.24.0",
-    "markdown-preview": "0.93.0",
-    "metrics": "0.33.0",
-    "open-on-github": "0.29.0",
+    "markdown-preview": "0.83.0",
+    "metrics": "0.32.0",
+    "open-on-github": "0.28.0",
    "package-generator": "0.31.0",
-    "release-notes": "0.35.0",
-    "settings-view": "0.134.0",
-    "snippets": "0.49.0",
+    "release-notes": "0.32.0",
+    "settings-view": "0.128.0",
+    "snippets": "0.46.0",
    "spell-check": "0.38.0",
    "status-bar": "0.41.0",
    "styleguide": "0.29.0",
-    "symbols-view": "0.60.0",
-    "tabs": "0.46.0",
-    "timecop": "0.21.0",
-    "tree-view": "0.111.0",
+    "symbols-view": "0.56.0",
+    "tabs": "0.42.0",
+    "timecop": "0.19.0",
+    "tree-view": "0.104.0",
    "update-package-dependencies": "0.6.0",
-    "welcome": "0.17.0",
-    "whitespace": "0.25.0",
-    "wrap-guide": "0.21.0",
-
-    "language-c": "0.25.0",
-    "language-coffee-script": "0.27.0",
+    "welcome": "0.16.0",
+    "whitespace": "0.22.0",
+    "wrap-guide": "0.19.0",
+    "language-c": "0.21.0",
+    "language-coffee-script": "0.22.0",
    "language-css": "0.17.0",
-    "language-gfm": "0.43.0",
+    "language-gfm": "0.40.0",
    "language-git": "0.9.0",
-    "language-go": "0.15.0",
+    "language-go": "0.12.0",
    "language-html": "0.22.0",
    "language-hyperlink": "0.10.0",
-    "language-java": "0.11.0",
-    "language-javascript": "0.37.0",
+    "language-java": "0.10.0",
+    "language-javascript": "0.28.0",
    "language-json": "0.8.0",
-    "language-less": "0.13.0",
+    "language-less": "0.9.0",
    "language-make": "0.10.0",
    "language-objective-c": "0.11.0",
    "language-perl": "0.9.0",
    "language-php": "0.15.0",
    "language-property-list": "0.7.0",
    "language-python": "0.18.0",
-    "language-ruby": "0.33.0",
-    "language-ruby-on-rails": "0.15.0",
-    "language-sass": "0.14.0",
+    "language-ruby": "0.30.0",
+    "language-ruby-on-rails": "0.14.0",
+    "language-sass": "0.13.0",
    "language-shellscript": "0.8.0",
    "language-source": "0.7.0",
-    "language-sql": "0.9.0",
+    "language-sql": "0.8.0",
    "language-text": "0.6.0",
    "language-todo": "0.10.0",
    "language-toml": "0.12.0",
    "language-xml": "0.15.0",
-    "language-yaml": "0.13.0"
+    "language-yaml": "0.7.0"
  },
  "private": true,
  "scripts": {
@@ -31,7 +31,7 @@ function bootstrap() {
    fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));

  var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
-  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? ' --no-color' : '';
+  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';

  var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
  var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
@@ -39,49 +39,12 @@ function bootstrap() {

  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];

-  var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
-  var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
-  var apmInstallCommand = npmPath + npmFlags + 'install';
-  var apmInstallOptions = {cwd: apmInstallPath};
-  var moduleInstallCommand = apmPath + ' install' + apmFlags;
-  var dedupeApmCommand = apmPath + ' dedupe' + apmFlags;
-  var dedupeNpmCommand = npmPath + npmFlags + 'dedupe';
-
-  if (process.argv.indexOf('--no-quiet') === -1) {
-    buildInstallCommand  += ' --quiet';
-    apmInstallCommand    += ' --quiet';
-    moduleInstallCommand += ' --quiet';
-    dedupeApmCommand     += ' --quiet';
-    dedupeNpmCommand     += ' --quiet';
-    buildInstallOptions.ignoreStdout = true;
-    apmInstallOptions.ignoreStdout = true;
-  }
-
-  // apm ships with 32-bit node so make sure its native modules are compiled
-  // for a 32-bit target architecture
-  if (process.env.JANKY_SHA1 && process.platform === 'win32')
-    apmInstallCommand += ' --arch=ia32';
-
  var commands = [
-    {
-      command: buildInstallCommand,
-      message: 'Installing build modules...',
-      options: buildInstallOptions
-    },
-    {
-      command: apmInstallCommand,
-      message: 'Installing apm...',
-      options: apmInstallOptions
-    },
-    apmPath + ' clean' + apmFlags,
-    moduleInstallCommand,
-    dedupeApmCommand + ' ' + packagesToDedupe.join(' '),
-    {
-      command: dedupeNpmCommand + ' request semver',
-      options: {
-        cwd: path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager')
-      }
-    },
+    {command: initialNpmCommand + npmFlags + 'install --quiet', message: 'Installing build modules...', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+    {command: npmPath + npmFlags + 'install --quiet', message: 'Installing apm...', options: {cwd: apmInstallPath, ignoreStdout: true}},
+    apmPath + ' clean ' + apmFlags,
+    apmPath + ' install --quiet ' + apmFlags,
+    apmPath + ' dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
  ];

  process.chdir(path.dirname(__dirname));
@@ -24,7 +24,6 @@ var commands = [
  [home, '.atom', 'storage'],
  [home, '.atom', '.npm'],
  [home, '.atom', 'compile-cache'],
-  [home, '.atom', 'atom-shell'],
  [tmpdir, 'atom-build'],
  [tmpdir, 'atom-cached-atom-shells'],
 ];
@@ -531,22 +531,7 @@ describe "the `atom` global", ->
  describe ".isReleasedVersion()", ->
    it "returns false if the version is a SHA and true otherwise", ->
      version = '0.1.0'
-      spyOn(atom, 'getVersion').andCallFake -> version
+      spyOn(atom.constructor, 'getVersion').andCallFake -> version
      expect(atom.isReleasedVersion()).toBe true
      version = '36b5518'
      expect(atom.isReleasedVersion()).toBe false
-
-  describe "window:update-available", ->
-    it "is triggered when the auto-updater sends the update-downloaded event", ->
-      updateAvailableHandler = jasmine.createSpy("update-available-handler")
-      atom.workspaceView.on 'window:update-available', updateAvailableHandler
-      autoUpdater = require('remote').require('auto-updater')
-      autoUpdater.emit 'update-downloaded', null, "notes", "version"
-
-      waitsFor ->
-        updateAvailableHandler.callCount > 0
-
-      runs ->
-        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
-        expect(notes).toBe 'notes'
-        expect(version).toBe 'version'
@@ -17,43 +17,6 @@ describe "ContextMenuManager", ->
      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'

-    it 'does not add duplicate menu items',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'].length).toBe 1
-
-    it 'allows multiple separators', ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'separator1': '-'
-          'separator2': '-'
-
-      expect(contextMenu.definitions['.selector'].length).toBe 2
-      expect(contextMenu.definitions['.selector'][0].type).toEqual 'separator'
-      expect(contextMenu.definitions['.selector'][1].type).toEqual 'separator'
-
-    it 'allows duplicate commands with different labels',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'another label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'][1].label).toEqual 'another label'
-      expect(contextMenu.definitions['.selector'][1].command).toEqual 'command'
-
    it "loads submenus", ->
      contextMenu.add 'file-path',
        '.selector':
@@ -47,15 +47,6 @@ describe "DisplayBuffer", ->
      buffer.insert([0,0], oneHundredLines)
      expect(displayBuffer.getLineCount()).toBe 100 + originalLineCount

-    it "reassigns the scrollTop if it exceeds the max possible value after lines are removed", ->
-      displayBuffer.manageScrollPosition = true
-      displayBuffer.setHeight(50)
-      displayBuffer.setLineHeightInPixels(10)
-      displayBuffer.setScrollTop(80)
-
-      buffer.delete([[8, 0], [10, 0]])
-      expect(displayBuffer.getScrollTop()).toBe 60
-
  describe "soft wrapping", ->
    beforeEach ->
      displayBuffer.setSoftWrap(true)
@@ -215,19 +206,6 @@ describe "DisplayBuffer", ->
        displayBuffer.setEditorWidthInChars(-1)
        expect(displayBuffer.editorWidthInChars).not.toBe -1

-    it "sets ::scrollLeft to 0 and keeps it there when soft wrapping is enabled", ->
-      displayBuffer.setDefaultCharWidth(10)
-      displayBuffer.setWidth(50)
-      displayBuffer.manageScrollPosition = true
-
-      displayBuffer.setSoftWrap(false)
-      displayBuffer.setScrollLeft(Infinity)
-      expect(displayBuffer.getScrollLeft()).toBeGreaterThan 0
-      displayBuffer.setSoftWrap(true)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-      displayBuffer.setScrollLeft(10)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-
  describe "primitive folding", ->
    beforeEach ->
      displayBuffer.destroy()
@@ -337,14 +315,6 @@ describe "DisplayBuffer", ->
          expect(line0.fold).toBe outerFold
          expect(line1.fold).toBeUndefined()

-      describe "when a fold ends where another fold begins", ->
-        it "continues to hide the lines inside the second fold", ->
-          fold2 = displayBuffer.createFold(4, 9)
-          fold1 = displayBuffer.createFold(0, 4)
-
-          expect(displayBuffer.lineForRow(0).text).toMatch /^0/
-          expect(displayBuffer.lineForRow(1).text).toMatch /^10/
-
      describe "when there is another display buffer pointing to the same buffer", ->
        it "does not create folds in the other display buffer", ->
          otherDisplayBuffer = new DisplayBuffer({buffer, tabLength})
@@ -654,19 +624,6 @@ describe "DisplayBuffer", ->
      buffer.delete([[6, 0], [6, 65]])
      expect(displayBuffer.getMaxLineLength()).toBe 62

-    it "correctly updates the location of the longest screen line when changes occur", ->
-      expect(displayBuffer.getLongestScreenRow()).toBe 6
-      buffer.delete([[0, 0], [2, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 4
-      buffer.delete([[4, 0], [5, 0]])
-
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
-      buffer.delete([[2, 0], [4, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
  describe "::destroy()", ->
    it "unsubscribes all display buffer markers from their underlying buffer marker (regression)", ->
      marker = displayBuffer.markBufferPosition([12, 2])
@@ -1029,44 +986,22 @@ describe "DisplayBuffer", ->

        displayBuffer.setLineHeightInPixels(20)
        displayBuffer.setDefaultCharWidth(10)
-
-        for char in ['r', 'e', 't', 'u', 'r', 'n']
-          displayBuffer.setScopedCharWidth(["source.js", "keyword.control.js"], char, 11)
+        displayBuffer.setScopedCharWidths(["source.js", "keyword.control.js"], r: 11, e: 11, t: 11, u: 11, n: 11)

        {start, end} = marker.getPixelRange()
        expect(start.top).toBe 5 * 20
        expect(start.left).toBe (4 * 10) + (6 * 11)

  describe "decorations", ->
-    [marker, decoration, decorationParams] = []
-    beforeEach ->
-      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
-      decorationParams = {type: 'gutter', class: 'one'}
-      decoration = displayBuffer.decorateMarker(marker, decorationParams)
-
    it "can add decorations associated with markers and remove them", ->
-      expect(decoration).toBeDefined()
-      expect(decoration.getParams()).toBe decorationParams
-      expect(displayBuffer.decorationForId(decoration.id)).toBe decoration
+      decoration = {type: 'gutter', class: 'one'}
+      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
+
+      displayBuffer.addDecorationForMarker(marker, decoration)
      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id][0]).toBe decoration

-      decoration.destroy()
+      displayBuffer.removeDecorationForMarker(marker, decoration)
      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).not.toBeDefined()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    it "will not fail if the decoration is removed twice", ->
-      decoration.destroy()
-      decoration.destroy()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    describe "when a decoration is updated via Decoration::update()", ->
-      it "emits an 'updated' event containing the new and old params", ->
-        decoration.on 'updated', updatedSpy = jasmine.createSpy()
-        decoration.update type: 'gutter', class: 'two'
-
-        {oldParams, newParams} = updatedSpy.mostRecentCall.args[0]
-        expect(oldParams).toEqual decorationParams
-        expect(newParams).toEqual type: 'gutter', class: 'two', id: decoration.id

  describe "::setScrollTop", ->
    beforeEach ->
@@ -1132,38 +1067,3 @@ describe "DisplayBuffer", ->
      it "does not scroll vertically if the position is already in view", ->
        displayBuffer.scrollToScreenPosition([4, 20], center: true)
        expect(displayBuffer.getScrollTop()).toBe 0
-
-  describe "scroll width", ->
-    cursorWidth = 1
-    beforeEach ->
-      displayBuffer.setDefaultCharWidth(10)
-
-    it "recomputes the scroll width when the default character width changes", ->
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 65 + cursorWidth
-
-      displayBuffer.setDefaultCharWidth(12)
-      expect(displayBuffer.getScrollWidth()).toBe 12 * 65 + cursorWidth
-
-    it "recomputes the scroll width when the max line length changes", ->
-      buffer.insert([6, 12], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 66 + cursorWidth
-
-      buffer.delete([[6, 10], [6, 12]], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change", ->
-      operatorWidth = 20
-      displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + operatorWidth + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change in a batch", ->
-      operatorWidth = 20
-
-      displayBuffer.on 'character-widths-changed', changedSpy = jasmine.createSpy()
-
-      displayBuffer.batchCharacterMeasurement ->
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '?', operatorWidth)
-
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 63 + operatorWidth * 2 + cursorWidth
-      expect(changedSpy.callCount).toBe 1
@@ -785,19 +785,6 @@ describe "Editor", ->
        editor.moveCursorLeft()
        expect(editor.getScrollLeft()).toBe 58 * 10

-      it "scrolls down when inserting lines makes the document longer than the editor's height", ->
-        editor.setCursorScreenPosition([13, Infinity])
-        editor.insertNewline()
-        expect(editor.getScrollBottom()).toBe 14 * 10
-        editor.insertNewline()
-        expect(editor.getScrollBottom()).toBe 15 * 10
-
-      it "autoscrolls to the cursor when it moves due to undo", ->
-        editor.insertText('abc')
-        editor.setScrollTop(Infinity)
-        editor.undo()
-        expect(editor.getScrollTop()).toBe 0
-
  describe "selection", ->
    selection = null

@@ -1209,7 +1196,6 @@ describe "Editor", ->
          editor.setHeight(50)
          editor.setWidth(50)
          editor.setHorizontalScrollbarHeight(0)
-
          expect(editor.getScrollTop()).toBe 0

          editor.setSelectedBufferRange([[5, 6], [6, 8]], autoscroll: true)
@@ -1240,8 +1226,6 @@ describe "Editor", ->
        expect(editor.getSelectedBufferRanges()).toEqual [[[0, 0], [0, 0]], [[3, 4], [5, 6]]]

      it "autoscrolls to the added selection if needed", ->
-        editor.manageScrollPosition = true
-
        editor.setLineHeightInPixels(10)
        editor.setDefaultCharWidth(10)
        editor.setHeight(50)
@@ -1498,17 +1482,6 @@ describe "Editor", ->
            expect(cursor1.getBufferPosition()).toEqual [1, 5]
            expect(cursor2.getBufferPosition()).toEqual [2, 7]

-          it "autoscrolls to the last cursor", ->
-            editor.manageScrollPosition = true
-            editor.setCursorScreenPosition([1, 2])
-            editor.addCursorAtScreenPosition([10, 4])
-            editor.setLineHeightInPixels(10)
-            editor.setHeight(50)
-
-            expect(editor.getScrollTop()).toBe 0
-            editor.insertText('a')
-            expect(editor.getScrollTop()).toBe 80
-
      describe "when there are multiple non-empty selections", ->
        describe "when the selections are on the same line", ->
          it "replaces each selection range with the inserted characters", ->
@@ -2081,20 +2054,6 @@ describe "Editor", ->
              editor.indent()
              expect(buffer.lineForRow(0)).toMatch(tabRegex)

-            it "respects the tab stops when cursor is in the middle of a tab", ->
-              editor.setTabLength(4)
-              buffer.insert([12, 2], "\n ")
-              editor.setCursorBufferPosition [13, 1]
-              editor.indent()
-              expect(buffer.lineForRow(13)).toMatch /^\s+$/
-              expect(buffer.lineForRow(13).length).toBe 4
-              expect(editor.getCursorBufferPosition()).toEqual [13, 4]
-
-              buffer.insert([13, 0], "  ")
-              editor.setCursorBufferPosition [13, 6]
-              editor.indent()
-              expect(buffer.lineForRow(13).length).toBe 8
-
          describe "if 'softTabs' is false", ->
            it "insert a \t into the buffer", ->
              editor.setSoftTabs(false)
@@ -2113,20 +2072,6 @@ describe "Editor", ->
                expect(buffer.lineForRow(5).length).toBe 6
                expect(editor.getCursorBufferPosition()).toEqual [5, 6]

-              it "respects the tab stops when cursor is in the middle of a tab", ->
-                editor.setTabLength(4)
-                buffer.insert([12, 2], "\n ")
-                editor.setCursorBufferPosition [13, 1]
-                editor.indent(autoIndent: true)
-                expect(buffer.lineForRow(13)).toMatch /^\s+$/
-                expect(buffer.lineForRow(13).length).toBe 4
-                expect(editor.getCursorBufferPosition()).toEqual [13, 4]
-
-                buffer.insert([13, 0], "  ")
-                editor.setCursorBufferPosition [13, 6]
-                editor.indent(autoIndent: true)
-                expect(buffer.lineForRow(13).length).toBe 8
-
            describe "when 'softTabs' is false", ->
              it "moves the cursor to the end of the leading whitespace and inserts enough tabs to bring the line to the suggested level of indentaion", ->
                convertToHardTabs(buffer)
@@ -2857,7 +2802,7 @@ describe "Editor", ->

            atom.config.set("editor.autoIndent", false)
            editor.indent()
-            expect(editor.lineForBufferRow(2)).toBe "  "
+            expect(editor.lineForBufferRow(2)).toBe "   "

      describe "when editor.autoIndent is true", ->
        beforeEach ->
@@ -0,0 +1 @@
+this tests files with no extensions
@@ -0,0 +1,18 @@
+'fileTypes': ['package-with-infinite-loop-grammar']
+'name': 'package-with-infinite-loop-grammar'
+'scopeName': 'source.package-with-infinite-loop-grammar'
+
+# This grammar should loop forever if the line contains an `a`
+'patterns': [
+  {
+    'name': 'start'
+    'begin': '^'
+    'end': '$'
+    'patterns': [
+      {
+        name: 'negative-look-ahead'
+        match: "(?!a)"
+      }
+    ]
+  }
+]
@@ -0,0 +1 @@
+This is a hidden file. Don't even try to load it as a snippet
@@ -0,0 +1 @@
+This file isn't CSON, but shouldn't be a big deal
@@ -0,0 +1,4 @@
+".test":
+  "Test Snippet":
+    prefix: "test"
+    body: "testing 123"
@@ -1,4 +0,0 @@
-{
-  "theme": "ui",
-  "stylesheets": ["editor.less"]
-}
@@ -1,10 +0,0 @@
-@import "ui-variables";
-
-.editor {
-  padding-top: @component-padding;
-  padding-right: @component-padding;
-  padding-bottom: @component-padding;
-
-  color: @input-background-color;
-  background-color: @background-color-info; // From the fallback variables, not overridden
-}
@@ -1,3 +0,0 @@
-// This does not contain all of the ui-variables available.
-@app-background-color: #00f; // Changed
-@input-background-color: #f00; // Changed
@@ -0,0 +1,3 @@
+@import "stylesheets/first";
+@import "stylesheets/second";
+@import "stylesheets/last";
@@ -0,0 +1,3 @@
+{
+  "theme": "ui"
+}
@@ -0,0 +1,7 @@
+.editor {
+  padding-top: 101px;
+  padding-right: 101px;
+  padding-bottom: 101px;
+
+  color: red;
+}
@@ -0,0 +1,5 @@
+.editor {
+/*  padding-top: 103px;
+  padding-right: 103px;*/
+  padding-bottom: 103px;
+}
@@ -0,0 +1,9 @@
+@import "ui-variables";
+
+@number: 102px;
+
+.editor {
+/*  padding-top: 102px;*/
+  padding-right: @number;
+  padding-bottom: @number;
+}
@@ -0,0 +1,75 @@
+// Variables different from the original are marked 'Changed'
+
+@text-color: #333;
+@text-color-subtle: #777;
+@text-color-highlight: #111;
+@text-color-selected: @text-color-highlight;
+
+@text-color-info: #5293d8;
+@text-color-success: #1fe977;
+@text-color-warning: #f78a46;
+@text-color-error: #c00;
+
+@background-color-info: #0098ff;
+@background-color-success: #17ca65;
+@background-color-warning: #ff4800;
+@background-color-error: #c00;
+@background-color-highlight: rgba(255, 255, 255, 0.10);
+@background-color-selected: @background-color-highlight;
+
+@app-background-color: #00f; // Changed
+
+@base-background-color: #fff;
+@base-border-color: #eee;
+
+@pane-item-background-color: @base-background-color;
+@pane-item-border-color: @base-border-color;
+
+@input-background-color: #f00; // Changed
+@input-border-color: @base-border-color;
+
+@tool-panel-background-color: #f4f4f4;
+@tool-panel-border-color: @base-border-color;
+
+@inset-panel-background-color: #eee;
+@inset-panel-border-color: @base-border-color;
+
+@panel-heading-background-color: #ddd;
+@panel-heading-border-color: transparent;
+
+@overlay-background-color: #f4f4f4;
+@overlay-border-color: @base-border-color;
+
+@button-background-color: #ccc;
+@button-background-color-hover: lighten(@button-background-color, 5%);
+@button-background-color-selected: @button-background-color-hover;
+@button-border-color: #aaa;
+
+@tab-bar-background-color: #fff;
+@tab-bar-border-color: darken(@tab-background-color-active, 10%);
+@tab-background-color: #f4f4f4;
+@tab-background-color-active: #fff;
+@tab-border-color: @base-border-color;
+
+@tree-view-background-color: @tool-panel-background-color;
+@tree-view-border-color: @tool-panel-border-color;
+
+@ui-site-color-1: @background-color-success; // green
+@ui-site-color-2: @background-color-info; // blue
+@ui-site-color-3: @background-color-warning; // orange
+@ui-site-color-4: #db2ff4; // purple
+@ui-site-color-5: #f5e11d; // yellow
+
+@font-size: 12px;
+
+@disclosure-arrow-size: 12px;
+
+@component-padding: 150px;
+@component-icon-padding: 5px;
+@component-icon-size: 16px;
+@component-line-height: 25px;
+@component-border-radius: 2px;
+
+@tab-height: 30px;
+
+@font-family: Arial;
@@ -0,0 +1 @@
+Hello World!
@@ -0,0 +1 @@
+Goodbye World!
@@ -0,0 +1 @@
+Hello World!
@@ -0,0 +1 @@
+Goodbye World!
@@ -0,0 +1 @@
+#header {
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>fileTypes</key>
+	<array>
+		<string>txt</string>
+	</array>
+	<key>keyEquivalent</key>
+	<string>^~P</string>
+	<key>name</key>
+	<string>Plain Text</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(•).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.strong.text</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(·).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.light.text</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(\*).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.star.text</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^([ \t]*)(?=\S)</string>
+			<key>contentName</key>
+			<string>meta.paragraph.text</string>
+			<key>end</key>
+			<string>^(?!\1(?=\S))</string>
+		</dict>
+	</array>
+	<key>scopeName</key>
+	<string>text.plain</string>
+	<key>uuid</key>
+	<string>3130E4FA-B10E-11D9-9F75-000D93589AF6</string>
+</dict>
+</plist>
@@ -0,0 +1 @@
+dir
@@ -0,0 +1 @@
+sample.js
@@ -0,0 +1 @@
+a
@@ -1,8 +1,7 @@
 fs = require 'fs'

 module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
-  {$, $$} = require '../src/space-pen-extensions'
-
+  {$, $$} = require 'atom'
  window[key] = value for key, value of require '../vendor/jasmine'

  {TerminalReporter} = require 'jasmine-tagged'
@@ -205,20 +205,6 @@ describe "Project", ->
      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 = []
@@ -37,7 +37,7 @@ jasmine.getEnv().addEqualityTester(_.isEqual) # Use underscore's definition of e

 if process.platform is 'win32' and process.env.JANKY_SHA1
  # Use longer timeout on Windows CI
-  jasmine.getEnv().defaultTimeoutInterval = 60000
+  jasmine.getEnv().defaultTimeoutInterval = 30000
 else
  jasmine.getEnv().defaultTimeoutInterval = 5000

@@ -318,13 +318,9 @@ window.setEditorWidthInChars = (editorView, widthInChars, charWidth=editorView.c
  editorView.width(charWidth * widthInChars + editorView.gutter.outerWidth())
  $(window).trigger 'resize' # update width of editor view's on-screen lines

-window.setEditorHeightInLines = (editorView, heightInLines, lineHeight=editorView.lineHeight) ->
-  if editorView.hasClass('react')
-    editorView.height(editorView.getEditor().getLineHeightInPixels() * heightInLines)
-    editorView.component?.measureHeightAndWidth()
-  else
-    editorView.height(lineHeight * heightInLines + editorView.renderedLines.position().top)
-    $(window).trigger 'resize' # update editor view's on-screen lines
+window.setEditorHeightInLines = (editorView, heightInChars, charHeight=editorView.lineHeight) ->
+  editorView.height(charHeight * heightInChars + editorView.renderedLines.position().top)
+  $(window).trigger 'resize' # update editor view's on-screen lines

 $.fn.resultOfTrigger = (type) ->
  event = $.Event(type)
@@ -1,5 +1,6 @@
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
+{Git} = require 'atom'
 path = require 'path'
 require './spec-helper'

@@ -232,21 +232,6 @@ describe "ThemeManager", ->
        expect($(".editor").css("padding-right")).toBe "150px"
        expect($(".editor").css("padding-bottom")).toBe "150px"

-    describe "when there is a theme with incomplete variables", ->
-      it "loads the correct values from the fallback ui-variables", ->
-        themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
-        atom.config.set('core.themes', ['theme-with-incomplete-ui-variables'])
-
-        waitsFor ->
-          reloadHandler.callCount > 0
-
-        runs ->
-          # an override loaded in the base css
-          expect(atom.workspaceView.css("background-color")).toBe "rgb(0, 0, 255)"
-
-          # from within the theme itself
-          expect($(".editor").css("background-color")).toBe "rgb(0, 152, 255)"
-
  describe "when the user stylesheet changes", ->
    it "reloads it", ->
      [stylesheetRemovedHandler, stylesheetAddedHandler, stylesheetsChangedHandler] = []
@@ -335,13 +335,12 @@ describe "TokenizedBuffer", ->
        expect(screenLine0.text).toBe "# Econ 101#{tabAsSpaces}"
        { tokens } = screenLine0

-        expect(tokens.length).toBe 4
+        expect(tokens.length).toBe 3
        expect(tokens[0].value).toBe "#"
        expect(tokens[1].value).toBe " Econ 101"
        expect(tokens[2].value).toBe tabAsSpaces
        expect(tokens[2].scopes).toEqual tokens[1].scopes
        expect(tokens[2].isAtomic).toBeTruthy()
-        expect(tokens[3].value).toBe ""

        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "#{tabAsSpaces} buy()#{tabAsSpaces}while supply > demand"

@@ -412,7 +411,7 @@ describe "TokenizedBuffer", ->
        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1

-  describe "when the buffer contains UTF-8 surrogate pairs", ->
+  describe "when the buffer contains surrogate pairs", ->
    beforeEach ->
      waitsForPromise ->
        atom.packages.activatePackage('language-javascript')
@@ -430,7 +429,7 @@ describe "TokenizedBuffer", ->
      tokenizedBuffer.destroy()
      buffer.release()

-    it "renders each UTF-8 surrogate pair as its own atomic token", ->
+    it "renders each surrogate pair as its own atomic token", ->
      screenLine0 = tokenizedBuffer.lineForScreenRow(0)
      expect(screenLine0.text).toBe "'abc\uD835\uDF97def'"
      { tokens } = screenLine0
@@ -447,12 +446,11 @@ describe "TokenizedBuffer", ->
      expect(screenLine1.text).toBe "//\uD835\uDF97xyz"
      { tokens } = screenLine1

-      expect(tokens.length).toBe 4
+      expect(tokens.length).toBe 3
      expect(tokens[0].value).toBe '//'
      expect(tokens[1].value).toBe '\uD835\uDF97'
      expect(tokens[1].value).toBeTruthy()
      expect(tokens[2].value).toBe 'xyz'
-      expect(tokens[3].value).toBe ''

  describe "when the grammar is tokenized", ->
    it "emits the `tokenized` event", ->
@@ -657,65 +655,3 @@ describe "TokenizedBuffer", ->

        buffer.setText('\n\n\n')
        expect(tokenizedBuffer.lineForScreenRow(1).indentLevel).toBe 0
-
-    describe "when the changed lines are surrounded by whitespace-only lines", ->
-      it "updates the indentLevel of empty lines that precede the change", ->
-        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 0
-
-        buffer.insert([12, 0], '\n')
-        buffer.insert([13, 0], '  ')
-        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 1
-
-      it "updates empty line indent guides when the empty line is the last line", ->
-        buffer.insert([12, 2], '\n')
-
-        # The newline and he tab need to be in two different operations to surface the bug
-        buffer.insert([12, 0], '  ')
-        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 1
-
-        buffer.insert([12, 0], '  ')
-        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(14)).not.toBeDefined()
-
-      it "updates the indentLevel of empty lines surrounding a change that inserts lines", ->
-        # create some new lines
-        buffer.insert([7, 0], '\n\n')
-        buffer.insert([5, 0], '\n\n')
-
-        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 3
-        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 3
-        expect(tokenizedBuffer.lineForScreenRow(9).indentLevel).toBe 3
-        expect(tokenizedBuffer.lineForScreenRow(10).indentLevel).toBe 3
-        expect(tokenizedBuffer.lineForScreenRow(11).indentLevel).toBe 2
-
-        tokenizedBuffer.on "changed", changeHandler = jasmine.createSpy('changeHandler')
-
-        buffer.setTextInRange([[7, 0], [8, 65]], '        one\n        two\n        three\n        four')
-
-        delete changeHandler.argsForCall[0][0].bufferChange
-        expect(changeHandler).toHaveBeenCalledWith(start: 5, end: 10, delta: 2)
-
-        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(11).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(13).indentLevel).toBe 2
-
-      it "updates the indentLevel of empty lines surrounding a change that removes lines", ->
-        # create some new lines
-        buffer.insert([7, 0], '\n\n')
-        buffer.insert([5, 0], '\n\n')
-
-        tokenizedBuffer.on "changed", changeHandler = jasmine.createSpy('changeHandler')
-
-        buffer.setTextInRange([[7, 0], [8, 65]], '    ok')
-
-        delete changeHandler.argsForCall[0][0].bufferChange
-        expect(changeHandler).toHaveBeenCalledWith(start: 5, end: 10, delta: -1)
-
-        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(7).indentLevel).toBe 2 # new text
-        expect(tokenizedBuffer.lineForScreenRow(8).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(9).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(10).indentLevel).toBe 2 # }
@@ -4,20 +4,6 @@ describe "TokenizedLine", ->
  beforeEach ->
    waitsForPromise -> atom.packages.activatePackage('language-coffee-script')

-  describe "::isOnlyWhitespace()", ->
-    beforeEach ->
-      waitsForPromise ->
-        atom.project.open('coffee.coffee').then (o) -> editor = o
-
-    it "returns true when the line is only whitespace", ->
-      expect(editor.lineForScreenRow(3).isOnlyWhitespace()).toBe true
-      expect(editor.lineForScreenRow(7).isOnlyWhitespace()).toBe true
-      expect(editor.lineForScreenRow(23).isOnlyWhitespace()).toBe true
-
-    it "returns false when the line is not only whitespace", ->
-      expect(editor.lineForScreenRow(0).isOnlyWhitespace()).toBe false
-      expect(editor.lineForScreenRow(2).isOnlyWhitespace()).toBe false
-
  describe "::getScopeTree()", ->
    it "returns a tree whose inner nodes are scopes and whose leaf nodes are tokens in those scopes", ->
      [tokens, tokenIndex] = []
@@ -309,28 +309,3 @@ describe "Workspace", ->
        expect(handler.callCount).toBe 1
        editorCopy = editor.copy()
        expect(handler.callCount).toBe 2
-
-  it "stores the active grammars used by all the open editors", ->
-    waitsForPromise ->
-      atom.packages.activatePackage('language-javascript')
-
-    waitsForPromise ->
-      atom.packages.activatePackage('language-coffee-script')
-
-    waitsForPromise ->
-      atom.workspace.open('sample.coffee')
-
-    runs ->
-      atom.workspace.getActiveEditor().setText('i = /test/;')
-
-      state = atom.workspace.serialize()
-      expect(state.packagesWithActiveGrammars).toEqual ['language-coffee-script', 'language-javascript']
-
-      jsPackage = atom.packages.getLoadedPackage('language-javascript')
-      coffeePackage = atom.packages.getLoadedPackage('language-coffee-script')
-      spyOn(jsPackage, 'loadGrammarsSync')
-      spyOn(coffeePackage, 'loadGrammarsSync')
-
-      workspace2 = Workspace.deserialize(state)
-      expect(jsPackage.loadGrammarsSync.callCount).toBe 1
-      expect(coffeePackage.loadGrammarsSync.callCount).toBe 1
@@ -110,6 +110,14 @@ class Atom extends Model
  @getCurrentWindow: ->
    remote.getCurrentWindow()

+  # Get the version of the Atom application.
+  @getVersion: ->
+    @appVersion ?= @getLoadSettings().appVersion
+
+  # Determine whether the current version is an official release.
+  @isReleasedVersion: ->
+    not /\w{7}/.test(@getVersion()) # Check if the release is a 7-character SHA prefix
+
  workspaceViewParentSelector: 'body'

  # Call .loadOrCreate instead
@@ -127,6 +135,13 @@ class Atom extends Model
      @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
      @emit 'uncaught-error', arguments...

+    nativeConsoleError = console.error
+
+    console.error = =>
+      @openDevTools()
+      @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
+      nativeConsoleError.call console, arguments...
+
    @unsubscribe()
    @setBodyPlatformClass()

@@ -217,15 +232,9 @@ class Atom extends Model
    else
      @center()

-  # Returns true if the dimensions are useable, false if they should be ignored.
-  # Work around for https://github.com/atom/atom-shell/issues/473
-  isValidDimensions: ({x, y, width, height}={}) ->
-    width > 0 and height > 0 and x + width > 0 and y + height > 0
-
  storeDefaultWindowDimensions: ->
-    dimensions = @getWindowDimensions()
-    if @isValidDimensions(dimensions)
-      localStorage.setItem("defaultWindowDimensions", JSON.stringify(dimensions))
+    dimensions = JSON.stringify(atom.getWindowDimensions())
+    localStorage.setItem("defaultWindowDimensions", dimensions)

  getDefaultWindowDimensions: ->
    {windowDimensions} = @getLoadSettings()
@@ -238,21 +247,15 @@ class Atom extends Model
      console.warn "Error parsing default window dimensions", error
      localStorage.removeItem("defaultWindowDimensions")

-    if @isValidDimensions(dimensions)
-      dimensions
-    else
-      {width, height} = screen.getPrimaryDisplay().workAreaSize
-      {x: 0, y: 0, width: Math.min(1024, width), height}
+    {width, height} = screen.getPrimaryDisplay().workAreaSize
+    dimensions ? {x: 0, y: 0, width: Math.min(1024, width), height: height}

  restoreWindowDimensions: ->
-    dimensions = @state.windowDimensions
-    unless @isValidDimensions(dimensions)
-      dimensions = @getDefaultWindowDimensions()
-    @setWindowDimensions(dimensions)
+    windowDimensions = @state.windowDimensions ? @getDefaultWindowDimensions()
+    @setWindowDimensions(windowDimensions)

  storeWindowDimensions: ->
-    dimensions = @getWindowDimensions()
-    @state.windowDimensions = dimensions if @isValidDimensions(dimensions)
+    @state.windowDimensions = @getWindowDimensions()

  # Public: Get the load settings for the current window.
  #
@@ -262,20 +265,13 @@ class Atom extends Model

  deserializeProject: ->
    Project = require './project'
-
-    startTime = Date.now()
    @project ?= @deserializers.deserialize(@state.project) ? new Project(path: @getLoadSettings().initialPath)
-    @deserializeTimings.project = Date.now() - startTime

  deserializeWorkspaceView: ->
    Workspace = require './workspace'
    WorkspaceView = require './workspace-view'
-
-    startTime = Date.now()
    @workspace = Workspace.deserialize(@state.workspace) ? new Workspace
    @workspaceView = new WorkspaceView(@workspace)
-    @deserializeTimings.workspace = Date.now() - startTime
-
    @keymaps.defaultTarget = @workspaceView[0]
    $(@workspaceViewParentSelector).append(@workspaceView)

@@ -284,7 +280,6 @@ class Atom extends Model
    delete @state.packageStates

  deserializeEditorWindow: ->
-    @deserializeTimings = {}
    @deserializePackageStates()
    @deserializeProject()
    @deserializeWorkspaceView()
@@ -495,11 +490,11 @@ class Atom extends Model
  #
  # Returns the version text {String}.
  getVersion: ->
-    @appVersion ?= @getLoadSettings().appVersion
+    @constructor.getVersion()

  # Public: Determine whether the current version is an official release.
  isReleasedVersion: ->
-    not /\w{7}/.test(@getVersion()) # Check if the release is a 7-character SHA prefix
+    @constructor.isReleasedVersion()

  # Public: Get the directory path to Atom's configuration area.
  #
@@ -105,7 +105,7 @@ class AtomWindow
        type: 'warning'
        buttons: ['Close Window', 'Reload', 'Keep It Open']
        message: 'The editor has crashed'
-        detail: 'Please report this issue to https://github.com/atom/atom'
+        detail: 'Please report this issue to atom@github.com'
      switch chosen
        when 0 then @browserWindow.destroy()
        when 1 then @browserWindow.restart()
@@ -138,7 +138,6 @@ class AtomWindow
          when 'window:reload' then @reload()
          when 'window:toggle-dev-tools' then @toggleDevTools()
          when 'window:close' then @close()
-          when 'window:update-available' then @sendCommandToBrowserWindow(command, args...) # For spec testing
    else if @isWebViewFocused()
      @sendCommandToBrowserWindow(command, args...)
    else
@@ -1,4 +1,3 @@
-https = require 'https'
 autoUpdater = require 'auto-updater'
 dialog = require 'dialog'
 _ = require 'underscore-plus'
@@ -17,12 +16,11 @@ class AutoUpdateManager

  constructor: (@version) ->
    @state = IDLE_STATE
-    @feedUrl = "https://atom.io/api/updates?version=#{@version}"

-    if process.platform is 'win32'
-      autoUpdater.checkForUpdates = => @checkForUpdatesShim()
+    # Only released versions should check for updates.
+    return if /\w{7}/.test(@version)

-    autoUpdater.setFeedUrl @feedUrl
+    autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}"

    autoUpdater.on 'checking-for-update', =>
      @setState(CHECKING_STATE)
@@ -41,25 +39,7 @@ class AutoUpdateManager
      @setState(UPDATE_AVAILABLE_STATE)
      @emitUpdateAvailableEvent(@getWindows()...)

-    # Only released versions should check for updates.
-    unless /\w{7}/.test(@version)
-      @check(hidePopups: true)
-
-  # Windows doesn't have an auto-updater, so use this method to shim the events.
-  checkForUpdatesShim: ->
-    autoUpdater.emit 'checking-for-update'
-    request = https.get @feedUrl, (response) ->
-      if response.statusCode == 200
-        body = ""
-        response.on 'data', (chunk) -> body += chunk
-        response.on 'end', ->
-          {notes, name} = JSON.parse(body)
-          autoUpdater.emit 'update-downloaded', null, notes, name
-      else
-        autoUpdater.emit 'update-not-available'
-
-    request.on 'error', (error) ->
-      autoUpdater.emit 'error', null, error.message
+    @check(hidePopups: true)

  emitUpdateAvailableEvent: (windows...) ->
    return unless @releaseVersion? and @releaseNotes
@@ -45,16 +45,7 @@ class BufferedProcess
    # Related to joyent/node#2318
    if process.platform is "win32"
      # Quote all arguments and escapes inner quotes
-      if args?
-        cmdArgs = args.map (arg) ->
-          if command in ['explorer.exe', 'explorer'] and /^\/[a-zA-Z]+,.*$/.test(arg)
-            # Don't wrap /root,C:\folder style arguments to explorer calls in
-            # quotes since they will not be interpreted correctly if they are
-            arg
-          else
-            "\"#{arg.replace(/"/g, '\\"')}\""
-      else
-        cmdArgs = []
+      cmdArgs = args.map (arg) -> "\"#{arg.replace(/"/g, '\\"')}\""
      cmdArgs.unshift("\"#{command}\"")
      cmdArgs = ['/s', '/c', "\"#{cmdArgs.join(' ')}\""]
      cmdOptions = _.clone(options)
@@ -44,7 +44,7 @@ class ContextMenuManager
          @addBySelector(selector, menuItem, {devMode})

  buildMenuItem: (label, command) ->
-    if command is '-'
+    if label is command is '-'
      {type: 'separator'}
    else
      {label, command}
@@ -60,8 +60,7 @@ class ContextMenuManager
  #              editor is in dev mode.
  addBySelector: (selector, definition, {devMode}={}) ->
    definitions = if devMode then @devModeDefinitions else @definitions
-    if not _.findWhere(definitions[selector], definition) or _.isEqual(definition, {type: 'separator'})
-      (definitions[selector] ?= []).push(definition)
+    (definitions[selector] ?= []).push(definition)

  # Returns definitions which match the element and devMode.
  definitionsForElement: (element, {devMode}={}) ->
@@ -1,29 +1,16 @@
 React = require 'react-atom-fork'
 {div} = require 'reactionary-atom-fork'
-{isEqualForProperties} = require 'underscore-plus'

 module.exports =
 CursorComponent = React.createClass
  displayName: 'CursorComponent'

  render: ->
-    {pixelRect, defaultCharWidth} = @props
-    {height, width} = pixelRect
-    width = defaultCharWidth if width is 0
-    WebkitTransform = @getTransform()
-
-    div className: 'cursor', style: {height, width, WebkitTransform}
-
-  getTransform: ->
-    {pixelRect, scrollTop, scrollLeft, useHardwareAcceleration} = @props
-    {top, left} = pixelRect
+    {editor, screenRange, scrollTop, scrollLeft, defaultCharWidth} = @props
+    {top, left, height, width} = editor.pixelRectForScreenRange(screenRange)
    top -= scrollTop
    left -= scrollLeft
+    width = defaultCharWidth if width is 0
+    WebkitTransform = "translate3d(#{left}px, #{top}px, 0px)"

-    if useHardwareAcceleration
-      "translate3d(#{left}px, #{top}px, 0px)"
-    else
-      "translate(#{left}px, #{top}px)"
-
-  shouldComponentUpdate: (newProps) ->
-    not isEqualForProperties(newProps, @props, 'pixelRect', 'scrollTop', 'scrollLeft', 'defaultCharWidth')
+    div className: 'cursor', style: {height, width, WebkitTransform}
@@ -28,7 +28,9 @@ class Cursor extends Model

      # Supports old editor view
      @needsAutoscroll ?= @isLastCursor() and !textChanged
-      @autoscroll() if @editor.manageScrollPosition and @isLastCursor() and textChanged
+
+      # Supports react editor view
+      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition

      @goalColumn = null

@@ -53,10 +55,8 @@ class Cursor extends Model
  changePosition: (options, fn) ->
    @clearSelection()
    @needsAutoscroll = options.autoscroll ? @isLastCursor()
-    fn()
-    if @needsAutoscroll
-      @emit 'autoscrolled' # Support legacy editor
-      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition # Support react editor view
+    unless fn()
+      @emit 'autoscrolled' if @needsAutoscroll

  getPixelRect: ->
    @editor.pixelRectForScreenRange(@getScreenRange())
@@ -12,16 +12,16 @@ CursorsComponent = React.createClass
  cursorBlinkIntervalHandle: null

  render: ->
-    {performedInitialMeasurement, cursorPixelRects, scrollTop, scrollLeft, defaultCharWidth, useHardwareAcceleration} = @props
+    {editor, cursorScreenRanges, scrollTop, scrollLeft, defaultCharWidth} = @props
    {blinkOff} = @state

    className = 'cursors'
    className += ' blink-off' if blinkOff

    div {className},
-      if performedInitialMeasurement
-        for key, pixelRect of cursorPixelRects
-          CursorComponent({key, pixelRect, scrollTop, scrollLeft, defaultCharWidth, useHardwareAcceleration})
+      if @isMounted()
+        for key, screenRange of cursorScreenRanges
+          CursorComponent({key, editor, screenRange, scrollTop, scrollLeft, defaultCharWidth})

  getInitialState: ->
    blinkOff: false
@@ -34,14 +34,13 @@ CursorsComponent = React.createClass

  shouldComponentUpdate: (newProps, newState) ->
    not newState.blinkOff is @state.blinkOff or
-      not isEqualForProperties(newProps, @props, 'cursorPixelRects', 'scrollTop', 'scrollLeft', 'defaultCharWidth', 'useHardwareAcceleration')
+      not isEqualForProperties(newProps, @props,
+        'cursorScreenRanges', 'scrollTop', 'scrollLeft', 'lineHeightInPixels',
+        'defaultCharWidth', 'scopedCharacterWidthsChangeCount'
+      )

  componentWillUpdate: (newProps) ->
-    cursorsMoved = @props.cursorPixelRects? and
-      isEqualForProperties(newProps, @props, 'defaultCharWidth', 'scopedCharacterWidthsChangeCount') and
-      not isEqual(newProps.cursorPixelRects, @props.cursorPixelRects)
-
-    @pauseCursorBlinking() if cursorsMoved
+    @pauseCursorBlinking() if @props.cursorScreenRanges and not isEqual(newProps.cursorScreenRanges, @props.cursorScreenRanges)

  startBlinkingCursors: ->
    @toggleCursorBlinkHandle = setInterval(@toggleCursorBlink, @props.cursorBlinkPeriod / 2) if @isMounted()
@@ -1,107 +0,0 @@
-_ = require 'underscore-plus'
-{Subscriber, Emitter} = require 'emissary'
-
-idCounter = 0
-nextId = -> idCounter++
-
-# Public: Represents a decoration that follows a {Marker}. A decoration is
-# basically a visual representation of a marker. It allows you to add CSS
-# classes to line numbers in the gutter, lines, and add selection-line regions
-# around marked ranges of text.
-#
-# {Decoration} objects are not meant to be created directly, but created with
-# {Editor::decorateMarker}. eg.
-#
-# ```coffee
-# range = editor.getSelectedBufferRange() # any range you like
-# marker = editor.markBufferRange(range)
-# decoration = editor.decorateMarker(marker, {type: 'line', class: 'my-line-class'})
-# ```
-#
-# Best practice for destorying the decoration is by destroying the {Marker}.
-#
-# ```
-# marker.destroy()
-# ```
-#
-# You should only use {Decoration::destroy} when you still need or do not own
-# the marker.
-#
-# ### IDs
-# Each {Decoration} has a unique ID available via `decoration.id`.
-#
-# ### Events
-# A couple of events are emitted:
-#
-# * `destroyed`: When the {Decoration} is destroyed
-# * `updated`: When the {Decoration} is updated via {Decoration::update}.
-#     Event object has properties `oldParams` and `newParams`
-#
-module.exports =
-class Decoration
-  Emitter.includeInto(this)
-
-  @isType: (decorationParams, type) ->
-    if _.isArray(decorationParams.type)
-      type in decorationParams.type
-    else
-      type is decorationParams.type
-
-  constructor: (@marker, @displayBuffer, @params) ->
-    @id = nextId()
-    @params.id = @id
-    @flashQueue = null
-    @isDestroyed = false
-
-  # Public: Destroy this marker.
-  #
-  # If you own the marker, you should use {Marker::destroy} which will destroy
-  # this decoration.
-  destroy: ->
-    return if @isDestroyed
-    @isDestroyed = true
-    @displayBuffer.removeDecoration(this)
-    @emit 'destroyed'
-
-  # Public: Update the marker with new params. Allows you to change the decoration's class.
-  #
-  # ```
-  # decoration.update({type: 'gutter', class: 'my-new-class'})
-  # ```
-  update: (newParams) ->
-    return if @isDestroyed
-    oldParams = @params
-    @params = newParams
-    @params.id = @id
-    @displayBuffer.decorationUpdated(this)
-    @emit 'updated', {oldParams, newParams}
-
-  # Public: Returns the marker associated with this {Decoration}
-  getMarker: -> @marker
-
-  # Public: Returns the {Decoration}'s params.
-  getParams: -> @params
-
-  # Public: Check if this decoration is of type `type`
-  #
-  # type - A {String} type like `'gutter'`
-  #
-  # Returns a {Boolean}
-  isType: (type) ->
-    Decoration.isType(@params, type)
-
-  matchesPattern: (decorationPattern) ->
-    return false unless decorationPattern?
-    for key, value of decorationPattern
-      return false if @params[key] != value
-    true
-
-  flash: (klass, duration=500) ->
-    flashObject = {class: klass, duration}
-    @flashQueue ?= []
-    @flashQueue.push(flashObject)
-    @emit 'flash'
-
-  consumeNextFlash: ->
-    return @flashQueue.shift() if @flashQueue?.length > 0
-    null
@@ -8,7 +8,6 @@ TokenizedBuffer = require './tokenized-buffer'
 RowMap = require './row-map'
 Fold = require './fold'
 Token = require './token'
-Decoration = require './decoration'
 DisplayBufferMarker = require './display-buffer-marker'

 class BufferToScreenConversionError extends Error
@@ -30,7 +29,6 @@ class DisplayBuffer extends Model
    width: null
    scrollTop: 0
    scrollLeft: 0
-    scrollWidth: 0

  verticalScrollMargin: 2
  horizontalScrollMargin: 6
@@ -46,10 +44,8 @@ class DisplayBuffer extends Model
    @charWidthsByScope = {}
    @markers = {}
    @foldsByMarkerId = {}
-    @decorationsById = {}
    @decorationsByMarkerId = {}
-    @decorationMarkerChangedSubscriptions = {}
-    @decorationMarkerDestroyedSubscriptions = {}
+    @decorationMarkerSubscriptions = {}
    @updateAllScreenLines()
    @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
    @subscribe @tokenizedBuffer, 'grammar-changed', (grammar) => @emit 'grammar-changed', grammar
@@ -184,12 +180,9 @@ class DisplayBuffer extends Model
  getScrollTop: -> @scrollTop
  setScrollTop: (scrollTop) ->
    if @manageScrollPosition
-      @scrollTop = Math.round(Math.max(0, Math.min(@getMaxScrollTop(), scrollTop)))
+      @scrollTop = Math.max(0, Math.min(@getScrollHeight() - @getClientHeight(), scrollTop))
    else
-      @scrollTop = Math.round(scrollTop)
-
-  getMaxScrollTop: ->
-    @getScrollHeight() - @getClientHeight()
+      @scrollTop = scrollTop

  getScrollBottom: -> @scrollTop + @height
  setScrollBottom: (scrollBottom) ->
@@ -199,13 +192,10 @@ class DisplayBuffer extends Model
  getScrollLeft: -> @scrollLeft
  setScrollLeft: (scrollLeft) ->
    if @manageScrollPosition
-      @scrollLeft = Math.round(Math.max(0, Math.min(@getScrollWidth() - @getClientWidth(), scrollLeft)))
+      @scrollLeft = Math.max(0, Math.min(@getScrollWidth() - @getClientWidth(), scrollLeft))
      @scrollLeft
    else
-      @scrollLeft = Math.round(scrollLeft)
-
-  getMaxScrollLeft: ->
-    @getScrollWidth() - @getClientWidth()
+      @scrollLeft = scrollLeft

  getScrollRight: -> @scrollLeft + @width
  setScrollRight: (scrollRight) ->
@@ -216,11 +206,7 @@ class DisplayBuffer extends Model
  setLineHeightInPixels: (@lineHeightInPixels) -> @lineHeightInPixels

  getDefaultCharWidth: -> @defaultCharWidth
-  setDefaultCharWidth: (defaultCharWidth) ->
-    if defaultCharWidth isnt @defaultCharWidth
-      @defaultCharWidth = defaultCharWidth
-      @computeScrollWidth()
-    defaultCharWidth
+  setDefaultCharWidth: (@defaultCharWidth) -> @defaultCharWidth

  getCursorWidth: -> 1

@@ -235,21 +221,13 @@ class DisplayBuffer extends Model
    scope.charWidths ?= {}
    scope.charWidths

-  batchCharacterMeasurement: (fn) ->
-    oldChangeCount = @scopedCharacterWidthsChangeCount
-    @batchingCharacterMeasurement = true
-    fn()
-    @batchingCharacterMeasurement = false
-    @characterWidthsChanged() if oldChangeCount isnt @scopedCharacterWidthsChangeCount
-
  setScopedCharWidth: (scopeNames, char, width) ->
    @getScopedCharWidths(scopeNames)[char] = width
-    @scopedCharacterWidthsChangeCount++
-    @characterWidthsChanged() unless @batchingCharacterMeasurement
+    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount++

-  characterWidthsChanged: ->
-    @computeScrollWidth()
-    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount
+  setScopedCharWidths: (scopeNames, charWidths) ->
+    _.extend(@getScopedCharWidths(scopeNames), charWidths)
+    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount++

  clearScopedCharWidths: ->
    @charWidthsByScope = {}
@@ -260,7 +238,7 @@ class DisplayBuffer extends Model
    @getLineCount() * @getLineHeightInPixels()

  getScrollWidth: ->
-    @scrollWidth
+    (@getMaxLineLength() * @getDefaultCharWidth()) + @getCursorWidth()

  getVisibleRowRange: ->
    return [0, 0] unless @getLineHeightInPixels() > 0
@@ -356,10 +334,8 @@ class DisplayBuffer extends Model
      if editorWidthInChars isnt previousWidthInChars and @softWrap
        @updateWrappedScreenLines()

-  # Returns the editor width in characters for soft wrap.
  getEditorWidthInChars: ->
-    width = @width ? @getScrollWidth()
-    width -= @getVerticalScrollbarWidth()
+    width = @getWidth()
    if width? and @defaultCharWidth > 0
      Math.floor(width / @defaultCharWidth)
    else
@@ -600,12 +576,6 @@ class DisplayBuffer extends Model
  getMaxLineLength: ->
    @maxLineLength

-  # Gets the row number of the longest screen line.
-  #
-  # Return a {}
-  getLongestScreenRow: ->
-    @longestScreenRow
-
  # Given a buffer position, this converts it into a screen position.
  #
  # bufferPosition - An object that represents a buffer position. It can be either
@@ -759,48 +729,53 @@ class DisplayBuffer extends Model
  rangeForAllLines: ->
    new Range([0, 0], @clipScreenPosition([Infinity, Infinity]))

-  decorationForId: (id) ->
-    @decorationsById[id]
-
  decorationsForScreenRowRange: (startScreenRow, endScreenRow) ->
    decorationsByMarkerId = {}
+
    for marker in @findMarkers(intersectsScreenRowRange: [startScreenRow, endScreenRow])
      if decorations = @decorationsByMarkerId[marker.id]
        decorationsByMarkerId[marker.id] = decorations
    decorationsByMarkerId

-  decorateMarker: (marker, decorationParams) ->
+  decorationMatchesType: (decoration, type) ->
+    if _.isArray(decoration.type)
+      type in decoration.type
+    else
+      type is decoration.type
+
+  decorationMatchesPattern: (decoration, decorationPattern) ->
+    return false unless decoration? and decorationPattern?
+    for key, value of decorationPattern
+      return false if decoration[key] != value
+    true
+
+  addDecorationForMarker: (marker, decoration) ->
+    unless marker?
+      console.warn 'A null marker cannot be decorated'
+      return
+
    marker = @getMarker(marker.id)
+    @decorationMarkerSubscriptions[marker.id] ?= @subscribe marker, 'destroyed', => @removeAllDecorationsForMarker(marker)

-    @decorationMarkerDestroyedSubscriptions[marker.id] ?= @subscribe marker, 'destroyed', =>
-      @removeAllDecorationsForMarker(marker)
-
-    @decorationMarkerChangedSubscriptions[marker.id] ?= @subscribe marker, 'changed', (event) =>
-      decorations = @decorationsByMarkerId[marker.id]
-
-      # Why check existence? Markers may get destroyed or decorations removed
-      # in the change handler. Bookmarks does this.
-      if decorations?
-        for decoration in decorations
-          @emit 'decoration-changed', marker, decoration, event
-
-    decoration = new Decoration(marker, this, decorationParams)
    @decorationsByMarkerId[marker.id] ?= []
    @decorationsByMarkerId[marker.id].push(decoration)
-    @decorationsById[decoration.id] = decoration
    @emit 'decoration-added', marker, decoration
-    decoration

-  removeDecoration: (decoration) ->
-    {marker} = decoration
-    return unless decorations = @decorationsByMarkerId[marker.id]
-    index = decorations.indexOf(decoration)
+  removeDecorationForMarker: (marker, decorationPattern) ->
+    unless marker?
+      console.warn 'A decoration cannot be removed from a null marker'
+      return

-    if index > -1
-      decorations.splice(index, 1)
-      delete @decorationsById[decoration.id]
-      @emit 'decoration-removed', marker, decoration
-      @removedAllMarkerDecorations(marker) if decorations.length is 0
+    return unless @decorationMarkerSubscriptions[marker.id]?
+
+    decorations = @decorationsByMarkerId[marker.id]
+    for i in [decorations.length - 1..0]
+      decoration = decorations[i]
+      if @decorationMatchesPattern(decoration, decorationPattern)
+        decorations.splice(i, 1)
+        @emit 'decoration-removed', marker, decoration
+
+    @removedAllMarkerDecorations(marker) if decorations.length is 0

  removeAllDecorationsForMarker: (marker) ->
    decorations = @decorationsByMarkerId[marker.id].slice()
@@ -809,15 +784,9 @@ class DisplayBuffer extends Model
    @removedAllMarkerDecorations(marker)

  removedAllMarkerDecorations: (marker) ->
-    @decorationMarkerChangedSubscriptions[marker.id].off()
-    @decorationMarkerDestroyedSubscriptions[marker.id].off()
-
+    @decorationMarkerSubscriptions[marker.id].off()
    delete @decorationsByMarkerId[marker.id]
-    delete @decorationMarkerChangedSubscriptions[marker.id]
-    delete @decorationMarkerDestroyedSubscriptions[marker.id]
-
-  decorationUpdated: (decoration) ->
-    @emit 'decoration-updated', decoration
+    delete @decorationMarkerSubscriptions[marker.id]

  # Retrieves a {DisplayBufferMarker} based on its id.
  #
@@ -972,7 +941,7 @@ class DisplayBuffer extends Model
    for marker in @getMarkers()
      marker.notifyObservers(textChanged: false)

-  destroyed: ->
+  destroy: ->
    marker.unsubscribe() for marker in @getMarkers()
    @tokenizedBuffer.destroy()
    @unsubscribe()
@@ -985,26 +954,24 @@ class DisplayBuffer extends Model
  handleTokenizedBufferChange: (tokenizedBufferChange) =>
    {start, end, delta, bufferChange} = tokenizedBufferChange
    @updateScreenLines(start, end + 1, delta, delayChangeEvent: bufferChange?)
-    @setScrollTop(Math.min(@getScrollTop(), @getMaxScrollTop())) if @manageScrollPosition and delta < 0

  updateScreenLines: (startBufferRow, endBufferRow, bufferDelta=0, options={}) ->
    startBufferRow = @rowMap.bufferRowRangeForBufferRow(startBufferRow)[0]
    endBufferRow = @rowMap.bufferRowRangeForBufferRow(endBufferRow - 1)[1]
    startScreenRow = @rowMap.screenRowRangeForBufferRow(startBufferRow)[0]
    endScreenRow = @rowMap.screenRowRangeForBufferRow(endBufferRow - 1)[1]
-    {screenLines, regions} = @buildScreenLines(startBufferRow, endBufferRow + bufferDelta)
-    screenDelta = screenLines.length - (endScreenRow - startScreenRow)

+    {screenLines, regions} = @buildScreenLines(startBufferRow, endBufferRow + bufferDelta)
    @screenLines[startScreenRow...endScreenRow] = screenLines
    @rowMap.spliceRegions(startBufferRow, endBufferRow - startBufferRow, regions)
-    @findMaxLineLength(startScreenRow, endScreenRow, screenLines, screenDelta)
+    @findMaxLineLength(startScreenRow, endScreenRow, screenLines)

    return if options.suppressChangeEvent

    changeEvent =
      start: startScreenRow
      end: endScreenRow - 1
-      screenDelta: screenDelta
+      screenDelta: screenLines.length - (endScreenRow - startScreenRow)
      bufferDelta: bufferDelta

    if options.delayChangeEvent
@@ -1059,33 +1026,22 @@ class DisplayBuffer extends Model

    {screenLines, regions}

-  findMaxLineLength: (startScreenRow, endScreenRow, newScreenLines, screenDelta) ->
-    oldMaxLineLength = @maxLineLength
-
+  findMaxLineLength: (startScreenRow, endScreenRow, newScreenLines) ->
    if startScreenRow <= @longestScreenRow < endScreenRow
      @longestScreenRow = 0
      @maxLineLength = 0
      maxLengthCandidatesStartRow = 0
      maxLengthCandidates = @screenLines
    else
-      @longestScreenRow += screenDelta if endScreenRow < @longestScreenRow
      maxLengthCandidatesStartRow = startScreenRow
      maxLengthCandidates = newScreenLines

-    for screenLine, i in maxLengthCandidates
-      screenRow = maxLengthCandidatesStartRow + i
+    for screenLine, screenRow in maxLengthCandidates
      length = screenLine.text.length
      if length > @maxLineLength
-        @longestScreenRow = screenRow
+        @longestScreenRow = maxLengthCandidatesStartRow + screenRow
        @maxLineLength = length

-    @computeScrollWidth() if oldMaxLineLength isnt @maxLineLength
-
-  computeScrollWidth: ->
-    @scrollWidth = @pixelPositionForScreenPosition([@longestScreenRow, @maxLineLength]).left
-    @scrollWidth += 1 unless @getSoftWrap()
-    @setScrollLeft(Math.min(@getScrollLeft(), @getMaxScrollLeft()))
-
  handleBufferMarkersUpdated: =>
    if event = @pendingChangeEvent
      @pendingChangeEvent = null
@@ -1096,7 +1052,7 @@ class DisplayBuffer extends Model
    @emit 'marker-created', @getMarker(marker.id)

  createFoldForMarker: (marker) ->
-    @decorateMarker(marker, type: 'gutter', class: 'folded')
+    @addDecorationForMarker(marker, type: 'gutter', class: 'folded')
    new Fold(this, marker)

  foldForMarker: (marker) ->
@@ -12,7 +12,7 @@ ScrollbarComponent = require './scrollbar-component'
 ScrollbarCornerComponent = require './scrollbar-corner-component'
 SubscriberMixin = require './subscriber-mixin'

-DummyHighlightDecoration = {id: 'dummy', startPixelPosition: {top: 0, left: 0}, endPixelPosition: {top: 0, left: 0}, decorations: [{class: 'dummy'}]}
+DummyHighlightDecoration = {id: 'dummy', screenRange: new Range(new Point(0, 0), new Point(0, 0)), decorations: [{class: 'dummy'}]}

 module.exports =
 EditorComponent = React.createClass
@@ -22,50 +22,44 @@ EditorComponent = React.createClass
  statics:
    performSyncUpdates: false

-  visible: false
-  autoHeight: false
  pendingScrollTop: null
  pendingScrollLeft: null
  selectOnMouseMove: false
  updateRequested: false
-  updatesPaused: false
-  updateRequestedWhilePaused: false
  cursorsMoved: false
  selectionChanged: false
  selectionAdded: false
  scrollingVertically: false
+  gutterWidth: 0
  refreshingScrollbars: false
  measuringScrollbars: true
+  pendingVerticalScrollDelta: 0
+  pendingHorizontalScrollDelta: 0
  mouseWheelScreenRow: null
  mouseWheelScreenRowClearDelay: 150
  scrollSensitivity: 0.4
-  heightAndWidthMeasurementRequested: false
+  scrollViewMeasurementRequested: false
  measureLineHeightAndDefaultCharWidthWhenShown: false
-  remeasureCharacterWidthsIfVisibleAfterNextUpdate: false
+  remeasureCharacterWidthsWhenShown: false
  inputEnabled: true
+  scrollViewMeasurementInterval: 100
  scopedCharacterWidthsChangeCount: null
-  domPollingInterval: 100
-  domPollingIntervalId: null
-  domPollingPaused: false

  render: ->
-    {focused, fontSize, lineHeight, fontFamily, showIndentGuide, showInvisibles, showLineNumbers, visible} = @state
-    {editor, mini, cursorBlinkPeriod, cursorBlinkResumeDelay} = @props
+    {focused, fontSize, lineHeight, fontFamily, showIndentGuide, showInvisibles, visible} = @state
+    {editor, cursorBlinkPeriod, cursorBlinkResumeDelay} = @props
    maxLineNumberDigits = editor.getLineCount().toString().length
-    invisibles = if showInvisibles and not mini then @state.invisibles else {}
+    invisibles = if showInvisibles then @state.invisibles else {}
    hasSelection = editor.getSelection()? and !editor.getSelection().isEmpty()
-    style = {fontSize, fontFamily}
-    style.lineHeight = lineHeight unless mini

-    if @performedInitialMeasurement
+    if @isMounted()
      renderedRowRange = @getRenderedRowRange()
      [renderedStartRow, renderedEndRow] = renderedRowRange
-      cursorPixelRects = @getCursorPixelRects(renderedRowRange)
+      cursorScreenRanges = @getCursorScreenRanges(renderedRowRange)

      decorations = editor.decorationsForScreenRowRange(renderedStartRow, renderedEndRow)
      highlightDecorations = @getHighlightDecorations(decorations)
      lineDecorations = @getLineDecorations(decorations)
-      placeholderText = @props.placeholderText if @props.placeholderText? and editor.isEmpty()

      scrollHeight = editor.getScrollHeight()
      scrollWidth = editor.getScrollWidth()
@@ -74,30 +68,25 @@ EditorComponent = React.createClass
      lineHeightInPixels = editor.getLineHeightInPixels()
      defaultCharWidth = editor.getDefaultCharWidth()
      scrollViewHeight = editor.getHeight()
-      lineWidth = Math.max(scrollWidth, editor.getWidth())
      horizontalScrollbarHeight = editor.getHorizontalScrollbarHeight()
      verticalScrollbarWidth = editor.getVerticalScrollbarWidth()
      verticallyScrollable = editor.verticallyScrollable()
      horizontallyScrollable = editor.horizontallyScrollable()
      hiddenInputStyle = @getHiddenInputPosition()
-      hiddenInputStyle.WebkitTransform = 'translateZ(0)' if @useHardwareAcceleration
+      hiddenInputStyle.WebkitTransform = 'translateZ(0)'
      if @mouseWheelScreenRow? and not (renderedStartRow <= @mouseWheelScreenRow < renderedEndRow)
        mouseWheelScreenRow = @mouseWheelScreenRow

-      style.height = scrollViewHeight if @autoHeight
-
-    className = 'editor-contents'
+    className = 'editor-contents editor-colors'
    className += ' is-focused' if focused
    className += ' has-selection' if hasSelection

-    div {className, style, tabIndex: -1},
-      if not mini and showLineNumbers
-        GutterComponent {
-          ref: 'gutter', onMouseDown: @onGutterMouseDown, lineDecorations,
-          defaultCharWidth, editor, renderedRowRange, maxLineNumberDigits, scrollViewHeight,
-          scrollTop, scrollHeight, lineHeightInPixels, @pendingChanges, mouseWheelScreenRow,
-          @useHardwareAcceleration, @performedInitialMeasurement
-        }
+    div className: className, style: {fontSize, lineHeight, fontFamily}, tabIndex: -1,
+      GutterComponent {
+        ref: 'gutter', onMouseDown: @onGutterMouseDown, onWidthChanged: @onGutterWidthChanged,
+        lineDecorations, defaultCharWidth, editor, renderedRowRange, maxLineNumberDigits, scrollViewHeight,
+        scrollTop, scrollHeight, lineHeightInPixels, @pendingChanges, mouseWheelScreenRow
+      }

      div ref: 'scrollView', className: 'scroll-view', onMouseDown: @onMouseDown,
        InputComponent
@@ -108,31 +97,17 @@ EditorComponent = React.createClass
          onBlur: @onInputBlurred

        CursorsComponent {
-          scrollTop, scrollLeft, cursorPixelRects, cursorBlinkPeriod, cursorBlinkResumeDelay,
-          lineHeightInPixels, defaultCharWidth, @scopedCharacterWidthsChangeCount, @useHardwareAcceleration,
-          @performedInitialMeasurement
+          editor, scrollTop, scrollLeft, cursorScreenRanges, cursorBlinkPeriod, cursorBlinkResumeDelay,
+          lineHeightInPixels, defaultCharWidth, @scopedCharacterWidthsChangeCount
        }
        LinesComponent {
          ref: 'lines',
          editor, lineHeightInPixels, defaultCharWidth, lineDecorations, highlightDecorations,
          showIndentGuide, renderedRowRange, @pendingChanges, scrollTop, scrollLeft,
          @scrollingVertically, scrollHeight, scrollWidth, mouseWheelScreenRow, invisibles,
-          @visible, scrollViewHeight, @scopedCharacterWidthsChangeCount, lineWidth, @useHardwareAcceleration,
-          placeholderText, @performedInitialMeasurement
+          visible, scrollViewHeight, @scopedCharacterWidthsChangeCount
        }

-        ScrollbarComponent
-          ref: 'horizontalScrollbar'
-          className: 'horizontal-scrollbar'
-          orientation: 'horizontal'
-          onScroll: @onHorizontalScroll
-          scrollLeft: scrollLeft
-          scrollWidth: scrollWidth
-          visible: horizontallyScrollable and not @refreshingScrollbars and not @measuringScrollbars
-          scrollableInOppositeDirection: verticallyScrollable
-          verticalScrollbarWidth: verticalScrollbarWidth
-          horizontalScrollbarHeight: horizontalScrollbarHeight
-
      ScrollbarComponent
        ref: 'verticalScrollbar'
        className: 'vertical-scrollbar'
@@ -145,6 +120,18 @@ EditorComponent = React.createClass
        verticalScrollbarWidth: verticalScrollbarWidth
        horizontalScrollbarHeight: horizontalScrollbarHeight

+      ScrollbarComponent
+        ref: 'horizontalScrollbar'
+        className: 'horizontal-scrollbar'
+        orientation: 'horizontal'
+        onScroll: @onHorizontalScroll
+        scrollLeft: scrollLeft
+        scrollWidth: scrollWidth + @gutterWidth
+        visible: horizontallyScrollable and not @refreshingScrollbars and not @measuringScrollbars
+        scrollableInOppositeDirection: verticallyScrollable
+        verticalScrollbarWidth: verticalScrollbarWidth
+        horizontalScrollbarHeight: horizontalScrollbarHeight
+
      # Also used to measure the height/width of scrollbars after the initial render
      ScrollbarCornerComponent
        ref: 'scrollbarCorner'
@@ -157,7 +144,8 @@ EditorComponent = React.createClass
    {editor} = @props
    Math.max(1, Math.ceil(editor.getHeight() / editor.getLineHeightInPixels()))

-  getInitialState: -> {}
+  getInitialState: ->
+    visible: true

  getDefaultProps: ->
    cursorBlinkPeriod: 800
@@ -173,7 +161,7 @@ EditorComponent = React.createClass
  componentDidMount: ->
    {editor} = @props

-    @domPollingIntervalId = setInterval(@pollDOM, @domPollingInterval)
+    @scrollViewMeasurementIntervalId = setInterval(@requestScrollViewMeasurement, @scrollViewMeasurementInterval)

    @observeEditor()
    @listenForDOMEvents()
@@ -182,14 +170,18 @@ EditorComponent = React.createClass
    @subscribe atom.themes, 'stylesheet-added stylsheet-removed', @onStylesheetsChanged
    @subscribe scrollbarStyle.changes, @refreshScrollbars

-    if @visible = @isVisible()
-      @performInitialMeasurement()
+    editor.setVisible(true)
+
+    @measureLineHeightAndDefaultCharWidth()
+    @measureScrollView()
+    @measureScrollbars()

  componentWillUnmount: ->
-    @props.parentView.trigger 'editor:will-be-removed', [@props.parentView]
    @unsubscribe()
-    clearInterval(@domPollingIntervalId)
-    @domPollingIntervalId = null
+    clearInterval(@scrollViewMeasurementIntervalId)
+    @scrollViewMeasurementIntervalId = null
+
+  componentWillUpdate: ->

  componentDidUpdate: (prevProps, prevState) ->
    cursorsMoved = @cursorsMoved
@@ -201,50 +193,23 @@ EditorComponent = React.createClass

    if @props.editor.isAlive()
      @updateParentViewFocusedClassIfNeeded(prevState)
-      @updateParentViewMiniClassIfNeeded(prevState)
      @props.parentView.trigger 'cursor:moved' if cursorsMoved
      @props.parentView.trigger 'selection:changed' if selectionChanged
      @props.parentView.trigger 'editor:display-updated'

-    @visible = @isVisible()
-    if @performedInitialMeasurement
-      @measureScrollbars() if @measuringScrollbars
-      @measureLineHeightAndDefaultCharWidthIfNeeded(prevState)
-      @remeasureCharacterWidthsIfNeeded(prevState)
-
-  performInitialMeasurement: ->
-    @updatesPaused = true
-    @measureLineHeightAndDefaultCharWidth()
-    @measureHeightAndWidth()
-    @measureScrollbars()
-    @props.editor.setVisible(true)
-    @updatesPaused = false
-    @performedInitialMeasurement = true
-    @requestUpdate()
+    @measureScrollbars() if @measuringScrollbars
+    @measureLineHeightAndCharWidthsIfNeeded(prevState)
+    @remeasureCharacterWidthsIfNeeded(prevState)

  requestUpdate: ->
-    if @updatesPaused
-      @updateRequestedWhilePaused = true
-      return
-
    if @performSyncUpdates ? EditorComponent.performSyncUpdates
      @forceUpdate()
    else unless @updateRequested
      @updateRequested = true
-      setImmediate =>
+      process.nextTick =>
        @updateRequested = false
        @forceUpdate() if @isMounted()

-  requestAnimationFrame: (fn) ->
-    @updatesPaused = true
-    @pauseDOMPolling()
-    requestAnimationFrame =>
-      fn()
-      @updatesPaused = false
-      if @updateRequestedWhilePaused and @isMounted()
-        @updateRequestedWhilePaused = false
-        @forceUpdate()
-
  getRenderedRowRange: ->
    {editor, lineOverdrawMargin} = @props
    [visibleStartRow, visibleEndRow] = editor.getVisibleRowRange()
@@ -277,45 +242,22 @@ EditorComponent = React.createClass
        cursorScreenRanges[cursor.id] = screenRange
    cursorScreenRanges

-  getCursorPixelRects: (renderedRowRange) ->
-    {editor} = @props
-    [renderedStartRow, renderedEndRow] = renderedRowRange
-
-    cursorPixelRects = {}
-    for selection in editor.getSelections() when selection.isEmpty()
-      {cursor} = selection
-      screenRange = cursor.getScreenRange()
-      if renderedStartRow <= screenRange.start.row < renderedEndRow
-        cursorPixelRects[cursor.id] = editor.pixelRectForScreenRange(screenRange)
-    cursorPixelRects
-
  getLineDecorations: (decorationsByMarkerId) ->
-    {editor, mini} = @props
-    return {} if mini
-
+    {editor} = @props
    decorationsByScreenRow = {}
    for markerId, decorations of decorationsByMarkerId
      marker = editor.getMarker(markerId)
      screenRange = null
-      headScreenRow = null
      if marker.isValid()
        for decoration in decorations
-          if decoration.isType('gutter') or decoration.isType('line')
-            decorationParams = decoration.getParams()
+          if editor.decorationMatchesType(decoration, 'gutter') or editor.decorationMatchesType(decoration, 'line')
            screenRange ?= marker.getScreenRange()
-            headScreenRow ?= marker.getHeadScreenPosition().row
            startRow = screenRange.start.row
            endRow = screenRange.end.row
            endRow-- if not screenRange.isEmpty() and screenRange.end.column == 0
            for screenRow in [startRow..endRow]
-              continue if decorationParams.onlyHead and screenRow isnt headScreenRow
-              if screenRange.isEmpty()
-                continue if decorationParams.onlyNonEmpty
-              else
-                continue if decorationParams.onlyEmpty
-
-              decorationsByScreenRow[screenRow] ?= {}
-              decorationsByScreenRow[screenRow][decoration.id] = decorationParams
+              decorationsByScreenRow[screenRow] ?= []
+              decorationsByScreenRow[screenRow].push decoration

    decorationsByScreenRow

@@ -324,17 +266,11 @@ EditorComponent = React.createClass
    filteredDecorations = {}
    for markerId, decorations of decorationsByMarkerId
      marker = editor.getMarker(markerId)
-      screenRange = marker.getScreenRange()
-      if marker.isValid() and not screenRange.isEmpty()
+      if marker.isValid() and not marker.getScreenRange().isEmpty()
        for decoration in decorations
-          if decoration.isType('highlight')
-            decorationParams = decoration.getParams()
-            filteredDecorations[markerId] ?=
-              id: markerId
-              startPixelPosition: editor.pixelPositionForScreenPosition(screenRange.start)
-              endPixelPosition: editor.pixelPositionForScreenPosition(screenRange.end)
-              decorations: []
-            filteredDecorations[markerId].decorations.push decorationParams
+          if editor.decorationMatchesType(decoration, 'highlight')
+            filteredDecorations[markerId] ?= {id: markerId, screenRange: marker.getScreenRange(), decorations: []}
+            filteredDecorations[markerId].decorations.push decoration

    # At least in Chromium 31, removing the last highlight causes a rendering
    # artifact where chunks of the lines disappear, so we always leave this
@@ -351,8 +287,6 @@ EditorComponent = React.createClass
    @subscribe editor, 'selection-added', @onSelectionAdded
    @subscribe editor, 'decoration-added', @onDecorationChanged
    @subscribe editor, 'decoration-removed', @onDecorationChanged
-    @subscribe editor, 'decoration-changed', @onDecorationChanged
-    @subscribe editor, 'decoration-updated', @onDecorationChanged
    @subscribe editor, 'character-widths-changed', @onCharacterWidthsChanged
    @subscribe editor.$scrollTop.changes, @onScrollTopChanged
    @subscribe editor.$scrollLeft.changes, @requestUpdate
@@ -369,7 +303,7 @@ EditorComponent = React.createClass

    scrollViewNode = @refs.scrollView.getDOMNode()
    scrollViewNode.addEventListener 'scroll', @onScrollViewScroll
-    window.addEventListener 'resize', @requestHeightAndWidthMeasurement
+    window.addEventListener 'resize', @requestScrollViewMeasurement

    @listenForIMEEvents()

@@ -391,13 +325,12 @@ EditorComponent = React.createClass
    #   5. textInput fired; event.data == the completion string

    selectedText = null
-    node.addEventListener 'compositionstart', ->
+    node.addEventListener 'compositionstart', =>
      selectedText = editor.getSelectedText()
-    node.addEventListener 'compositionupdate', (event) ->
+    node.addEventListener 'compositionupdate', (event) =>
      editor.insertText(event.data, select: true, undo: 'skip')
-    node.addEventListener 'compositionend', (event) ->
+    node.addEventListener 'compositionend', =>
      editor.insertText(selectedText, select: true, undo: 'skip')
-      event.target.value = ''

  listenForCommands: ->
    {parentView, editor, mini} = @props
@@ -481,7 +414,7 @@ EditorComponent = React.createClass
        'editor:unfold-all': => editor.unfoldAll()
        'editor:fold-current-row': => editor.foldCurrentRow()
        'editor:unfold-current-row': => editor.unfoldCurrentRow()
-        'editor:fold-selection': => editor.foldSelectedLines()
+        'editor:fold-selection': => neditor.foldSelectedLines()
        'editor:fold-at-indent-level-1': => editor.foldAllAtIndentLevel(0)
        'editor:fold-at-indent-level-2': => editor.foldAllAtIndentLevel(1)
        'editor:fold-at-indent-level-3': => editor.foldAllAtIndentLevel(2)
@@ -517,9 +450,7 @@ EditorComponent = React.createClass
    @subscribe atom.config.observe 'editor.showIndentGuide', @setShowIndentGuide
    @subscribe atom.config.observe 'editor.invisibles', @setInvisibles
    @subscribe atom.config.observe 'editor.showInvisibles', @setShowInvisibles
-    @subscribe atom.config.observe 'editor.showLineNumbers', @setShowLineNumbers
    @subscribe atom.config.observe 'editor.scrollSensitivity', @setScrollSensitivity
-    @subscribe atom.config.observe 'editor.useHardwareAcceleration', @setUseHardwareAcceleration

  onFocus: ->
    @refs.input.focus()
@@ -553,46 +484,50 @@ EditorComponent = React.createClass
  onVerticalScroll: (scrollTop) ->
    {editor} = @props

-    return if @updateRequested or scrollTop is editor.getScrollTop()
+    return if scrollTop is editor.getScrollTop()

    animationFramePending = @pendingScrollTop?
    @pendingScrollTop = scrollTop
    unless animationFramePending
-      @requestAnimationFrame =>
-        pendingScrollTop = @pendingScrollTop
+      requestAnimationFrame =>
+        @props.editor.setScrollTop(@pendingScrollTop)
        @pendingScrollTop = null
-        @props.editor.setScrollTop(pendingScrollTop)

  onHorizontalScroll: (scrollLeft) ->
    {editor} = @props

-    return if @updateRequested or scrollLeft is editor.getScrollLeft()
+    return if scrollLeft is editor.getScrollLeft()

    animationFramePending = @pendingScrollLeft?
    @pendingScrollLeft = scrollLeft
    unless animationFramePending
-      @requestAnimationFrame =>
+      requestAnimationFrame =>
        @props.editor.setScrollLeft(@pendingScrollLeft)
        @pendingScrollLeft = null

  onMouseWheel: (event) ->
-    {editor} = @props
+    event.preventDefault()
+    animationFramePending = @pendingHorizontalScrollDelta isnt 0 or @pendingVerticalScrollDelta isnt 0

    # Only scroll in one direction at a time
    {wheelDeltaX, wheelDeltaY} = event
    if Math.abs(wheelDeltaX) > Math.abs(wheelDeltaY)
      # Scrolling horizontally
-      previousScrollLeft = editor.getScrollLeft()
-      editor.setScrollLeft(previousScrollLeft - Math.round(wheelDeltaX * @scrollSensitivity))
-      event.preventDefault() unless previousScrollLeft is editor.getScrollLeft()
+      @pendingHorizontalScrollDelta -= Math.round(wheelDeltaX * @scrollSensitivity)
    else
      # Scrolling vertically
+      @pendingVerticalScrollDelta -= Math.round(wheelDeltaY * @scrollSensitivity)
      @mouseWheelScreenRow = @screenRowForNode(event.target)
      @clearMouseWheelScreenRowAfterDelay ?= debounce(@clearMouseWheelScreenRow, @mouseWheelScreenRowClearDelay)
      @clearMouseWheelScreenRowAfterDelay()
-      previousScrollTop = editor.getScrollTop()
-      editor.setScrollTop(previousScrollTop - Math.round(wheelDeltaY * @scrollSensitivity))
-      event.preventDefault() unless previousScrollTop is editor.getScrollTop()
+
+    unless animationFramePending
+      requestAnimationFrame =>
+        {editor} = @props
+        editor.setScrollTop(editor.getScrollTop() + @pendingVerticalScrollDelta)
+        editor.setScrollLeft(editor.getScrollLeft() + @pendingHorizontalScrollDelta)
+        @pendingVerticalScrollDelta = 0
+        @pendingHorizontalScrollDelta = 0

  onScrollViewScroll: ->
    if @isMounted()
@@ -605,7 +540,7 @@ EditorComponent = React.createClass
    return unless event.button is 0 # only handle the left mouse button

    {editor} = @props
-    {detail, shiftKey, metaKey, ctrlKey} = event
+    {detail, shiftKey, metaKey} = event
    screenPosition = @screenPositionForMouseEvent(event)

    if event.target?.classList.contains('fold-marker')
@@ -613,18 +548,15 @@ EditorComponent = React.createClass
      editor.unfoldBufferRow(bufferRow)
      return

-    switch detail
-      when 1
-        if shiftKey
-          editor.selectToScreenPosition(screenPosition)
-        else if metaKey or (ctrlKey and process.platform isnt 'darwin')
-          editor.addCursorAtScreenPosition(screenPosition)
-        else
-          editor.setCursorScreenPosition(screenPosition)
-      when 2
-        editor.getLastSelection().selectWord()
-      when 3
-        editor.getLastSelection().selectLine()
+    if shiftKey
+      editor.selectToScreenPosition(screenPosition)
+    else if metaKey
+      editor.addCursorAtScreenPosition(screenPosition)
+    else
+      editor.setCursorScreenPosition(screenPosition)
+      switch detail
+        when 2 then editor.selectWord()
+        when 3 then editor.selectLine()

    @handleDragUntilMouseUp event, (screenPosition) ->
      editor.selectToScreenPosition(screenPosition)
@@ -669,8 +601,6 @@ EditorComponent = React.createClass

  onStylesheetsChanged: (stylesheet) ->
    @refreshScrollbars() if @containsScrollbarSelector(stylesheet)
-    @remeasureCharacterWidthsIfVisibleAfterNextUpdate = true
-    @requestUpdate() if @visible

  onScreenLinesChanged: (change) ->
    {editor} = @props
@@ -693,7 +623,7 @@ EditorComponent = React.createClass
  onScrollTopChanged: ->
    @scrollingVertically = true
    @requestUpdate()
-    @onStoppedScrollingAfterDelay ?= debounce(@onStoppedScrolling, 200)
+    @onStoppedScrollingAfterDelay ?= debounce(@onStoppedScrolling, 100)
    @onStoppedScrollingAfterDelay()

  onStoppedScrolling: ->
@@ -720,7 +650,7 @@ EditorComponent = React.createClass
    dragging = false
    lastMousePosition = {}
    animationLoop = =>
-      @requestAnimationFrame =>
+      requestAnimationFrame =>
        if dragging
          screenPosition = @screenPositionForMouseEvent(lastMousePosition)
          dragHandler(screenPosition)
@@ -747,95 +677,65 @@ EditorComponent = React.createClass
    window.addEventListener('mousemove', onMouseMove)
    window.addEventListener('mouseup', onMouseUp)

-  isVisible: ->
-    node = @getDOMNode()
-    node.offsetHeight > 0 or node.offsetWidth > 0
+  requestScrollViewMeasurement: ->
+    return if @measurementPending

-  pauseDOMPolling: ->
-    @domPollingPaused = true
-    @resumeDOMPollingAfterDelay ?= debounce(@resumeDOMPolling, 100)
-    @resumeDOMPollingAfterDelay()
-
-  resumeDOMPolling: ->
-    @domPollingPaused = false
-
-  resumeDOMPollingAfterDelay: null # created lazily
-
-  pollDOM: ->
-    return if @domPollingPaused or not @isMounted()
-
-    wasVisible = @visible
-    if @visible = @isVisible()
-      if wasVisible
-        @measureHeightAndWidth()
-      else
-        @performInitialMeasurement()
-
-  requestHeightAndWidthMeasurement: ->
-    return if @heightAndWidthMeasurementRequested
-
-    @heightAndWidthMeasurementRequested = true
+    @scrollViewMeasurementRequested = true
    requestAnimationFrame =>
-      @heightAndWidthMeasurementRequested = false
-      @measureHeightAndWidth()
+      @scrollViewMeasurementRequested = false
+      @measureScrollView()

  # Measure explicitly-styled height and width and relay them to the model. If
  # these values aren't explicitly styled, we assume the editor is unconstrained
  # and use the scrollHeight / scrollWidth as its height and width in
  # calculations.
-  measureHeightAndWidth: ->
+  measureScrollView: ->
    return unless @isMounted()

-    {editor, parentView} = @props
-    parentNode = parentView.element
+    {editor} = @props
+    editorNode = @getDOMNode()
    scrollViewNode = @refs.scrollView.getDOMNode()
-    {position} = getComputedStyle(parentNode)
-    {height} = parentNode.style
+    {position} = getComputedStyle(editorNode)
+    {width, height} = editorNode.style

    if position is 'absolute' or height
-      if @autoHeight
-        @autoHeight = false
-        @forceUpdate()
-
      clientHeight =  scrollViewNode.clientHeight
      editor.setHeight(clientHeight) if clientHeight > 0
-    else
-      editor.setHeight(null)
-      @autoHeight = true

-    clientWidth = scrollViewNode.clientWidth
-    paddingLeft = parseInt(getComputedStyle(scrollViewNode).paddingLeft)
-    clientWidth -= paddingLeft
-    editor.setWidth(clientWidth) if clientWidth > 0
+    if position is 'absolute' or width
+      clientWidth = scrollViewNode.clientWidth
+      editor.setWidth(clientWidth) if clientWidth > 0

-  measureLineHeightAndDefaultCharWidthIfNeeded: (prevState) ->
+  measureLineHeightAndCharWidthsIfNeeded: (prevState) ->
    if not isEqualForProperties(prevState, @state, 'lineHeight', 'fontSize', 'fontFamily')
-      if @visible
+      if @state.visible
        @measureLineHeightAndDefaultCharWidth()
      else
        @measureLineHeightAndDefaultCharWidthWhenShown = true
-    else if @measureLineHeightAndDefaultCharWidthWhenShown and @visible
-      @measureLineHeightAndDefaultCharWidthWhenShown = false
+    else if @measureLineHeightAndDefaultCharWidthWhenShown and @state.visible and not prevState.visible
      @measureLineHeightAndDefaultCharWidth()

  measureLineHeightAndDefaultCharWidth: ->
+    @measureLineHeightAndDefaultCharWidthWhenShown = false
    @refs.lines.measureLineHeightAndDefaultCharWidth()

  remeasureCharacterWidthsIfNeeded: (prevState) ->
    if not isEqualForProperties(prevState, @state, 'fontSize', 'fontFamily')
-      if @visible
+      if @state.visible
        @remeasureCharacterWidths()
      else
-        @remeasureCharacterWidthsIfVisibleAfterNextUpdate = true
-    else if @remeasureCharacterWidthsIfVisibleAfterNextUpdate and @visible
-      @remeasureCharacterWidthsIfVisibleAfterNextUpdate = false
+        @remeasureCharacterWidthsWhenShown = true
+    else if @remeasureCharacterWidthsWhenShown and @state.visible and not prevState.visible
      @remeasureCharacterWidths()

  remeasureCharacterWidths: ->
+    @remeasureCharacterWidthsWhenShown = false
    @refs.lines.remeasureCharacterWidths()

+  onGutterWidthChanged: (@gutterWidth) ->
+    @requestUpdate()
+
  measureScrollbars: ->
-    return unless @visible
    @measuringScrollbars = false

    {editor} = @props
@@ -892,6 +792,12 @@ EditorComponent = React.createClass
      node = node.parentNode
    null

+  hide: ->
+    @setState(visible: false)
+
+  show: ->
+    @setState(visible: true)
+
  getFontSize: ->
    @state.fontSize

@@ -929,18 +835,10 @@ EditorComponent = React.createClass
  setShowInvisibles: (showInvisibles) ->
    @setState({showInvisibles})

-  setShowLineNumbers: (showLineNumbers) ->
-    @setState({showLineNumbers})
-
  setScrollSensitivity: (scrollSensitivity) ->
    if scrollSensitivity = parseInt(scrollSensitivity)
      @scrollSensitivity = Math.abs(scrollSensitivity) / 100

-  setUseHardwareAcceleration: (useHardwareAcceleration=true) ->
-    unless @useHardwareAcceleration is useHardwareAcceleration
-      @useHardwareAcceleration = useHardwareAcceleration
-      @requestUpdate()
-
  screenPositionForMouseEvent: (event) ->
    pixelPosition = @pixelPositionForMouseEvent(event)
    @props.editor.screenPositionForPixelPosition(pixelPosition)
@@ -949,9 +847,9 @@ EditorComponent = React.createClass
    {editor} = @props
    {clientX, clientY} = event

-    linesClientRect = @refs.lines.getDOMNode().getBoundingClientRect()
-    top = clientY - linesClientRect.top
-    left = clientX - linesClientRect.left
+    scrollViewClientRect = @refs.scrollView.getDOMNode().getBoundingClientRect()
+    top = clientY - scrollViewClientRect.top + editor.getScrollTop()
+    left = clientX - scrollViewClientRect.left + editor.getScrollLeft()
    {top, left}

  getModel: ->
@@ -965,10 +863,6 @@ EditorComponent = React.createClass
    if prevState.focused isnt @state.focused
      @props.parentView.toggleClass('is-focused', @props.focused)

-  updateParentViewMiniClassIfNeeded: (prevProps) ->
-    if prevProps.mini isnt @props.mini
-      @props.parentView.toggleClass('mini', @props.mini)
-
  runScrollBenchmark: ->
    unless process.env.NODE_ENV is 'production'
      ReactPerf = require 'react-atom-fork/lib/ReactDefaultPerf'
@@ -57,7 +57,6 @@ class EditorView extends View
    softTabs: true
    softWrapAtPreferredLineLength: false
    scrollSensitivity: 40
-    useHardwareAcceleration: true

  @nextEditorId: 1

@@ -131,10 +131,6 @@ TextMateScopeSelector = require('first-mate').ScopeSelector
 # - {::markScreenRange}
 # - {::getMarker}
 # - {::findMarkers}
-#
-# ### Decorations
-# - {::decorateMarker}
-# - {::decorationsForScreenRowRange}
 module.exports =
 class Editor extends Model
  Serializable.includeInto(this)
@@ -150,7 +146,6 @@ class Editor extends Model
  selections: null
  suppressSelectionMerging: false
  updateBatchDepth: 0
-  selectionFlashDuration: 500

  @delegatesMethods 'suggestedIndentForBufferRow', 'autoIndentBufferRow', 'autoIndentBufferRows',
    'autoDecreaseIndentForBufferRow', 'toggleLineCommentForBufferRow', 'toggleLineCommentsForBufferRows',
@@ -222,8 +217,6 @@ class Editor extends Model
    @subscribe @displayBuffer, 'soft-wrap-changed', (args...) => @emit 'soft-wrap-changed', args...
    @subscribe @displayBuffer, "decoration-added", (args...) => @emit 'decoration-added', args...
    @subscribe @displayBuffer, "decoration-removed", (args...) => @emit 'decoration-removed', args...
-    @subscribe @displayBuffer, "decoration-changed", (args...) => @emit 'decoration-changed', args...
-    @subscribe @displayBuffer, "decoration-updated", (args...) => @emit 'decoration-updated', args...
    @subscribe @displayBuffer, "character-widths-changed", (changeCount) => @emit 'character-widths-changed', changeCount

  getViewClass: ->
@@ -416,10 +409,9 @@ class Editor extends Model
    @displayBuffer.indentLevelForLine(line)

  # Constructs the string used for tabs.
-  buildIndentString: (number, column=0) ->
+  buildIndentString: (number) ->
    if @getSoftTabs()
-      tabStopViolation = column % @getTabLength()
-      _.multiplyString(" ", Math.floor(number * @getTabLength()) - tabStopViolation)
+      _.multiplyString(" ", Math.floor(number * @getTabLength()))
    else
      _.multiplyString("\t", Math.floor(number))

@@ -518,8 +510,6 @@ class Editor extends Model
  # {Delegates to: TextBuffer.isModified}
  isModified: -> @buffer.isModified()

-  isEmpty: -> @buffer.isEmpty()
-
  # Public: Determine whether the user should be prompted to save before closing
  # this editor.
  shouldPromptToSave: -> @isModified() and not @buffer.hasMultipleEditors()
@@ -1067,11 +1057,9 @@ class Editor extends Model
  # All the changes made inside the given {Function} can be reverted with a
  # single call to {::undo}.
  #
-  # fn - A {Function} that will be called once for each {Selection}. The first
-  #      argument will be a {Selection} and the second argument will be the
-  #      {Number} index of that selection.
+  # fn - A {Function} that will be called with each {Selection}.
  mutateSelectedText: (fn) ->
-    @transact => fn(selection, index) for selection, index in @getSelections()
+    @transact => fn(selection,index) for selection,index in @getSelections()

  replaceSelectedText: (options={}, fn) ->
    {selectWordIfEmpty} = options
@@ -1089,57 +1077,60 @@ class Editor extends Model
  # startScreenRow - the {Number} beginning screen row
  # endScreenRow - the {Number} end screen row (inclusive)
  #
-  # Returns an {Object} of decorations in the form
-  #  `{1: [{id: 10, type: 'gutter', class: 'someclass'}], 2: ...}`
-  #   where the keys are {Marker} IDs, and the values are an array of decoration
-  #   params objects attached to the marker.
+  # Returns an {Object} of decorations in the form `{1: [{type: 'gutter', class: 'someclass'}], 2: ...}`
+  #   where the keys are markerIds, and the values are an array of decoration objects attached to the marker.
  # Returns an empty object when no decorations are found
  decorationsForScreenRowRange: (startScreenRow, endScreenRow) ->
    @displayBuffer.decorationsForScreenRowRange(startScreenRow, endScreenRow)

  # Public: Adds a decoration that tracks a {Marker}. When the marker moves,
-  # is invalidated, or is destroyed, the decoration will be updated to reflect
-  # the marker's state.
+  # is invalidated, or is destroyed, the decoration will be updated to reflect the marker's state.
  #
-  # There are three types of supported decorations:
-  # * `line`: Adds your CSS `class` to the line nodes within the range
-  #     marked by the marker
-  # * `gutter`: Adds your CSS `class` to the line number nodes within the
-  #     range marked by the marker
-  # * `highlight`: Adds a new highlight div to the editor surrounding the
-  #     range marked by the marker. When the user selects text, the selection is
-  #     visualized with a highlight decoration internally. The structure of this
-  #     highlight will be:
-  #     ```html
-  #     <div class="highlight <your-class>">
-  #       <!-- Will be one region for each row in the range. Spans 2 lines? There will be 2 regions. -->
-  #       <div class="region"></div>
-  #     </div>
-  #     ```
+  # There are a few supported decoration types:
+  # * `gutter`: `{type: 'gutter', class: 'linter-error'}` Will add a class to the gutter rows associated with the marker.
+  # * `line`: `{type: 'line', class: 'linter-error'}` Will add a class to the editor lines associated with the marker.
+  # * `highlight`: `{type: 'highlight', class: 'linter-error'}` Will highlight the region of the buffer associated with the marker. Your specified class will be added to the highlight.
  #
-  # marker - A {Marker} you want this decoration to follow.
-  # decorationParams - An {Object} representing the decoration eg. `{type: 'gutter', class: 'linter-error'}`
-  #   :type - There are a few supported decoration types:
-  #     * `gutter`: Applies the decoration to the line numbers spanned by the marker.
-  #     * `line`: Applies the decoration to the lines spanned by the marker.
-  #     * `highlight`: Applies the decoration to a "highlight" behind the marked range.
-  #   :class - This CSS class will be applied to the decorated line number,
-  #     line, or highlight.
-  #   :onlyHead - If `true`, the decoration will only be applied to the head
-  #     of the marker. Only applicable to the `line` and `gutter` types.
-  #   :onlyEmpty - If `true`, the decoration will only be applied if the
-  #     associated marker is empty. Only applicable to the `line` and
-  #     `gutter` types.
-  #   :onlyNonEmpty - If `true`, the decoration will only be applied if the
-  #     associated marker is non-empty.  Only applicable to the `line` and
-  #     gutter types.
+  # marker - the {Marker} you want this decoration to follow
+  # decoration - the {Object} decoration eg. `{type: 'gutter', class: 'linter-error'}`
  #
-  # Returns a {Decoration} object
-  decorateMarker: (marker, decorationParams) ->
-    @displayBuffer.decorateMarker(marker, decorationParams)
+  # Returns nothing
+  addDecorationForMarker: (marker, decoration) ->
+    @displayBuffer.addDecorationForMarker(marker, decoration)

-  decorationForId: (id) ->
-    @displayBuffer.decorationForId(id)
+  # Public: Removes all decorations associated with a {Marker} that match a
+  # `decorationPattern` and stop tracking the {Marker}.
+  #
+  # ```coffee
+  # marker = editor.markBufferRange([[4, 13], [5, 17]])
+  # editor.removeDecorationForMarker(marker, {type: 'gutter', class: 'linter-error'})
+  # ```
+  #
+  # All decorations matching a pattern will be removed. For example, you might
+  # have decorations with a namespace like this attached to a row:
+  #
+  # ```coffee
+  # [
+  #   {type: 'gutter', namespace: 'myns', class: 'something'},
+  #   {type: 'gutter', namespace: 'myns', class: 'something-else'}
+  # ]
+  # ```
+  #
+  # You can remove both with:
+  #
+  # ```coffee
+  # editor.removeDecorationForMarker(marker, {namespace: 'myns'})
+  # ```
+  #
+  # marker - the {Marker} to detach from
+  # decorationPattern - the {Object} decoration type to filter by eg. `{type: 'gutter', class: 'linter-error'}`
+  #
+  # Returns nothing
+  removeDecorationForMarker: (marker, decorationPattern) ->
+    @displayBuffer.removeDecorationForMarker(marker, decorationPattern)
+
+  decorationMatchesType: (decoration, type) ->
+    @displayBuffer.decorationMatchesType(decoration, type)

  # Public: Get the {DisplayBufferMarker} for the given marker id.
  getMarker: (id) ->
@@ -1246,9 +1237,7 @@ class Editor extends Model
  addCursor: (marker) ->
    cursor = new Cursor(editor: this, marker: marker)
    @cursors.push(cursor)
-    @decorateMarker(marker, type: 'gutter', class: 'cursor-line')
-    @decorateMarker(marker, type: 'gutter', class: 'cursor-line-no-selection', onlyHead: true, onlyEmpty: true)
-    @decorateMarker(marker, type: 'line', class: 'cursor-line', onlyEmpty: true)
+    @addDecorationForMarker(marker, type: ['gutter', 'line'], class: 'cursor-line')
    @emit 'cursor-added', cursor
    cursor

@@ -1275,6 +1264,7 @@ class Editor extends Model
        if selection.intersectsBufferRange(selectionBufferRange)
          return selection
    else
+      @addDecorationForMarker(marker, type: 'highlight', class: 'selection')
      @emit 'selection-added', selection
      selection

@@ -1289,7 +1279,7 @@ class Editor extends Model
  addSelectionForBufferRange: (bufferRange, options={}) ->
    @markBufferRange(bufferRange, _.defaults(@getSelectionMarkerAttributes(), options))
    selection = @getLastSelection()
-    selection.autoscroll() if @manageScrollPosition
+    selection.autoscroll()
    selection

  # Public: Set the selected range in buffer coordinates. If there are multiple
@@ -1497,7 +1487,7 @@ class Editor extends Model
  # text - A {String}
  #
  # Returns the {Range} of the newly-inserted text.
-  setTextInBufferRange: (range, text, normalizeLineEndings) -> @getBuffer().setTextInRange(range, text, normalizeLineEndings)
+  setTextInBufferRange: (range, text) -> @getBuffer().setTextInRange(range, text)

  # Public: Get the {Range} of the paragraph surrounding the most recently added
  # cursor.
@@ -1984,8 +1974,6 @@ class Editor extends Model
  getLineHeightInPixels: -> @displayBuffer.getLineHeightInPixels()
  setLineHeightInPixels: (lineHeightInPixels) -> @displayBuffer.setLineHeightInPixels(lineHeightInPixels)

-  batchCharacterMeasurement: (fn) -> @displayBuffer.batchCharacterMeasurement(fn)
-
  getScopedCharWidth: (scopeNames, char) -> @displayBuffer.getScopedCharWidth(scopeNames, char)
  setScopedCharWidth: (scopeNames, char, width) -> @displayBuffer.setScopedCharWidth(scopeNames, char, width)

@@ -35,11 +35,6 @@ class Fold
  # Returns a {Range}.
  getBufferRange: ({includeNewline}={}) ->
    range = @marker.getRange()
-
-    if range.end.row > range.start.row and nextFold = @displayBuffer.largestFoldStartingAtBufferRow(range.end.row)
-      nextRange = nextFold.getBufferRange()
-      range = new Range(range.start, nextRange.end)
-
    if includeNewline
      range = range.copy()
      range.end.row++
@@ -2,7 +2,6 @@ _ = require 'underscore-plus'
 React = require 'react-atom-fork'
 {div} = require 'reactionary-atom-fork'
 {isEqual, isEqualForProperties, multiplyString, toArray} = require 'underscore-plus'
-Decoration = require './decoration'
 SubscriberMixin = require './subscriber-mixin'

 WrapperDiv = document.createElement('div')
@@ -16,20 +15,14 @@ GutterComponent = React.createClass
  measuredWidth: null

  render: ->
-    {scrollHeight, scrollViewHeight, onMouseDown} = @props
+    {scrollHeight, scrollViewHeight, scrollTop, onMouseDown} = @props

    div className: 'gutter', onClick: @onClick, onMouseDown: onMouseDown,
-      div className: 'line-numbers', ref: 'lineNumbers', style:
+      # The line-numbers div must have the 'editor-colors' class so it has an
+      # opaque background to avoid sub-pixel anti-aliasing problems on the GPU
+      div className: 'gutter line-numbers editor-colors', ref: 'lineNumbers', style:
        height: Math.max(scrollHeight, scrollViewHeight)
-        WebkitTransform: @getTransform()
-
-  getTransform: ->
-    {scrollTop, useHardwareAcceleration} = @props
-
-    if useHardwareAcceleration
-      "translate3d(0px, #{-scrollTop}px, 0px)"
-    else
-      "translate(0px, #{-scrollTop}px)"
+        WebkitTransform: "translate3d(0px, #{-scrollTop}px, 0px)"

  componentWillMount: ->
    @lineNumberNodesById = {}
@@ -39,7 +32,6 @@ GutterComponent = React.createClass

  componentDidMount: ->
    @appendDummyLineNumber()
-    @updateLineNumbers() if @props.performedInitialMeasurement

  # Only update the gutter if the visible row range has changed or if a
  # non-zero-delta change to the screen lines has occurred within the current
@@ -47,24 +39,23 @@ GutterComponent = React.createClass
  shouldComponentUpdate: (newProps) ->
    return true unless isEqualForProperties(newProps, @props,
      'renderedRowRange', 'scrollTop', 'lineHeightInPixels', 'mouseWheelScreenRow', 'lineDecorations',
-      'scrollViewHeight', 'useHardwareAcceleration'
+      'scrollViewHeight'
    )

    {renderedRowRange, pendingChanges, lineDecorations} = newProps
-    return false unless renderedRowRange?
-
    for change in pendingChanges when Math.abs(change.screenDelta) > 0 or Math.abs(change.bufferDelta) > 0
      return true unless change.end <= renderedRowRange.start or renderedRowRange.end <= change.start

    false

  componentDidUpdate: (oldProps) ->
-    return unless @props.performedInitialMeasurement
-
    unless isEqualForProperties(oldProps, @props, 'maxLineNumberDigits')
      @updateDummyLineNumber()
      @removeLineNumberNodes()

+    unless isEqualForProperties(oldProps, @props, 'maxLineNumberDigits', 'defaultCharWidth')
+      @measureWidth()
+
    @clearScreenRowCaches() unless oldProps.lineHeightInPixels is @props.lineHeightInPixels
    @updateLineNumbers()

@@ -154,8 +145,8 @@ GutterComponent = React.createClass

    classes = ''
    if lineDecorations? and decorations = lineDecorations[screenRow]
-      for id, decoration of decorations
-        if Decoration.isType(decoration, 'gutter')
+      for decoration in decorations
+        if editor.decorationMatchesType(decoration, 'gutter')
          classes += decoration.class + ' '

    classes += "foldable " if bufferRow >= 0 and editor.isFoldableAtBufferRow(bufferRow)
@@ -186,13 +177,12 @@ GutterComponent = React.createClass
    previousDecorations = @renderedDecorationsByLineNumberId[lineNumberId]

    if previousDecorations?
-      for id, decoration of previousDecorations
-        if Decoration.isType(decoration, 'gutter') and not @hasDecoration(decorations, decoration)
-          node.classList.remove(decoration.class)
+      for decoration in previousDecorations
+        node.classList.remove(decoration.class) if editor.decorationMatchesType(decoration, 'gutter') and not _.deepContains(decorations, decoration)

    if decorations?
-      for id, decoration of decorations
-        if Decoration.isType(decoration, 'gutter') and not @hasDecoration(previousDecorations, decoration)
+      for decoration in decorations
+        if editor.decorationMatchesType(decoration, 'gutter') and not _.deepContains(previousDecorations, decoration)
          node.classList.add(decoration.class)

    unless @screenRowsByLineNumberId[lineNumberId] is screenRow
@@ -202,9 +192,6 @@ GutterComponent = React.createClass
      @screenRowsByLineNumberId[lineNumberId] = screenRow
      @lineNumberIdsByScreenRow[screenRow] = lineNumberId

-  hasDecoration: (decorations, decoration) ->
-    decorations? and decorations[decoration.id] is decoration
-
  hasLineNumberNode: (lineNumberId) ->
    @lineNumberNodesById.hasOwnProperty(lineNumberId)

@@ -222,3 +209,9 @@ GutterComponent = React.createClass
        editor.unfoldBufferRow(bufferRow)
      else
        editor.foldBufferRow(bufferRow)
+
+  measureWidth: ->
+    width = @getDOMNode().offsetWidth
+    unless width is @measuredWidth
+      @measuredWidth = width
+      @props.onWidthChanged?(width)
@@ -1,47 +1,27 @@
 React = require 'react-atom-fork'
 {div} = require 'reactionary-atom-fork'
-{isEqualForProperties} = require 'underscore-plus'

 module.exports =
 HighlightComponent = React.createClass
  displayName: 'HighlightComponent'

  render: ->
-    {startPixelPosition, endPixelPosition, decoration} = @props
+    {editor, screenRange, decoration} = @props
+    {start, end} = screenRange
+    rowCount = end.row - start.row + 1
+    startPixelPosition = editor.pixelPositionForScreenPosition(start)
+    endPixelPosition = editor.pixelPositionForScreenPosition(end)

    className = 'highlight'
    className += " #{decoration.class}" if decoration.class?
-
    div {className},
-      if endPixelPosition.top is startPixelPosition.top
-        @renderSingleLineRegions()
+      if rowCount is 1
+        @renderSingleLineRegions(startPixelPosition, endPixelPosition)
      else
-        @renderMultiLineRegions()
+        @renderMultiLineRegions(startPixelPosition, endPixelPosition, rowCount)

-  componentDidMount: ->
-    {editor, decoration} = @props
-    if decoration.id?
-      @decoration = editor.decorationForId(decoration.id)
-      @decoration.on 'flash', @startFlashAnimation
-      @startFlashAnimation()
-
-  componentWillUnmount: ->
-    @decoration?.off 'flash', @startFlashAnimation
-
-  startFlashAnimation: ->
-    return unless flash = @decoration.consumeNextFlash()
-
-    node = @getDOMNode()
-    node.classList.remove(flash.class)
-
-    requestAnimationFrame =>
-      node.classList.add(flash.class)
-      clearTimeout(@flashTimeoutId)
-      removeFlashClass = -> node.classList.remove(flash.class)
-      @flashTimeoutId = setTimeout(removeFlashClass, flash.duration)
-
-  renderSingleLineRegions: ->
-    {startPixelPosition, endPixelPosition, lineHeightInPixels} = @props
+  renderSingleLineRegions: (startPixelPosition, endPixelPosition) ->
+    {lineHeightInPixels} = @props

    [
      div className: 'region', key: 0, style:
@@ -51,8 +31,8 @@ HighlightComponent = React.createClass
        width: endPixelPosition.left - startPixelPosition.left
    ]

-  renderMultiLineRegions: ->
-    {startPixelPosition, endPixelPosition, lineHeightInPixels} = @props
+  renderMultiLineRegions: (startPixelPosition, endPixelPosition, rowCount) ->
+    {lineHeightInPixels} = @props
    regions = []
    index = 0

@@ -66,11 +46,11 @@ HighlightComponent = React.createClass
    )

    # Middle rows, extending from left side to right side of screen
-    if endPixelPosition.top - startPixelPosition.top > lineHeightInPixels
+    if rowCount > 2
      regions.push(
        div className: 'region', key: index++, style:
          top: startPixelPosition.top + lineHeightInPixels
-          height: endPixelPosition.top - startPixelPosition.top - lineHeightInPixels
+          height: (rowCount - 2) * lineHeightInPixels
          left: 0
          right: 0
      )
@@ -85,6 +65,3 @@ HighlightComponent = React.createClass
    )

    regions
-
-  shouldComponentUpdate: (newProps) ->
-    not isEqualForProperties(newProps, @props, 'startPixelPosition', 'endPixelPosition', 'lineHeightInPixels')
@@ -8,16 +8,15 @@ HighlightsComponent = React.createClass
  displayName: 'HighlightsComponent'

  render: ->
-    div className: 'highlights',
-      @renderHighlights() if @props.performedInitialMeasurement
+    div className: 'highlights', @renderHighlights()

  renderHighlights: ->
    {editor, highlightDecorations, lineHeightInPixels} = @props

    highlightComponents = []
-    for markerId, {startPixelPosition, endPixelPosition, decorations} of highlightDecorations
+    for markerId, {screenRange, decorations} of highlightDecorations
      for decoration in decorations
-        highlightComponents.push(HighlightComponent({editor, key: "#{markerId}-#{decoration.class}", startPixelPosition, endPixelPosition, decoration, lineHeightInPixels}))
+        highlightComponents.push(HighlightComponent({key: "#{markerId}-#{decoration.class}", screenRange, decoration, editor, lineHeightInPixels}))

    highlightComponents

@@ -30,10 +30,6 @@ class LessCompileCache
  setImportPaths: (importPaths=[]) ->
    @cache.setImportPaths(importPaths.concat(@lessSearchPaths))

-  read: (stylesheetPath) ->
-    @cache.readFileSync(stylesheetPath)
-
-  cssForFile: (stylesheetPath, lessContent) ->
-    @cache.cssForFile(stylesheetPath, lessContent)
+  read: (stylesheetPath) -> @cache.readFileSync(stylesheetPath)

  destroy: -> @unsubscribe()
@@ -4,7 +4,6 @@ React = require 'react-atom-fork'
 {debounce, isEqual, isEqualForProperties, multiplyString, toArray} = require 'underscore-plus'
 {$$} = require 'space-pen'

-Decoration = require './decoration'
 HighlightsComponent = require './highlights-component'

 DummyLineNode = $$(-> @div className: 'line', style: 'position: absolute; visibility: hidden;', => @span 'x')[0]
@@ -16,27 +15,18 @@ LinesComponent = React.createClass
  displayName: 'LinesComponent'

  render: ->
-    {performedInitialMeasurement} = @props
-
-    if performedInitialMeasurement
-      {editor, highlightDecorations, scrollHeight, scrollWidth, placeholderText} = @props
+    if @isMounted()
+      {editor, highlightDecorations, scrollTop, scrollLeft, scrollHeight, scrollWidth} = @props
      {lineHeightInPixels, defaultCharWidth, scrollViewHeight, scopedCharacterWidthsChangeCount} = @props
      style =
        height: Math.max(scrollHeight, scrollViewHeight)
        width: scrollWidth
-        WebkitTransform: @getTransform()
+        WebkitTransform: "translate3d(#{-scrollLeft}px, #{-scrollTop}px, 0px)"

-    div {className: 'lines', style},
-      div className: 'placeholder-text', placeholderText if placeholderText?
-      HighlightsComponent({editor, highlightDecorations, lineHeightInPixels, defaultCharWidth, scopedCharacterWidthsChangeCount, performedInitialMeasurement})
-
-  getTransform: ->
-    {scrollTop, scrollLeft, useHardwareAcceleration} = @props
-
-    if useHardwareAcceleration
-      "translate3d(#{-scrollLeft}px, #{-scrollTop}px, 0px)"
-    else
-      "translate(#{-scrollLeft}px, #{-scrollTop}px)"
+    # The lines div must have the 'editor-colors' class so it has an opaque
+    # background to avoid sub-pixel anti-aliasing problems on the GPU
+    div {className: 'lines editor-colors', style},
+      HighlightsComponent({editor, highlightDecorations, lineHeightInPixels, defaultCharWidth, scopedCharacterWidthsChangeCount}) if @isMounted()

  componentWillMount: ->
    @measuredLines = new WeakSet
@@ -49,42 +39,35 @@ LinesComponent = React.createClass
    return true unless isEqualForProperties(newProps, @props,
      'renderedRowRange', 'lineDecorations', 'highlightDecorations', 'lineHeightInPixels', 'defaultCharWidth',
      'scrollTop', 'scrollLeft', 'showIndentGuide', 'scrollingVertically', 'invisibles', 'visible',
-      'scrollViewHeight', 'mouseWheelScreenRow', 'scopedCharacterWidthsChangeCount', 'lineWidth', 'useHardwareAcceleration',
-      'placeholderText', 'performedInitialMeasurement'
+      'scrollViewHeight', 'mouseWheelScreenRow', 'scopedCharacterWidthsChangeCount'
    )

    {renderedRowRange, pendingChanges} = newProps
-    return false unless renderedRowRange?
-
    [renderedStartRow, renderedEndRow] = renderedRowRange
    for change in pendingChanges
-      if change.screenDelta is 0
-        return true unless change.end < renderedStartRow or renderedEndRow <= change.start
-      else
-        return true unless renderedEndRow <= change.start
+      return true unless change.end < renderedStartRow or renderedEndRow <= change.start

    false

  componentDidUpdate: (prevProps) ->
-    {visible, scrollingVertically, performedInitialMeasurement} = @props
-    return unless performedInitialMeasurement
+    {visible, scrollingVertically} = @props

    @clearScreenRowCaches() unless prevProps.lineHeightInPixels is @props.lineHeightInPixels
    @removeLineNodes() unless isEqualForProperties(prevProps, @props, 'showIndentGuide', 'invisibles')
-    @updateLines(@props.lineWidth isnt prevProps.lineWidth)
+    @updateLines()
    @measureCharactersInNewLines() if visible and not scrollingVertically

  clearScreenRowCaches: ->
    @screenRowsByLineId = {}
    @lineIdsByScreenRow = {}

-  updateLines: (updateWidth) ->
+  updateLines: ->
    {editor, renderedRowRange, showIndentGuide, selectionChanged, lineDecorations} = @props
    [startRow, endRow] = renderedRowRange

    visibleLines = editor.linesForScreenRows(startRow, endRow - 1)
    @removeLineNodes(visibleLines)
-    @appendOrUpdateVisibleLineNodes(visibleLines, startRow, updateWidth)
+    @appendOrUpdateVisibleLineNodes(visibleLines, startRow)

  removeLineNodes: (visibleLines=[]) ->
    {mouseWheelScreenRow} = @props
@@ -100,7 +83,7 @@ LinesComponent = React.createClass
        delete @renderedDecorationsByLineId[lineId]
        node.removeChild(lineNode)

-  appendOrUpdateVisibleLineNodes: (visibleLines, startRow, updateWidth) ->
+  appendOrUpdateVisibleLineNodes: (visibleLines, startRow) ->
    {lineDecorations} = @props

    newLines = null
@@ -110,7 +93,7 @@ LinesComponent = React.createClass
      screenRow = startRow + index

      if @hasLineNode(line.id)
-        @updateLineNode(line, screenRow, updateWidth)
+        @updateLineNode(line, screenRow)
      else
        newLines ?= []
        newLinesHTML ?= ""
@@ -135,18 +118,18 @@ LinesComponent = React.createClass
    @lineNodesByLineId.hasOwnProperty(lineId)

  buildLineHTML: (line, screenRow) ->
-    {editor, mini, showIndentGuide, lineHeightInPixels, lineDecorations, lineWidth} = @props
+    {editor, mini, showIndentGuide, lineHeightInPixels, lineDecorations} = @props
    {tokens, text, lineEnding, fold, isSoftWrapped, indentLevel} = line

    classes = ''
    if decorations = lineDecorations[screenRow]
-      for id, decoration of decorations
-        if Decoration.isType(decoration, 'line')
+      for decoration in decorations
+        if editor.decorationMatchesType(decoration, 'line')
          classes += decoration.class + ' '
    classes += 'line'

    top = screenRow * lineHeightInPixels
-    lineHTML = "<div class=\"#{classes}\" style=\"position: absolute; top: #{top}px; width: #{lineWidth}px;\" data-screen-row=\"#{screenRow}\">"
+    lineHTML = "<div class=\"#{classes}\" style=\"position: absolute; top: #{top}px;\" data-screen-row=\"#{screenRow}\">"

    if text is ""
      lineHTML += @buildEmptyLineInnerHTML(line)
@@ -158,31 +141,14 @@ LinesComponent = React.createClass
    lineHTML

  buildEmptyLineInnerHTML: (line) ->
-    {showIndentGuide, invisibles} = @props
-    {cr, eol} = invisibles
+    {showIndentGuide} = @props
    {indentLevel, tabLength} = line

    if showIndentGuide and indentLevel > 0
-      invisiblesToRender = []
-      invisiblesToRender.push(cr) if cr? and line.lineEnding is '\r\n'
-      invisiblesToRender.push(eol) if eol?
-
-      lineHTML = ''
-      for i in [0...indentLevel]
-        lineHTML += "<span class='indent-guide'>"
-        for j in [0...tabLength]
-          if invisible = invisiblesToRender.shift()
-            lineHTML += "<span class='invisible-character'>#{invisible}</span>"
-          else
-            lineHTML += ' '
-        lineHTML += "</span>"
-
-      while invisiblesToRender.length
-        lineHTML += "<span class='invisible-character'>#{invisiblesToRender.shift()}</span>"
-
-      lineHTML
+      indentSpan = "<span class='indent-guide'>#{multiplyString(' ', tabLength)}</span>"
+      multiplyString(indentSpan, indentLevel + 1)
    else
-      @buildEndOfLineHTML(line, @props.invisibles) or '&nbsp;'
+      "&nbsp;"

  buildLineInnerHTML: (line) ->
    {invisibles, mini, showIndentGuide, invisibles} = @props
@@ -194,7 +160,7 @@ LinesComponent = React.createClass
    lineIsWhitespaceOnly = firstTrailingWhitespacePosition is 0
    for token in tokens
      innerHTML += @updateScopeStack(scopeStack, token.scopes)
-      hasIndentGuide = not mini and showIndentGuide and (token.hasLeadingWhitespace or (token.hasTrailingWhitespace and lineIsWhitespaceOnly))
+      hasIndentGuide = not mini and showIndentGuide and token.hasLeadingWhitespace or (token.hasTrailingWhitespace and lineIsWhitespaceOnly)
      innerHTML += token.getValueAsHtml({invisibles, hasIndentGuide})

    innerHTML += @popScope(scopeStack) while scopeStack.length > 0
@@ -205,11 +171,9 @@ LinesComponent = React.createClass
    return '' if @props.mini or line.isSoftWrapped()

    html = ''
-    # Note the lack of '?' in the character checks. A user can set the chars
-    # to an empty string which we will interpret as not-set
-    if invisibles.cr and line.lineEnding is '\r\n'
+    if invisibles.cr? and line.lineEnding is '\r\n'
      html += "<span class='invisible-character'>#{invisibles.cr}</span>"
-    if invisibles.eol
+    if invisibles.eol?
      html += "<span class='invisible-character'>#{invisibles.eol}</span>"

    html
@@ -219,7 +183,7 @@ LinesComponent = React.createClass

    # Find a common prefix
    for scope, i in desiredScopes
-      break unless scopeStack[i] is desiredScopes[i]
+      break unless scopeStack[i]?.scope is desiredScopes[i]

    # Pop scopes until we're at the common prefx
    until scopeStack.length is i
@@ -239,34 +203,28 @@ LinesComponent = React.createClass
    scopeStack.push(scope)
    "<span class=\"#{scope.replace(/\.+/g, ' ')}\">"

-  updateLineNode: (line, screenRow, updateWidth) ->
-    {editor, lineHeightInPixels, lineDecorations, lineWidth} = @props
+  updateLineNode: (line, screenRow) ->
+    {editor, lineHeightInPixels, lineDecorations} = @props
    lineNode = @lineNodesByLineId[line.id]

    decorations = lineDecorations[screenRow]
    previousDecorations = @renderedDecorationsByLineId[line.id]

    if previousDecorations?
-      for id, decoration of previousDecorations
-        if Decoration.isType(decoration, 'line') and not @hasDecoration(decorations, decoration)
-          lineNode.classList.remove(decoration.class)
+      for decoration in previousDecorations
+        lineNode.classList.remove(decoration.class) if editor.decorationMatchesType(decoration, 'line') and not _.deepContains(decorations, decoration)

    if decorations?
-      for id, decoration of decorations
-        if Decoration.isType(decoration, 'line') and not @hasDecoration(previousDecorations, decoration)
+      for decoration in decorations
+        if editor.decorationMatchesType(decoration, 'line') and not _.deepContains(previousDecorations, decoration)
          lineNode.classList.add(decoration.class)

-    lineNode.style.width = lineWidth + 'px' if updateWidth
-
    unless @screenRowsByLineId[line.id] is screenRow
      lineNode.style.top = screenRow * lineHeightInPixels + 'px'
      lineNode.dataset.screenRow = screenRow
      @screenRowsByLineId[line.id] = screenRow
      @lineIdsByScreenRow[screenRow] = line.id

-  hasDecoration: (decorations, decoration) ->
-    decorations? and decorations[decoration.id] is decoration
-
  lineNodeForScreenRow: (screenRow) ->
    @lineNodesByLineId[@lineIdsByScreenRow[screenRow]]

@@ -290,12 +248,10 @@ LinesComponent = React.createClass
    [visibleStartRow, visibleEndRow] = @props.renderedRowRange
    node = @getDOMNode()

-    editor.batchCharacterMeasurement =>
-      for tokenizedLine in editor.linesForScreenRows(visibleStartRow, visibleEndRow - 1)
-        unless @measuredLines.has(tokenizedLine)
-          lineNode = @lineNodesByLineId[tokenizedLine.id]
-          @measureCharactersInLine(tokenizedLine, lineNode)
-      return
+    for tokenizedLine in editor.linesForScreenRows(visibleStartRow, visibleEndRow - 1)
+      unless @measuredLines.has(tokenizedLine)
+        lineNode = @lineNodesByLineId[tokenizedLine.id]
+        @measureCharactersInLine(tokenizedLine, lineNode)

  measureCharactersInLine: (tokenizedLine, lineNode) ->
    {editor} = @props
@@ -67,6 +67,7 @@ class Package
        @loadKeymaps()
        @loadMenus()
        @loadStylesheets()
+        @grammarsPromise = @loadGrammars()
        @scopedPropertiesPromise = @loadScopedProperties()
        @requireMainModule() unless @hasActivationEvents()

@@ -82,8 +83,6 @@ class Package
    @scopedProperties = []

  activate: ->
-    @grammarsPromise ?= @loadGrammars()
-
    unless @activationDeferred?
      @activationDeferred = Q.defer()
      @measure 'activateTime', =>
@@ -129,9 +128,8 @@ class Package
    atom.contextMenu.add(menuPath, map['context-menu']) for [menuPath, map] in @menus
    atom.menu.add(map.menu) for [menuPath, map] in @menus when map.menu

-    unless @grammarsActivated
-      grammar.activate() for grammar in @grammars
-      @grammarsActivated = true
+    grammar.activate() for grammar in @grammars
+    @grammarsActivated = true

    scopedProperties.activate() for scopedProperties in @scopedProperties
    @scopedPropertiesActivated = true
@@ -158,7 +156,7 @@ class Package

  loadStylesheets: ->
    @stylesheets = @getStylesheetPaths().map (stylesheetPath) ->
-      [stylesheetPath, atom.themes.loadStylesheet(stylesheetPath, true)]
+      [stylesheetPath, atom.themes.loadStylesheet(stylesheetPath)]

  getStylesheetsPath: ->
    path.join(@path, @constructor.stylesheetsDir)
@@ -175,32 +173,14 @@ class Package
    else
      fs.listSync(stylesheetDirPath, ['css', 'less'])

-  loadGrammarsSync: ->
-    return if @grammarsLoaded
-
-    grammarsDirPath = path.join(@path, 'grammars')
-    grammarPaths = fs.listSync(grammarsDirPath, ['json', 'cson'])
-    for grammarPath in grammarPaths
-      try
-        grammar = atom.syntax.readGrammarSync(grammarPath)
-        grammar.packageName = @name
-        @grammars.push(grammar)
-        grammar.activate()
-      catch error
-        console.warn("Failed to load grammar: #{grammarPath}", error.stack ? error)
-
-    @grammarsLoaded = true
-    @grammarsActivated = true
-
  loadGrammars: ->
-    return Q() if @grammarsLoaded
+    @grammars = []

    loadGrammar = (grammarPath, callback) =>
      atom.syntax.readGrammar grammarPath, (error, grammar) =>
        if error?
          console.warn("Failed to load grammar: #{grammarPath}", error.stack ? error)
        else
-          grammar.packageName = @name
          @grammars.push(grammar)
          grammar.activate() if @grammarsActivated
        callback()
@@ -8,8 +8,6 @@ class PaneContainer extends Model
  atom.deserializers.add(this)
  Serializable.includeInto(this)

-  @version: 1
-
  @properties
    root: -> new Pane
    activePane: null
@@ -29,12 +27,10 @@ class PaneContainer extends Model
  deserializeParams: (params) ->
    params.root = atom.deserializers.deserialize(params.root, container: this)
    params.destroyEmptyPanes = atom.config.get('core.destroyEmptyPanes')
-    params.activePane = params.root.getPanes().find (pane) -> pane.id is params.activePaneId
    params

  serializeParams: (params) ->
    root: @root?.serialize()
-    activePaneId: @activePane.id

  replaceChild: (oldChild, newChild) ->
    throw new Error("Replacing non-existent child") if oldChild isnt @root
@@ -40,12 +40,14 @@ class Pane extends Model
    @subscribe @items.onRemoval (item, index) =>
      @unsubscribe item if typeof item.on is 'function'

+    @activate() if params?.active
+
  # Called by the Serializable mixin during serialization.
  serializeParams: ->
-    id: @id
    items: compact(@items.map((item) -> item.serialize?()))
    activeItemUri: @activeItem?.getUri?()
    focused: @focused
+    active: @active

  # Called by the Serializable mixin during deserialization.
  deserializeParams: (params) ->
@@ -239,9 +239,6 @@ class Project extends Model
    task.on 'scan:result-found', (result) =>
      iterator(result) unless @isPathModified(result.filePath)

-    task.on 'scan:file-error', (error) ->
-      iterator(null, error)
-
    if _.isFunction(options.onPathsSearched)
      task.on 'scan:paths-searched', (numberOfPathsSearched) ->
        options.onPathsSearched(numberOfPathsSearched)
@@ -286,7 +283,6 @@ class Project extends Model
        checkFinished()

      task.on 'replace:path-replaced', iterator
-      task.on 'replace:file-error', (error) -> iterator(null, error)

    for buffer in @getBuffers()
      continue unless buffer.getPath() in filePaths
@@ -1,33 +1,15 @@
 {View, $} = require 'space-pen'
 React = require 'react-atom-fork'
-{defaults} = require 'underscore-plus'
-TextBuffer = require 'text-buffer'
-Editor = require './editor'
 EditorComponent = require './editor-component'
+{defaults} = require 'underscore-plus'

 module.exports =
 class ReactEditorView extends View
-  @content: (params) ->
-    attributes = params.attributes ? {}
-    attributes.class = 'editor react editor-colors'
-    @div attributes
+  @content: -> @div class: 'editor react'

  focusOnAttach: false

-  constructor: (editorOrParams, @props) ->
-    if editorOrParams instanceof Editor
-      @editor = editorOrParams
-    else
-      {@editor, mini, placeholderText} = editorOrParams
-      @props ?= {}
-      @props.mini = mini
-      @props.placeholderText = placeholderText
-      @editor ?= new Editor
-        buffer: new TextBuffer
-        softWrap: false
-        tabLength: 2
-        softTabs: true
-
+  constructor: (@editor, @props) ->
    super

  getEditor: -> @editor
@@ -38,7 +20,7 @@ class ReactEditorView extends View
  Object.defineProperty @::, 'charWidth', get: -> @editor.getDefaultCharWidth()
  Object.defineProperty @::, 'firstRenderedScreenRow', get: -> @component.getRenderedRowRange()[0]
  Object.defineProperty @::, 'lastRenderedScreenRow', get: -> @component.getRenderedRowRange()[1]
-  Object.defineProperty @::, 'active', get: -> @is(@getPane()?.activeView)
+  Object.defineProperty @::, 'active', get: -> @is(@getPane().activeView)
  Object.defineProperty @::, 'isFocused', get: -> @component?.state.focused

  afterAttach: (onDom) ->
@@ -56,20 +38,17 @@ class ReactEditorView extends View
    @overlayer = $(node).find('.lines').addClass('overlayer')
    @hiddenInput = $(node).find('.hidden-input')

-    # FIXME: there should be a better way to deal with the gutter element
-    @subscribe atom.config.observe 'editor.showLineNumbers', =>
-      @gutter = $(node).find('.gutter')
+    @gutter = $(node).find('.gutter')
+    @gutter.removeClassFromAllLines = (klass) =>
+      @gutter.find('.line-number').removeClass(klass)

-      @gutter.removeClassFromAllLines = (klass) =>
-        @gutter.find('.line-number').removeClass(klass)
+    @gutter.getLineNumberElement = (bufferRow) =>
+      @gutter.find("[data-buffer-row='#{bufferRow}']")

-      @gutter.getLineNumberElement = (bufferRow) =>
-        @gutter.find("[data-buffer-row='#{bufferRow}']")
-
-      @gutter.addClassToLine = (bufferRow, klass) =>
-        lines = @gutter.find("[data-buffer-row='#{bufferRow}']")
-        lines.addClass(klass)
-        lines.length > 0
+    @gutter.addClassToLine = (bufferRow, klass) =>
+      lines = @gutter.find("[data-buffer-row='#{bufferRow}']")
+      lines.addClass(klass)
+      lines.length > 0

    @focus() if @focusOnAttach

@@ -140,7 +119,7 @@ class ReactEditorView extends View
    pane?.splitDown(pane?.copyActiveItem()).activeView

  getPane: ->
-    @parent('.item-views').parents('.pane').view()
+    @closest('.pane').view()

  focus: ->
    if @component?
@@ -150,18 +129,11 @@ class ReactEditorView extends View

  hide: ->
    super
-    @pollComponentDOM()
+    @component?.hide()

  show: ->
    super
-    @pollComponentDOM()
-
-  pollComponentDOM: ->
-    return unless @component?
-    valueToRestore = @component.performSyncUpdates
-    @component.performSyncUpdates = true
-    @component.pollDOM()
-    @component.performSyncUpdates = valueToRestore
+    @component?.show()

  pageDown: ->
    @editor.pageDown()
@@ -230,12 +202,4 @@ class ReactEditorView extends View

  updateDisplay: -> # No-op shim for package specs

-  resetDisplay: -> # No-op shim for package specs
-
  redraw: -> # No-op shim
-
-  setPlaceholderText: (placeholderText) ->
-    if @component?
-      @component.setProps({placeholderText})
-    else
-      @props.placeholderText = placeholderText
@@ -6,10 +6,8 @@ module.exports = (filePaths, regexSource, regexFlags, replacementText) ->
  replacer = new PathReplacer()
  regex = new RegExp(regexSource, regexFlags)

-  replacer.on 'file-error', ({code, path, message}) ->
-    emit('replace:file-error', {code, path, message})
-
  replacer.on 'path-replaced', (result) ->
    emit('replace:path-replaced', result)

-  replacer.replacePaths(regex, replacementText, filePaths, -> callback())
+  replacer.replacePaths regex, replacementText, filePaths, ->
+    callback()
@@ -9,9 +9,6 @@ module.exports = (rootPath, regexSource, options) ->
  searcher = new PathSearcher()
  scanner = new PathScanner(rootPath, options)

-  searcher.on 'file-error', ({code, path, message}) ->
-    emit('scan:file-error', {code, path, message})
-
  searcher.on 'results-found', (result) ->
    emit('scan:result-found', result)

@@ -17,9 +17,8 @@ ScrollbarComponent = React.createClass
        style.width = verticalScrollbarWidth
        style.bottom = horizontalScrollbarHeight if scrollableInOppositeDirection
      when 'horizontal'
-        style.left = 0
-        style.right = verticalScrollbarWidth if scrollableInOppositeDirection
        style.height = horizontalScrollbarHeight
+        style.right = verticalScrollbarWidth if scrollableInOppositeDirection

    div {className, style, @onScroll},
      switch orientation
@@ -15,8 +15,6 @@ class Selection extends Model
  constructor: ({@cursor, @marker, @editor, id}) ->
    @assignId(id)
    @cursor.selection = this
-    @decoration = @editor.decorateMarker(@marker, type: 'highlight', class: 'selection')
-
    @marker.on 'changed', => @screenRangeChanged()
    @marker.on 'destroyed', =>
      @destroyed = true
@@ -78,12 +76,9 @@ class Selection extends Model
    options.reversed ?= @isReversed()
    @editor.destroyFoldsIntersectingBufferRange(bufferRange) unless options.preserveFolds
    @modifySelection =>
-      needsFlash = options.flash
-      delete options.flash if options.flash?
      @cursor.needsAutoscroll = false if @needsAutoscroll?
      @marker.setBufferRange(bufferRange, options)
      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition
-      @decoration.flash('flash', @editor.selectionFlashDuration) if needsFlash

  # Public: Returns the starting and ending buffer rows the selection is
  # highlighting.
@@ -325,7 +320,6 @@ class Selection extends Model
      text = @normalizeIndents(text, options.indentBasis)

    newBufferRange = @editor.buffer.setTextInRange(oldBufferRange, text, pick(options, 'undo'))
-
    if options.select
      @setBufferRange(newBufferRange, reversed: wasReversed)
    else
@@ -392,7 +386,7 @@ class Selection extends Model
      if autoIndent and delta > 0
        @insertText(@editor.buildIndentString(delta))
      else
-        @insertText(@editor.buildIndentString(1, @cursor.getBufferColumn()))
+        @insertText(@editor.getTabText())
    else
      @indentSelectedRows()

@@ -128,7 +128,7 @@ class ThemeManager
    @userStylesheetFile = new File(userStylesheetPath)
    @userStylesheetFile.on 'contents-changed moved removed', =>
      @loadUserStylesheet()
-    userStylesheetContents = @loadStylesheet(userStylesheetPath, true)
+    userStylesheetContents = @loadStylesheet(userStylesheetPath)
    @applyStylesheet(userStylesheetPath, userStylesheetContents, 'userTheme')

  loadBaseStylesheets: ->
@@ -167,27 +167,19 @@ class ThemeManager

    fullPath

-  loadStylesheet: (stylesheetPath, importFallbackVariables) ->
+  loadStylesheet: (stylesheetPath) ->
    if path.extname(stylesheetPath) is '.less'
-      @loadLessStylesheet(stylesheetPath, importFallbackVariables)
+      @loadLessStylesheet(stylesheetPath)
    else
      fs.readFileSync(stylesheetPath, 'utf8')

-  loadLessStylesheet: (lessStylesheetPath, importFallbackVariables=false) ->
+  loadLessStylesheet: (lessStylesheetPath) ->
    unless @lessCache?
      LessCompileCache = require './less-compile-cache'
      @lessCache = new LessCompileCache({@resourcePath, importPaths: @getImportPaths()})

    try
-      if importFallbackVariables
-        baseVarImports = """
-        @import "variables/ui-variables";
-        @import "variables/syntax-variables";
-        """
-        less = fs.readFileSync(lessStylesheetPath, 'utf8')
-        @lessCache.cssForFile(lessStylesheetPath, [baseVarImports, less].join('\n'))
-      else
-        @lessCache.read(lessStylesheetPath)
+      @lessCache.read(lessStylesheetPath)
    catch e
      console.error """
        Error compiling less stylesheet: #{lessStylesheetPath}
--- a/Mostrar Mais
+++ b/Mostrar Mais
				`@@ -0,0 +1 @@`
				`This is a hidden file. Don't even try to load it as a snippet`
				`@@ -0,0 +1 @@`
				`This file isn't CSON, but shouldn't be a big deal`