Render lines inline instead of with separate components

.gitattributes

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

.gitignore

@@ -13,5 +13,3 @@ debug.log
 docs/output
 docs/includes
 spec/fixtures/evil-files/
-resources/linux/Atom.desktop
-resources/linux/debian/control

.npmrc

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

.pairs

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

CONTRIBUTING.md

@@ -1,28 +1,20 @@
-# Contributing to Atom
-
-:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+# :tada: Contributing to Atom :tada:
 
 The following is a set of guidelines for contributing to Atom and its packages,
 which are hosted in the [Atom Organization](https://github.com/atom) on GitHub.
 If you're unsure which package is causing your problem or if you're having an
-issue with Atom core, please open an issue on the [main atom repository](https://github.com/atom/atom/issues).
-These are just guidelines, not rules, use your best judgement and feel free to
-propose changes to this document in a pull request.
+issue with Atom core, please use the feedback form in the application or email
+[atom@github.com](mailto:atom@github.com). These are just guidelines, not rules,
+use your best judgement and feel free to propose changes to this document in a
+pull request.
 
 ## Submitting Issues
 
-* Check the [debugging guide](https://atom.io/docs/latest/debugging) for tips
-  on debugging. You might be able to find the cause of the problem and fix 
-  things yourself.
-* Include the version of Atom you are using and the OS.
 * Include screenshots and animated GIFs whenever possible; they are immensely
   helpful.
 * Include the behavior you expected and other places you've seen that behavior
   such as Emacs, vi, Xcode, etc.
-* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools 
-  are open _before_ the error is triggered, a full stack trace for the error
-  will be logged. If you can reproduce the error, use this approach to get the
-  full stack trace and include it in the issue.
+* Check the dev tools (`alt-cmd-i`) for errors and stack traces to include.
 * On Mac, check Console.app for stack traces to include if reporting a crash.
 * Perform a cursory search to see if a similar issue has already been submitted.
 
@@ -76,7 +68,6 @@ For more information on how to work with Atom's official packages, see
     * :memo: `:memo:` when writing docs
     * :penguin: `:penguin:` when fixing something on Linux
     * :apple: `:apple:` when fixing something on Mac OS
-    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
     * :bug: `:bug:` when fixing a bug
     * :fire: `:fire:` when removing code or files
     * :green_heart: `:green_heart:` when fixing the CI build

apm/package.json

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

build/Gruntfile.coffee

@@ -39,22 +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')
   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)
+    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)
+    installDir = path.join('/Applications', appName)
   else
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
+    installDir = process.env.INSTALL_PREFIX ? '/usr/local'
 
   coffeeConfig =
     glob_to_multiple:
@@ -122,8 +121,6 @@ module.exports = (grunt) ->
 
     atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}
 
-    docsOutputDir: 'docs/output/api'
-
     coffee: coffeeConfig
 
     less: lessConfig

build/package.json

@@ -13,12 +13,12 @@
     "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-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.8.0",
-    "grunt-download-atom-shell": "~0.8.0",
+    "grunt-download-atom-shell": "~0.7.2",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.0",
@@ -26,7 +26,7 @@
     "harmony-collections": "~0.3.8",
     "json-front-matter": "~0.1.3",
     "legal-eagle": "~0.4.0",
-    "minidump": "~0.7",
+    "minidump": "0.5.x",
     "read-package-json": "1.1.8",
     "normalize-package-data": "0.2.12",
     "rcedit": "~0.1.2",

build/tasks/build-task.coffee

@@ -1,6 +1,5 @@
 fs = require 'fs'
 path = require 'path'
-_ = require 'underscore-plus'
 
 module.exports = (grunt) ->
   {cp, isAtomPackage, mkdir, rm} = require('./task-helpers')(grunt)
@@ -49,22 +48,16 @@ module.exports = (grunt) ->
       path.join('bootstrap', 'docs')
       path.join('bootstrap', 'examples')
       path.join('pegjs', 'examples')
-      path.join('plist', 'tests')
+      # Add .* to avoid matching hunspell_dictionaries.
+      path.join('spellchecker', 'vendor', 'hunspell', '.*')
       path.join('xmldom', 'test')
       path.join('jasmine-reporters', 'ext')
       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')
     ]
-    ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath)
-
-    # Add .* to avoid matching hunspell_dictionaries.
-    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep)}.*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.*\\.pdb"
-
     # Hunspell dictionaries are only not needed on OS X.
     if process.platform is 'darwin'
       ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
@@ -86,15 +79,6 @@ module.exports = (grunt) ->
         unless /.+\.plist/.test(sourcePath)
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
-    if process.platform is 'win32'
-      cp path.join('resources', 'win', 'msvcp100.dll'), path.join(shellAppDir, 'msvcp100.dll')
-      cp path.join('resources', 'win', 'msvcr100.dll'), path.join(shellAppDir, 'msvcr100.dll')
-
-      # Set up chocolatey ignore and gui files
-      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
-      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
-      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
-
     dependencies = ['compile', "generate-license:save"]
     dependencies.push('copy-info-plist') if process.platform is 'darwin'
     dependencies.push('set-exe-icon') if process.platform is 'win32'

build/tasks/codesign-task.coffee

@@ -2,8 +2,6 @@ module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'codesign', 'Codesign the app', ->
-    return unless process.platform is 'darwin'
-
     done = @async()
 
     if process.env.XCODE_KEYCHAIN

build/tasks/docs-task.coffee

@@ -15,17 +15,15 @@ module.exports = (grunt) ->
   grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
     done = @async()
 
-    docsOutputDir = grunt.config.get('docsOutputDir')
-
     downloadIncludes (error, includePaths) ->
       if error?
         done(error)
       else
-        rm(docsOutputDir)
+        rm('docs/output/api')
         args = [
           commonArgs...
           '--title', 'Atom API Documentation'
-          '-o', docsOutputDir
+          '-o', 'docs/output/api'
           '-r', 'docs/README.md'
           '--stability', '1'
           'src/'

build/tasks/install-task.coffee

@@ -1,14 +1,8 @@
 fs = require 'fs'
 path = require 'path'
-_ = 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)
 
@@ -31,25 +25,12 @@ module.exports = (grunt) ->
       binDir = path.join(installDir, 'bin')
       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')
       rm shareDir
       mkdir path.dirname(shareDir)
       cp shellAppDir, shareDir
 
-      # Create Atom.desktop if installation not in temporary folder
-      tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
-      desktopInstallFile = path.join(installDir,'share','applications','Atom.desktop')
-      if installDir.indexOf(tmpDir) isnt 0
-        mkdir path.dirname(desktopInstallFile)
-        {description} = grunt.file.readJSON('package.json')
-        installDir = path.join(installDir,'.') # To prevent "Exec=/usr/local//share/atom/atom"
-        fillTemplate(desktopFile, {description, installDir, iconName})
-        cp desktopFile, desktopInstallFile
-
       # Create relative symbol link for apm.
       process.chdir(binDir)
       rm('apm')

build/tasks/mkdeb-task.coffee

@@ -13,19 +13,11 @@ module.exports = (grunt) ->
   grunt.registerTask 'mkdeb', 'Create debian package', ->
     done = @async()
 
-    if process.arch is 'ia32'
-      arch = 'i386'
-    else if process.arch is 'x64'
-      arch = 'amd64'
-    else
-      return done("Unsupported arch #{process.arch}")
-
     {name, version, description} = grunt.file.readJSON('package.json')
     section = 'devel'
+    arch = 'amd64'
     maintainer = 'GitHub <atom@github.com>'
-    installDir = '/usr'
-    iconName = 'atom'
-    data = {name, version, description, section, arch, maintainer, installDir, iconName}
+    data = {name, version, description, section, arch, maintainer}
 
     control = path.join('resources', 'linux', 'debian', 'control')
     fillTemplate(control, data)
@@ -35,5 +27,5 @@ module.exports = (grunt) ->
     buildDir = grunt.config.get('atom.buildDir')
 
     cmd = path.join('script', 'mkdeb')
-    args = [version, arch, control, desktop, icon, buildDir]
+    args = [version, control, desktop, icon, buildDir]
     spawn({cmd, args}, done)

build/tasks/publish-build-task.coffee

@@ -8,7 +8,11 @@ GitHub = require 'github-releases'
 request = require 'request'
 
 grunt = null
-
+maxReleases = 10
+assets = [
+  {assetName: 'atom-mac.zip', sourceName: 'Atom.app'}
+  {assetName: 'atom-mac-symbols.zip', sourceName: 'Atom.breakpad.syms'}
+]
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -19,20 +23,13 @@ module.exports = (gruntObject) ->
   grunt = gruntObject
 
   grunt.registerTask 'publish-build', 'Publish the built app', ->
+    return unless process.platform is 'darwin'
     return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
-    tasks = ['upload-assets']
-    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    grunt.task.run(tasks)
 
-  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
-    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))
-
-  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
     done = @async()
     buildDir = grunt.config.get('atom.buildDir')
-    assets = getAssets()
 
-    zipAssets buildDir, assets, (error) ->
+    zipApps buildDir, assets, (error) ->
       return done(error) if error?
       getAtomDraftRelease (error, release) ->
         return done(error) if error?
@@ -41,38 +38,23 @@ 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) ->
-    if process.platform is 'win32'
-      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} #{sourcePath}"
-    else
-      zipCommand = "zip -r --symlinks #{assetName} #{sourcePath}"
+zipApps = (buildDir, assets, callback) ->
+  zip = (directory, sourceName, assetName, callback) ->
     options = {cwd: directory, maxBuffer: Infinity}
-    child_process.exec zipCommand, options, (error, stdout, stderr) ->
-      logError("Zipping #{sourcePath} failed", error, stderr) if error?
+    child_process.exec "zip -r --symlinks #{assetName} #{sourceName}", options, (error, stdout, stderr) ->
+      if error?
+        logError("Zipping #{sourceName} failed", error, stderr)
       callback(error)
 
   tasks = []
-  for {assetName, sourcePath} in assets
+  for {assetName, sourceName} in assets
     fs.removeSync(path.join(buildDir, assetName))
-    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
+    tasks.push(zip.bind(this, buildDir, sourceName, assetName))
   async.parallel(tasks, callback)
 
 getAtomDraftRelease = (callback) ->
@@ -137,7 +119,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)

build/tasks/spec-task.coffee

@@ -39,8 +39,7 @@ module.exports = (grunt) ->
       grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
         if process.platform is 'win32'
-          if error
-            process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
+          process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
@@ -78,7 +77,7 @@ module.exports = (grunt) ->
 
     spawn options, (error, results, code) ->
       if process.platform is 'win32'
-        process.stderr.write(fs.readFileSync('ci.log')) if error
+        process.stderr.write(fs.readFileSync('ci.log'))
         fs.unlinkSync('ci.log')
       else
         # TODO: Restore concurrency on Windows
@@ -105,4 +104,9 @@ module.exports = (grunt) ->
       failures.push "atom core" if coreSpecFailed
 
       grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
-      done(!coreSpecFailed and failedPackages.length == 0)
+
+      # TODO: Mark the build as green on Windows until specs pass.
+      if process.platform is 'darwin'
+        done(!coreSpecFailed and failedPackages.length == 0)
+      else if process.platform is 'win32'
+        done(true)

docs/advanced/configuration.md

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

docs/advanced/keymaps.md

@@ -91,16 +91,6 @@ the current keystroke sequence and continue searching from its parent. If you
 want to remove a binding from a keymap you don't control, such as keymaps in
 Atom core or in packages, use the `unset!` directive.
 
-For example, the following code removes the keybinding for `a` in the Tree View, 
-which is normally used to trigger the `tree-view:add-file` command:
-
-```coffee
-'.tree-view':
-    'a': 'unset!'
-```
-
-![](https://cloud.githubusercontent.com/assets/38924/3174771/e7f6ce64-ebf4-11e3-922d-f280bffb3fc5.png)
-
 ## Forcing Chromium's Native Keystroke Handling
 
 If you want to force the native browser behavior for a given keystroke, use the

docs/apm-rest-api.md

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

docs/build-instructions/linux.md

@@ -4,26 +4,12 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
 ## Requirements
 
-  * OS with 64-bit or 32-bit architecture
-  * C++ toolchain
-    * on Ubuntu/Debian: `sudo apt-get install build-essential`
-    * on Fedora: `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel`
+  * OS with 64-bit architecture
   * [node.js](http://nodejs.org/download/) v0.10.x
-    * [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
-    * 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](http://www.npmjs.org/) v1.4.x  
+  * libgnome-keyring-dev `sudo apt-get install libgnome-keyring-dev` (refer to your distribution's manual on how to install packages if you are not on Debian or Ubuntu-based systems)
   * `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
 
@@ -35,6 +21,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
   script/grunt mkdeb # Generates a .deb package at $TMPDIR/atom-build
   ```
 
+
 ## Troubleshooting
 
 
@@ -60,14 +47,3 @@ 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.

docs/build-instructions/os-x.md

@@ -9,12 +9,9 @@
 ## Instructions
 
   ```sh
-  git clone https://github.com/atom/atom.git
+  git clone https://github.com/atom/atom
   cd atom
   script/build # Creates application at /Applications/Atom.app
   ```
 
 ## Troubleshooting
-
-### OSX build error reports in atom/atom
-* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Aos-x&type=Issues) to get a list of reports about build errors on OSX.

docs/build-instructions/windows.md

@@ -2,24 +2,10 @@
 
 ## Requirements
 
-### On Windows 7
-  * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4)
-  * [Visual Studio 2010 Service Pack 1](http://www.microsoft.com/en-us/download/details.aspx?id=23691)
+  * Windows 7 or later
+  * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4) with [SP1](http://www.microsoft.com/en-us/download/details.aspx?id=23691)
   * [node.js](http://nodejs.org/download/) v0.10.x
-    * For 64-bit builds of node and native modules you **must** have the
-    [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279).
-    You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422)
-  * [Python](http://www.python.org/download/) v2.7.
-    * The python.exe must be available at `%SystemDrive%\Python27\python.exe`.
-      If it is installed elsewhere, you can create a symbolic link to the
-      directory containing the python.exe using:
-      `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
-  * [GitHub for Windows](http://windows.github.com/)
-
-### On Windows 8
-  * [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2)
-  * [node.js](http://nodejs.org/download/) v0.10.x
-  * [Python](http://www.python.org/download/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp))
+  * [Python](http://www.python.org/download/) v2.7.x
   * [GitHub for Windows](http://windows.github.com/)
 
 ## Instructions
@@ -30,7 +16,7 @@
   cd C:\
   git clone https://github.com/atom/atom/
   cd atom
-  script/build # Creates application in the `Program Files` directory
+  script\build
   ```
 
 ## Why do I have to use GitHub for Windows?
@@ -47,20 +33,3 @@ fix this, you probably need to fiddle with your system PATH.
 
   * If you just installed node you need to restart your computer before node is
   available on your Path.
-
-
-* `script/build` outputs only the Node and Python versions before returning
-
-  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
-    See [issue #2200](https://github.com/atom/atom/issues/2200).
-
-* `error MSB4025: The project file could not be loaded. Invalid character in the given encoding.`
-
-  * These can occur because your home directory (`%USERPROFILE%`) has non-ASCII
-    characters in it. This is a bug in [gyp](https://code.google.com/p/gyp/)
-    which is used to build native node modules and there is no known workaround.
-    * https://github.com/TooTallNate/node-gyp/issues/297
-    * https://code.google.com/p/gyp/issues/detail?id=393
-
-### Windows build error reports in atom/atom
-* 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.

docs/creating-a-package.md

@@ -225,20 +225,6 @@ elements until reaching the top of the DOM tree.
 In the example above, the `Add file` item will only appear when the focused item
 or one of its parents has the `tree-view` class applied to it.
 
-You can also add separators and submenus to your context menus. To add a
-submenu, pass in another object instead of a command. To add a separator, use
-`-` for the name and command of the item.
-
-```coffeescript
-'context-menu':
-  '.workspace':
-    'Inspect Element': 'core:inspect'
-    '-': '-'
-    'Text':
-      'Select All': 'core:select-all'
-      'Deleted Selected Text': 'core:delete'
-```
-
 ## Snippets
 
 An extension can supply language snippets in the _snippets_ directory which

docs/debugging.md

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

docs/index.md

@@ -9,7 +9,6 @@
 * [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
 * [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
-* [Debugging](debugging.md)
 
 ### Advanced Topics
 

docs/publishing-a-package.md

@@ -75,34 +75,18 @@ credentials are stored securely in your [keychain][keychain] once you login.
 :tada: Your package is now published and available on atom.io. Head on over to
 `http://atom.io/packages/my-package` to see your package's page.
 
-With `apm publish`, you can bump the version and publish by using
-```sh
-apm publish <version-type>
-```
-where `<version-type>` can be `major`, `minor` and `patch`.
-
-The `major` option to the publish command tells apm to increment the first
-digit of the version before publishing so the published version will be `1.0.0`
-and the Git tag created will be `v1.0.0`.
-
 The `minor` option to the publish command tells apm to increment the second
 digit of the version before publishing so the published version will be `0.1.0`
 and the Git tag created will be `v0.1.0`.
 
-The `patch` option to the publish command tells apm to increment the third
-digit of the version before publishing so the published version will be `0.0.1`
-and the Git tag created will be `v0.0.1`.
-
-Use `major` when you make a huge change, like a rewrite, or a large change to the functionality or interface.
-Use `minor` when adding or removing a feature.
-Use `patch` when you make a small change like a bug fix that does not add or remove features.
+In the future you can run `apm publish major` to publish the `1.0.0` version but
+since this was the first version being published it is a good idea to start
+with a minor release.
 
 ### Further Reading
 
 * Check out [semantic versioning][semver] to learn more about versioning your
   package releases.
-* Consult the [Atom.io package API docs][apm-rest-api] to learn more about how
-  `apm` works.
 
 [atomio]: https://atom.io
 [github]: https://github.com
@@ -111,4 +95,3 @@ Use `patch` when you make a small change like a bug fix that does not add or rem
 [repo-guide]: http://guides.github.com/overviews/desktop
 [semver]: http://semver.org
 [your-first-package]: your-first-package.html
-[apm-rest-api]: apm-rest-api.md

docs/writing-specs.md

@@ -1,4 +1,4 @@
-# Writing specs
+# Writting specs
 
 Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec framework. Any new functionality should have specs to guard against regressions.
 
@@ -10,7 +10,7 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec
 
   Spec files **must** end with `-spec` so add `sample-spec.coffee` to `atom/spec`.
 
-0. Add one or more `describe` methods
+0. Add one or more `describe` method
 
   The `describe` method takes two arguments, a description and a function. If the description explains a behavior it typically begins with `when` if it is more like a unit test it begins with the method name.
 
@@ -28,7 +28,7 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec
 
 0. Add one or more `it` method
 
-  The `it` method also takes two arguments, a description and a function. Try and make the description flow with the `it` method. For example, a description of `this should work` doesn't read well as `it this should work`. But a description of `should work` sounds great as `it should work`.
+  The `it` method also takes two arugments, a description and a function. Try and make the description flow with the `it` method. For example, a description of `this should work` doesn't read well as `it this should work`. But a description of `should work` sounds great as `it should work`.
 
   ```coffee
   describe "when a test is written", ->
@@ -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 [jamsine 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,75 +47,7 @@ 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
+## Runnings 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.
 

keymaps/base.cson

@@ -12,7 +12,6 @@
   # Sublime Parity
   'tab': 'editor:indent'
   'enter': 'editor:newline'
-  'num-enter': 'editor:newline'
   'shift-tab': 'editor:outdent-selected-rows'
   'ctrl-K': 'editor:delete-line'
 
@@ -27,7 +26,6 @@
   'tab': 'core:focus-next'
   'shift-tab': 'core:focus-previous'
   'enter': 'native!'
-  'num-enter': 'native!'
   'backspace': 'native!'
   'shift-backspace': 'native!'
   'delete': 'native!'

keymaps/darwin.cson

@@ -21,7 +21,6 @@
   'cmd-O': 'application:open-dev'
   'cmd-alt-ctrl-s': 'application:run-all-specs'
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -53,10 +52,7 @@
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
-  'shift-delete': 'core:delete'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
@@ -69,8 +65,6 @@
   'cmd-}': 'pane:show-next-item'
   'cmd-alt-left': 'pane:show-previous-item'
   'cmd-alt-right': 'pane:show-next-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
   'ctrl-tab': 'pane:show-next-item'
   'ctrl-shift-tab': 'pane:show-previous-item'
   'cmd-=': 'window:increase-font-size'

keymaps/linux.cson

@@ -1,14 +1,13 @@
 'body':
   # Atom Specific
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
   'left': 'core:move-left'
   'right': 'core:move-right'
   'ctrl-alt-r': 'window:reload'
-  'ctrl-shift-i': 'window:toggle-dev-tools'
+  'ctrl-alt-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
   'ctrl-alt-s': 'application:run-all-specs'
   'ctrl-shift-o': 'application:open-dev'
@@ -29,24 +28,16 @@
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
   'ctrl-v': 'core:paste'
-  'ctrl-insert': 'core:copy'
-  'shift-insert': 'core:paste'
   'shift-up': 'core:select-up'
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
-  'shift-delete': 'core: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'
@@ -67,15 +58,6 @@
   'ctrl-k ctrl-down':  'window:focus-pane-below'
   'ctrl-k ctrl-left':  'window:focus-pane-on-left'
   'ctrl-k ctrl-right': 'window:focus-pane-on-right'
-  'alt-1': 'pane:show-item-1'
-  'alt-2': 'pane:show-item-2'
-  'alt-3': 'pane:show-item-3'
-  'alt-4': 'pane:show-item-4'
-  'alt-5': 'pane:show-item-5'
-  'alt-6': 'pane:show-item-6'
-  'alt-7': 'pane:show-item-7'
-  'alt-8': 'pane:show-item-8'
-  'alt-9': 'pane:show-item-9'
 
 '.workspace .editor':
   # Platform Bindings
@@ -92,7 +74,7 @@
 
   # Sublime Parity
   'ctrl-a': 'core:select-all'
-  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
+  'ctrl-alt-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
 

keymaps/win32.cson

@@ -5,7 +5,6 @@
 
   # Atom Specific
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -31,28 +30,19 @@
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
   'ctrl-v': 'core:paste'
-  'ctrl-insert': 'core:copy'
-  'shift-insert': 'core:paste'
   'shift-up': 'core:select-up'
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
-  'shift-pageup': 'core:select-page-up'
-  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
-  'shift-delete': 'core: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'
-  'ctrl-alt-down': 'editor:add-selection-below'
   'ctrl-=': 'window:increase-font-size'
   'ctrl-+': 'window:increase-font-size'
   'ctrl--': 'window:decrease-font-size'
@@ -85,7 +75,7 @@
 
   # Sublime Parity
   'ctrl-a': 'core:select-all'
-  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
+  'ctrl-alt-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
 

menus/darwin.cson

@@ -109,7 +109,6 @@
     submenu: [
       { label: 'Add Selection Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection Below', command: 'editor:add-selection-below' }
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { label: 'Split into Lines', command: 'editor:split-selections-into-lines'}
       { type: 'separator' }
       { label: 'Select to Top', command: 'core:select-to-top' }

menus/linux.cson

@@ -108,7 +108,6 @@
       { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
       { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { type: 'separator' }
       { label: 'Select to &Top', command: 'core:select-to-top' }
       { label: 'Select to Botto&m', command: 'core:select-to-bottom' }

menus/win32.cson

@@ -8,7 +8,7 @@
       { label: 'Open Folder...', command: 'application:open-folder' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
-      { label: 'Se&ttings', command: 'application:show-settings' }
+      { label: '&Preferences...', command: 'application:show-settings' }
       { type: 'separator' }
       { label: '&Save', command: 'core:save' }
       { label: 'Save &As...', command: 'core:save-as' }
@@ -127,7 +127,6 @@
       { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
       { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
-      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { type: 'separator' }
       { label: 'Select to &Top', command: 'core:select-to-top' }
       { label: 'Select to Botto&m', command: 'core:select-to-bottom' }
@@ -165,9 +164,11 @@
   {
     label: '&Help'
     submenu: [
+      { label: '&About Atom...', command: 'application:about' }
       { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
       { label: 'View &License', command: 'application:open-license' }
       { label: "VERSION", enabled: false }
+      { label: "Install &update", command: 'application:install-update', visible: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
       { type: 'separator' }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.109.0",
+  "version": "0.98.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,126 +17,125 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.13.3",
+  "atomShellVersion": "0.12.5",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^0.27.0",
+    "atom-keymap": "^0.22.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",
+    "first-mate": "^1.5.3",
     "fs-plus": "^2.2.3",
     "fstream": "0.1.24",
     "fuzzaldrin": "^1.1",
     "git-utils": "^1.3",
-    "grim": "0.11.0",
+    "grim": "0.10.0",
     "guid": "0.0.10",
-    "jasmine-tagged": "^1.1.2",
+    "jasmine-tagged": "^1.1.1",
     "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.3.2",
+    "pathwatcher": "^1.3.1",
     "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.2",
     "scoped-property-store": "^0.9.0",
     "scrollbar-style": "^0.4.0",
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
     "space-pen": "3.2.0",
-    "temp": "0.7.0",
-    "text-buffer": "^2.4.2",
+    "temp": "0.5.0",
+    "text-buffer": "^2.2.2",
     "theorist": "^1",
-    "underscore-plus": "^1.5.0",
+    "underscore-plus": "^1.3.0",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.17.0",
-    "atom-dark-ui": "0.30.0",
-    "atom-light-syntax": "0.18.0",
-    "atom-light-ui": "0.26.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",
+    "atom-dark-syntax": "0.15.0",
+    "atom-dark-ui": "0.26.0",
+    "atom-light-syntax": "0.17.0",
+    "atom-light-ui": "0.24.0",
+    "base16-tomorrow-dark-theme": "0.15.0",
+    "solarized-dark-syntax": "0.14.0",
+    "solarized-light-syntax": "0.7.0",
+    "archive-view": "0.31.0",
     "autocomplete": "0.28.0",
     "autoflow": "0.17.0",
-    "autosave": "0.14.0",
-    "background-tips": "0.15.0",
-    "bookmarks": "0.26.0",
-    "bracket-matcher": "0.48.0",
-    "command-palette": "0.24.0",
-    "deprecation-cop": "0.7.0",
-    "dev-live-reload": "0.31.0",
-    "exception-reporting": "0.18.0",
+    "autosave": "0.13.0",
+    "background-tips": "0.13.0",
+    "bookmarks": "0.22.0",
+    "bracket-matcher": "0.38.0",
+    "command-palette": "0.21.0",
+    "deprecation-cop": "0.5.0",
+    "dev-live-reload": "0.30.0",
+    "exception-reporting": "0.17.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.122.0",
-    "fuzzy-finder": "0.56.0",
-    "git-diff": "0.34.0",
-    "go-to-line": "0.23.0",
+    "find-and-replace": "0.106.0",
+    "fuzzy-finder": "0.51.0",
+    "git-diff": "0.28.0",
+    "go-to-line": "0.21.0",
     "grammar-selector": "0.27.0",
-    "image-view": "0.36.0",
-    "keybinding-resolver": "0.18.0",
-    "link": "0.24.0",
-    "markdown-preview": "0.86.0",
+    "image-view": "0.33.0",
+    "keybinding-resolver": "0.17.0",
+    "link": "0.22.0",
+    "markdown-preview": "0.72.0",
     "metrics": "0.32.0",
-    "open-on-github": "0.29.0",
-    "package-generator": "0.31.0",
-    "release-notes": "0.32.0",
-    "settings-view": "0.129.0",
-    "snippets": "0.47.0",
-    "spell-check": "0.38.0",
-    "status-bar": "0.41.0",
+    "open-on-github": "0.28.0",
+    "package-generator": "0.30.0",
+    "release-notes": "0.31.0",
+    "settings-view": "0.116.0",
+    "snippets": "0.43.0",
+    "spell-check": "0.35.0",
+    "status-bar": "0.40.0",
     "styleguide": "0.29.0",
-    "symbols-view": "0.59.0",
-    "tabs": "0.42.0",
-    "timecop": "0.21.0",
-    "tree-view": "0.108.0",
+    "symbols-view": "0.53.0",
+    "tabs": "0.40.0",
+    "timecop": "0.18.0",
+    "tree-view": "0.93.0",
     "update-package-dependencies": "0.6.0",
-    "welcome": "0.17.0",
-    "whitespace": "0.23.0",
-    "wrap-guide": "0.19.0",
-
-    "language-c": "0.21.0",
-    "language-coffee-script": "0.23.0",
-    "language-css": "0.17.0",
-    "language-gfm": "0.42.0",
+    "welcome": "0.14.0",
+    "whitespace": "0.22.0",
+    "wrap-guide": "0.18.0",
+    "language-c": "0.15.0",
+    "language-coffee-script": "0.22.0",
+    "language-css": "0.16.0",
+    "language-gfm": "0.38.0",
     "language-git": "0.9.0",
-    "language-go": "0.13.0",
+    "language-go": "0.12.0",
     "language-html": "0.22.0",
-    "language-hyperlink": "0.10.0",
-    "language-java": "0.11.0",
-    "language-javascript": "0.32.0",
+    "language-hyperlink": "0.9.0",
+    "language-java": "0.10.0",
+    "language-javascript": "0.26.0",
     "language-json": "0.8.0",
-    "language-less": "0.11.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-perl": "0.8.0",
+    "language-php": "0.14.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.18.0",
-    "language-ruby": "0.30.0",
-    "language-ruby-on-rails": "0.15.0",
-    "language-sass": "0.13.0",
+    "language-python": "0.17.0",
+    "language-ruby": "0.25.0",
+    "language-ruby-on-rails": "0.14.0",
+    "language-sass": "0.11.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.7.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.11.0"
+    "language-xml": "0.13.0",
+    "language-yaml": "0.6.0"
   },
   "private": true,
   "scripts": {

resources/linux/Atom.desktop.in

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

script/bootstrap

@@ -1,8 +1,23 @@
 #!/usr/bin/env node
 
 var fs = require('fs');
-var verifyRequirements = require('./utils/verify-requirements');
+
+var nodeVersion = process.versions.node.split('.')
+var nodeMajorVersion = +nodeVersion[0]
+var nodeMinorVersion = +nodeVersion[1]
+if (nodeMajorVersion === 0 && nodeMinorVersion < 10) {
+  console.warn("You must run script/bootstrap and script/build with node v0.10 or above");
+  process.exit(1);
+}
+
+// Make sure python2.7 is installed
+if (process.platform == 'win32' && !fs.existsSync('C:\\Python27\\')) {
+  console.warn("You must have Python 2.7 installed at 'C:\\Python27\\'");
+  process.exit(1);
+}
+
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
+var fs = require('fs');
 var path = require('path');
 
 // Executes an array of commands one by one.
@@ -10,69 +25,39 @@ function executeCommands(commands, done, index) {
   index = (index == undefined ? 0 : index);
   if (index < commands.length) {
     var command = commands[index];
-    if (command.message)
-      console.log(command.message);
     var options = null;
     if (typeof command !== 'string') {
       options = command.options;
       command = command.command;
     }
     safeExec(command, options, executeCommands.bind(this, commands, done, index + 1));
-  }
-  else
+  } else
     done(null);
 }
 
-function bootstrap() {
-  var apmInstallPath = path.resolve(__dirname, '..', 'apm');
-  if (!fs.existsSync(apmInstallPath))
-    fs.mkdirSync(apmInstallPath);
-  if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
-    fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
+var apmInstallPath = path.resolve(__dirname, '..', 'apm');
+if (!fs.existsSync(apmInstallPath))
+  fs.mkdirSync(apmInstallPath);
+if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
+  fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
-  var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
-  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? ' --no-color' : '';
+var apmPath = 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 npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
-  var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
-  var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
+var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
+var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];
+var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season'];
+var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 
-  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 dedupeCommand = apmPath + ' dedupe' + apmFlags;
+var commands = [
+  {command: 'npm' + npmFlags + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+  {command: npmPath + npmFlags + 'install --quiet', options: {cwd: apmInstallPath, ignoreStdout: true}},
+  echoNewLine,
+  apmPath + ' clean ' + apmFlags,
+  apmPath + ' install --quiet ' + apmFlags,
+  apmPath + ' dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
+];
 
-  if (process.argv.indexOf('--no-quiet') === -1) {
-    buildInstallCommand  += ' --quiet';
-    apmInstallCommand    += ' --quiet';
-    moduleInstallCommand += ' --quiet';
-    dedupeCommand        += ' --quiet';
-    buildInstallOptions.ignoreStdout = true;
-    apmInstallOptions.ignoreStdout = true;
-  }
-
-  var commands = [
-    {command: buildInstallCommand, message: 'Installing build modules...', options: buildInstallOptions},
-    {command: apmInstallCommand, message: 'Installing apm...', options: apmInstallOptions},
-    apmPath + ' clean' + apmFlags,
-    moduleInstallCommand,
-    dedupeCommand + ' ' + packagesToDedupe.join(' '),
-  ];
-
-  process.chdir(path.dirname(__dirname));
-  executeCommands(commands, process.exit);
-}
-
-verifyRequirements(function(error, successMessage) {
-  if (error) {
-    console.log(error);
-    process.exit(1);
-  }
-
-  console.log(successMessage);
-  bootstrap();
-});
+process.chdir(path.dirname(__dirname));
+executeCommands(commands, process.exit);

script/cibuild

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

script/clean

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
-var fs = require('fs');
 var path = require('path');
 var os = require('os');
 
-var removeCommand = process.platform === 'win32' ? 'rmdir /S /Q ' : 'rm -rf ';
+var removeCommand = process.platform === 'win32' ? 'del /F /Q /S ' : 'rm -rf ';
 var productName = require('../package.json').productName;
 
 process.chdir(path.dirname(__dirname));
@@ -31,15 +30,8 @@ var run = function() {
   var next = commands.shift();
   if (!next)
     process.exit(0);
-
-  if (Array.isArray(next)) {
-    var pathToRemove = path.resolve.apply(path.resolve, next);
-    if (fs.existsSync(pathToRemove))
-      next = removeCommand + pathToRemove;
-    else
-      return run();
-  }
-
+  if (Array.isArray(next))
+    next = removeCommand + path.resolve.apply(path.resolve, next);
   cp.safeExec(next, run);
 };
 run();

script/grunt

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

script/install-cli

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

script/mkdeb

@@ -8,28 +8,27 @@ ROOT=`readlink -f $(dirname $SCRIPT)/..`
 cd $ROOT
 
 VERSION="$1"
-ARCH="$2"
-CONTROL_FILE="$3"
-DESKTOP_FILE="$4"
-ICON_FILE="$5"
-DEB_PATH="$6"
+CONTROL_FILE="$2"
+DESKTOP_FILE="$3"
+ICON_FILE="$4"
+DEB_PATH="$5"
 
 TARGET_ROOT="`mktemp -d`"
 chmod 755 "$TARGET_ROOT"
-TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
+TARGET="$TARGET_ROOT/atom-$VERSION-amd64"
 
 mkdir -p "$TARGET/usr"
 env INSTALL_PREFIX="$TARGET/usr" script/grunt install
 
 mkdir -p "$TARGET/DEBIAN"
-cp "$CONTROL_FILE" "$TARGET/DEBIAN/control"
+mv "$CONTROL_FILE" "$TARGET/DEBIAN/control"
 
 mkdir -p "$TARGET/usr/share/applications"
-cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"
+mv "$DESKTOP_FILE" "$TARGET/usr/share/applications"
 
 mkdir -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
 
 dpkg-deb -b "$TARGET"
-mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
+mv "$TARGET_ROOT/atom-$VERSION-amd64.deb" "$DEB_PATH"
 rm -rf $TARGET_ROOT

script/utils/verify-requirements.js

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

spec/atom-reporter.coffee

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

spec/atom-spec.coffee

@@ -380,8 +380,8 @@ describe "the `atom` global", ->
 
           runs ->
             atom.packages.deactivatePackage('package-with-keymaps')
-            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-1')[0])).toHaveLength 0
-            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-2')[0])).toHaveLength 0
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:$$ -> @div class: 'test-1'[0])).toHaveLength 0
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:$$ -> @div class: 'test-2'[0])).toHaveLength 0
 
         it "removes the package's stylesheets", ->
           waitsForPromise ->

spec/context-menu-manager-spec.coffee

@@ -17,49 +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 duplicate commands with different labels',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'another label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'][1].label).toEqual 'another label'
-      expect(contextMenu.definitions['.selector'][1].command).toEqual 'command'
-
-    it "loads submenus", ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'parent':
-            'child-1': 'child-1:trigger'
-            'child-2': 'child-2:trigger'
-          'parent-2': 'parent-2:trigger'
-
-      expect(contextMenu.definitions['.selector'].length).toBe 2
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'parent'
-      expect(contextMenu.definitions['.selector'][0].submenu.length).toBe 2
-      expect(contextMenu.definitions['.selector'][0].submenu[0].label).toBe 'child-1'
-      expect(contextMenu.definitions['.selector'][0].submenu[0].command).toBe 'child-1:trigger'
-      expect(contextMenu.definitions['.selector'][0].submenu[1].label).toBe 'child-2'
-      expect(contextMenu.definitions['.selector'][0].submenu[1].command).toBe 'child-2:trigger'
-
     describe 'dev mode', ->
       it 'loads',  ->
         contextMenu.add 'file-path',
@@ -148,7 +105,7 @@ describe "ContextMenuManager", ->
           expect(menu[2].command).toEqual 'dev-command'
           expect(menu[3]).toBeUndefined()
 
-  describe "executeBuildHandlers", ->
+  describe "#executeBuildHandlers", ->
     menuTemplate = [
         label: 'label'
         executeAtBuild: ->
@@ -162,3 +119,4 @@ describe "ContextMenuManager", ->
 
       expect(buildFn).toHaveBeenCalled()
       expect(buildFn.mostRecentCall.args[0]).toBe event
+

spec/display-buffer-spec.coffee

@@ -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)
@@ -324,16 +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)
-
-          displayBuffer.logLines(0, 20)
-
-          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})
@@ -931,42 +912,6 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.findMarkers(class: 'a', startBufferRow: 0, endBufferRow: 3)).toEqual [marker1]
         expect(displayBuffer.findMarkers(endBufferRow: 10)).toEqual [marker3]
 
-      it "allows the startScreenRow and endScreenRow to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[6, 0], [7, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[9, 0], [10, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', startScreenRow: 6, endScreenRow: 7)).toEqual [marker2]
-
-      it "allows intersectsBufferRowRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsBufferRowRange: [5, 6])).toEqual [marker1]
-
-      it "allows intersectsScreenRowRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsScreenRowRange: [5, 10])).toEqual [marker2]
-
-      it "allows containedInScreenRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', containedInScreenRange: [[5, 0], [7, 0]])).toEqual [marker2]
-
-      it "allows intersectsBufferRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsBufferRange: [[5, 0], [6, 0]])).toEqual [marker1]
-
-      it "allows intersectsScreenRange to be specified", ->
-        marker1 = displayBuffer.markBufferRange([[5, 0], [5, 0]], class: 'a')
-        marker2 = displayBuffer.markBufferRange([[8, 0], [8, 0]], class: 'a')
-        displayBuffer.createFold(4, 7)
-        expect(displayBuffer.findMarkers(class: 'a', intersectsScreenRange: [[5, 0], [10, 0]])).toEqual [marker2]
-
     describe "marker destruction", ->
       it "allows markers to be destroyed", ->
         marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
@@ -1005,25 +950,12 @@ 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", ->
-    it "can add decorations associated with markers and remove them", ->
-      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
-
-      displayBuffer.removeDecorationForMarker(marker, decoration)
-      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).not.toBeDefined()
-
   describe "::setScrollTop", ->
     beforeEach ->
       displayBuffer.manageScrollPosition = true
@@ -1065,61 +997,17 @@ describe "DisplayBuffer", ->
       expect(displayBuffer.setScrollLeft(maxScrollLeft + 50)).toBe maxScrollLeft
       expect(displayBuffer.getScrollLeft()).toBe maxScrollLeft
 
-  describe "::scrollToScreenPosition(position, [options])", ->
-    beforeEach ->
+  describe "::scrollToScreenPosition(position)", ->
+    it "sets the scroll top and scroll left so the given screen position is in view", ->
       displayBuffer.manageScrollPosition = true
       displayBuffer.setLineHeightInPixels(10)
       displayBuffer.setDefaultCharWidth(10)
       displayBuffer.setHorizontalScrollbarHeight(0)
+
       displayBuffer.setHeight(50)
       displayBuffer.setWidth(50)
+      maxScrollTop = displayBuffer.getScrollHeight() - displayBuffer.getHeight()
 
-    it "sets the scroll top and scroll left so the given screen position is in view", ->
       displayBuffer.scrollToScreenPosition([8, 20])
       expect(displayBuffer.getScrollBottom()).toBe (9 + displayBuffer.getVerticalScrollMargin()) * 10
       expect(displayBuffer.getScrollRight()).toBe (20 + displayBuffer.getHorizontalScrollMargin()) * 10
-
-    describe "when the 'center' option is true", ->
-      it "vertically scrolls to center the given position vertically", ->
-        displayBuffer.scrollToScreenPosition([8, 20], center: true)
-        expect(displayBuffer.getScrollTop()).toBe (8 * 10) + 5 - (50 / 2)
-        expect(displayBuffer.getScrollRight()).toBe (20 + displayBuffer.getHorizontalScrollMargin()) * 10
-
-      it "does not scroll vertically if the position is already in view", ->
-        displayBuffer.scrollToScreenPosition([4, 20], center: true)
-        expect(displayBuffer.getScrollTop()).toBe 0
-
-  describe "scroll width", ->
-    cursorWidth = 1
-    beforeEach ->
-      displayBuffer.setDefaultCharWidth(10)
-
-    it "recomputes the scroll width when the default character width changes", ->
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 65 + cursorWidth
-
-      displayBuffer.setDefaultCharWidth(12)
-      expect(displayBuffer.getScrollWidth()).toBe 12 * 65 + cursorWidth
-
-    it "recomputes the scroll width when the max line length changes", ->
-      buffer.insert([6, 12], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 66 + cursorWidth
-
-      buffer.delete([[6, 10], [6, 12]], ' ')
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change", ->
-      operatorWidth = 20
-      displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 64 + operatorWidth + cursorWidth
-
-    it "recomputes the scroll width when the scoped character widths change in a batch", ->
-      operatorWidth = 20
-
-      displayBuffer.on 'character-widths-changed', changedSpy = jasmine.createSpy()
-
-      displayBuffer.batchCharacterMeasurement ->
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '<', operatorWidth)
-        displayBuffer.setScopedCharWidth(['source.js', 'keyword.operator.js'], '?', operatorWidth)
-
-      expect(displayBuffer.getScrollWidth()).toBe 10 * 63 + operatorWidth * 2 + cursorWidth
-      expect(changedSpy.callCount).toBe 1

spec/editor-spec.coffee

@@ -622,38 +622,6 @@ describe "Editor", ->
         editor.moveCursorToBeginningOfNextWord()
         expect(editor.getCursorBufferPosition()).toEqual [11, 9]
 
-    describe ".moveCursorToBeginningOfNextParagraph()", ->
-      it "moves the cursor before the first line of the next paragraph", ->
-        editor.setCursorBufferPosition [0,6]
-        cursor = editor.getCursor()
-
-        editor.moveCursorToBeginningOfNextParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual  { row : 10, column : 0 }
-
-        editor.setText("")
-        editor.setCursorBufferPosition [0,0]
-        cursor = editor.getCursor()
-        editor.moveCursorToBeginningOfNextParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual [0, 0]
-
-    describe ".moveCursorToBeginningOfPreviousParagraph()", ->
-      it "moves the cursor before the first line of the pevious paragraph", ->
-        editor.setCursorBufferPosition [10,0]
-        cursor = editor.getCursor()
-
-        editor.moveCursorToBeginningOfPreviousParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual  { row : 0, column : 0 }
-
-        editor.setText("")
-        editor.setCursorBufferPosition [0,0]
-        cursor = editor.getCursor()
-        editor.moveCursorToBeginningOfPreviousParagraph()
-
-        expect(cursor.getBufferPosition()).toEqual [0, 0]
-
     describe ".getCurrentParagraphBufferRange()", ->
       it "returns the buffer range of the current paragraph, delimited by blank lines or the beginning / end of the file", ->
         buffer.setText """
@@ -863,30 +831,6 @@ describe "Editor", ->
         expect(selection1.getScreenRange()).toEqual [[3, 0], [4, 5]]
         expect(selection2.getScreenRange()).toEqual [[5, 6], [6, 2]]
 
-    describe ".selectToBeginningOfNextParagraph()", ->
-      it "selects from the cursor to first line of the next paragraph", ->
-        editor.setSelectedBufferRange([[3, 0], [4, 5]])
-        editor.addCursorAtScreenPosition([5, 6])
-        editor.selectToScreenPosition([6, 2])
-
-        editor.selectToBeginningOfNextParagraph()
-
-        selections = editor.getSelections()
-        expect(selections.length).toBe 1
-        expect(selections[0].getScreenRange()).toEqual [[3, 0], [10, 0]]
-
-    describe ".selectToBeginningOfPreviousParagraph()", ->
-      it "selects from the cursor to the first line of the pevious paragraph", ->
-        editor.setSelectedBufferRange([[3, 0], [4, 5]])
-        editor.addCursorAtScreenPosition([5, 6])
-        editor.selectToScreenPosition([6, 2])
-
-        editor.selectToBeginningOfPreviousParagraph()
-
-        selections = editor.getSelections()
-        expect(selections.length).toBe 1
-        expect(selections[0].getScreenRange()).toEqual [[0, 0], [5, 6]]
-
       it "merges selections if they intersect, maintaining the directionality of the last selection", ->
         editor.setCursorScreenPosition([4, 10])
         editor.selectToScreenPosition([5, 27])
@@ -1196,7 +1140,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)
@@ -1221,21 +1164,6 @@ describe "Editor", ->
           expect(editor.selectMarker(marker)).toBeFalsy()
           expect(editor.getSelectedBufferRange()).toEqual [[0, 0], [0, 0]]
 
-    describe ".addSelectionForBufferRange(bufferRange)", ->
-      it "adds a selection for the specified buffer range", ->
-        editor.addSelectionForBufferRange([[3, 4], [5, 6]])
-        expect(editor.getSelectedBufferRanges()).toEqual [[[0, 0], [0, 0]], [[3, 4], [5, 6]]]
-
-      it "autoscrolls to the added selection if needed", ->
-        editor.setLineHeightInPixels(10)
-        editor.setDefaultCharWidth(10)
-        editor.setHeight(50)
-        editor.setWidth(50)
-
-        editor.addSelectionForBufferRange([[8, 10], [8, 15]])
-        expect(editor.getScrollTop()).toBe 75
-        expect(editor.getScrollLeft()).toBe 160
-
     describe ".addSelectionBelow()", ->
       describe "when the selection is non-empty", ->
         it "selects the same region of the line below current selections if possible", ->
@@ -1483,17 +1411,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", ->
@@ -1667,13 +1584,6 @@ describe "Editor", ->
         expect(editor.lineForBufferRow(1)).toBe '  '
         expect(editor.lineForBufferRow(2)).toBe '}'
 
-    describe "when a new line is appended before a closing tag (e.g. by pressing enter before a selection)", ->
-      it "moves the line down and keeps the indentation level the same when editor.autoIndent is true", ->
-        atom.config.set('editor.autoIndent', true)
-        editor.setCursorBufferPosition([9,2])
-        editor.insertNewline()
-        expect(editor.lineForBufferRow(10)).toBe '  };'
-
     describe ".backspace()", ->
       describe "when there is a single cursor", ->
         changeScreenRangeHandler = null
@@ -1858,32 +1768,6 @@ describe "Editor", ->
           expect(buffer.lineForRow(1)).toBe '  var sort = function(it) {'
           expect(buffer.lineForRow(2)).toBe 'if (items.length <= 1) return items;'
 
-    describe '.deleteToEndOfLine()', ->
-      describe 'when no text is selected', ->
-        it 'deletes all text between the cursor and the end of the line', ->
-          editor.setCursorBufferPosition([1, 24])
-          editor.addCursorAtBufferPosition([2, 5])
-          [cursor1, cursor2] = editor.getCursors()
-
-          editor.deleteToEndOfLine()
-          expect(buffer.lineForRow(1)).toBe '  var sort = function(it'
-          expect(buffer.lineForRow(2)).toBe '    i'
-          expect(cursor1.getBufferPosition()).toEqual [1, 24]
-          expect(cursor2.getBufferPosition()).toEqual [2, 5]
-
-        describe 'when at the end of the line', ->
-          it 'deletes the next newline', ->
-            editor.setCursorBufferPosition([1, 30])
-            editor.deleteToEndOfLine()
-            expect(buffer.lineForRow(1)).toBe '  var sort = function(items) {    if (items.length <= 1) return items;'
-
-      describe 'when text is selected', ->
-        it 'deletes only the text in the selection', ->
-          editor.setSelectedBufferRanges([[[1, 24], [1, 27]], [[2, 0], [2, 4]]])
-          editor.deleteToEndOfLine()
-          expect(buffer.lineForRow(1)).toBe '  var sort = function(it) {'
-          expect(buffer.lineForRow(2)).toBe 'if (items.length <= 1) return items;'
-
     describe ".deleteToBeginningOfLine()", ->
       describe "when no text is selected", ->
         it "deletes all text between the cursor and the beginning of the line", ->
@@ -2311,15 +2195,6 @@ describe "Editor", ->
           editor.outdentSelectedRows()
           expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
 
-        it "outdents only up to the first non-space non-tab character", ->
-          editor.insertText(' \tfoo\t ')
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "\tfoo\t var quicksort = function () {"
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "foo\t var quicksort = function () {"
-          editor.outdentSelectedRows()
-          expect(buffer.lineForRow(0)).toBe "foo\t var quicksort = function () {"
-
       describe "when one line is selected", ->
         it "outdents line and retains editor", ->
           editor.setSelectedBufferRange([[1,4], [1,14]])
@@ -2969,18 +2844,6 @@ describe "Editor", ->
       expect(editor.lineForBufferRow(4)).toBe "    }"
       expect(editor.lineForBufferRow(5)).toBe "    i=1"
 
-  describe "soft and hard tabs", ->
-    it "resets the tab style when tokenization is complete", ->
-      editor.destroy()
-      atom.project.open('sample-with-tabs-and-leading-comment.coffee').then (o) -> editor = o
-      expect(editor.softTabs).toBe true
-
-      waitsForPromise ->
-        atom.packages.activatePackage('language-coffee-script')
-
-      runs ->
-        expect(editor.softTabs).toBe false
-
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
       expect(buffer.getMarkerCount()).toBeGreaterThan 0
@@ -3273,60 +3136,21 @@ describe "Editor", ->
       expect(editor.getScrollRight()).toBe (9 + editor.getHorizontalScrollMargin()) * 10
 
   describe ".pageUp/Down()", ->
-    it "scrolls one screen height up or down and moves the cursor one page length", ->
+    it "scrolls one screen height up or down", ->
       editor.manageScrollPosition = true
 
       editor.setLineHeightInPixels(10)
       editor.setHeight(50)
       expect(editor.getScrollHeight()).toBe 130
-      expect(editor.getCursorBufferPosition().row).toBe 0
 
       editor.pageDown()
       expect(editor.getScrollTop()).toBe 50
-      expect(editor.getCursorBufferPosition().row).toBe 5
 
       editor.pageDown()
       expect(editor.getScrollTop()).toBe 80
-      expect(editor.getCursorBufferPosition().row).toBe 10
 
       editor.pageUp()
       expect(editor.getScrollTop()).toBe 30
-      expect(editor.getCursorBufferPosition().row).toBe 5
 
       editor.pageUp()
       expect(editor.getScrollTop()).toBe 0
-      expect(editor.getCursorBufferPosition().row).toBe 0
-
-  describe ".selectPageUp/Down()", ->
-    it "selects one screen height of text up or down", ->
-      editor.manageScrollPosition = true
-
-      editor.setLineHeightInPixels(10)
-      editor.setHeight(50)
-      expect(editor.getScrollHeight()).toBe 130
-      expect(editor.getCursorBufferPosition().row).toBe 0
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 30
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [5,0]]]
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 80
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [10,0]]]
-
-      editor.selectPageDown()
-      expect(editor.getScrollTop()).toBe 80
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [12,2]]]
-
-      editor.moveCursorToBottom()
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 50
-      expect(editor.getSelectedBufferRanges()).toEqual [[[7,0], [12,2]]]
-
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getSelectedBufferRanges()).toEqual [[[2,0], [12,2]]]
-
-      editor.selectPageUp()
-      expect(editor.getScrollTop()).toBe 0
-      expect(editor.getSelectedBufferRanges()).toEqual [[[0,0], [12,2]]]

spec/editor-view-spec.coffee

@@ -10,8 +10,6 @@ describe "EditorView", ->
   [buffer, editorView, editor, cachedEditor, cachedLineHeight, cachedCharWidth, fart] = []
 
   beforeEach ->
-    atom.config.set 'core.useReactEditor', false
-
     waitsForPromise ->
       atom.workspace.open('sample.js').then (o) -> editor = o
 
@@ -1611,7 +1609,7 @@ describe "EditorView", ->
         editorView.attachToDom()
 
         expect(atom.config.get("editor.showInvisibles")).toBeFalsy()
-        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs and spaces "
+        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs  and spaces "
 
         atom.config.set("editor.showInvisibles", true)
         space = editorView.invisibles?.space
@@ -1620,10 +1618,10 @@ describe "EditorView", ->
         expect(tab).toBeTruthy()
         eol = editorView.invisibles?.eol
         expect(eol).toBeTruthy()
-        expect(editorView.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab}and spaces#{space}#{eol}"
+        expect(editorView.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab} and spaces#{space}#{eol}"
 
         atom.config.set("editor.showInvisibles", false)
-        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs and spaces "
+        expect(editorView.renderedLines.find('.line').text()).toBe " a line with tabs  and spaces "
 
       it "displays newlines as their own token outside of the other tokens scope", ->
         editorView.setShowInvisibles(true)
@@ -1636,7 +1634,7 @@ describe "EditorView", ->
         editorView.attachToDom()
         atom.config.set("editor.showInvisibles", true)
         atom.config.set("editor.invisibles", eol: ";", space: "_", tab: "tab")
-        expect(editorView.find(".line:first").text()).toBe "_tab_;"
+        expect(editorView.find(".line:first").text()).toBe "_tab _;"
 
       it "displays trailing carriage return using a visible non-empty value", ->
         editor.setText "a line that ends with a carriage return\r\n"
@@ -2082,7 +2080,7 @@ describe "EditorView", ->
         tab = miniEditor.invisibles?.tab
         expect(tab).toBeTruthy()
         miniEditor.getEditor().setText(" a line with tabs\tand spaces ")
-        expect(miniEditor.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab}and spaces#{space}"
+        expect(miniEditor.renderedLines.find('.line').text()).toBe "#{space}a line with tabs#{tab} and spaces#{space}"
 
       it "doesn't show the indent guide", ->
         atom.config.set "editor.showIndentGuide", true
@@ -2415,21 +2413,20 @@ describe "EditorView", ->
       expect(editorView.getFirstVisibleScreenRow()).toBe(0)
 
   describe ".checkoutHead()", ->
-    [filePath] = []
+    [filePath, originalPathText] = []
 
     beforeEach ->
-      workingDirPath = temp.mkdirSync('atom-working-dir')
-      fs.copySync(path.join(__dirname, 'fixtures', 'git', 'working-dir'), workingDirPath)
-      fs.renameSync(path.join(workingDirPath, 'git.git'), path.join(workingDirPath, '.git'))
-      atom.project.setPath(workingDirPath)
-      filePath = atom.project.resolve('file.txt')
-
+      filePath = atom.project.resolve('git/working-dir/file.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
       waitsForPromise ->
         atom.workspace.open(filePath).then (o) -> editor = o
 
       runs ->
         editorView.edit(editor)
 
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
+
     it "restores the contents of the editor view to the HEAD revision", ->
       editor.setText('')
       editor.save()
@@ -2443,7 +2440,7 @@ describe "EditorView", ->
         fileChangeHandler.callCount > 0
 
       runs ->
-        expect(editor.getText()).toBe('undefined')
+        expect(editor.getText()).toBe(originalPathText)
 
   describe ".pixelPositionForBufferPosition(position)", ->
     describe "when the editor view is detached", ->

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

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

spec/fixtures/git/working-dir/git.git/objects/8a/9c86f1cb1f14b8f436eb91f4b052c8802ca99e

@@ -1 +0,0 @@
-x
�ŽInB1³ö)úσ„¢°fÉ	Úîvb�ù‘c†ãóQn�e=©žª,½·	ÚÄ·9˜¡r&V!ªÆq¢êuH¢.Éâ)i6Ί|™àtuÞº�}-(­+lUΉŒf_pUµQIcx�ßË€ßÚŽxoåÔ`wzáï}~ulçmYú(+•�QJ¤ëºvNþÿƒØ
µñž·ó1ÅiHL¢

spec/fixtures/git/working-dir/git.git/refs/heads/master

@@ -1 +1 @@
-8a9c86f1cb1f14b8f436eb91f4b052c8802ca99e
+ef046e9eecaa5255ea5e9817132d4001724d6ae1

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

@@ -0,0 +1 @@
+Full of text

spec/fixtures/sample-with-tabs-and-leading-comment.coffee

@@ -1,4 +0,0 @@
-  # This is a comment
-if this.studyingEconomics
-	buy()	while supply > demand
-		sell() until supply > demand

spec/git-spec.coffee

@@ -4,12 +4,6 @@ fs = require 'fs-plus'
 path = require 'path'
 Task = require '../src/task'
 
-copyRepository = ->
-  workingDirPath = temp.mkdirSync('atom-working-dir')
-  fs.copySync(path.join(__dirname, 'fixtures', 'git', 'working-dir'), workingDirPath)
-  fs.renameSync(path.join(workingDirPath, 'git.git'), path.join(workingDirPath, '.git'))
-  workingDirPath
-
 describe "Git", ->
   repo = null
 
@@ -47,13 +41,17 @@ describe "Git", ->
       expect(repo.isPathIgnored('b.txt')).toBeFalsy()
 
   describe ".isPathModified(path)", ->
-    [repo, filePath, newPath] = []
+    [repo, filePath, newPath, originalPathText] = []
 
     beforeEach ->
-      workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
-      filePath = path.join(workingDirPath, 'a.txt')
-      newPath = path.join(workingDirPath, 'new-path.txt')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      filePath = require.resolve('./fixtures/git/working-dir/file.txt')
+      newPath = path.join(__dirname, 'fixtures', 'git', 'working-dir', 'new-path.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
+
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
+      fs.removeSync(newPath) if fs.existsSync(newPath)
 
     describe "when the path is unstaged", ->
       it "returns false if the path has not been modified", ->
@@ -74,12 +72,14 @@ describe "Git", ->
     [filePath, newPath] = []
 
     beforeEach ->
-      workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
-      filePath = path.join(workingDirPath, 'a.txt')
-      newPath = path.join(workingDirPath, 'new-path.txt')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      filePath = require.resolve('./fixtures/git/working-dir/file.txt')
+      newPath = path.join(__dirname, 'fixtures', 'git', 'working-dir', 'new-path.txt')
       fs.writeFileSync(newPath, "i'm new here")
 
+    afterEach ->
+      fs.removeSync(newPath) if fs.existsSync(newPath)
+
     describe "when the path is unstaged", ->
       it "returns true if the path is new", ->
         expect(repo.isPathNew(newPath)).toBeTruthy()
@@ -88,35 +88,48 @@ describe "Git", ->
         expect(repo.isPathNew(filePath)).toBeFalsy()
 
   describe ".checkoutHead(path)", ->
-    [filePath] = []
+    [path1, path2, originalPath1Text, originalPath2Text] = []
 
     beforeEach ->
-      workingDirPath = copyRepository()
-      repo = new Git(workingDirPath)
-      filePath = path.join(workingDirPath, 'a.txt')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      path1 = require.resolve('./fixtures/git/working-dir/file.txt')
+      originalPath1Text = fs.readFileSync(path1, 'utf8')
+      path2 = require.resolve('./fixtures/git/working-dir/other.txt')
+      originalPath2Text = fs.readFileSync(path2, 'utf8')
+
+    afterEach ->
+      fs.writeFileSync(path1, originalPath1Text)
+      fs.writeFileSync(path2, originalPath2Text)
 
     it "no longer reports a path as modified after checkout", ->
-      expect(repo.isPathModified(filePath)).toBeFalsy()
-      fs.writeFileSync(filePath, 'ch ch changes')
-      expect(repo.isPathModified(filePath)).toBeTruthy()
-      expect(repo.checkoutHead(filePath)).toBeTruthy()
-      expect(repo.isPathModified(filePath)).toBeFalsy()
+      expect(repo.isPathModified(path1)).toBeFalsy()
+      fs.writeFileSync(path1, '')
+      expect(repo.isPathModified(path1)).toBeTruthy()
+      expect(repo.checkoutHead(path1)).toBeTruthy()
+      expect(repo.isPathModified(path1)).toBeFalsy()
 
     it "restores the contents of the path to the original text", ->
-      fs.writeFileSync(filePath, 'ch ch changes')
-      expect(repo.checkoutHead(filePath)).toBeTruthy()
-      expect(fs.readFileSync(filePath, 'utf8')).toBe ''
+      fs.writeFileSync(path1, '')
+      expect(repo.checkoutHead(path1)).toBeTruthy()
+      expect(fs.readFileSync(path1, 'utf8')).toBe(originalPath1Text)
+
+    it "only restores the path specified", ->
+      fs.writeFileSync(path2, 'path 2 is edited')
+      expect(repo.isPathModified(path2)).toBeTruthy()
+      expect(repo.checkoutHead(path1)).toBeTruthy()
+      expect(fs.readFileSync(path2, 'utf8')).toBe('path 2 is edited')
+      expect(repo.isPathModified(path2)).toBeTruthy()
 
     it "fires a status-changed event if the checkout completes successfully", ->
-      fs.writeFileSync(filePath, 'ch ch changes')
-      repo.getPathStatus(filePath)
+      fs.writeFileSync(path1, '')
+      repo.getPathStatus(path1)
       statusHandler = jasmine.createSpy('statusHandler')
       repo.on 'status-changed', statusHandler
-      repo.checkoutHead(filePath)
+      repo.checkoutHead(path1)
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler.argsForCall[0][0..1]).toEqual [filePath, 0]
+      expect(statusHandler.argsForCall[0][0..1]).toEqual [path1, 0]
 
-      repo.checkoutHead(filePath)
+      repo.checkoutHead(path1)
       expect(statusHandler.callCount).toBe 1
 
   describe ".destroy()", ->
@@ -125,13 +138,32 @@ describe "Git", ->
       repo.destroy()
       expect(-> repo.getShortHead()).toThrow()
 
-  describe ".getPathStatus(path)", ->
-    [filePath] = []
+  describe ".getDiffStats(path)", ->
+    [filePath, originalPathText] = []
 
     beforeEach ->
-      workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
-      filePath = path.join(workingDirectory, 'file.txt')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      filePath = require.resolve('./fixtures/git/working-dir/file.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
+
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
+
+    it "returns the number of lines added and deleted", ->
+      expect(repo.getDiffStats(filePath)).toEqual {added: 0, deleted: 0}
+      fs.writeFileSync(filePath, "#{originalPathText} edited line")
+      expect(repo.getDiffStats(filePath)).toEqual {added: 1, deleted: 1}
+
+  describe ".getPathStatus(path)", ->
+    [filePath, originalPathText] = []
+
+    beforeEach ->
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      filePath = require.resolve('./fixtures/git/working-dir/file.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
+
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
 
     it "trigger a status-changed event when the new status differs from the last cached one", ->
       statusHandler = jasmine.createSpy("statusHandler")
@@ -146,13 +178,16 @@ describe "Git", ->
       expect(statusHandler.callCount).toBe 1
 
   describe ".getDirectoryStatus(path)", ->
-    [directoryPath, filePath] = []
+    [directoryPath, filePath, originalPathText] = []
 
     beforeEach ->
-      workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
-      directoryPath = path.join(workingDirectory, 'dir')
-      filePath = path.join(directoryPath, 'b.txt')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      directoryPath = path.join(__dirname, 'fixtures', 'git', 'working-dir', 'dir')
+      filePath = require.resolve('./fixtures/git/working-dir/dir/b.txt')
+      originalPathText = fs.readFileSync(filePath, 'utf8')
+
+    afterEach ->
+      fs.writeFileSync(filePath, originalPathText)
 
     it "gets the status based on the files inside the directory", ->
       expect(repo.isStatusModified(repo.getDirectoryStatus(directoryPath))).toBe false
@@ -164,15 +199,18 @@ describe "Git", ->
     [newPath, modifiedPath, cleanPath, originalModifiedPathText] = []
 
     beforeEach ->
-      workingDirectory = copyRepository()
-      repo = new Git(workingDirectory)
-      modifiedPath = path.join(workingDirectory, 'file.txt')
-      newPath = path.join(workingDirectory, 'untracked.txt')
-      cleanPath = path.join(workingDirectory, 'other.txt')
-      fs.writeFileSync(cleanPath, 'Full of text')
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'working-dir'))
+      modifiedPath = atom.project.resolve('git/working-dir/file.txt')
+      originalModifiedPathText = fs.readFileSync(modifiedPath, 'utf8')
+      newPath = atom.project.resolve('git/working-dir/untracked.txt')
+      cleanPath = atom.project.resolve('git/working-dir/other.txt')
       fs.writeFileSync(newPath, '')
       newPath = fs.absolute newPath  # specs could be running under symbol path.
 
+    afterEach ->
+      fs.writeFileSync(modifiedPath, originalModifiedPathText)
+      fs.removeSync(newPath) if fs.existsSync(newPath)
+
     it "returns status information for all new and modified files", ->
       fs.writeFileSync(modifiedPath, 'making this path modified')
       statusHandler = jasmine.createSpy('statusHandler')
@@ -188,13 +226,17 @@ describe "Git", ->
         expect(repo.isStatusModified(repo.getCachedPathStatus(modifiedPath))).toBeTruthy()
 
   describe "buffer events", ->
-    [editor] = []
+    [originalContent, editor] = []
 
     beforeEach ->
-      atom.project.setPath(copyRepository())
-
       waitsForPromise ->
-        atom.workspace.open('other.txt').then (o) -> editor = o
+        atom.workspace.open('sample.js').then (o) -> editor = o
+
+      runs ->
+        originalContent = editor.getText()
+
+    afterEach ->
+      fs.writeFileSync(editor.getPath(), originalContent)
 
     it "emits a status-changed event when a buffer is saved", ->
       editor.insertNewline()
@@ -228,16 +270,15 @@ describe "Git", ->
       expect(statusHandler.callCount).toBe 1
 
   describe "when a project is deserialized", ->
-    [buffer, project2] = []
+    [originalContent, buffer, project2] = []
 
     afterEach ->
+      fs.writeFileSync(buffer.getPath(), originalContent)
       project2?.destroy()
 
     it "subscribes to all the serialized buffers in the project", ->
-      atom.project.setPath(copyRepository())
-
       waitsForPromise ->
-        atom.workspace.open('file.txt')
+        atom.workspace.open('sample.js')
 
       runs ->
         project2 = atom.project.testSerialization()

spec/language-mode-spec.coffee

@@ -52,17 +52,12 @@ describe "LanguageMode", ->
         languageMode.toggleLineCommentsForBufferRows(0, 0)
         expect(buffer.lineForRow(0)).toBe "  // "
 
-        buffer.setText('    a\n  \n    b')
+        buffer.setText ('    a\n  \n    b')
         languageMode.toggleLineCommentsForBufferRows(0, 2)
         expect(buffer.lineForRow(0)).toBe "    // a"
         expect(buffer.lineForRow(1)).toBe "    // "
         expect(buffer.lineForRow(2)).toBe "    // b"
 
-        buffer.setText('    \n    // var i;')
-        languageMode.toggleLineCommentsForBufferRows(0, 1)
-        expect(buffer.lineForRow(0)).toBe '    '
-        expect(buffer.lineForRow(1)).toBe '    var i;'
-
     describe ".rowRangeForCodeFoldAtBufferRow(bufferRow)", ->
       it "returns the start/end rows of the foldable region starting at the given row", ->
         expect(languageMode.rowRangeForCodeFoldAtBufferRow(0)).toEqual [0, 12]

spec/pane-container-spec.coffee

@@ -16,7 +16,6 @@ describe "PaneContainer", ->
       containerA = new PaneContainer(root: pane1A)
       pane2A = pane1A.splitRight(items: [new Item])
       pane3A = pane2A.splitDown(items: [new Item])
-      pane3A.focus()
 
     it "preserves the focused pane across serialization", ->
       expect(pane3A.focused).toBe true

spec/pane-spec.coffee

@@ -439,11 +439,10 @@ describe "Pane", ->
           expect(column.orientation).toBe 'vertical'
           expect(column.children).toEqual [pane1, pane3, pane2]
 
-    it "activates the new pane", ->
-      expect(pane1.isActive()).toBe true
+    it "sets up the new pane to be focused", ->
+      expect(pane1.focused).toBe false
       pane2 = pane1.splitRight()
-      expect(pane1.isActive()).toBe false
-      expect(pane2.isActive()).toBe true
+      expect(pane2.focused).toBe true
 
   describe "::destroy()", ->
     [container, pane1, pane2] = []

spec/pane-view-spec.coffee

@@ -166,8 +166,7 @@ describe "PaneView", ->
     it "removes the pane item", ->
       editor = null
       jasmine.unspy(window, 'setTimeout')
-      filePath = path.join(temp.mkdirSync(), 'file.txt')
-      fs.writeFileSync(filePath, '')
+      filePath = temp.openSync('atom').path
 
       waitsForPromise ->
         atom.workspace.open(filePath).then (o) -> editor = o
@@ -199,7 +198,6 @@ describe "PaneView", ->
 
       it "focuses the next pane", ->
         container.attachToDom()
-        pane2.activate()
         expect(pane.hasFocus()).toBe false
         expect(pane2.hasFocus()).toBe true
         pane2Model.destroy()

spec/project-spec.coffee

@@ -156,20 +156,11 @@ describe "Project", ->
         expect(atom.project.resolve('a')).toBe absolutePath
         expect(atom.project.resolve(absolutePath + '/../a')).toBe absolutePath
         expect(atom.project.resolve('a/../a')).toBe absolutePath
-        expect(atom.project.resolve()).toBeUndefined()
 
     describe "when passed a uri with a scheme", ->
       it "does not modify uris that begin with a scheme", ->
         expect(atom.project.resolve('http://zombo.com')).toBe 'http://zombo.com'
 
-    describe "when the project has no path", ->
-      it "returns undefined for relative URIs", ->
-        atom.project.setPath()
-        expect(atom.project.resolve('test.txt')).toBeUndefined()
-        expect(atom.project.resolve('http://github.com')).toBe 'http://github.com'
-        absolutePath = fs.absolute(__dirname)
-        expect(atom.project.resolve(absolutePath)).toBe absolutePath
-
   describe ".setPath(path)", ->
     describe "when path is a file", ->
       it "sets its path to the files parent directory and updates the root directory", ->
@@ -205,17 +196,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 = []
-        waitsForPromise ->
-          atom.project.replace /items/gi, 'items', ['/not-a-file.js'], (result, error) ->
-            errors.push(error)
-
-        runs ->
-          expect(errors).toHaveLength 1
-          expect(errors[0].path).toBe '/not-a-file.js'
-
     describe "when called with unopened files", ->
       it "replaces properly", ->
         results = []

spec/space-pen-extensions-spec.coffee

@@ -24,6 +24,19 @@ describe "SpacePen extensions", ->
       expect(eventHandler).toHaveBeenCalled()
 
   describe "tooltips", ->
+    describe "humanizeKeystrokes", ->
+      humanizeKeystrokes = $.fn.setTooltip.humanizeKeystrokes
+
+      it "replaces single keystroke", ->
+        expect(humanizeKeystrokes('cmd-O')).toEqual '⌘⇧O'
+        expect(humanizeKeystrokes('cmd-shift-up')).toEqual '⌘⇧↑'
+        expect(humanizeKeystrokes('cmd-option-down')).toEqual '⌘⌥↓'
+        expect(humanizeKeystrokes('cmd-option-left')).toEqual '⌘⌥←'
+        expect(humanizeKeystrokes('cmd-option-right')).toEqual '⌘⌥→'
+
+      it "replaces multiple keystroke", ->
+        expect(humanizeKeystrokes('cmd-o ctrl-2')).toEqual '⌘O ⌃2'
+
     describe "when the window is resized", ->
       it "hides the tooltips", ->
         class TooltipView extends View

spec/spec-bootstrap.coffee

@@ -14,8 +14,8 @@ try
 
   {runSpecSuite} = require './jasmine-helper'
 
-  # Add 'exports' to module search path.
-  exportsPath = path.join(atom.getLoadSettings().resourcePath, 'exports')
+  # Add 'src/exports' to module search path.
+  exportsPath = path.resolve(atom.getLoadSettings().resourcePath, 'exports')
   require('module').globalPaths.push(exportsPath)
   # Still set NODE_PATH since tasks may need it.
   process.env.NODE_PATH = exportsPath

spec/spec-helper.coffee

@@ -15,7 +15,6 @@ Project = require '../src/project'
 Editor = require '../src/editor'
 EditorView = require '../src/editor-view'
 TokenizedBuffer = require '../src/tokenized-buffer'
-EditorComponent = require '../src/editor-component'
 pathwatcher = require 'pathwatcher'
 clipboard = require 'clipboard'
 
@@ -34,12 +33,7 @@ $(window).on 'unload', ->
 $('html,body').css('overflow', 'auto')
 
 jasmine.getEnv().addEqualityTester(_.isEqual) # Use underscore's definition of equality for toEqual assertions
-
-if process.platform is 'win32' and process.env.JANKY_SHA1
-  # Use longer timeout on Windows CI
-  jasmine.getEnv().defaultTimeoutInterval = 30000
-else
-  jasmine.getEnv().defaultTimeoutInterval = 5000
+jasmine.getEnv().defaultTimeoutInterval = 5000
 
 specPackageName = null
 specPackagePath = null
@@ -95,14 +89,12 @@ beforeEach ->
   config.set "editor.autoIndent", false
   config.set "core.disabledPackages", ["package-that-throws-an-exception",
     "package-with-broken-package-json", "package-with-broken-keymap"]
-  config.set "core.useReactEditor", true
+  config.set "core.useReactEditor", false
   config.save.reset()
   atom.config = config
 
   # make editor display updates synchronous
   spyOn(EditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
-  EditorComponent.performSyncUpdates = true
-
   spyOn(WorkspaceView.prototype, 'setTitle').andCallFake (@title) ->
   spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
   spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout

spec/spec-suite.coffee

@@ -27,8 +27,10 @@ setSpecDirectory = (specDirectory) ->
 runAllSpecs = ->
   {resourcePath} = atom.getLoadSettings()
 
-  requireSpecs(path.join(resourcePath, 'spec'))
-  setSpecType('core')
+  # Only run core specs when resource path is the Atom repository
+  if Git.exists(resourcePath)
+    requireSpecs(path.join(resourcePath, 'spec'))
+    setSpecType('core')
 
   fixturesPackagesPath = path.join(__dirname, 'fixtures', 'packages')
   packagePaths = atom.packages.getAvailablePackageNames().map (packageName) ->

spec/tokenized-buffer-spec.coffee

@@ -335,84 +335,16 @@ 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"
 
-      it "aligns the hard tabs to the correct tab stop column", ->
-        buffer.setText """
-          1\t2 \t3\t4
-          12\t3  \t4\t5
-          123\t4   \t5\t6
-        """
-
-        tokenizedBuffer.setTabLength(4)
-        fullyTokenize(tokenizedBuffer)
-
-        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1   2   3   4"
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 3
-
-        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12  3   4   5"
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 2
-
-        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4       5   6"
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1
-
-        tokenizedBuffer.setTabLength(3)
-        fullyTokenize(tokenizedBuffer)
-
-        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1  2  3  4"
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 2
-
-        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12 3     4  5"
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 1
-
-        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123   4     5  6"
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 3
-
-        tokenizedBuffer.setTabLength(2)
-        fullyTokenize(tokenizedBuffer)
-
-        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1 2   3 4"
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 1
-
-        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12  3   4 5"
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 2
-
-        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4     5 6"
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1
-
-        tokenizedBuffer.setTabLength(1)
-        fullyTokenize(tokenizedBuffer)
-
-        expect(tokenizedBuffer.lineForScreenRow(0).text).toBe "1 2  3 4"
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(0).tokens[1].screenDelta).toBe 1
-
-        expect(tokenizedBuffer.lineForScreenRow(1).text).toBe "12 3   4 5"
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].bufferDelta).toBe 1
-        expect(tokenizedBuffer.lineForScreenRow(1).tokens[1].screenDelta).toBe 1
-
-        expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "123 4    5 6"
-        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 +362,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,65 +379,13 @@ 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", ->
-      editor = null
-      tokenizedHandler = jasmine.createSpy("tokenized handler")
-
-      waitsForPromise ->
-        atom.project.open('sample.js').then (o) -> editor = o
-
-      runs ->
-        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
-        tokenizedBuffer.on 'tokenized', tokenizedHandler
-        fullyTokenize(tokenizedBuffer)
-        expect(tokenizedHandler.callCount).toBe(1)
-
-    it "doesn't re-emit the `tokenized` event when it is re-tokenized", ->
-      editor = null
-      tokenizedHandler = jasmine.createSpy("tokenized handler")
-
-      waitsForPromise ->
-        atom.project.open('sample.js').then (o) -> editor = o
-
-      runs ->
-        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
-        fullyTokenize(tokenizedBuffer)
-
-        tokenizedBuffer.on 'tokenized', tokenizedHandler
-        editor.getBuffer().insert([0, 0], "'")
-        fullyTokenize(tokenizedBuffer)
-        expect(tokenizedHandler).not.toHaveBeenCalled()
 
   describe "when the grammar is updated because a grammar it includes is activated", ->
-    it "re-emits the `tokenized` event", ->
-      editor = null
-      tokenizedBuffer = null
-      tokenizedHandler = jasmine.createSpy("tokenized handler")
-
-      waitsForPromise ->
-        atom.project.open('coffee.coffee').then (o) -> editor = o
-
-      runs ->
-        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
-        tokenizedBuffer.on 'tokenized', tokenizedHandler
-        fullyTokenize(tokenizedBuffer)
-        tokenizedHandler.reset()
-
-      waitsForPromise ->
-        atom.packages.activatePackage('language-coffee-script')
-
-      runs ->
-        fullyTokenize(tokenizedBuffer)
-        expect(tokenizedHandler.callCount).toBe(1)
-
     it "retokenizes the buffer", ->
 
       waitsForPromise ->
@@ -657,65 +537,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 2
-        expect(tokenizedBuffer.lineForScreenRow(10).indentLevel).toBe 2
-        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: 8, delta: 2)
-
-        expect(tokenizedBuffer.lineForScreenRow(5).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(6).indentLevel).toBe 4
-        expect(tokenizedBuffer.lineForScreenRow(11).indentLevel).toBe 2
-        expect(tokenizedBuffer.lineForScreenRow(12).indentLevel).toBe 2
-        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: 8, 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 # }

spec/tokenized-line-spec.coffee

@@ -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] = []

spec/workspace-spec.coffee

@@ -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

spec/workspace-view-spec.coffee

@@ -196,14 +196,12 @@ describe "WorkspaceView", ->
       atom.workspaceView.height(200)
       atom.workspaceView.attachToDom()
       rightEditorView = atom.workspaceView.getActiveView()
-      rightEditorView.getEditor().setText("\t  ")
+      rightEditorView.getEditor().setText(" \t ")
       leftEditorView = rightEditorView.splitLeft()
       expect(rightEditorView.find(".line:first").text()).toBe "    "
       expect(leftEditorView.find(".line:first").text()).toBe "    "
 
-      {invisibles} = rightEditorView.component.state
-      {space, tab, eol} = invisibles
-      withInvisiblesShowing = "#{tab} #{space}#{space}#{eol}"
+      withInvisiblesShowing = "#{rightEditorView.invisibles.space}#{rightEditorView.invisibles.tab} #{rightEditorView.invisibles.space}#{rightEditorView.invisibles.eol}"
 
       atom.workspaceView.trigger "window:toggle-invisibles"
       expect(rightEditorView.find(".line:first").text()).toBe withInvisiblesShowing

src/atom.coffee

@@ -151,8 +151,8 @@ class Atom extends Model
     {devMode, safeMode, resourcePath} = @getLoadSettings()
     configDirPath = @getConfigDirPath()
 
-    # Add 'exports' to module search path.
-    exportsPath = path.join(resourcePath, 'exports')
+    # Add 'src/exports' to module search path.
+    exportsPath = path.resolve(resourcePath, 'exports')
     require('module').globalPaths.push(exportsPath)
     # Still set NODE_PATH since tasks may need it.
     process.env.NODE_PATH = exportsPath
@@ -258,20 +258,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)
 
@@ -280,7 +273,6 @@ class Atom extends Model
     delete @state.packageStates
 
   deserializeEditorWindow: ->
-    @deserializeTimings = {}
     @deserializePackageStates()
     @deserializeProject()
     @deserializeWorkspaceView()

src/browser/atom-application.coffee

@@ -60,10 +60,6 @@ class AtomApplication
 
   constructor: (options) ->
     {@resourcePath, @version, @devMode, @safeMode} = options
-
-    # Normalize to make sure drive letter case is consistent on Windows
-    @resourcePath = path.normalize(@resourcePath) if @resourcePath
-
     global.atomApplication = this
 
     @pidsToOpenWindows = {}
@@ -310,7 +306,13 @@ class AtomApplication
   #   :safeMode - Boolean to control the opened window's safe mode.
   #   :windowDimensions - Object with height and width keys.
   openPath: ({pathToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, windowDimensions}={}) ->
-    {pathToOpen, initialLine, initialColumn} = @locationForPathToOpen(pathToOpen)
+    if pathToOpen
+      [basename, initialLine, initialColumn] = path.basename(pathToOpen).split(':')
+      pathToOpen = path.join(path.dirname(pathToOpen), basename) if initialLine
+
+      # Convert line numbers to a base of 0
+      initialLine -= 1 if initialLine
+      initialColumn -= 1 if initialColumn
 
     unless devMode
       existingWindow = @windowForPath(pathToOpen) unless pidToKillWhenClosed or newWindow
@@ -413,20 +415,6 @@ class AtomApplication
     isSpec = true
     new AtomWindow({bootstrapScript, @resourcePath, isSpec})
 
-  locationForPathToOpen: (pathToOpen) ->
-    return {pathToOpen} unless pathToOpen
-    return {pathToOpen} if fs.existsSync(pathToOpen)
-
-    [fileToOpen, initialLine, initialColumn] = path.basename(pathToOpen).split(':')
-    return {pathToOpen} unless initialLine
-    return {pathToOpen} unless parseInt(initialLine) > 0
-
-    # Convert line numbers to a base of 0
-    initialLine -= 1 if initialLine
-    initialColumn -= 1 if initialColumn
-    pathToOpen = path.join(path.dirname(pathToOpen), fileToOpen)
-    {pathToOpen, initialLine, initialColumn}
-
   # Opens a native dialog to prompt the user for a path.
   #
   # Once paths are selected, they're opened in a new or existing {AtomWindow}s.

src/browser/atom-window.coffee

@@ -21,10 +21,6 @@ class AtomWindow
 
   constructor: (settings={}) ->
     {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone} = settings
-
-    # Normalize to make sure drive letter case is consistent on Windows
-    @resourcePath = path.normalize(@resourcePath) if @resourcePath
-
     global.atomApplication.addWindow(this)
 
     @browserWindow = new BrowserWindow show: false, title: 'Atom', icon: @constructor.iconPath
@@ -33,7 +29,6 @@ class AtomWindow
     loadSettings = _.extend({}, settings)
     loadSettings.windowState ?= '{}'
     loadSettings.appVersion = app.getVersion()
-    loadSettings.resourcePath = @resourcePath
 
     # Only send to the first non-spec window created
     if @constructor.includeShellLoadTime and not @isSpec
@@ -114,15 +109,9 @@ class AtomWindow
       new ContextMenu(menuTemplate, this)
 
     if @isSpec
-      # Workaround for https://github.com/atom/atom-shell/issues/380
-      # Don't focus the window when it is being blurred during close or
-      # else the app will crash on Windows.
-      if process.platform is 'win32'
-        @browserWindow.on 'close', => @isWindowClosing = true
-
       # Spec window's web view should always have focus
       @browserWindow.on 'blur', =>
-        @browserWindow.focusOnWebView() unless @isWindowClosing
+        @browserWindow.focusOnWebView()
 
   openPath: (pathToOpen, initialLine, initialColumn) ->
     if @loaded

src/browser/context-menu.coffee

@@ -19,6 +19,4 @@ class ContextMenu
         do (item) =>
           item.click = =>
             global.atomApplication.sendCommandToWindow(item.command, @atomWindow, item.commandOptions)
-      else if item.submenu
-        @createClickHandlers(item.submenu)
       item

src/browser/main.coffee

@@ -54,9 +54,7 @@ start = ->
     AtomApplication.open(args)
     console.log("App load time: #{Date.now() - global.shellStartTime}ms") unless args.test
 
-global.devResourcePath = process.env.ATOM_DEV_RESOURCE_PATH ? path.join(app.getHomeDir(), 'github', 'atom')
-# Normalize to make sure drive letter case is consistent on Windows
-global.devResourcePath = path.normalize(global.devResourcePath) if global.devResourcePath
+global.devResourcePath = path.join(app.getHomeDir(), 'github', 'atom')
 
 setupCrashReporter = ->
   crashReporter.start(productName: 'Atom', companyName: 'GitHub')

src/buffered-process.coffee

@@ -1,4 +1,3 @@
-_ = require 'underscore-plus'
 ChildProcess = require 'child_process'
 
 # Public: A wrapper which provides standard error/output line buffering for
@@ -44,13 +43,8 @@ class BufferedProcess
     # process and will just orphan it. Does not escape ^ (cmd's escape symbol).
     # Related to joyent/node#2318
     if process.platform is "win32"
-      # Quote all arguments and escapes inner quotes
-      cmdArgs = args.map (arg) -> "\"#{arg.replace(/"/g, '\\"')}\""
-      cmdArgs.unshift("\"#{command}\"")
-      cmdArgs = ['/s', '/c', "\"#{cmdArgs.join(' ')}\""]
-      cmdOptions = _.clone(options)
-      cmdOptions.windowsVerbatimArguments = true
-      @process = ChildProcess.spawn(process.env.comspec or 'cmd.exe', cmdArgs, cmdOptions)
+      @process = ChildProcess.spawn(process.env.comspec || "cmd.exe",
+        [ "/c", command ].concat(args), options)
     else
       @process = ChildProcess.spawn(command, args, options)
     @killed = false

src/context-menu-manager.coffee

@@ -33,21 +33,8 @@ class ContextMenuManager
   # Returns nothing.
   add: (name, object, {devMode}={}) ->
     for selector, items of object
-      for label, commandOrSubmenu of items
-        if typeof commandOrSubmenu is 'object'
-          submenu = []
-          for submenuLabel, command of commandOrSubmenu
-            submenu.push(@buildMenuItem(submenuLabel, command))
-          @addBySelector(selector, {label: label, submenu: submenu}, {devMode})
-        else
-          menuItem = @buildMenuItem(label, commandOrSubmenu)
-          @addBySelector(selector, menuItem, {devMode})
-
-  buildMenuItem: (label, command) ->
-    if label is command is '-'
-      {type: 'separator'}
-    else
-      {label, command}
+      for label, command of items
+        @addBySelector(selector, {label, command}, {devMode})
 
   # Registers a command to be displayed when the relevant item is right
   # clicked.
@@ -60,8 +47,7 @@ class ContextMenuManager
   #              editor is in dev mode.
   addBySelector: (selector, definition, {devMode}={}) ->
     definitions = if devMode then @devModeDefinitions else @definitions
-    unless _.findWhere(definitions[selector], definition)
-      (definitions[selector] ?= []).push(definition)
+    (definitions[selector] ?= []).push(definition)
 
   # Returns definitions which match the element and devMode.
   definitionsForElement: (element, {devMode}={}) ->

src/cursor-component.coffee

@@ -1,29 +1,15 @@
 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
+    {cursor, scrollTop, scrollLeft} = @props
+    {top, left, height, width} = cursor.getPixelRect()
     top -= scrollTop
     left -= scrollLeft
+    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}

src/cursor.coffee

@@ -29,6 +29,9 @@ class Cursor extends Model
       # Supports old editor view
       @needsAutoscroll ?= @isLastCursor() and !textChanged
 
+      # Supports react editor view
+      @autoscroll() if @needsAutoscroll and @editor.manageScrollPosition
+
       @goalColumn = null
 
       movedEvent =
@@ -52,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())
@@ -113,10 +114,9 @@ class Cursor extends Model
 
   # Public: Get the RegExp used by the cursor to determine what a "word" is.
   #
-  # options: An optional {Object} with the following keys:
+  # options: An {Object} with the following keys:
   #   :includeNonWordCharacters - A {Boolean} indicating whether to include
   #                               non-word characters in the regex.
-  #                               (default: true)
   #
   # Returns a {RegExp}.
   wordRegExp: ({includeNonWordCharacters}={})->
@@ -457,43 +457,6 @@ class Cursor extends Model
   getCurrentLineBufferRange: (options) ->
     @editor.bufferRangeForBufferRow(@getBufferRow(), options)
 
-  # Public: Moves the cursor to the beginning of the next paragraph
-  moveToBeginningOfNextParagraph: ->
-    if position = @getBeginningOfNextParagraphBufferPosition()
-      @setBufferPosition(position)
-
-  # Public: Moves the cursor to the beginning of the previous paragraph
-  moveToBeginningOfPreviousParagraph: ->
-    if position = @getBeginningOfPreviousParagraphBufferPosition()
-      @setBufferPosition(position)
-
-  getBeginningOfNextParagraphBufferPosition: (editor) ->
-    start = @getBufferPosition()
-    eof = @editor.getEofBufferPosition()
-    scanRange = [start, eof]
-
-    {row, column} = eof
-    position = new Point(row, column - 1)
-
-    @editor.scanInBufferRange /^\n*$/g, scanRange, ({range, stop}) =>
-      if !range.start.isEqual(start)
-        position = range.start
-        stop()
-    @editor.screenPositionForBufferPosition(position)
-
-  getBeginningOfPreviousParagraphBufferPosition: (editor) ->
-    start = @editor.getCursorBufferPosition()
-
-    {row, column} = start
-    scanRange = [[row-1, column], [0,0]]
-    position = new Point(0, 0)
-    zero = new Point(0,0)
-    @editor.backwardsScanInBufferRange /^\n*$/g, scanRange, ({range, stop}) =>
-      if !range.start.isEqual(zero)
-        position = range.start
-        stop()
-    @editor.screenPositionForBufferPosition(position)
-
   # Public: Retrieves the range for the current paragraph.
   #
   # A paragraph is defined as a block of text surrounded by empty lines.

src/cursors-component.coffee

@@ -1,6 +1,6 @@
 React = require 'react-atom-fork'
 {div} = require 'reactionary-atom-fork'
-{debounce, toArray, isEqualForProperties, isEqual} = require 'underscore-plus'
+{debounce, toArray} = require 'underscore-plus'
 SubscriberMixin = require './subscriber-mixin'
 CursorComponent = require './cursor-component'
 
@@ -12,7 +12,7 @@ CursorsComponent = React.createClass
   cursorBlinkIntervalHandle: null
 
   render: ->
-    {cursorPixelRects, scrollTop, scrollLeft, defaultCharWidth, useHardwareAcceleration} = @props
+    {editor, scrollTop, scrollLeft} = @props
     {blinkOff} = @state
 
     className = 'cursors'
@@ -20,8 +20,10 @@ CursorsComponent = React.createClass
 
     div {className},
       if @isMounted()
-        for key, pixelRect of cursorPixelRects
-          CursorComponent({key, pixelRect, scrollTop, scrollLeft, defaultCharWidth, useHardwareAcceleration})
+        for selection in editor.getSelections()
+          if selection.isEmpty() and editor.selectionIntersectsVisibleRowRange(selection)
+            {cursor} = selection
+            CursorComponent({key: cursor.id, cursor, scrollTop, scrollLeft})
 
   getInitialState: ->
     blinkOff: false
@@ -32,15 +34,7 @@ CursorsComponent = React.createClass
   componentWillUnmount: ->
     @stopBlinkingCursors()
 
-  shouldComponentUpdate: (newProps, newState) ->
-    not newState.blinkOff is @state.blinkOff or
-      not isEqualForProperties(newProps, @props, 'cursorPixelRects', 'scrollTop', 'scrollLeft', 'defaultCharWidth', 'useHardwareAcceleration')
-
-  componentWillUpdate: (newProps) ->
-    cursorsMoved = @props.cursorPixelRects? and
-      isEqualForProperties(newProps, @props, 'defaultCharWidth', 'scopedCharacterWidthsChangeCount') and
-      not isEqual(newProps.cursorPixelRects, @props.cursorPixelRects)
-
+  componentWillUpdate: ({cursorsMoved}) ->
     @pauseCursorBlinking() if cursorsMoved
 
   startBlinkingCursors: ->

src/display-buffer-marker.coffee

@@ -111,34 +111,6 @@ class DisplayBufferMarker
   setTailBufferPosition: (bufferPosition) ->
     @bufferMarker.setTailPosition(bufferPosition)
 
-  # Retrieves the screen position of the marker's start. This will always be
-  # less than or equal to the result of {DisplayBufferMarker::getEndScreenPosition}.
-  #
-  # Returns a {Point}.
-  getStartScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getStartBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Retrieves the buffer position of the marker's start. This will always be
-  # less than or equal to the result of {DisplayBufferMarker::getEndBufferPosition}.
-  #
-  # Returns a {Point}.
-  getStartBufferPosition: ->
-    @bufferMarker.getStartPosition()
-
-  # Retrieves the screen position of the marker's end. This will always be
-  # greater than or equal to the result of {DisplayBufferMarker::getStartScreenPosition}.
-  #
-  # Returns a {Point}.
-  getEndScreenPosition: ->
-    @displayBuffer.screenPositionForBufferPosition(@getEndBufferPosition(), wrapAtSoftNewlines: true)
-
-  # Retrieves the buffer position of the marker's end. This will always be
-  # greater than or equal to the result of {DisplayBufferMarker::getStartBufferPosition}.
-  #
-  # Returns a {Point}.
-  getEndBufferPosition: ->
-    @bufferMarker.getEndPosition()
-
   # Sets the marker's tail to the same position as the marker's head.
   #
   # This only works if there isn't already a tail position.

src/display-buffer.coffee

@@ -29,13 +29,11 @@ class DisplayBuffer extends Model
     width: null
     scrollTop: 0
     scrollLeft: 0
-    scrollWidth: 0
 
   verticalScrollMargin: 2
   horizontalScrollMargin: 6
   horizontalScrollbarHeight: 15
   verticalScrollbarWidth: 15
-  scopedCharacterWidthsChangeCount: 0
 
   constructor: ({tabLength, @editorWidthInChars, @tokenizedBuffer, buffer}={}) ->
     super
@@ -45,13 +43,9 @@ class DisplayBuffer extends Model
     @charWidthsByScope = {}
     @markers = {}
     @foldsByMarkerId = {}
-    @decorationsByMarkerId = {}
-    @decorationMarkerChangedSubscriptions = {}
-    @decorationMarkerDestroyedSubscriptions = {}
     @updateAllScreenLines()
     @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
     @subscribe @tokenizedBuffer, 'grammar-changed', (grammar) => @emit 'grammar-changed', grammar
-    @subscribe @tokenizedBuffer, 'tokenized', => @emit 'tokenized'
     @subscribe @tokenizedBuffer, 'changed', @handleTokenizedBufferChange
     @subscribe @buffer, 'markers-updated', @handleBufferMarkersUpdated
     @subscribe @buffer, 'marker-created', @handleBufferMarkerCreated
@@ -182,12 +176,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) ->
@@ -197,10 +188,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)
+      @scrollLeft = scrollLeft
 
   getScrollRight: -> @scrollLeft + @width
   setScrollRight: (scrollRight) ->
@@ -211,11 +202,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
 
@@ -230,35 +217,27 @@ 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
 
-  characterWidthsChanged: ->
-    @computeScrollWidth()
-    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount
+  setScopedCharWidths: (scopeNames, charWidths) ->
+    _.extend(@getScopedCharWidths(scopeNames), charWidths)
 
   clearScopedCharWidths: ->
     @charWidthsByScope = {}
 
   getScrollHeight: ->
-    return 0 unless @getLineHeightInPixels() > 0
+    unless @getLineHeightInPixels() > 0
+      throw new Error("You must assign lineHeightInPixels before calling ::getScrollHeight()")
 
     @getLineCount() * @getLineHeightInPixels()
 
   getScrollWidth: ->
-    @scrollWidth
+    (@getMaxLineLength() * @getDefaultCharWidth()) + @getCursorWidth()
 
   getVisibleRowRange: ->
-    return [0, 0] unless @getLineHeightInPixels() > 0
+    unless @getLineHeightInPixels() > 0
+      throw new Error("You must assign a non-zero lineHeightInPixels before calling ::getVisibleRowRange()")
 
     heightInLines = Math.ceil(@getHeight() / @getLineHeightInPixels()) + 1
     startRow = Math.floor(@getScrollTop() / @getLineHeightInPixels())
@@ -274,23 +253,15 @@ class DisplayBuffer extends Model
     {start, end} = selection.getScreenRange()
     @intersectsVisibleRowRange(start.row, end.row + 1)
 
-  scrollToScreenRange: (screenRange, options) ->
+  scrollToScreenRange: (screenRange) ->
     verticalScrollMarginInPixels = @getVerticalScrollMargin() * @getLineHeightInPixels()
     horizontalScrollMarginInPixels = @getHorizontalScrollMargin() * @getDefaultCharWidth()
 
     {top, left, height, width} = @pixelRectForScreenRange(screenRange)
     bottom = top + height
     right = left + width
-
-    if options?.center
-      desiredScrollCenter = top + height / 2
-      unless @getScrollTop() < desiredScrollCenter < @getScrollBottom()
-        desiredScrollTop =  desiredScrollCenter - @getHeight() / 2
-        desiredScrollBottom =  desiredScrollCenter + @getHeight() / 2
-    else
-      desiredScrollTop = top - verticalScrollMarginInPixels
-      desiredScrollBottom = bottom + verticalScrollMarginInPixels
-
+    desiredScrollTop = top - verticalScrollMarginInPixels
+    desiredScrollBottom = bottom + verticalScrollMarginInPixels
     desiredScrollLeft = left - horizontalScrollMarginInPixels
     desiredScrollRight = right + horizontalScrollMarginInPixels
 
@@ -304,11 +275,11 @@ class DisplayBuffer extends Model
     else if desiredScrollRight > @getScrollRight()
       @setScrollRight(desiredScrollRight)
 
-  scrollToScreenPosition: (screenPosition, options) ->
-    @scrollToScreenRange(new Range(screenPosition, screenPosition), options)
+  scrollToScreenPosition: (screenPosition) ->
+    @scrollToScreenRange(new Range(screenPosition, screenPosition))
 
-  scrollToBufferPosition: (bufferPosition, options) ->
-    @scrollToScreenPosition(@screenPositionForBufferPosition(bufferPosition), options)
+  scrollToBufferPosition: (bufferPosition) ->
+    @scrollToScreenPosition(@screenPositionForBufferPosition(bufferPosition))
 
   pixelRectForScreenRange: (screenRange) ->
     if screenRange.end.row > screenRange.start.row
@@ -317,9 +288,9 @@ class DisplayBuffer extends Model
       height = (screenRange.end.row - screenRange.start.row + 1) * @getLineHeightInPixels()
       width = @getScrollWidth()
     else
-      {top, left} = @pixelPositionForScreenPosition(screenRange.start, false)
+      {top, left} = @pixelPositionForScreenPosition(screenRange.start)
       height = @getLineHeightInPixels()
-      width = @pixelPositionForScreenPosition(screenRange.end, false).left - left
+      width = @pixelPositionForScreenPosition(screenRange.end).left - left
 
     {top, left, width, height}
 
@@ -548,7 +519,7 @@ class DisplayBuffer extends Model
       charWidths = @getScopedCharWidths(token.scopes)
       for char in token.value
         return {top, left} if column is targetColumn
-        left += charWidths[char] ? defaultCharWidth unless char is '\0'
+        left += charWidths[char] ? defaultCharWidth
         column++
     {top, left}
 
@@ -746,78 +717,6 @@ class DisplayBuffer extends Model
   rangeForAllLines: ->
     new Range([0, 0], @clipScreenPosition([Infinity, Infinity]))
 
-  decorationsForScreenRowRange: (startScreenRow, endScreenRow) ->
-    decorationsByMarkerId = {}
-
-    for marker in @findMarkers(intersectsScreenRowRange: [startScreenRow, endScreenRow])
-      if decorations = @decorationsByMarkerId[marker.id]
-        decorationsByMarkerId[marker.id] = decorations
-    decorationsByMarkerId
-
-  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)
-
-    @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
-
-    @decorationsByMarkerId[marker.id] ?= []
-    @decorationsByMarkerId[marker.id].push(decoration)
-    @emit 'decoration-added', marker, decoration
-
-  removeDecorationForMarker: (marker, decorationPattern) ->
-    unless marker?
-      console.warn 'A decoration cannot be removed from a null marker'
-      return
-
-    return unless 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()
-    for decoration in decorations
-      @emit 'decoration-removed', marker, decoration
-    @removedAllMarkerDecorations(marker)
-
-  removedAllMarkerDecorations: (marker) ->
-    @decorationMarkerChangedSubscriptions[marker.id].off()
-    @decorationMarkerDestroyedSubscriptions[marker.id].off()
-
-    delete @decorationsByMarkerId[marker.id]
-    delete @decorationMarkerChangedSubscriptions[marker.id]
-    delete @decorationMarkerDestroyedSubscriptions[marker.id]
-
   # Retrieves a {DisplayBufferMarker} based on its id.
   #
   # id - A {Number} representing a marker id
@@ -921,34 +820,13 @@ class DisplayBuffer extends Model
           key = 'startRow'
         when 'endBufferRow'
           key = 'endRow'
-        when 'startScreenRow'
-          key = 'startRow'
-          value = @bufferRowForScreenRow(value)
-        when 'endScreenRow'
-          key = 'endRow'
-          value = @bufferRowForScreenRow(value)
-        when 'intersectsBufferRowRange'
-          key = 'intersectsRowRange'
-        when 'intersectsScreenRowRange'
-          key = 'intersectsRowRange'
-          [startRow, endRow] = value
-          value = [@bufferRowForScreenRow(startRow), @bufferRowForScreenRow(endRow)]
         when 'containsBufferRange'
           key = 'containsRange'
         when 'containsBufferPosition'
           key = 'containsPosition'
         when 'containedInBufferRange'
           key = 'containedInRange'
-        when 'containedInScreenRange'
-          key = 'containedInRange'
-          value = @bufferRangeForScreenRange(value)
-        when 'intersectsBufferRange'
-          key = 'intersectsRange'
-        when 'intersectsScreenRange'
-          key = 'intersectsRange'
-          value = @bufferRangeForScreenRange(value)
       bufferMarkerParams[key] = value
-
     bufferMarkerParams
 
   findFoldMarker: (attributes) ->
@@ -984,7 +862,6 @@ 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]
@@ -1058,8 +935,6 @@ class DisplayBuffer extends Model
     {screenLines, regions}
 
   findMaxLineLength: (startScreenRow, endScreenRow, newScreenLines) ->
-    oldMaxLineLength = @maxLineLength
-
     if startScreenRow <= @longestScreenRow < endScreenRow
       @longestScreenRow = 0
       @maxLineLength = 0
@@ -1075,25 +950,6 @@ class DisplayBuffer extends Model
         @longestScreenRow = maxLengthCandidatesStartRow + screenRow
         @maxLineLength = length
 
-    if atom.config.get('editor.debugFindMaxLineLength')
-      unless @maxLineLength is @findReferenceMaxLineLength()
-        debugger
-        throw new Error("Found wrong max line length")
-
-    @computeScrollWidth() if oldMaxLineLength isnt @maxLineLength
-
-  findReferenceMaxLineLength: ->
-    maxLineLength = 0
-
-    for line in @screenLines
-      length = line.text.length
-      maxLineLength = length if length > maxLineLength
-
-    maxLineLength
-
-  computeScrollWidth: ->
-    @scrollWidth = @pixelPositionForScreenPosition([@longestScreenRow, @maxLineLength]).left + 1
-
   handleBufferMarkersUpdated: =>
     if event = @pendingChangeEvent
       @pendingChangeEvent = null
@@ -1104,7 +960,6 @@ class DisplayBuffer extends Model
     @emit 'marker-created', @getMarker(marker.id)
 
   createFoldForMarker: (marker) ->
-    @addDecorationForMarker(marker, type: 'gutter', class: 'folded')
     new Fold(this, marker)
 
   foldForMarker: (marker) ->

src/editor-component.coffee

@@ -1,33 +1,24 @@
 React = require 'react-atom-fork'
 {div, span} = require 'reactionary-atom-fork'
-{debounce, defaults, isEqualForProperties} = require 'underscore-plus'
+{debounce, defaults} = require 'underscore-plus'
 scrollbarStyle = require 'scrollbar-style'
-{Range, Point} = require 'text-buffer'
 
 GutterComponent = require './gutter-component'
-InputComponent = require './input-component'
-CursorsComponent = require './cursors-component'
-LinesComponent = require './lines-component'
+EditorScrollViewComponent = require './editor-scroll-view-component'
 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'}]}
-
 module.exports =
 EditorComponent = React.createClass
   displayName: 'EditorComponent'
   mixins: [SubscriberMixin]
 
-  statics:
-    performSyncUpdates: false
-
   pendingScrollTop: null
   pendingScrollLeft: null
   selectOnMouseMove: false
+  batchingUpdates: false
   updateRequested: false
-  updatesPaused: false
-  updateRequestedWhilePaused: false
   cursorsMoved: false
   selectionChanged: false
   selectionAdded: false
@@ -38,80 +29,44 @@ EditorComponent = React.createClass
   pendingVerticalScrollDelta: 0
   pendingHorizontalScrollDelta: 0
   mouseWheelScreenRow: null
-  mouseWheelScreenRowClearDelay: 150
-  scrollSensitivity: 0.4
-  scrollViewMeasurementRequested: false
-  measureLineHeightAndDefaultCharWidthWhenShown: false
-  remeasureCharacterWidthsWhenShown: false
-  inputEnabled: true
-  scrollViewMeasurementInterval: 100
-  scopedCharacterWidthsChangeCount: null
-  scrollViewMeasurementPaused: false
 
   render: ->
-    {focused, fontSize, lineHeight, fontFamily, showIndentGuide, showInvisibles, showLineNumbers, visible} = @state
+    {focused, fontSize, lineHeight, fontFamily, showIndentGuide, showInvisibles, visible} = @state
     {editor, cursorBlinkPeriod, cursorBlinkResumeDelay} = @props
-    maxLineNumberDigits = editor.getLineCount().toString().length
+    maxLineNumberDigits = editor.getScreenLineCount().toString().length
     invisibles = if showInvisibles then @state.invisibles else {}
-    hasSelection = editor.getSelection()? and !editor.getSelection().isEmpty()
 
     if @isMounted()
       renderedRowRange = @getRenderedRowRange()
-      [renderedStartRow, renderedEndRow] = renderedRowRange
-      cursorPixelRects = @getCursorPixelRects(renderedRowRange)
-
-      decorations = editor.decorationsForScreenRowRange(renderedStartRow, renderedEndRow)
-      highlightDecorations = @getHighlightDecorations(decorations)
-      lineDecorations = @getLineDecorations(decorations)
-
       scrollHeight = editor.getScrollHeight()
       scrollWidth = editor.getScrollWidth()
       scrollTop = editor.getScrollTop()
       scrollLeft = editor.getScrollLeft()
       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
-      if @mouseWheelScreenRow? and not (renderedStartRow <= @mouseWheelScreenRow < renderedEndRow)
-        mouseWheelScreenRow = @mouseWheelScreenRow
 
-    className = 'editor-contents editor-colors'
+    className = 'editor editor-colors react'
     className += ' is-focused' if focused
-    className += ' has-selection' if hasSelection
 
     div className: className, style: {fontSize, lineHeight, fontFamily}, tabIndex: -1,
-      if showLineNumbers
-        GutterComponent {
-          ref: 'gutter', onMouseDown: @onGutterMouseDown, onWidthChanged: @onGutterWidthChanged,
-          lineDecorations, defaultCharWidth, editor, renderedRowRange, maxLineNumberDigits, scrollViewHeight,
-          scrollTop, scrollHeight, lineHeightInPixels, @pendingChanges, mouseWheelScreenRow, @useHardwareAcceleration
-        }
+      GutterComponent {
+        ref: 'gutter', editor, renderedRowRange, maxLineNumberDigits,
+        scrollTop, scrollHeight, lineHeight, lineHeightInPixels, fontSize, fontFamily,
+        @pendingChanges, onWidthChanged: @onGutterWidthChanged, @mouseWheelScreenRow
+      }
 
-      div ref: 'scrollView', className: 'scroll-view', onMouseDown: @onMouseDown,
-        InputComponent
-          ref: 'input'
-          className: 'hidden-input'
-          style: hiddenInputStyle
-          onFocus: @onInputFocused
-          onBlur: @onInputBlurred
-
-        CursorsComponent {
-          scrollTop, scrollLeft, cursorPixelRects, cursorBlinkPeriod, cursorBlinkResumeDelay,
-          lineHeightInPixels, defaultCharWidth, @scopedCharacterWidthsChangeCount, @useHardwareAcceleration
-        }
-        LinesComponent {
-          ref: 'lines',
-          editor, lineHeightInPixels, defaultCharWidth, lineDecorations, highlightDecorations,
-          showIndentGuide, renderedRowRange, @pendingChanges, scrollTop, scrollLeft,
-          @scrollingVertically, scrollHeight, scrollWidth, mouseWheelScreenRow, invisibles,
-          visible, scrollViewHeight, @scopedCharacterWidthsChangeCount, lineWidth, @useHardwareAcceleration
-        }
+      EditorScrollViewComponent {
+        ref: 'scrollView', editor, fontSize, fontFamily, showIndentGuide,
+        lineHeight, lineHeightInPixels, renderedRowRange, @pendingChanges,
+        scrollTop, scrollLeft, scrollHeight, scrollWidth, @scrollingVertically,
+        @cursorsMoved, @selectionChanged, @selectionAdded, cursorBlinkPeriod,
+        cursorBlinkResumeDelay, @onInputFocused, @onInputBlurred, @mouseWheelScreenRow,
+        invisibles, visible, scrollViewHeight
+      }
 
       ScrollbarComponent
         ref: 'verticalScrollbar'
@@ -145,9 +100,12 @@ EditorComponent = React.createClass
         height: horizontalScrollbarHeight
         width: verticalScrollbarWidth
 
-  getPageRows: ->
-    {editor} = @props
-    Math.max(1, Math.ceil(editor.getHeight() / editor.getLineHeightInPixels()))
+  getRenderedRowRange: ->
+    {editor, lineOverdrawMargin} = @props
+    [visibleStartRow, visibleEndRow] = editor.getVisibleRowRange()
+    renderedStartRow = Math.max(0, visibleStartRow - lineOverdrawMargin)
+    renderedEndRow = Math.min(editor.getScreenLineCount(), visibleEndRow + lineOverdrawMargin)
+    [renderedStartRow, renderedEndRow]
 
   getInitialState: ->
     visible: true
@@ -161,176 +119,41 @@ EditorComponent = React.createClass
     @pendingChanges = []
     @props.editor.manageScrollPosition = true
     @observeConfig()
-    @setScrollSensitivity(atom.config.get('editor.scrollSensitivity'))
 
   componentDidMount: ->
-    {editor} = @props
-
-    @scrollViewMeasurementIntervalId = setInterval(@measureScrollView, @scrollViewMeasurementInterval)
-
     @observeEditor()
     @listenForDOMEvents()
     @listenForCommands()
-
+    @measureScrollbars()
     @subscribe atom.themes, 'stylesheet-added stylsheet-removed', @onStylesheetsChanged
     @subscribe scrollbarStyle.changes, @refreshScrollbars
-
-    editor.setVisible(true)
-
-    @measureLineHeightAndDefaultCharWidth()
-    @measureScrollView()
-    @measureScrollbars()
+    @props.editor.setVisible(true)
+    @requestUpdate()
 
   componentWillUnmount: ->
     @unsubscribe()
-    clearInterval(@scrollViewMeasurementIntervalId)
-    @scrollViewMeasurementIntervalId = null
+    @getDOMNode().removeEventListener 'mousewheel', @onMouseWheel
 
-  componentDidUpdate: (prevProps, prevState) ->
-    cursorsMoved = @cursorsMoved
-    selectionChanged = @selectionChanged
+  componentWillUpdate: ->
+    @props.parentView.trigger 'cursor:moved' if @cursorsMoved
+
+  componentDidUpdate: ->
     @pendingChanges.length = 0
     @cursorsMoved = false
     @selectionChanged = false
+    @selectionAdded = false
     @refreshingScrollbars = false
-
-    if @props.editor.isAlive()
-      @updateParentViewFocusedClassIfNeeded(prevState)
-      @props.parentView.trigger 'cursor:moved' if cursorsMoved
-      @props.parentView.trigger 'selection:changed' if selectionChanged
-      @props.parentView.trigger 'editor:display-updated'
-
     @measureScrollbars() if @measuringScrollbars
-    @measureLineHeightAndCharWidthsIfNeeded(prevState)
-    @remeasureCharacterWidthsIfNeeded(prevState)
-
-  requestUpdate: ->
-    if @updatesPaused
-      @updateRequestedWhilePaused = true
-      return
-
-    if @performSyncUpdates ? EditorComponent.performSyncUpdates
-      @forceUpdate()
-    else unless @updateRequested
-      @updateRequested = true
-      setImmediate =>
-        @updateRequested = false
-        @forceUpdate() if @isMounted()
-
-  requestAnimationFrame: (fn) ->
-    @updatesPaused = true
-    @pauseScrollViewMeasurement()
-    requestAnimationFrame =>
-      fn()
-      @updatesPaused = false
-      if @updateRequestedWhilePaused and @isMounted()
-        @updateRequestedWhilePaused = false
-        @forceUpdate()
-
-  getRenderedRowRange: ->
-    {editor, lineOverdrawMargin} = @props
-    [visibleStartRow, visibleEndRow] = editor.getVisibleRowRange()
-    renderedStartRow = Math.max(0, visibleStartRow - lineOverdrawMargin)
-    renderedEndRow = Math.min(editor.getScreenLineCount(), visibleEndRow + lineOverdrawMargin)
-    [renderedStartRow, renderedEndRow]
-
-  getHiddenInputPosition: ->
-    {editor} = @props
-    {focused} = @state
-    return {top: 0, left: 0} unless @isMounted() and focused and editor.getCursor()?
-
-    {top, left, height, width} = editor.getCursor().getPixelRect()
-    width = 2 if width is 0 # Prevent autoscroll at the end of longest line
-    top -= editor.getScrollTop()
-    left -= editor.getScrollLeft()
-    top = Math.max(0, Math.min(editor.getHeight() - height, top))
-    left = Math.max(0, Math.min(editor.getWidth() - width, left))
-    {top, left}
-
-  getCursorScreenRanges: (renderedRowRange) ->
-    {editor} = @props
-    [renderedStartRow, renderedEndRow] = renderedRowRange
-
-    cursorScreenRanges = {}
-    for selection in editor.getSelections() when selection.isEmpty()
-      {cursor} = selection
-      screenRange = cursor.getScreenRange()
-      if renderedStartRow <= screenRange.start.row < renderedEndRow
-        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} = @props
-    decorationsByScreenRow = {}
-    for markerId, decorations of decorationsByMarkerId
-      marker = editor.getMarker(markerId)
-      screenRange = null
-      headScreenRow = null
-      if marker.isValid()
-        for decoration in decorations
-          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 decoration.onlyHead and screenRow isnt headScreenRow
-              if screenRange.isEmpty()
-                continue if decoration.onlyNonEmpty
-              else
-                continue if decoration.onlyEmpty
-
-              decorationsByScreenRow[screenRow] ?= []
-              decorationsByScreenRow[screenRow].push decoration
-
-    decorationsByScreenRow
-
-  getHighlightDecorations: (decorationsByMarkerId) ->
-    {editor} = @props
-    filteredDecorations = {}
-    for markerId, decorations of decorationsByMarkerId
-      marker = editor.getMarker(markerId)
-      screenRange = marker.getScreenRange()
-      if marker.isValid() and not screenRange.isEmpty()
-        for decoration in decorations
-          if editor.decorationMatchesType(decoration, 'highlight')
-            filteredDecorations[markerId] ?=
-              id: markerId
-              startPixelPosition: editor.pixelPositionForScreenPosition(screenRange.start)
-              endPixelPosition: editor.pixelPositionForScreenPosition(screenRange.end)
-              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
-    # dummy highlight in place to prevent that.
-    filteredDecorations['dummy'] = DummyHighlightDecoration
-
-    filteredDecorations
+    @props.parentView.trigger 'editor:display-updated'
 
   observeEditor: ->
     {editor} = @props
+    @subscribe editor, 'batched-updates-started', @onBatchedUpdatesStarted
+    @subscribe editor, 'batched-updates-ended', @onBatchedUpdatesEnded
     @subscribe editor, 'screen-lines-changed', @onScreenLinesChanged
     @subscribe editor, 'cursors-moved', @onCursorsMoved
     @subscribe editor, 'selection-removed selection-screen-range-changed', @onSelectionChanged
     @subscribe editor, 'selection-added', @onSelectionAdded
-    @subscribe editor, 'decoration-added', @onDecorationChanged
-    @subscribe editor, 'decoration-removed', @onDecorationChanged
-    @subscribe editor, 'decoration-changed', @onDecorationChanged
-    @subscribe editor, 'character-widths-changed', @onCharacterWidthsChanged
     @subscribe editor.$scrollTop.changes, @onScrollTopChanged
     @subscribe editor.$scrollLeft.changes, @requestUpdate
     @subscribe editor.$height.changes, @requestUpdate
@@ -342,39 +165,6 @@ EditorComponent = React.createClass
     node = @getDOMNode()
     node.addEventListener 'mousewheel', @onMouseWheel
     node.addEventListener 'focus', @onFocus # For some reason, React's built in focus events seem to bubble
-    node.addEventListener 'textInput', @onTextInput
-
-    scrollViewNode = @refs.scrollView.getDOMNode()
-    scrollViewNode.addEventListener 'scroll', @onScrollViewScroll
-    window.addEventListener 'resize', @requestScrollViewMeasurement
-
-    @listenForIMEEvents()
-
-  listenForIMEEvents: ->
-    node = @getDOMNode()
-    {editor} = @props
-
-    # The IME composition events work like this:
-    #
-    # User types 's', chromium pops up the completion helper
-    #   1. compositionstart fired
-    #   2. compositionupdate fired; event.data == 's'
-    # User hits arrow keys to move around in completion helper
-    #   3. compositionupdate fired; event.data == 's' for each arry key press
-    # User escape to cancel
-    #   4. compositionend fired
-    # OR User chooses a completion
-    #   4. compositionend fired
-    #   5. textInput fired; event.data == the completion string
-
-    selectedText = null
-    node.addEventListener 'compositionstart', ->
-      selectedText = editor.getSelectedText()
-    node.addEventListener 'compositionupdate', (event) ->
-      editor.insertText(event.data, select: true, undo: 'skip')
-    node.addEventListener 'compositionend', (event) ->
-      editor.insertText(selectedText, select: true, undo: 'skip')
-      event.target.value = ''
 
   listenForCommands: ->
     {parentView, editor, mini} = @props
@@ -397,12 +187,9 @@ EditorComponent = React.createClass
       'editor:consolidate-selections': @consolidateSelections
       'editor:delete-to-beginning-of-word': => editor.deleteToBeginningOfWord()
       'editor:delete-to-beginning-of-line': => editor.deleteToBeginningOfLine()
-      'editor:delete-to-end-of-line': => editor.deleteToEndOfLine()
       'editor:delete-to-end-of-word': => editor.deleteToEndOfWord()
       'editor:delete-line': => editor.deleteLine()
       'editor:cut-to-end-of-line': => editor.cutToEndOfLine()
-      'editor:move-to-beginning-of-next-paragraph': => editor.moveCursorToBeginningOfNextParagraph()
-      'editor:move-to-beginning-of-previous-paragraph': => editor.moveCursorToBeginningOfPreviousParagraph()
       'editor:move-to-beginning-of-screen-line': => editor.moveCursorToBeginningOfScreenLine()
       'editor:move-to-beginning-of-line': => editor.moveCursorToBeginningOfLine()
       'editor:move-to-end-of-screen-line': => editor.moveCursorToEndOfScreenLine()
@@ -413,8 +200,6 @@ EditorComponent = React.createClass
       'editor:move-to-beginning-of-next-word': => editor.moveCursorToBeginningOfNextWord()
       'editor:move-to-previous-word-boundary': => editor.moveCursorToPreviousWordBoundary()
       'editor:move-to-next-word-boundary': => editor.moveCursorToNextWordBoundary()
-      'editor:select-to-beginning-of-next-paragraph': => editor.selectToBeginningOfNextParagraph()
-      'editor:select-to-beginning-of-previous-paragraph': => editor.selectToBeginningOfPreviousParagraph()
       'editor:select-to-end-of-line': => editor.selectToEndOfLine()
       'editor:select-to-beginning-of-line': => editor.selectToBeginningOfLine()
       'editor:select-to-end-of-word': => editor.selectToEndOfWord()
@@ -434,14 +219,10 @@ EditorComponent = React.createClass
         'core:move-down': => editor.moveCursorDown()
         'core:move-to-top': => editor.moveCursorToTop()
         'core:move-to-bottom': => editor.moveCursorToBottom()
-        'core:page-up': => editor.pageUp()
-        'core:page-down': => editor.pageDown()
         'core:select-up': => editor.selectUp()
         'core:select-down': => editor.selectDown()
         'core:select-to-top': => editor.selectToTop()
         'core:select-to-bottom': => editor.selectToBottom()
-        'core:select-page-up': => editor.selectPageUp()
-        'core:select-page-down': => editor.selectPageDown()
         'editor:indent': => editor.indent()
         'editor:auto-indent': => editor.autoIndentSelectedRows()
         'editor:indent-selected-rows': => editor.indentSelectedRows()
@@ -479,6 +260,8 @@ EditorComponent = React.createClass
         'editor:toggle-indent-guide': => atom.config.toggle('editor.showIndentGuide')
         'editor:toggle-line-numbers': =>  atom.config.toggle('editor.showLineNumbers')
         'editor:scroll-to-cursor': => editor.scrollToCursorPosition()
+        'core:page-up': => editor.pageUp()
+        'core:page-down': => editor.pageDown()
         'benchmark:scroll': @runScrollBenchmark
 
   addCommandListeners: (listenersByCommandName) ->
@@ -494,304 +277,6 @@ 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()
-
-  onTextInput: (event) ->
-    return unless @isInputEnabled()
-
-    {editor} = @props
-    inputNode = event.target
-
-    # Work around of the accented character suggestion feature in OS X.
-    # Text input fires before a character is inserted, and if the browser is
-    # replacing the previous un-accented character with an accented variant, it
-    # will select backward over it.
-    selectedLength = inputNode.selectionEnd - inputNode.selectionStart
-    editor.selectLeft() if selectedLength is 1
-
-    editor.insertText(event.data)
-    inputNode.value = event.data
-
-    # If we prevent the insertion of a space character, then the browser
-    # interprets the spacebar keypress as a page-down command.
-    event.preventDefault() unless event.data is ' '
-
-  onInputFocused: ->
-    @setState(focused: true)
-
-  onInputBlurred: ->
-    @setState(focused: false)
-
-  onVerticalScroll: (scrollTop) ->
-    {editor} = @props
-
-    return if @updateRequested or scrollTop is editor.getScrollTop()
-
-    animationFramePending = @pendingScrollTop?
-    @pendingScrollTop = scrollTop
-    unless animationFramePending
-      @requestAnimationFrame =>
-        pendingScrollTop = @pendingScrollTop
-        @pendingScrollTop = null
-        @props.editor.setScrollTop(pendingScrollTop)
-
-  onHorizontalScroll: (scrollLeft) ->
-    {editor} = @props
-
-    return if @updateRequested or scrollLeft is editor.getScrollLeft()
-
-    animationFramePending = @pendingScrollLeft?
-    @pendingScrollLeft = scrollLeft
-    unless animationFramePending
-      @requestAnimationFrame =>
-        @props.editor.setScrollLeft(@pendingScrollLeft)
-        @pendingScrollLeft = null
-
-  onMouseWheel: (event) ->
-    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
-      @pendingHorizontalScrollDelta -= Math.round(wheelDeltaX * @scrollSensitivity)
-    else
-      # Scrolling vertically
-      @pendingVerticalScrollDelta -= Math.round(wheelDeltaY * @scrollSensitivity)
-      @mouseWheelScreenRow = @screenRowForNode(event.target)
-      @clearMouseWheelScreenRowAfterDelay ?= debounce(@clearMouseWheelScreenRow, @mouseWheelScreenRowClearDelay)
-      @clearMouseWheelScreenRowAfterDelay()
-
-    unless animationFramePending
-      @requestAnimationFrame =>
-        {editor} = @props
-        editor.setScrollTop(editor.getScrollTop() + @pendingVerticalScrollDelta)
-        editor.setScrollLeft(editor.getScrollLeft() + @pendingHorizontalScrollDelta)
-        @pendingVerticalScrollDelta = 0
-        @pendingHorizontalScrollDelta = 0
-
-  onScrollViewScroll: ->
-    if @isMounted()
-      console.warn "EditorScrollView scrolled when it shouldn't have."
-      scrollViewNode = @refs.scrollView.getDOMNode()
-      scrollViewNode.scrollTop = 0
-      scrollViewNode.scrollLeft = 0
-
-  onMouseDown: (event) ->
-    return unless event.button is 0 # only handle the left mouse button
-
-    {editor} = @props
-    {detail, shiftKey, metaKey, ctrlKey} = event
-    screenPosition = @screenPositionForMouseEvent(event)
-
-    if event.target?.classList.contains('fold-marker')
-      bufferRow = editor.bufferRowForScreenRow(screenPosition.row)
-      editor.unfoldBufferRow(bufferRow)
-      return
-
-    if shiftKey
-      editor.selectToScreenPosition(screenPosition)
-    else if metaKey or (ctrlKey and process.platform isnt 'darwin')
-      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)
-
-  onGutterMouseDown: (event) ->
-    return unless event.button is 0 # only handle the left mouse button
-
-    if event.shiftKey
-      @onGutterShiftClick(event)
-    else
-      @onGutterClick(event)
-
-  onGutterClick: (event) ->
-    {editor} = @props
-    clickedRow = @screenPositionForMouseEvent(event).row
-
-    editor.setCursorScreenPosition([clickedRow, 0])
-
-    @handleDragUntilMouseUp event, (screenPosition) ->
-      dragRow = screenPosition.row
-      if dragRow < clickedRow # dragging up
-        editor.setSelectedScreenRange([[dragRow, 0], [clickedRow + 1, 0]])
-      else
-        editor.setSelectedScreenRange([[clickedRow, 0], [dragRow + 1, 0]])
-
-  onGutterShiftClick: (event) ->
-    {editor} = @props
-    clickedRow = @screenPositionForMouseEvent(event).row
-    tailPosition = editor.getSelection().getTailScreenPosition()
-
-    if clickedRow < tailPosition.row
-      editor.selectToScreenPosition([clickedRow, 0])
-    else
-      editor.selectToScreenPosition([clickedRow + 1, 0])
-
-    @handleDragUntilMouseUp event, (screenPosition) ->
-      dragRow = screenPosition.row
-      if dragRow < tailPosition.row # dragging up
-        editor.setSelectedScreenRange([[dragRow, 0], tailPosition])
-      else
-        editor.setSelectedScreenRange([tailPosition, [dragRow + 1, 0]])
-
-  onStylesheetsChanged: (stylesheet) ->
-    @refreshScrollbars() if @containsScrollbarSelector(stylesheet)
-
-  onScreenLinesChanged: (change) ->
-    {editor} = @props
-    @pendingChanges.push(change)
-    @requestUpdate() if editor.intersectsVisibleRowRange(change.start, change.end + 1) # TODO: Use closed-open intervals for change events
-
-  onSelectionChanged: (selection) ->
-    {editor} = @props
-    if editor.selectionIntersectsVisibleRowRange(selection)
-      @selectionChanged = true
-      @requestUpdate()
-
-  onSelectionAdded: (selection) ->
-    {editor} = @props
-    if editor.selectionIntersectsVisibleRowRange(selection)
-      @selectionChanged = true
-      @selectionAdded = true
-      @requestUpdate()
-
-  onScrollTopChanged: ->
-    @scrollingVertically = true
-    @requestUpdate()
-    @onStoppedScrollingAfterDelay ?= debounce(@onStoppedScrolling, 200)
-    @onStoppedScrollingAfterDelay()
-
-  onStoppedScrolling: ->
-    return unless @isMounted()
-
-    @scrollingVertically = false
-    @mouseWheelScreenRow = null
-    @requestUpdate()
-
-  onStoppedScrollingAfterDelay: null # created lazily
-
-  onCursorsMoved: ->
-    @cursorsMoved = true
-    @requestUpdate()
-
-  onDecorationChanged: ->
-    @requestUpdate()
-
-  onCharacterWidthsChanged: (@scopedCharacterWidthsChangeCount) ->
-    @requestUpdate()
-
-  handleDragUntilMouseUp: (event, dragHandler) ->
-    {editor} = @props
-    dragging = false
-    lastMousePosition = {}
-    animationLoop = =>
-      @requestAnimationFrame =>
-        if dragging
-          screenPosition = @screenPositionForMouseEvent(lastMousePosition)
-          dragHandler(screenPosition)
-          animationLoop()
-
-    onMouseMove = (event) ->
-      lastMousePosition.clientX = event.clientX
-      lastMousePosition.clientY = event.clientY
-
-      # Start the animation loop when the mouse moves prior to a mouseup event
-      unless dragging
-        dragging = true
-        animationLoop()
-
-      # Stop dragging when cursor enters dev tools because we can't detect mouseup
-      onMouseUp() if event.which is 0
-
-    onMouseUp = ->
-      dragging = false
-      window.removeEventListener('mousemove', onMouseMove)
-      window.removeEventListener('mouseup', onMouseUp)
-      editor.finalizeSelections()
-
-    window.addEventListener('mousemove', onMouseMove)
-    window.addEventListener('mouseup', onMouseUp)
-
-  pauseScrollViewMeasurement: ->
-    @scrollViewMeasurementPaused = true
-    @resumeScrollViewMeasurementAfterDelay ?= debounce(@resumeScrollViewMeasurement, 100)
-    @resumeScrollViewMeasurementAfterDelay()
-
-  resumeScrollViewMeasurement: ->
-    @scrollViewMeasurementPaused = false
-
-  resumeScrollViewMeasurementAfterDelay: null # created lazily
-
-  requestScrollViewMeasurement: ->
-    return if @scrollViewMeasurementRequested
-
-    @scrollViewMeasurementRequested = true
-    requestAnimationFrame =>
-      @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.
-  measureScrollView: ->
-    return if @scrollViewMeasurementPaused
-    return unless @isMounted()
-
-    {editor} = @props
-    editorNode = @getDOMNode()
-    scrollViewNode = @refs.scrollView.getDOMNode()
-    {position} = getComputedStyle(editorNode)
-    {width, height} = editorNode.style
-
-    if position is 'absolute' or height
-      clientHeight =  scrollViewNode.clientHeight
-      editor.setHeight(clientHeight) if clientHeight > 0
-
-    if position is 'absolute' or width
-      clientWidth = scrollViewNode.clientWidth
-      editor.setWidth(clientWidth) if clientWidth > 0
-
-  measureLineHeightAndCharWidthsIfNeeded: (prevState) ->
-    if not isEqualForProperties(prevState, @state, 'lineHeight', 'fontSize', 'fontFamily')
-      if @state.visible
-        @measureLineHeightAndDefaultCharWidth()
-      else
-        @measureLineHeightAndDefaultCharWidthWhenShown = true
-    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 @state.visible
-        @remeasureCharacterWidths()
-      else
-        @remeasureCharacterWidthsWhenShown = true
-    else if @remeasureCharacterWidthsWhenShown and @state.visible and not prevState.visible
-      @remeasureCharacterWidths()
-
-  remeasureCharacterWidths: ->
-    @remeasureCharacterWidthsWhenShown = false
-    @refs.lines.remeasureCharacterWidths()
-
-  onGutterWidthChanged: (@gutterWidth) ->
-    @requestUpdate()
 
   measureScrollbars: ->
     @measuringScrollbars = false
@@ -803,74 +288,15 @@ EditorComponent = React.createClass
     editor.setVerticalScrollbarWidth(width)
     editor.setHorizontalScrollbarHeight(height)
 
-  containsScrollbarSelector: (stylesheet) ->
-    for rule in stylesheet.cssRules
-      if rule.selectorText?.indexOf('scrollbar') > -1
-        return true
-    false
-
-  refreshScrollbars: ->
-    # Believe it or not, proper handling of changes to scrollbar styles requires
-    # three DOM updates.
-
-    # Scrollbar style changes won't apply to scrollbars that are already
-    # visible, so first we need to hide scrollbars so we can redisplay them and
-    # force Chromium to apply updates.
-    @refreshingScrollbars = true
-    @forceUpdate()
-
-    # Next, we display only the scrollbar corner so we can measure the new
-    # scrollbar dimensions. The ::measuringScrollbars property will be set back
-    # to false after the scrollbars are measured.
-    @measuringScrollbars = true
-    @forceUpdate()
-
-    # Finally, we restore the scrollbars based on the newly-measured dimensions
-    # if the editor's content and dimensions require them to be visible.
-    @forceUpdate()
-
-  clearMouseWheelScreenRow: ->
-    if @mouseWheelScreenRow?
-      @mouseWheelScreenRow = null
-      @requestUpdate()
-
-  clearMouseWheelScreenRowAfterDelay: null # created lazily
-
-  consolidateSelections: (e) ->
-    e.abortKeyBinding() unless @props.editor.consolidateSelections()
-
-  lineNodeForScreenRow: (screenRow) -> @refs.lines.lineNodeForScreenRow(screenRow)
-
-  lineNumberNodeForScreenRow: (screenRow) -> @refs.gutter.lineNumberNodeForScreenRow(screenRow)
-
-  screenRowForNode: (node) ->
-    while node isnt document
-      if screenRow = node.dataset.screenRow
-        return parseInt(screenRow)
-      node = node.parentNode
-    null
-
-  hide: ->
-    @setState(visible: false)
-
-  show: ->
-    @setState(visible: true)
-
-  getFontSize: ->
-    @state.fontSize
-
   setFontSize: (fontSize) ->
     @setState({fontSize})
 
-  getFontFamily: ->
-    @state.fontFamily
+  setLineHeight: (lineHeight) ->
+    @setState({lineHeight})
 
   setFontFamily: (fontFamily) ->
     @setState({fontFamily})
 
-  setLineHeight: (lineHeight) ->
-    @setState({lineHeight})
-
   setShowIndentGuide: (showIndentGuide) ->
     @setState({showIndentGuide})
 
@@ -893,41 +319,164 @@ EditorComponent = React.createClass
   setShowInvisibles: (showInvisibles) ->
     @setState({showInvisibles})
 
-  setShowLineNumbers: (showLineNumbers) ->
-    @setState({showLineNumbers})
+  onFocus: ->
+    @refs.scrollView.focus()
 
-  setScrollSensitivity: (scrollSensitivity) ->
-    if scrollSensitivity = parseInt(scrollSensitivity)
-      @scrollSensitivity = Math.abs(scrollSensitivity) / 100
+  onInputFocused: ->
+    @setState(focused: true)
 
-  setUseHardwareAcceleration: (useHardwareAcceleration=true) ->
-    unless @useHardwareAcceleration is useHardwareAcceleration
-      @useHardwareAcceleration = useHardwareAcceleration
+  onInputBlurred: ->
+    @setState(focused: false)
+
+  onVerticalScroll: (scrollTop) ->
+    {editor} = @props
+
+    return if scrollTop is editor.getScrollTop()
+
+    animationFramePending = @pendingScrollTop?
+    @pendingScrollTop = scrollTop
+    unless animationFramePending
+      requestAnimationFrame =>
+        @props.editor.setScrollTop(@pendingScrollTop)
+        @pendingScrollTop = null
+
+  onHorizontalScroll: (scrollLeft) ->
+    {editor} = @props
+
+    return if scrollLeft is editor.getScrollLeft()
+
+    animationFramePending = @pendingScrollLeft?
+    @pendingScrollLeft = scrollLeft
+    unless animationFramePending
+      requestAnimationFrame =>
+        @props.editor.setScrollLeft(@pendingScrollLeft)
+        @pendingScrollLeft = null
+
+  onMouseWheel: (event) ->
+    event.preventDefault()
+    screenRow = @screenRowForNode(event.target)
+    @mouseWheelScreenRow = screenRow if screenRow?
+    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)
+      @pendingHorizontalScrollDelta -= wheelDeltaX
+    else
+      @pendingVerticalScrollDelta -= wheelDeltaY
+
+    unless animationFramePending
+      requestAnimationFrame =>
+        {editor} = @props
+        editor.setScrollTop(editor.getScrollTop() + @pendingVerticalScrollDelta)
+        editor.setScrollLeft(editor.getScrollLeft() + @pendingHorizontalScrollDelta)
+        @pendingVerticalScrollDelta = 0
+        @pendingHorizontalScrollDelta = 0
+
+  screenRowForNode: (node) ->
+    while node isnt document
+      if screenRow = node.dataset.screenRow
+        return parseInt(screenRow)
+      node = node.parentNode
+    null
+
+  onStylesheetsChanged: (stylesheet) ->
+    @refreshScrollbars() if @containsScrollbarSelector(stylesheet)
+
+  containsScrollbarSelector: (stylesheet) ->
+    for rule in stylesheet.cssRules
+      if rule.selectorText?.indexOf('scrollbar') > -1
+        return true
+    false
+
+  refreshScrollbars: ->
+    # Believe it or not, proper handling of changes to scrollbar styles requires
+    # three DOM updates.
+
+    # Scrollbar style changes won't apply to scrollbars that are already
+    # visible, so first we need to hide scrollbars so we can redisplay them and
+    # force Chromium to apply updates.
+    @refreshingScrollbars = true
+    @requestUpdate()
+
+    # Next, we display only the scrollbar corner so we can measure the new
+    # scrollbar dimensions. The ::measuringScrollbars property will be set back
+    # to false after the scrollbars are measured.
+    @measuringScrollbars = true
+    @requestUpdate()
+
+    # Finally, we restore the scrollbars based on the newly-measured dimensions
+    # if the editor's content and dimensions require them to be visible.
+    @requestUpdate()
+
+  onBatchedUpdatesStarted: ->
+    @batchingUpdates = true
+
+  onBatchedUpdatesEnded: ->
+    updateRequested = @updateRequested
+    @updateRequested = false
+    @batchingUpdates = false
+    if updateRequested
       @requestUpdate()
 
-  screenPositionForMouseEvent: (event) ->
-    pixelPosition = @pixelPositionForMouseEvent(event)
-    @props.editor.screenPositionForPixelPosition(pixelPosition)
-
-  pixelPositionForMouseEvent: (event) ->
+  onScreenLinesChanged: (change) ->
     {editor} = @props
-    {clientX, clientY} = event
+    @pendingChanges.push(change)
+    @requestUpdate() if editor.intersectsVisibleRowRange(change.start, change.end + 1) # TODO: Use closed-open intervals for change events
 
-    linesClientRect = @refs.lines.getDOMNode().getBoundingClientRect()
-    top = clientY - linesClientRect.top
-    left = clientX - linesClientRect.left
-    {top, left}
+  onSelectionChanged: (selection) ->
+    {editor} = @props
+    if editor.selectionIntersectsVisibleRowRange(selection)
+      @selectionChanged = true
+      @requestUpdate()
 
-  getModel: ->
-    @props.editor
+  onSelectionAdded: (selection) ->
+    {editor} = @props
+    if editor.selectionIntersectsVisibleRowRange(selection)
+      @selectionChanged = true
+      @selectionAdded = true
+      @requestUpdate()
 
-  isInputEnabled: -> @inputEnabled
+  onScrollTopChanged: ->
+    @scrollingVertically = true
+    @requestUpdate()
+    @stopScrollingAfterDelay ?= debounce(@onStoppedScrolling, 100)
+    @stopScrollingAfterDelay()
 
-  setInputEnabled: (@inputEnabled) -> @inputEnabled
+  onStoppedScrolling: ->
+    @scrollingVertically = false
+    @mouseWheelScreenRow = null
+    @requestUpdate()
 
-  updateParentViewFocusedClassIfNeeded: (prevState) ->
-    if prevState.focused isnt @state.focused
-      @props.parentView.toggleClass('is-focused', @props.focused)
+  stopScrollingAfterDelay: null # created lazily
+
+  onCursorsMoved: ->
+    @cursorsMoved = true
+
+  onGutterWidthChanged: (@gutterWidth) ->
+    @requestUpdate()
+
+  requestUpdate: ->
+    if @batchingUpdates
+      @updateRequested = true
+    else
+      @forceUpdate()
+
+  measureHeightAndWidth: ->
+    @refs.scrollView.measureHeightAndWidth()
+
+  consolidateSelections: (e) ->
+    e.abortKeyBinding() unless @props.editor.consolidateSelections()
+
+  lineNodeForScreenRow: (screenRow) -> @refs.scrollView.lineNodeForScreenRow(screenRow)
+
+  lineNumberNodeForScreenRow: (screenRow) -> @refs.gutter.lineNumberNodeForScreenRow(screenRow)
+
+  hide: ->
+    @setState(visible: false)
+
+  show: ->
+    @setState(visible: true)
 
   runScrollBenchmark: ->
     unless process.env.NODE_ENV is 'production'

src/editor-scroll-view-component.coffee

@@ -0,0 +1,196 @@
+React = require 'react-atom-fork'
+{div} = require 'reactionary-atom-fork'
+{debounce} = require 'underscore-plus'
+
+InputComponent = require './input-component'
+LinesComponent = require './lines-component'
+CursorsComponent = require './cursors-component'
+SelectionsComponent = require './selections-component'
+
+module.exports =
+EditorScrollViewComponent = React.createClass
+  displayName: 'EditorScrollViewComponent'
+
+  measurementPending: false
+  overflowChangedEventsPaused: false
+  overflowChangedWhilePaused: false
+
+  render: ->
+    {editor, fontSize, fontFamily, lineHeight, lineHeightInPixels, showIndentGuide, invisibles, visible} = @props
+    {renderedRowRange, pendingChanges, scrollTop, scrollLeft, scrollHeight, scrollWidth, scrollViewHeight, scrollingVertically, mouseWheelScreenRow} = @props
+    {selectionChanged, selectionAdded, cursorBlinkPeriod, cursorBlinkResumeDelay, cursorsMoved, onInputFocused, onInputBlurred} = @props
+
+    if @isMounted()
+      inputStyle = @getHiddenInputPosition()
+      inputStyle.WebkitTransform = 'translateZ(0)'
+
+    div className: 'scroll-view', onMouseDown: @onMouseDown,
+      InputComponent
+        ref: 'input'
+        className: 'hidden-input'
+        style: inputStyle
+        onInput: @onInput
+        onFocus: onInputFocused
+        onBlur: onInputBlurred
+
+      CursorsComponent({editor, scrollTop, scrollLeft, cursorsMoved, selectionAdded, cursorBlinkPeriod, cursorBlinkResumeDelay})
+      LinesComponent {
+        ref: 'lines', editor, fontSize, fontFamily, lineHeight, lineHeightInPixels,
+        showIndentGuide, renderedRowRange, pendingChanges, scrollTop, scrollLeft, scrollingVertically,
+        selectionChanged, scrollHeight, scrollWidth, mouseWheelScreenRow, invisibles,
+        visible, scrollViewHeight
+      }
+
+  componentDidMount: ->
+    @getDOMNode().addEventListener 'overflowchanged', @onOverflowChanged
+    window.addEventListener('resize', @onWindowResize)
+
+    @measureHeightAndWidth()
+
+  componentDidUnmount: ->
+    window.removeEventListener('resize', @onWindowResize)
+
+  componentDidUpdate: ->
+    @pauseOverflowChangedEvents()
+
+  onOverflowChanged: ->
+    if @overflowChangedEventsPaused
+      @overflowChangedWhilePaused = true
+    else
+      @requestMeasurement()
+
+  onWindowResize: ->
+    @requestMeasurement()
+
+  pauseOverflowChangedEvents: ->
+    @overflowChangedEventsPaused = true
+    @resumeOverflowChangedEventsAfterDelay ?= debounce(@resumeOverflowChangedEvents, 500)
+    @resumeOverflowChangedEventsAfterDelay()
+
+  resumeOverflowChangedEvents: ->
+    if @overflowChangedWhilePaused
+      @overflowChangedWhilePaused = false
+      @requestMeasurement()
+
+  resumeOverflowChangedEventsAfterDelay: null
+
+  requestMeasurement: ->
+    return if @measurementPending
+
+    @measurementPending = true
+    requestAnimationFrame =>
+      @measurementPending = false
+      @measureHeightAndWidth()
+
+  onInput: (char, replaceLastCharacter) ->
+    {editor} = @props
+
+    if replaceLastCharacter
+      editor.transact ->
+        editor.selectLeft()
+        editor.insertText(char)
+    else
+      editor.insertText(char)
+
+  onMouseDown: (event) ->
+    {editor} = @props
+    {detail, shiftKey, metaKey} = event
+    screenPosition = @screenPositionForMouseEvent(event)
+
+    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()
+
+    @selectToMousePositionUntilMouseUp(event)
+
+  selectToMousePositionUntilMouseUp: (event) ->
+    {editor} = @props
+    dragging = false
+    lastMousePosition = {}
+
+    animationLoop = =>
+      requestAnimationFrame =>
+        if dragging
+          @selectToMousePosition(lastMousePosition)
+          animationLoop()
+
+    onMouseMove = (event) ->
+      lastMousePosition.clientX = event.clientX
+      lastMousePosition.clientY = event.clientY
+
+      # Start the animation loop when the mouse moves prior to a mouseup event
+      unless dragging
+        dragging = true
+        animationLoop()
+
+      # Stop dragging when cursor enters dev tools because we can't detect mouseup
+      onMouseUp() if event.which is 0
+
+    onMouseUp = ->
+      dragging = false
+      window.removeEventListener('mousemove', onMouseMove)
+      window.removeEventListener('mouseup', onMouseUp)
+      editor.finalizeSelections()
+
+    window.addEventListener('mousemove', onMouseMove)
+    window.addEventListener('mouseup', onMouseUp)
+
+  selectToMousePosition: (event) ->
+    @props.editor.selectToScreenPosition(@screenPositionForMouseEvent(event))
+
+  screenPositionForMouseEvent: (event) ->
+    pixelPosition = @pixelPositionForMouseEvent(event)
+    @props.editor.screenPositionForPixelPosition(pixelPosition)
+
+  pixelPositionForMouseEvent: (event) ->
+    {editor} = @props
+    {clientX, clientY} = event
+
+    editorClientRect = @getDOMNode().getBoundingClientRect()
+    top = clientY - editorClientRect.top + editor.getScrollTop()
+    left = clientX - editorClientRect.left + editor.getScrollLeft()
+    {top, left}
+
+  getHiddenInputPosition: ->
+    {editor} = @props
+    return {top: 0, left: 0} unless @isMounted() and editor.getCursor()?
+
+    {top, left, height, width} = editor.getCursor().getPixelRect()
+    top = top - editor.getScrollTop()
+    top = Math.max(0, Math.min(editor.getHeight() - height, top))
+    left = left - editor.getScrollLeft()
+    left = Math.max(0, Math.min(editor.getWidth() - width, left))
+
+    {top, left}
+
+  # 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: ->
+    return unless @isMounted()
+
+    {editor} = @props
+    node = @getDOMNode()
+    editorNode = node.parentNode
+    {position} = getComputedStyle(editorNode)
+    {width, height} = editorNode.style
+
+    if position is 'absolute' or height
+      clientHeight =  node.clientHeight
+      editor.setHeight(clientHeight) if clientHeight > 0
+
+    if position is 'absolute' or width
+      clientWidth = node.clientWidth
+      editor.setWidth(clientWidth) if clientWidth > 0
+
+  focus: ->
+    @refs.input.focus()
+
+  lineNodeForScreenRow: (screenRow) -> @refs.lines.lineNodeForScreenRow(screenRow)

src/editor-view.coffee

@@ -28,7 +28,7 @@ LongLineLength = 1000
 # ## Iterating over the open editor views
 #
 # ```coffee
-# for editorView in atom.workspaceView.getEditorViews()
+# for editorView in atom.workspace.getEditorViews()
 #   console.log(editorView.getEditor().getPath())
 # ```
 #
@@ -56,8 +56,6 @@ class EditorView extends View
     softWrap: false
     softTabs: true
     softWrapAtPreferredLineLength: false
-    scrollSensitivity: 40
-    useHardwareAcceleration: true
 
   @nextEditorId: 1
 
@@ -158,12 +156,9 @@ class EditorView extends View
       'editor:consolidate-selections': (event) => @consolidateSelections(event)
       'editor:delete-to-beginning-of-word': => @editor.deleteToBeginningOfWord()
       'editor:delete-to-beginning-of-line': => @editor.deleteToBeginningOfLine()
-      'editor:delete-to-end-of-line': => @editor.deleteToEndOfLine()
       'editor:delete-to-end-of-word': => @editor.deleteToEndOfWord()
       'editor:delete-line': => @editor.deleteLine()
       'editor:cut-to-end-of-line': => @editor.cutToEndOfLine()
-      'editor:move-to-beginning-of-next-paragraph': => @editor.moveCursorToBeginningOfNextParagraph()
-      'editor:move-to-beginning-of-previous-paragraph': => @editor.moveCursorToBeginningOfPreviousParagraph()
       'editor:move-to-beginning-of-screen-line': => @editor.moveCursorToBeginningOfScreenLine()
       'editor:move-to-beginning-of-line': => @editor.moveCursorToBeginningOfLine()
       'editor:move-to-end-of-screen-line': => @editor.moveCursorToEndOfScreenLine()
@@ -174,8 +169,6 @@ class EditorView extends View
       'editor:move-to-beginning-of-next-word': => @editor.moveCursorToBeginningOfNextWord()
       'editor:move-to-previous-word-boundary': => @editor.moveCursorToPreviousWordBoundary()
       'editor:move-to-next-word-boundary': => @editor.moveCursorToNextWordBoundary()
-      'editor:select-to-beginning-of-next-paragraph': => @editor.selectToBeginningOfNextParagraph()
-      'editor:select-to-beginning-of-previous-paragraph': => @editor.selectToBeginningOfPreviousParagraph()
       'editor:select-to-end-of-line': => @editor.selectToEndOfLine()
       'editor:select-to-beginning-of-line': => @editor.selectToBeginningOfLine()
       'editor:select-to-end-of-word': => @editor.selectToEndOfWord()
@@ -195,14 +188,12 @@ class EditorView extends View
         'core:move-down': => @editor.moveCursorDown()
         'core:move-to-top': => @editor.moveCursorToTop()
         'core:move-to-bottom': => @editor.moveCursorToBottom()
-        'core:page-up': => @pageUp()
         'core:page-down': => @pageDown()
+        'core:page-up': => @pageUp()
         'core:select-up': => @editor.selectUp()
         'core:select-down': => @editor.selectDown()
         'core:select-to-top': => @editor.selectToTop()
         'core:select-to-bottom': => @editor.selectToBottom()
-        'core:select-page-up': => @editor.selectUp(@getPageRows())
-        'core:select-page-down': => @editor.selectDown(@getPageRows())
         'editor:indent': => @editor.indent()
         'editor:auto-indent': => @editor.autoIndentSelectedRows()
         'editor:indent-selected-rows': => @editor.indentSelectedRows()
@@ -287,7 +278,7 @@ class EditorView extends View
     @editor.moveCursorUp(@getPageRows())
     @scrollTop(newScrollTop,  adjustVerticalScrollbar: true)
 
-  # Gets the number of actual page rows existing in an editor.
+  # Public: Gets the number of actual page rows existing in an editor.
   #
   # Returns a {Number}.
   getPageRows: ->
@@ -372,8 +363,6 @@ class EditorView extends View
       false if @isFocused
 
     @overlayer.on 'mousedown', (e) =>
-      return unless e.which is 1 # only handle the left mouse button
-
       @overlayer.hide()
       clickedElement = document.elementFromPoint(e.pageX, e.pageY)
       @overlayer.show()
@@ -556,6 +545,7 @@ class EditorView extends View
       @showBufferConflictAlert(@editor)
 
     @subscribe @editor, "path-changed", =>
+      @editor.reloadGrammar()
       @trigger 'editor:path-changed'
 
     @subscribe @editor, "grammar-changed", =>
@@ -573,7 +563,7 @@ class EditorView extends View
       @scrollTop(scrollTop)
 
     @subscribe @editor, 'scroll-left-changed', (scrollLeft) =>
-      @scrollView.scrollLeft(scrollLeft)
+      @scrollLeft(scrollLeft)
 
     @subscribe @editor, 'soft-wrap-changed', (softWrap) =>
       @setSoftWrap(softWrap)

src/editor.coffee

@@ -112,7 +112,6 @@ TextMateScopeSelector = require('first-mate').ScopeSelector
 # - {::deleteToBeginningOfWord}
 # - {::deleteToBeginningOfLine}
 # - {::delete}
-# - {::deleteToEndOfLine}
 # - {::deleteToEndOfWord}
 # - {::deleteLine}
 # - {::cutSelectedText}
@@ -145,7 +144,6 @@ class Editor extends Model
   cursors: null
   selections: null
   suppressSelectionMerging: false
-  updateBatchDepth: 0
 
   @delegatesMethods 'suggestedIndentForBufferRow', 'autoIndentBufferRow', 'autoIndentBufferRows',
     'autoDecreaseIndentForBufferRow', 'toggleLineCommentForBufferRow', 'toggleLineCommentsForBufferRows',
@@ -213,12 +211,7 @@ class Editor extends Model
     @subscribe @displayBuffer, "changed", (e) => @emit 'screen-lines-changed', e
     @subscribe @displayBuffer, "markers-updated", => @mergeIntersectingSelections()
     @subscribe @displayBuffer, 'grammar-changed', => @handleGrammarChange()
-    @subscribe @displayBuffer, 'tokenized', => @handleTokenization()
     @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, "character-widths-changed", (changeCount) => @emit 'character-widths-changed', changeCount
 
   getViewClass: ->
     if atom.config.get('core.useReactEditor')
@@ -266,8 +259,7 @@ class Editor extends Model
   getLongTitle: ->
     if sessionPath = @getPath()
       fileName = path.basename(sessionPath)
-      directory = atom.project.relativize(path.dirname(sessionPath))
-      directory = if directory.length > 0 then directory else path.basename(path.dirname(sessionPath))
+      directory = path.basename(path.dirname(sessionPath))
       "#{fileName} - #{directory}"
     else
       'untitled'
@@ -693,13 +685,6 @@ class Editor extends Model
   delete: ->
     @mutateSelectedText (selection) -> selection.delete()
 
-  # Public: For each selection, if the selection is not empty, deletes the
-  # selection; otherwise, deletes all characters of the containing line
-  # following the cursor. If the cursor is already at the end of the line,
-  # deletes the following newline.
-  deleteToEndOfLine: ->
-    @mutateSelectedText (selection) -> selection.deleteToEndOfLine()
-
   # Public: For each selection, if the selection is empty, delete all characters
   # of the containing word following the cursor. Otherwise delete the selected
   # text.
@@ -854,10 +839,6 @@ class Editor extends Model
   isFoldableAtBufferRow: (bufferRow) ->
     @languageMode.isFoldableAtBufferRow(bufferRow)
 
-  isFoldableAtScreenRow: (screenRow) ->
-    bufferRow = @displayBuffer.bufferRowForScreenRow(screenRow)
-    @isFoldableAtBufferRow(bufferRow)
-
   # TODO: Rename to foldRowRange?
   createFold: (startRow, endRow) ->
     @displayBuffer.createFold(startRow, endRow)
@@ -1073,78 +1054,6 @@ class Editor extends Model
       selection.insertText(fn(text))
       selection.setBufferRange(range)
 
-  # Public: Get all the decorations within a screen row range.
-  #
-  # startScreenRow - the {Number} beginning screen row
-  # endScreenRow - the {Number} end screen row (inclusive)
-  #
-  # 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.
-  #
-  # marker - A {Marker} you want this decoration to follow.
-  # decoration - An {Object} representing the decoration eg. `{type: 'gutter', class: 'linter-error'}`
-  #   The decoration can contain the following keys:
-  #     * 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. When the user selects text, the selection is
-  #            visualized with a highlight decoration internally.
-  #     * 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.
-  addDecorationForMarker: (marker, decoration) ->
-    @displayBuffer.addDecorationForMarker(marker, decoration)
-
-  # 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) ->
     @displayBuffer.getMarker(id)
@@ -1250,9 +1159,6 @@ class Editor extends Model
   addCursor: (marker) ->
     cursor = new Cursor(editor: this, marker: marker)
     @cursors.push(cursor)
-    @addDecorationForMarker(marker, type: 'gutter', class: 'cursor-line')
-    @addDecorationForMarker(marker, type: 'gutter', class: 'cursor-line-no-selection', onlyHead: true, onlyEmpty: true)
-    @addDecorationForMarker(marker, type: 'line', class: 'cursor-line', onlyEmpty: true)
     @emit 'cursor-added', cursor
     cursor
 
@@ -1279,7 +1185,6 @@ class Editor extends Model
         if selection.intersectsBufferRange(selectionBufferRange)
           return selection
     else
-      @addDecorationForMarker(marker, type: 'highlight', class: 'selection')
       @emit 'selection-added', selection
       selection
 
@@ -1293,9 +1198,7 @@ class Editor extends Model
   # Returns the added {Selection}.
   addSelectionForBufferRange: (bufferRange, options={}) ->
     @markBufferRange(bufferRange, _.defaults(@getSelectionMarkerAttributes(), options))
-    selection = @getLastSelection()
-    selection.autoscroll()
-    selection
+    @getLastSelection()
 
   # Public: Set the selected range in buffer coordinates. If there are multiple
   # selections, they are reduced to a single selection with the given range.
@@ -1585,43 +1488,22 @@ class Editor extends Model
   moveCursorToNextWordBoundary: ->
     @moveCursors (cursor) -> cursor.moveToNextWordBoundary()
 
-  # Public: Move every cursor to the beginning of the next paragraph.
-  moveCursorToBeginningOfNextParagraph: ->
-    @moveCursors (cursor) -> cursor.moveToBeginningOfNextParagraph()
-
-  # Public: Move every cursor to the beginning of the previous paragraph.
-  moveCursorToBeginningOfPreviousParagraph: ->
-    @moveCursors (cursor) -> cursor.moveToBeginningOfPreviousParagraph()
-
   scrollToCursorPosition: ->
     @getCursor().autoscroll()
 
   pageUp: ->
-    newScrollTop = @getScrollTop() - @getHeight()
-    @moveCursorUp(@getRowsPerPage())
-    @setScrollTop(newScrollTop)
+    @setScrollTop(@getScrollTop() - @getHeight())
 
   pageDown: ->
-    newScrollTop = @getScrollTop() + @getHeight()
-    @moveCursorDown(@getRowsPerPage())
-    @setScrollTop(newScrollTop)
-
-  selectPageUp: ->
-    @selectUp(@getRowsPerPage())
-
-  selectPageDown: ->
-    @selectDown(@getRowsPerPage())
-
-  # Returns the number of rows per page
-  getRowsPerPage: ->
-    Math.max(1, Math.ceil(@getHeight() / @getLineHeightInPixels()))
+    @setScrollTop(@getScrollTop() + @getHeight())
 
   moveCursors: (fn) ->
     @movingCursors = true
-    fn(cursor) for cursor in @getCursors()
-    @mergeCursors()
-    @movingCursors = false
-    @emit 'cursors-moved'
+    @batchUpdates =>
+      fn(cursor) for cursor in @getCursors()
+      @mergeCursors()
+      @movingCursors = false
+      @emit 'cursors-moved'
 
   cursorMoved: (event) ->
     @emit 'cursor-moved', event
@@ -1834,20 +1716,6 @@ class Editor extends Model
   selectWord: ->
     @expandSelectionsForward (selection) => selection.selectWord()
 
-  # Public: Expand selections to the beginning of the next paragraph.
-  #
-  # Operates on all selections. Moves the cursor to the beginning of the next
-  # paragraph while preserving the selection's tail position.
-  selectToBeginningOfNextParagraph: ->
-    @expandSelectionsForward (selection) => selection.selectToBeginningOfNextParagraph()
-
-  # Public: Expand selections to the beginning of the next paragraph.
-  #
-  # Operates on all selections. Moves the cursor to the beginning of the next
-  # paragraph while preserving the selection's tail position.
-  selectToBeginningOfPreviousParagraph: ->
-    @expandSelectionsBackward (selection) => selection.selectToBeginningOfPreviousParagraph()
-
   # Public: Select the range of the given marker if it is valid.
   #
   # marker - A {DisplayBufferMarker}
@@ -1941,7 +1809,9 @@ class Editor extends Model
   # execution and revert any changes performed up to the abortion.
   #
   # fn - A {Function} to call inside the transaction.
-  transact: (fn) -> @buffer.transact(fn)
+  transact: (fn) ->
+    @batchUpdates =>
+      @buffer.transact(fn)
 
   # Public: Start an open-ended transaction.
   #
@@ -1961,14 +1831,17 @@ class Editor extends Model
   # within the transaction.
   abortTransaction: -> @buffer.abortTransaction()
 
+  batchUpdates: (fn) ->
+    @emit 'batched-updates-started'
+    result = fn()
+    @emit 'batched-updates-ended'
+    result
+
   inspect: ->
     "<Editor #{@id}>"
 
   logScreenLines: (start, end) -> @displayBuffer.logLines(start, end)
 
-  handleTokenization: ->
-    @softTabs = @usesSoftTabs() ? @softTabs
-
   handleGrammarChange: ->
     @unfoldAll()
     @emit 'grammar-changed'
@@ -1989,8 +1862,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)
 
@@ -2038,11 +1909,11 @@ class Editor extends Model
 
   pixelRectForScreenRange: (screenRange) -> @displayBuffer.pixelRectForScreenRange(screenRange)
 
-  scrollToScreenRange: (screenRange, options) -> @displayBuffer.scrollToScreenRange(screenRange, options)
+  scrollToScreenRange: (screenRange) -> @displayBuffer.scrollToScreenRange(screenRange)
 
-  scrollToScreenPosition: (screenPosition, options) -> @displayBuffer.scrollToScreenPosition(screenPosition, options)
+  scrollToScreenPosition: (screenPosition) -> @displayBuffer.scrollToScreenPosition(screenPosition)
 
-  scrollToBufferPosition: (bufferPosition, options) -> @displayBuffer.scrollToBufferPosition(bufferPosition, options)
+  scrollToBufferPosition: (bufferPosition) -> @displayBuffer.scrollToBufferPosition(bufferPosition)
 
   horizontallyScrollable: -> @displayBuffer.horizontallyScrollable()
 

src/fold.coffee

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

src/git.coffee

@@ -1,4 +1,4 @@
-{join} = require 'path'
+{join, sep} = require 'path'
 
 _ = require 'underscore-plus'
 {Emitter, Subscriber} = require 'emissary'
@@ -246,7 +246,7 @@ class Git
   # Returns a {Number} representing the status. This value can be passed to
   # {::isStatusModified} or {::isStatusNew} to get more information.
   getDirectoryStatus: (directoryPath)  ->
-    directoryPath = "#{@relativize(directoryPath)}/"
+    directoryPath = "#{@relativize(directoryPath)}#{sep}"
     directoryStatus = 0
     for path, status of @statuses
       directoryStatus |= status if path.indexOf(directoryPath) is 0

src/gutter-component.coffee

@@ -1,225 +1,124 @@
-_ = require 'underscore-plus'
 React = require 'react-atom-fork'
 {div} = require 'reactionary-atom-fork'
 {isEqual, isEqualForProperties, multiplyString, toArray} = require 'underscore-plus'
 SubscriberMixin = require './subscriber-mixin'
 
 WrapperDiv = document.createElement('div')
+Nbsp = String.fromCharCode(160)
 
 module.exports =
 GutterComponent = React.createClass
   displayName: 'GutterComponent'
   mixins: [SubscriberMixin]
 
-  dummyLineNumberNode: null
-  measuredWidth: null
+  lastMeasuredWidth: null
+  wrapCountsByScreenRow: null
 
   render: ->
-    {scrollHeight, scrollViewHeight, onMouseDown} = @props
+    {scrollHeight, scrollTop} = @props
 
-    div className: 'gutter', onClick: @onClick, onMouseDown: onMouseDown,
-      # 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()
+    style =
+      height: scrollHeight
+      WebkitTransform: "translate3d(0px, #{-scrollTop}px, 0px)"
 
-  getTransform: ->
-    {scrollTop, useHardwareAcceleration} = @props
+    div className: 'gutter',
+      div className: 'line-numbers', ref: 'lineNumbers', style: style,
+        @renderDummyLineNode()
+        @renderLineNumbers() if @isMounted()
 
-    if useHardwareAcceleration
-      "translate3d(0px, #{-scrollTop}px, 0px)"
+  renderDummyLineNode: ->
+    {editor} = @props
+    @renderLineNumber('dummy', null, editor.getLastBufferRow(), false)
+
+  renderLineNumbers: ->
+    {editor, renderedRowRange, maxLineNumberDigits, lineHeightInPixels, mouseWheelScreenRow} = @props
+    [startRow, endRow] = renderedRowRange
+
+    lastBufferRow = null
+    wrapCount = 0
+
+    wrapCountsByScreenRow = {}
+    lineNumberComponents =
+      for bufferRow, i in editor.bufferRowsForScreenRows(startRow, endRow - 1)
+        if bufferRow is lastBufferRow
+          softWrapped = true
+          key = "#{bufferRow}-#{++wrapCount}"
+        else
+          softWrapped = false
+          key = bufferRow.toString()
+          lastBufferRow = bufferRow
+          wrapCount = 0
+
+        screenRow = startRow + i
+        wrapCountsByScreenRow[screenRow] = wrapCount
+        @renderLineNumber(key, screenRow, bufferRow, softWrapped)
+
+    # Preserve the mouse wheel target's screen row if it exists
+    if mouseWheelScreenRow? and not (startRow <= mouseWheelScreenRow < endRow)
+      screenRow = mouseWheelScreenRow
+      bufferRow = editor.bufferRowForScreenRow(screenRow)
+      wrapCount = @wrapCountsByScreenRow[screenRow]
+      wrapCountsByScreenRow[screenRow] = wrapCount
+      if softWrapped = (wrapCount > 0)
+        key = "#{bufferRow}-#{wrapCount}"
+      else
+        key = bufferRow.toString()
+
+      lineNumberComponents.push(@renderLineNumber(key, screenRow, bufferRow, false, endRow))
+
+    @wrapCountsByScreenRow = wrapCountsByScreenRow
+    lineNumberComponents
+
+  renderLineNumber: (key, screenRow, bufferRow, softWrapped, screenRowOverride) ->
+    {lineHeightInPixels, maxLineNumberDigits} = @props
+
+    if screenRow?
+      style =
+        position: 'absolute'
+        top: (screenRowOverride ? screenRow) * lineHeightInPixels
     else
-      "translate(0px, #{-scrollTop}px)"
+      style =
+        visibility: 'hidden'
 
-  componentWillMount: ->
-    @lineNumberNodesById = {}
-    @lineNumberIdsByScreenRow = {}
-    @screenRowsByLineNumberId = {}
-    @renderedDecorationsByLineNumberId = {}
+    if softWrapped
+      lineNumber = "•"
+    else
+      lineNumber = (bufferRow + 1).toString()
 
-  componentDidMount: ->
-    @appendDummyLineNumber()
+    if lineNumber.length < maxLineNumberDigits
+      padding = multiplyString(Nbsp, maxLineNumberDigits - lineNumber.length)
+      lineNumber = padding + lineNumber
+
+    div key: key, className: 'line-number', 'data-screen-row': screenRow, style: style,
+      lineNumber,
+      div className: 'icon-right'
 
   # 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
   # visible row range.
   shouldComponentUpdate: (newProps) ->
-    return true unless isEqualForProperties(newProps, @props,
-      'renderedRowRange', 'scrollTop', 'lineHeightInPixels', 'mouseWheelScreenRow', 'lineDecorations',
-      'scrollViewHeight', 'useHardwareAcceleration'
-    )
+    return true unless isEqualForProperties(newProps, @props, 'renderedRowRange', 'scrollTop', 'lineHeightInPixels', 'fontSize', 'maxLineNumberDigits', 'mouseWheelScreenRow')
 
-    {renderedRowRange, pendingChanges, lineDecorations} = newProps
+    {renderedRowRange, pendingChanges} = newProps
     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) ->
-    unless isEqualForProperties(oldProps, @props, 'maxLineNumberDigits')
-      @updateDummyLineNumber()
-      @removeLineNumberNodes()
-
-    unless isEqualForProperties(oldProps, @props, 'maxLineNumberDigits', 'defaultCharWidth')
-      @measureWidth()
-
-    @clearScreenRowCaches() unless oldProps.lineHeightInPixels is @props.lineHeightInPixels
-    @updateLineNumbers()
-
-  clearScreenRowCaches: ->
-    @lineNumberIdsByScreenRow = {}
-    @screenRowsByLineNumberId = {}
-
-  # This dummy line number element holds the gutter to the appropriate width,
-  # since the real line numbers are absolutely positioned for performance reasons.
-  appendDummyLineNumber: ->
-    {maxLineNumberDigits} = @props
-    WrapperDiv.innerHTML = @buildLineNumberHTML(-1, false, maxLineNumberDigits)
-    @dummyLineNumberNode = WrapperDiv.children[0]
-    @refs.lineNumbers.getDOMNode().appendChild(@dummyLineNumberNode)
-
-  updateDummyLineNumber: ->
-    @dummyLineNumberNode.innerHTML = @buildLineNumberInnerHTML(0, false, @props.maxLineNumberDigits)
-
-  updateLineNumbers: ->
-    lineNumberIdsToPreserve = @appendOrUpdateVisibleLineNumberNodes()
-    @removeLineNumberNodes(lineNumberIdsToPreserve)
-
-  appendOrUpdateVisibleLineNumberNodes: ->
-    {editor, renderedRowRange, scrollTop, maxLineNumberDigits, lineDecorations} = @props
-    [startRow, endRow] = renderedRowRange
-
-    newLineNumberIds = null
-    newLineNumbersHTML = null
-    visibleLineNumberIds = new Set
-
-    wrapCount = 0
-    for bufferRow, index in editor.bufferRowsForScreenRows(startRow, endRow - 1)
-      screenRow = startRow + index
-
-      if bufferRow is lastBufferRow
-        id = "#{bufferRow}-#{wrapCount++}"
-      else
-        id = bufferRow.toString()
-        lastBufferRow = bufferRow
-        wrapCount = 0
-
-      visibleLineNumberIds.add(id)
-
-      if @hasLineNumberNode(id)
-        @updateLineNumberNode(id, bufferRow, screenRow, wrapCount > 0)
-      else
-        newLineNumberIds ?= []
-        newLineNumbersHTML ?= ""
-        newLineNumberIds.push(id)
-        newLineNumbersHTML += @buildLineNumberHTML(bufferRow, wrapCount > 0, maxLineNumberDigits, screenRow)
-        @screenRowsByLineNumberId[id] = screenRow
-        @lineNumberIdsByScreenRow[screenRow] = id
-
-      @renderedDecorationsByLineNumberId[id] = lineDecorations[screenRow]
-
-    if newLineNumberIds?
-      WrapperDiv.innerHTML = newLineNumbersHTML
-      newLineNumberNodes = toArray(WrapperDiv.children)
-
-      node = @refs.lineNumbers.getDOMNode()
-      for lineNumberId, i in newLineNumberIds
-        lineNumberNode = newLineNumberNodes[i]
-        @lineNumberNodesById[lineNumberId] = lineNumberNode
-        node.appendChild(lineNumberNode)
-
-    visibleLineNumberIds
-
-  removeLineNumberNodes: (lineNumberIdsToPreserve) ->
-    {mouseWheelScreenRow} = @props
-    node = @refs.lineNumbers.getDOMNode()
-    for lineNumberId, lineNumberNode of @lineNumberNodesById when not lineNumberIdsToPreserve?.has(lineNumberId)
-      screenRow = @screenRowsByLineNumberId[lineNumberId]
-      if not screenRow? or screenRow isnt mouseWheelScreenRow
-        delete @lineNumberNodesById[lineNumberId]
-        delete @lineNumberIdsByScreenRow[screenRow] if @lineNumberIdsByScreenRow[screenRow] is lineNumberId
-        delete @screenRowsByLineNumberId[lineNumberId]
-        delete @renderedDecorationsByLineNumberId[lineNumberId]
-        node.removeChild(lineNumberNode)
-
-  buildLineNumberHTML: (bufferRow, softWrapped, maxLineNumberDigits, screenRow) ->
-    {editor, lineHeightInPixels, lineDecorations} = @props
-    if screenRow?
-      style = "position: absolute; top: #{screenRow * lineHeightInPixels}px;"
-    else
-      style = "visibility: hidden;"
-    innerHTML = @buildLineNumberInnerHTML(bufferRow, softWrapped, maxLineNumberDigits)
-
-    classes = ''
-    if lineDecorations? and decorations = lineDecorations[screenRow]
-      for decoration in decorations
-        if editor.decorationMatchesType(decoration, 'gutter')
-          classes += decoration.class + ' '
-
-    classes += "foldable " if bufferRow >= 0 and editor.isFoldableAtBufferRow(bufferRow)
-    classes += "line-number line-number-#{bufferRow}"
-
-    "<div class=\"#{classes}\" style=\"#{style}\" data-buffer-row=\"#{bufferRow}\" data-screen-row=\"#{screenRow}\">#{innerHTML}</div>"
-
-  buildLineNumberInnerHTML: (bufferRow, softWrapped, maxLineNumberDigits) ->
-    if softWrapped
-      lineNumber = "•"
-    else
-      lineNumber = (bufferRow + 1).toString()
-
-    padding = multiplyString('&nbsp;', maxLineNumberDigits - lineNumber.length)
-    iconHTML = '<div class="icon-right"></div>'
-    padding + lineNumber + iconHTML
-
-  updateLineNumberNode: (lineNumberId, bufferRow, screenRow, softWrapped) ->
-    {editor, lineDecorations} = @props
-    node = @lineNumberNodesById[lineNumberId]
-
-    if editor.isFoldableAtBufferRow(bufferRow)
-      node.classList.add('foldable')
-    else
-      node.classList.remove('foldable')
-
-    decorations = lineDecorations[screenRow]
-    previousDecorations = @renderedDecorationsByLineNumberId[lineNumberId]
-
-    if previousDecorations?
-      for decoration in previousDecorations
-        node.classList.remove(decoration.class) if editor.decorationMatchesType(decoration, 'gutter') and not _.deepContains(decorations, decoration)
-
-    if decorations?
-      for decoration in decorations
-        if editor.decorationMatchesType(decoration, 'gutter') and not _.deepContains(previousDecorations, decoration)
-          node.classList.add(decoration.class)
-
-    unless @screenRowsByLineNumberId[lineNumberId] is screenRow
-      {lineHeightInPixels} = @props
-      node.style.top = screenRow * lineHeightInPixels + 'px'
-      node.dataset.screenRow = screenRow
-      @screenRowsByLineNumberId[lineNumberId] = screenRow
-      @lineNumberIdsByScreenRow[screenRow] = lineNumberId
-
-  hasLineNumberNode: (lineNumberId) ->
-    @lineNumberNodesById.hasOwnProperty(lineNumberId)
-
-  lineNumberNodeForScreenRow: (screenRow) ->
-    @lineNumberNodesById[@lineNumberIdsByScreenRow[screenRow]]
-
-  onClick: (event) ->
-    {editor} = @props
-    {target} = event
-    lineNumber = target.parentNode
-
-    if target.classList.contains('icon-right') and lineNumber.classList.contains('foldable')
-      bufferRow = parseInt(lineNumber.getAttribute('data-buffer-row'))
-      if lineNumber.classList.contains('folded')
-        editor.unfoldBufferRow(bufferRow)
-      else
-        editor.foldBufferRow(bufferRow)
+    @measureWidth() unless @lastMeasuredWidth? and isEqualForProperties(oldProps, @props, 'maxLineNumberDigits', 'fontSize', 'fontFamily')
 
   measureWidth: ->
-    width = @getDOMNode().offsetWidth
-    unless width is @measuredWidth
-      @measuredWidth = width
-      @props.onWidthChanged?(width)
+    lineNumberNode = @refs.lineNumbers.getDOMNode().firstChild
+    width = lineNumberNode.offsetWidth
+    if width isnt @lastMeasuredWidth
+      @props.onWidthChanged(@lastMeasuredWidth = width)
+
+  lineNumberNodeForScreenRow: (screenRow) ->
+    {renderedRowRange} = @props
+    [startRow, endRow] = renderedRowRange
+
+    unless startRow <= screenRow < endRow
+      throw new Error("Requested screenRow #{screenRow} is not currently rendered")
+
+    @refs.lineNumbers.getDOMNode().children[screenRow - startRow + 1]

src/highlights-component.coffee

@@ -1,25 +0,0 @@
-React = require 'react-atom-fork'
-{div} = require 'reactionary-atom-fork'
-{isEqualForProperties} = require 'underscore-plus'
-HighlightComponent = require './highlight-component'
-
-module.exports =
-HighlightsComponent = React.createClass
-  displayName: 'HighlightsComponent'
-
-  render: ->
-    div className: 'highlights',
-      @renderHighlights() if @isMounted()
-
-  renderHighlights: ->
-    {highlightDecorations, lineHeightInPixels} = @props
-
-    highlightComponents = []
-    for markerId, {startPixelPosition, endPixelPosition, decorations} of highlightDecorations
-      for decoration in decorations
-        highlightComponents.push(HighlightComponent({key: "#{markerId}-#{decoration.class}", startPixelPosition, endPixelPosition, decoration, lineHeightInPixels}))
-
-    highlightComponents
-
-  shouldComponentUpdate: (newProps) ->
-    not isEqualForProperties(newProps, @props, 'highlightDecorations', 'lineHeightInPixels', 'defaultCharWidth', 'scopedCharacterWidthsChangeCount')