Don't assign scrollLeft on model on 'scroll-left-changed' events

Fixes #2513

I'm not entirely sure why, but for some reason we're getting into an
feedback cycle when the scrollLeft position changes in certain cases. In
theory, this shouldn't happen because reassigning the same value
shouldn't emit a change event. But since we're about to end-of-life the
jQuery editor, I'd like to try fixing it this way for now.

.node-version

@@ -1 +0,0 @@
-v0.10.21

.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

@@ -11,9 +11,6 @@ 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.

README.md

@@ -6,36 +6,10 @@ Visit [atom.io](https://atom.io) to learn more.
 
 ## Installing
 
-### Mac OS X
-
 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).
 
 Atom will automatically update when a new release is available.
 
-### Windows
-
-Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).
-
-1. Install [chocolatey](https://chocolatey.org).
-2. Close and reopen your command prompt or PowerShell window.
-3. Run `cinst Atom`
-4. In the future run `cup Atom` to upgrade to the latest release.
-
-You can also download a `.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
-The Windows version does not currently automatically update so you will need to
-manually upgrade to future releases by re-downloading the `.zip` file.
-
-### Debian Linux (Ubuntu)
-
-Currently only a 64-bit version is available.
-
-1. Download `atom-amd64.deb` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
-2. Run `sudo dpkg --install atom-amd64.deb` on the downloaded package.
-3. Launch Atom using the installed `atom` command.
-
-The Linux version does not currently automatically update so you will need to
-repeat these steps to upgrade to future releases.
-
 ## Building
 
 * [Linux](docs/build-instructions/linux.md)
@@ -44,5 +18,4 @@ repeat these steps to upgrade to future releases.
 * [Windows](docs/build-instructions/windows.md)
 
 ## Developing
-
 Check out the [guides](https://atom.io/docs/latest) and the [API reference](https://atom.io/docs/api).

apm/package.json

@@ -1,11 +1,11 @@
 {
   "name": "atom-bundled-apm",
-  "description": "Atom's bundled apm",
+  "description": "Atom's bundled APM",
   "repository": {
     "type": "git",
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.97.0"
+    "atom-package-manager": "0.68.0"
   }
 }

atom.sh

@@ -50,7 +50,7 @@ if [ $OS == 'Mac' ]; then
 
   # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
   if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs dirname)
+    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
   fi
 
   # Exit if Atom can't be found
@@ -69,11 +69,6 @@ elif [ $OS == 'Linux' ]; then
   SCRIPT=$(readlink -f "$0")
   USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
   ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-  DOT_ATOM_DIR="$HOME/.atom"
-
-  if [ ! -d "$DOT_ATOM_DIR" ]; then
-    mkdir -p "$DOT_ATOM_DIR"
-  fi
 
   : ${TMPDIR:=/tmp}
 
@@ -84,9 +79,9 @@ elif [ $OS == 'Linux' ]; then
     exit $?
   else
     (
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$DOT_ATOM_DIR/nohup.out" 2>&1
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$TMPDIR/atom-nohup.out" 2>&1
     if [ $? -ne 0 ]; then
-      cat "$DOT_ATOM_DIR/nohup.out"
+      cat "$TMPDIR/atom-nohup.out"
       exit $?
     fi
     ) &

benchmark/benchmark-bootstrap.coffee

@@ -1,6 +1,6 @@
 require '../src/window'
 Atom = require '../src/atom'
-window.atom = Atom.loadOrCreate('spec')
+atom = new Atom()
 atom.show() unless atom.getLoadSettings().exitWhenDone
 window.atom = atom
 
@@ -9,4 +9,5 @@ window.atom = atom
 atom.openDevTools()
 
 document.title = "Benchmark Suite"
-runSpecSuite('../benchmark/benchmark-suite', atom.getLoadSettings().logFile)
+benchmarkSuite = require.resolve('./benchmark-suite')
+runSpecSuite(benchmarkSuite, true)

benchmark/benchmark-helper.coffee

@@ -1,9 +1,7 @@
 require '../spec/spec-helper'
 
 path = require 'path'
-{$, Point} = require 'atom'
-_ = require 'underscore-plus'
-fs = require 'fs-plus'
+{$, _, Point, fs} = require 'atom'
 Project = require '../src/project'
 TokenizedBuffer = require '../src/tokenized-buffer'
 
@@ -103,7 +101,7 @@ $.fn.resultOfTrigger = (type) ->
   event.result
 
 $.fn.enableKeymap = ->
-  @on 'keydown', (e) -> window.keymap.handleKeyEvent(e)
+  @on 'keydown', (e) => window.keymap.handleKeyEvent(e)
 
 $.fn.attachToDom = ->
   $('#jasmine-content').append(this)

benchmark/benchmark-suite.coffee

@@ -7,7 +7,7 @@ describe "editorView.", ->
 
   beforeEach ->
     atom.workspaceViewParentSelector = '#jasmine-content'
-    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
+    atom.workspaceView = new WorkspaceView
     atom.workspaceView.attachToDom()
 
     atom.workspaceView.width(1024)
@@ -53,7 +53,7 @@ describe "editorView.", ->
 
     describe "at-end.", ->
       beforeEach ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()
 
       benchmark "insert-delete", ->
         editorView.insertText('"')
@@ -62,8 +62,8 @@ describe "editorView.", ->
     describe "empty-vs-set-innerHTML.", ->
       [firstRow, lastRow] = []
       beforeEach ->
-        firstRow = editorView.getModel().getFirstVisibleScreenRow()
-        lastRow = editorView.getModel().getLastVisibleScreenRow()
+        firstRow = editorView.getFirstVisibleScreenRow()
+        lastRow = editorView.getLastVisibleScreenRow()
 
       benchmark "build-gutter-html.", 1000, ->
         editorView.gutter.renderLineNumbers(null, firstRow, lastRow)
@@ -97,13 +97,13 @@ describe "editorView.", ->
       describe "multiple-lines.", ->
         [firstRow, lastRow] = []
         beforeEach ->
-          firstRow = editorView.getModel().getFirstVisibleScreenRow()
-          lastRow = editorView.getModel().getLastVisibleScreenRow()
+          firstRow = editorView.getFirstVisibleScreenRow()
+          lastRow = editorView.getLastVisibleScreenRow()
 
         benchmark "cache-entire-visible-area", 100, ->
           for i in [firstRow..lastRow]
             line = editorView.lineElementForScreenRow(i)[0]
-            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.getModel().lineTextForBufferRow(i).length))
+            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.lineLengthForBufferRow(i)))
 
     describe "text-rendering.", ->
       beforeEach ->
@@ -178,7 +178,7 @@ describe "editorView.", ->
         atom.workspaceView.openSync('huge.js')
 
       benchmark "moving-to-eof.", 1, ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()
 
       describe "on-first-line.", ->
         benchmark "inserting-newline", 5, ->
@@ -195,11 +195,11 @@ describe "editorView.", ->
         endPosition = null
 
         beforeEach ->
-          editorView.moveToBottom()
+          editorView.moveCursorToBottom()
           endPosition = editorView.getCursorScreenPosition()
 
         benchmark "move-to-beginning-of-word", ->
-          editorView.moveToBeginningOfWord()
+          editorView.moveCursorToBeginningOfWord()
           editorView.setCursorScreenPosition(endPosition)
 
         benchmark "insert", ->

benchmark/browser-process-startup.coffee

@@ -1,56 +0,0 @@
-#!/usr/bin/env coffee
-
-{spawn, exec} = require 'child_process'
-fs = require 'fs'
-os = require 'os'
-path = require 'path'
-_ = require 'underscore-plus'
-temp = require 'temp'
-
-directoryToOpen = temp.mkdirSync('browser-process-startup-')
-socketPath = path.join(os.tmpdir(), 'atom.sock')
-numberOfRuns = 10
-
-deleteSocketFile = ->
-  try
-    fs.unlinkSync(socketPath) if fs.existsSync(socketPath)
-  catch error
-    console.error(error)
-
-launchAtom = (callback) ->
-  deleteSocketFile()
-
-  cmd = 'atom'
-  args = ['--safe', '--new-window', '--foreground', directoryToOpen]
-  atomProcess = spawn(cmd, args)
-
-  output = ''
-  startupTimes = []
-  dataListener = (data) ->
-    output += data
-    if match = /App load time: (\d+)/.exec(output)
-      startupTime = parseInt(match[1])
-      atomProcess.stderr.removeListener 'data', dataListener
-      atomProcess.kill()
-      exec 'pkill -9 Atom', (error) ->
-        console.error(error) if error?
-        callback(startupTime)
-
-  atomProcess.stderr.on 'data', dataListener
-
-startupTimes = []
-collector = (startupTime) ->
-  startupTimes.push(startupTime)
-  if startupTimes.length < numberOfRuns
-    launchAtom(collector)
-  else
-    maxTime = _.max(startupTimes)
-    minTime = _.min(startupTimes)
-    totalTime = startupTimes.reduce (previousValue=0, currentValue) -> previousValue + currentValue
-    console.log "Startup Runs: #{startupTimes.length}"
-    console.log "First run time: #{startupTimes[0]}ms"
-    console.log "Max time: #{maxTime}ms"
-    console.log "Min time: #{minTime}ms"
-    console.log "Average time: #{Math.round(totalTime/startupTimes.length)}ms"
-
-launchAtom(collector)

build/Gruntfile.coffee

@@ -39,31 +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')
-  buildDir = path.resolve(buildDir)
-  installDir = grunt.option('install-dir')
-
-  home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
-  atomShellDownloadDir = path.join(home, '.atom', 'atom-shell')
-
+  atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
   symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
   shellAppDir = path.join(buildDir, appName)
   if process.platform is 'win32'
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= path.join(process.env.ProgramFiles, appName)
-    killCommand = 'taskkill /F /IM atom.exe'
+    installDir = path.join(process.env.ProgramFiles, appName)
   else if process.platform is 'darwin'
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
-    installDir ?= path.join('/Applications', appName)
-    killCommand = 'pkill -9 Atom'
+    installDir = path.join('/Applications', appName)
   else
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
-    killCommand ='pkill -9 atom'
-
-  installDir = path.resolve(installDir)
+    installDir = process.env.INSTALL_PREFIX ? '/usr/local'
 
   coffeeConfig =
     glob_to_multiple:
@@ -99,8 +89,6 @@ module.exports = (grunt) ->
   csonConfig =
     options:
       rootObject: true
-      cachePath: path.join(home, '.atom', 'compile-cache', 'grunt-cson')
-
     glob_to_multiple:
       expand: true
       src: [
@@ -133,8 +121,6 @@ module.exports = (grunt) ->
 
     atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}
 
-    docsOutputDir: 'docs/output'
-
     coffee: coffeeConfig
 
     less: lessConfig
@@ -147,7 +133,12 @@ module.exports = (grunt) ->
 
     coffeelint:
       options:
-        configFile: 'coffeelint.json'
+        no_empty_param_list:
+          level: 'error'
+        max_line_length:
+          level: 'ignore'
+        indentation:
+          level: 'ignore'
       src: [
         'dot-atom/**/*.coffee'
         'exports/**/*.coffee'
@@ -219,7 +210,7 @@ module.exports = (grunt) ->
 
     shell:
       'kill-atom':
-        command: killCommand
+        command: 'pkill -9 Atom'
         options:
           stdout: false
           stderr: false
@@ -228,16 +219,9 @@ module.exports = (grunt) ->
   grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg'])
   grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
   grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'dump-symbols', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
   grunt.registerTask('docs', ['markdown:guides', 'build-docs'])
 
-  ciTasks = ['output-disk-space', 'download-atom-shell', 'build']
-  ciTasks.push('dump-symbols') if process.platform isnt 'win32'
-  ciTasks.push('set-version', 'check-licenses', 'lint')
-  ciTasks.push('mkdeb') if process.platform is 'linux'
-  ciTasks.push('test') if process.platform isnt 'linux'
-  ciTasks.push('codesign', 'publish-build')
-  grunt.registerTask('ci', ciTasks)
-
   defaultTasks = ['download-atom-shell', 'build', 'set-version']
   defaultTasks.push 'install' unless process.platform is 'linux'
   grunt.registerTask('default', defaultTasks)

build/package.json

@@ -7,18 +7,17 @@
   },
   "dependencies": {
     "async": "~0.2.9",
-    "donna": "1.0.1",
-    "tello": "1.0.3",
+    "biscotto": ">=2.1.1 <3.0",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
-    "grunt-contrib-coffee": "~0.9.0",
+    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
     "grunt-contrib-csslint": "~0.1.2",
+    "grunt-contrib-coffee": "~0.9.0",
     "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.10.0",
+    "grunt-cson": "0.8.0",
     "grunt-download-atom-shell": "~0.8.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
@@ -27,16 +26,16 @@
     "harmony-collections": "~0.3.8",
     "json-front-matter": "~0.1.3",
     "legal-eagle": "~0.4.0",
-    "minidump": "~0.8",
-    "normalize-package-data": "0.2.12",
-    "npm": "~1.4.5",
-    "rcedit": "~0.1.2",
+    "minidump": "~0.7",
     "read-package-json": "1.1.8",
+    "normalize-package-data": "0.2.12",
+    "rcedit": "~0.1.2",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
-    "runas": "~1.0.1",
+    "runas": "0.5.x",
     "underscore-plus": "1.x",
     "unzip": "~0.1.9",
-    "vm-compatibility-layer": "~0.1.0"
+    "vm-compatibility-layer": "~0.1.0",
+    "npm": "~1.4.5"
   }
 }

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)
@@ -14,9 +13,9 @@ module.exports = (grunt) ->
     mkdir path.dirname(buildDir)
 
     if process.platform is 'darwin'
-      cp 'atom-shell/Atom.app', shellAppDir, filter: /default_app/
+      cp 'atom-shell/Atom.app', shellAppDir
     else
-      cp 'atom-shell', shellAppDir, filter: /default_app/
+      cp 'atom-shell', shellAppDir
 
     mkdir appDir
 
@@ -45,114 +44,41 @@ module.exports = (grunt) ->
       path.join('git-utils', 'deps')
       path.join('oniguruma', 'deps')
       path.join('less', 'dist')
+      path.join('less', 'test')
       path.join('bootstrap', 'docs')
-      path.join('bootstrap', '_config.yml')
-      path.join('bootstrap', '_includes')
-      path.join('bootstrap', '_layouts')
-      path.join('npm', 'doc')
-      path.join('npm', 'html')
-      path.join('npm', 'man')
-      path.join('npm', 'node_modules', '.bin', 'beep')
-      path.join('npm', 'node_modules', '.bin', 'clear')
-      path.join('npm', 'node_modules', '.bin', 'starwars')
+      path.join('bootstrap', 'examples')
       path.join('pegjs', 'examples')
+      # Add .* to avoid matching hunspell_dictionaries.
+      path.join('spellchecker', 'vendor', 'hunspell', '.*')
+      path.join('xmldom', 'test')
       path.join('jasmine-reporters', 'ext')
-      path.join('jasmine-node', 'node_modules', 'gaze')
-      path.join('jasmine-node', 'spec')
-      path.join('node_modules', 'nan')
-      path.join('build', 'binding.Makefile')
-      path.join('build', 'config.gypi')
-      path.join('build', 'gyp-mac-tool')
-      path.join('build', 'Makefile')
       path.join('build', 'Release', 'obj.target')
-      path.join('build', 'Release', 'obj')
       path.join('build', 'Release', '.deps')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')
-
-      # These are only require in dev mode when the grammar isn't precompiled
-      path.join('atom-keymap', 'node_modules', 'loophole')
-      path.join('atom-keymap', 'node_modules', 'pegjs')
-      path.join('atom-keymap', 'node_modules', '.bin', 'pegjs')
-      path.join('snippets', 'node_modules', 'loophole')
-      path.join('snippets', 'node_modules', 'pegjs')
-      path.join('snippets', 'node_modules', '.bin', 'pegjs')
-
-      '.DS_Store'
-      '.jshintrc'
-      '.npmignore'
-      '.pairs'
-      '.travis.yml'
     ]
-    ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath)
-
-    # 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"
-
-    # Ignore *.cc and *.h files from native modules
-    ignoredPaths.push "#{_.escapeRegExp(path.join('ctags', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('git-utils', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('keytar', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('nslog', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('oniguruma', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('pathwatcher', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('runas', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('scrollbar-style', 'src') + path.sep)}.*\\.(cc|h)*"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'src') + path.sep)}.*\\.(cc|h)*"
-
-    # Ignore build files
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}binding\\.gyp$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}.+\\.target.mk$"
-    ignoredPaths.push "#{_.escapeRegExp(path.sep)}linker\\.lock$"
-    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.+\\.node\\.dSYM"
-
     # Hunspell dictionaries are only not needed on OS X.
     if process.platform is 'darwin'
       ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
-
-    testFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}te?sts?#{_.escapeRegExp(path.sep)}")
-    exampleFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}examples?#{_.escapeRegExp(path.sep)}")
-    benchmarkFolderPattern = new RegExp("#{_.escapeRegExp(path.sep)}benchmarks?#{_.escapeRegExp(path.sep)}")
-
     nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
-    filterNodeModule = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      nodeModulesFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
     packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")
-    filterPackage = (pathToCopy) ->
-      return true if benchmarkFolderPattern.test(pathToCopy)
-
-      pathToCopy = path.resolve(pathToCopy)
-      packageFilter.test(pathToCopy) or testFolderPattern.test(pathToCopy) or exampleFolderPattern.test(pathToCopy)
-
     for directory in nonPackageDirectories
-      cp directory, path.join(appDir, directory), filter: filterNodeModule
-
+      cp directory, path.join(appDir, directory), filter: nodeModulesFilter
     for directory in packageDirectories
-      cp directory, path.join(appDir, directory), filter: filterPackage
+      cp directory, path.join(appDir, directory), filter: packageFilter
 
     cp 'spec', path.join(appDir, 'spec')
     cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
     cp 'static', path.join(appDir, 'static')
-    cp 'apm', path.join(appDir, 'apm'), filter: filterNodeModule
+    cp 'apm', path.join(appDir, 'apm'), filter: nodeModulesFilter
 
     if process.platform is 'darwin'
       grunt.file.recurse path.join('resources', 'mac'), (sourcePath, rootDirectory, subDirectory='', filename) ->
         unless /.+\.plist/.test(sourcePath)
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
-    if process.platform is 'win32'
-      # Set up chocolatey ignore and gui files
-      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
-      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
-      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
-
     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

@@ -1,12 +1,12 @@
-path = require 'path'
-
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'codesign', 'Codesign the app', ->
+    return unless process.platform is 'darwin'
+
     done = @async()
 
-    if process.platform is 'darwin' and process.env.XCODE_KEYCHAIN
+    if process.env.XCODE_KEYCHAIN
       unlockKeychain (error) ->
         if error?
           done(error)
@@ -22,15 +22,6 @@ module.exports = (grunt) ->
     spawn {cmd, args}, (error) -> callback(error)
 
   signApp = (callback) ->
-    switch process.platform
-      when 'darwin'
-        cmd = 'codesign'
-        args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
-        spawn {cmd, args}, (error) -> callback(error)
-      when 'win32'
-        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
-          cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
-          args = [path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
-          spawn {cmd, args}, (error) -> callback(error)
-      else
-        callback()
+    cmd = 'codesign'
+    args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+    spawn {cmd, args}, (error) -> callback(error)

build/tasks/docs-task.coffee

@@ -1,40 +1,160 @@
 path = require 'path'
 
+async = require 'async'
 fs = require 'fs-plus'
-_ = require 'underscore-plus'
-
-donna = require 'donna'
-tello = require 'tello'
+request = require 'request'
 
 module.exports = (grunt) ->
-  getClassesToInclude = ->
-    modulesPath = path.resolve(__dirname, '..', '..', 'node_modules')
-    classes = {}
-    fs.traverseTreeSync modulesPath, (modulePath) ->
-      return false if modulePath.match(/node_modules/g).length > 1 # dont need the dependencies of the dependencies
-      return true unless path.basename(modulePath) is 'package.json'
-      return true unless fs.isFileSync(modulePath)
+  {rm} = require('./task-helpers')(grunt)
 
-      apiPath = path.join(path.dirname(modulePath), 'api.json')
-      if fs.isFileSync(apiPath)
-        _.extend(classes, grunt.file.readJSON(apiPath).classes)
-      true
-    classes
-
-  sortClasses = (classes) ->
-    sortedClasses = {}
-    for className in Object.keys(classes).sort()
-      sortedClasses[className] = classes[className]
-    sortedClasses
+  cmd = path.join('node_modules', '.bin', 'coffee')
+  commonArgs = [path.join('build', 'node_modules', '.bin', 'biscotto'), '--']
+  opts =
+    stdio: 'inherit'
 
   grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
-    docsOutputDir = grunt.config.get('docsOutputDir')
+    done = @async()
 
-    metadata = donna.generateMetadata(['.'])
-    api = tello.digest(metadata)
-    _.extend(api.classes, getClassesToInclude())
-    api.classes = sortClasses(api.classes)
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        rm('docs/output/api')
+        args = [
+          commonArgs...
+          '--title', 'Atom API Documentation'
+          '-o', 'docs/output/api'
+          '-r', 'docs/README.md'
+          '--stability', '1'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
 
-    apiJson = JSON.stringify(api, null, 2)
-    apiJsonPath = path.join(docsOutputDir, 'api.json')
-    grunt.file.write(apiJsonPath, apiJson)
+  grunt.registerTask 'lint-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'missing-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          '--missing'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'copy-docs', 'Copies over latest API docs to atom-docs', ->
+    done = @async()
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    copyDocs = (tag, callback) ->
+      cmd = 'cp'
+      args = ['-r', 'docs/output/', "../atom.io/public/docs/api/#{tag}/"]
+
+      fs.exists "../atom.io/public/docs/api/", (exists) ->
+        if exists
+          grunt.util.spawn {cmd, args}, (error, result) ->
+            if error?
+              callback(error)
+            else
+              callback(null, tag)
+        else
+          grunt.log.error "../atom.io/public/docs/api/ doesn't exist"
+          return false
+
+    grunt.util.async.waterfall [fetchTag, copyDocs], done
+
+  grunt.registerTask 'deploy-docs', 'Publishes latest API docs to atom-docs.githubapp.com', ->
+    done = @async()
+    docsRepoArgs = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/']
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim().split('.')[0..1].join('.'))
+
+    stageDocs = (tag, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'add', "public/#{tag}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    fetchSha = (args..., callback) ->
+      cmd = 'git'
+      args = ['rev-parse', 'HEAD']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    commitChanges = (sha, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'commit', "-m Update API docs to #{sha}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushOrigin = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'origin', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushHeroku = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'heroku', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    grunt.util.async.waterfall [fetchTag, stageDocs, fetchSha, commitChanges, pushOrigin, pushHeroku], done
+
+downloadFileFromRepo = ({repo, file}, callback) ->
+  uri = "https://raw.github.com/atom/#{repo}/master/#{file}"
+  request uri, (error, response, contents) ->
+    return callback(error) if error?
+    downloadPath = path.join('docs', 'includes', repo, file)
+    fs.writeFile downloadPath, contents, (error) ->
+      callback(error, downloadPath)
+
+downloadIncludes = (callback) ->
+  includes = [
+    {repo: 'atom-keymap', file: 'src/keymap-manager.coffee'}
+    {repo: 'atom-keymap', file: 'src/key-binding.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar-registry.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/directory.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/file.coffee'}
+    {repo: 'space-pen',   file: 'src/space-pen.coffee'}
+    {repo: 'text-buffer', file: 'src/marker.coffee'}
+    {repo: 'text-buffer', file: 'src/point.coffee'}
+    {repo: 'text-buffer', file: 'src/range.coffee'}
+    {repo: 'text-buffer', file: 'src/text-buffer.coffee'}
+    {repo: 'theorist',    file: 'src/model.coffee'}
+  ]
+
+  async.map(includes, downloadFileFromRepo, callback)

build/tasks/install-task.coffee

@@ -1,6 +1,5 @@
 fs = require 'fs'
 path = require 'path'
-_ = require 'underscore-plus'
 fs = require 'fs-plus'
 runas = null
 
@@ -10,7 +9,6 @@ module.exports = (grunt) ->
   grunt.registerTask 'install', 'Install the built application', ->
     installDir = grunt.config.get('atom.installDir')
     shellAppDir = grunt.config.get('atom.shellAppDir')
-
     if process.platform is 'win32'
       runas ?= require 'runas'
       copyFolder = path.resolve 'script', 'copy-folder.cmd'
@@ -27,28 +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')
-
       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'
-      if installDir.indexOf(tmpDir) isnt 0
-        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
-        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')
-
-        {description} = grunt.file.readJSON('package.json')
-        iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-        installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/atom/atom"
-        template = _.template(String(fs.readFileSync(desktopFile)))
-        filled = template({description, installDir, iconName})
-
-        grunt.file.write(desktopInstallFile, filled)
-
       # Create relative symbol link for apm.
       process.chdir(binDir)
       rm('apm')

build/tasks/mkdeb-task.coffee

@@ -2,27 +2,16 @@ fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'
 
+fillTemplate = (filePath, data) ->
+  template = _.template(String(fs.readFileSync(filePath + '.in')))
+  filled = template(data)
+  fs.writeFileSync(filePath, filled)
+
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
-  fillTemplate = (filePath, data) ->
-    template = _.template(String(fs.readFileSync("#{filePath}.in")))
-    filled = template(data)
-
-    outputPath = path.join(grunt.config.get('atom.buildDir'), path.basename(filePath))
-    grunt.file.write(outputPath, filled)
-    outputPath
-
-  getInstalledSize = (buildDir, callback) ->
-    cmd = 'du'
-    args = ['-sk', path.join(buildDir, 'Atom')]
-    spawn {cmd, args}, (error, {stdout}) ->
-      installedSize = stdout.split(/\s+/)?[0] or '200000' # default to 200MB
-      callback(null, installedSize)
-
   grunt.registerTask 'mkdeb', 'Create debian package', ->
     done = @async()
-    buildDir = grunt.config.get('atom.buildDir')
 
     if process.arch is 'ia32'
       arch = 'i386'
@@ -34,19 +23,15 @@ module.exports = (grunt) ->
     {name, version, description} = grunt.file.readJSON('package.json')
     section = 'devel'
     maintainer = 'GitHub <atom@github.com>'
-    installDir = '/usr'
-    iconName = 'atom'
-    getInstalledSize buildDir, (error, installedSize) ->
-      data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize}
-      controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
-      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
-      icon = path.join('resources', 'atom.png')
+    data = {name, version, description, section, arch, maintainer}
 
-      cmd = path.join('script', 'mkdeb')
-      args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
-      spawn {cmd, args}, (error) ->
-        if error?
-          done(error)
-        else
-          grunt.log.ok "Created #{buildDir}/atom-#{version}-#{arch}.deb"
-          done()
+    control = path.join('resources', 'linux', 'debian', 'control')
+    fillTemplate(control, data)
+    desktop = path.join('resources', 'linux', 'Atom.desktop')
+    fillTemplate(desktop, data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, arch, control, desktop, icon, buildDir]
+    spawn({cmd, args}, done)

build/tasks/output-build-filetypes.coffee

@@ -1,21 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-build-filetypes', 'Log counts for each filetype in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    types = {}
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      extension = path.extname(fileName) or fileName
-      types[extension] ?= 0
-      types[extension]++
-
-    extensions = Object.keys(types).sort (extension1, extension2) ->
-      diff = types[extension2] - types[extension1]
-      if diff is 0
-        extension1.toLowerCase().localeCompare(extension2.toLowerCase())
-      else
-        diff
-
-    extensions.forEach (extension) ->
-      grunt.log.error "#{extension}: #{types[extension]}"

build/tasks/output-long-paths-task.coffee

@@ -1,18 +0,0 @@
-path = require 'path'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'output-long-paths', 'Log long paths in the built application', ->
-    shellAppDir = grunt.config.get('atom.shellAppDir')
-
-    longPaths = []
-    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
-      if relativePath
-        fullPath = path.join(relativePath, fileName)
-      else
-        fullPath = fileName
-      longPaths.push(fullPath) if fullPath.length >= 200
-
-    longPaths.sort (longPath1, longPath2) -> longPath2.length - longPath1.length
-
-    longPaths.forEach (longPath) ->
-      grunt.log.error "#{longPath.length} character path: #{longPath}"

build/tasks/prebuild-less-task.coffee

@@ -9,12 +9,10 @@ module.exports = (grunt) ->
       ['atom-dark-ui', 'atom-light-syntax']
       ['atom-dark-ui', 'solarized-dark-syntax']
       ['atom-dark-ui', 'base16-tomorrow-dark-theme']
-      ['atom-dark-ui', 'base16-tomorrow-light-theme']
       ['atom-light-ui', 'atom-light-syntax']
       ['atom-light-ui', 'atom-dark-syntax']
       ['atom-light-ui', 'solarized-dark-syntax']
       ['atom-light-ui', 'base16-tomorrow-dark-theme']
-      ['atom-light-ui', 'base16-tomorrow-light-theme']
     ]
 
     directory = path.join(grunt.config.get('atom.appDir'), 'less-compile-cache')

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 =
@@ -17,25 +21,15 @@ defaultHeaders =
 
 module.exports = (gruntObject) ->
   grunt = gruntObject
-  {cp} = require('./task-helpers')(grunt)
 
   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 api.json to atom-api.json', ->
-    docsOutputDir = grunt.config.get('docsOutputDir')
-    buildDir = grunt.config.get('atom.buildDir')
-    cp path.join(docsOutputDir, 'api.json'), path.join(buildDir, 'atom-api.json')
-
-  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?
@@ -44,55 +38,23 @@ module.exports = (gruntObject) ->
           return done(error) if error?
           uploadAssets(release, buildDir, assets, done)
 
-getAssets = ->
-  switch process.platform
-    when 'darwin'
-      [
-        {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
-        {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
-        {assetName: 'atom-api.json', sourcePath: 'atom-api.json'}
-      ]
-    when 'win32'
-      [
-        {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
-      ]
-    when 'linux'
-      buildDir = grunt.config.get('atom.buildDir')
-      if process.arch is 'ia32'
-        arch = 'i386'
-      else
-        arch = 'amd64'
-      {version} = grunt.file.readJSON('package.json')
-      sourcePath = "#{buildDir}/atom-#{version}-#{arch}.deb"
-      assetName = "atom-#{arch}.deb"
-
-      {cp} = require('./task-helpers')(grunt)
-      cp sourcePath, path.join(buildDir, assetName)
-
-      [
-        {assetName, sourcePath}
-      ]
-
 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 when path.extname(assetName) is '.zip'
+  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) ->
@@ -157,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/set-version-task.coffee

@@ -45,8 +45,8 @@ module.exports = (grunt) ->
 
         strings =
           CompanyName: 'GitHub, Inc.'
-          FileDescription: 'Atom'
-          LegalCopyright: 'Copyright (C) 2014 GitHub, Inc. All rights reserved'
+          FileDescription: 'The hackable editor'
+          LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
           ProductName: 'Atom'
           ProductVersion: version
 

build/tasks/spec-task.coffee

@@ -2,6 +2,7 @@ fs = require 'fs'
 path = require 'path'
 
 _ = require 'underscore-plus'
+
 async = require 'async'
 
 module.exports = (grunt) ->
@@ -9,27 +10,18 @@ module.exports = (grunt) ->
 
   packageSpecQueue = null
 
-  getAppPath = ->
-    contentsDir = grunt.config.get('atom.contentsDir')
-    switch process.platform
-      when 'darwin'
-        path.join(contentsDir, 'MacOS', 'Atom')
-      when 'linux'
-        path.join(contentsDir, 'atom')
-      when 'win32'
-        path.join(contentsDir, 'atom.exe')
-
   runPackageSpecs = (callback) ->
     failedPackages = []
     rootDir = grunt.config.get('atom.shellAppDir')
+    contentsDir = grunt.config.get('atom.contentsDir')
     resourcePath = process.cwd()
-    appPath = getAppPath()
-
-    # Ensure application is executable on Linux
-    fs.chmodSync(appPath, '755') if process.platform is 'linux'
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')
 
     packageSpecQueue = async.queue (packagePath, callback) ->
-      if process.platform in ['darwin', 'linux']
+      if process.platform is 'darwin'
         options =
           cmd: appPath
           args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}"]
@@ -61,15 +53,21 @@ module.exports = (grunt) ->
       continue unless isAtomPackage(packagePath)
       packageSpecQueue.push(packagePath)
 
-    packageSpecQueue.concurrency = 1
+    # TODO: Restore concurrency on Windows
+    packageSpecQueue.concurrency = 1 unless process.platform is 'win32'
+
     packageSpecQueue.drain = -> callback(null, failedPackages)
 
   runCoreSpecs = (callback) ->
-    appPath = getAppPath()
+    contentsDir = grunt.config.get('atom.contentsDir')
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')
     resourcePath = process.cwd()
     coreSpecsPath = path.resolve('spec')
 
-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
       options =
         cmd: appPath
         args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}"]
@@ -94,7 +92,7 @@ module.exports = (grunt) ->
 
     # TODO: This should really be parallel on both platforms, however our
     # fixtures step on each others toes currently.
-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
       method = async.parallel
     else if process.platform is 'win32'
       method = async.series
@@ -107,8 +105,4 @@ module.exports = (grunt) ->
       failures.push "atom core" if coreSpecFailed
 
       grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
-
-      if process.platform is 'win32' and process.env.JANKY_SHA1
-        done()
-      else
-        done(!coreSpecFailed and failedPackages.length == 0)
+      done(!coreSpecFailed and failedPackages.length == 0)

build/tasks/task-helpers.coffee

@@ -7,7 +7,7 @@ module.exports = (grunt) ->
       grunt.fatal("Cannot copy non-existent #{source.cyan} to #{destination.cyan}")
 
     copyFile = (sourcePath, destinationPath) ->
-      return if filter?(sourcePath) or filter?.test?(sourcePath)
+      return if filter?.test(sourcePath)
 
       stats = fs.lstatSync(sourcePath)
       if stats.isSymbolicLink()
@@ -53,9 +53,8 @@ module.exports = (grunt) ->
     proc = childProcess.spawn(options.cmd, options.args, options.opts)
     proc.stdout.on 'data', (data) -> stdout.push(data.toString())
     proc.stderr.on 'data', (data) -> stderr.push(data.toString())
-    proc.on 'error', (processError) -> error ?= processError
     proc.on 'close', (exitCode, signal) ->
-      error ?= new Error(signal) if exitCode != 0
+      error = new Error(signal) if exitCode != 0
       results = {stderr: stderr.join(''), stdout: stdout.join(''), code: exitCode}
       grunt.log.error results.stderr if exitCode != 0
       callback(error, results, exitCode)

coffeelint.json

@@ -1,14 +0,0 @@
-{
-  "max_line_length": {
-    "level": "ignore"
-  },
-  "no_empty_param_list": {
-    "level": "error"
-  },
-  "arrow_spacing": {
-    "level": "error"
-  },
-  "no_interpolation_in_single_quotes": {
-    "level": "error"
-  }
-}

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

@@ -56,7 +56,7 @@ character of the current line:
 class EditorView
   listenForEvents: ->
     @command 'editor:move-to-first-character-of-line', =>
-      @editor.moveToFirstCharacterOfLine()
+      @editor.moveCursorToFirstCharacterOfLine()
 ```
 
 The `::command` method is basically an enhanced version of jQuery's `::on`

docs/apm-rest-api.md

@@ -1,4 +1,4 @@
-# Atom.io package and update API
+## Atom.io package and update API
 
 This guide describes the web API used by [apm](https://github.com/atom/apm) and
 Atom. The vast majority of use cases are met by the `apm` command-line tool,
@@ -8,8 +8,6 @@ and making sure you have pushed your git tag. In fact, Atom itself shells out to
 uses `apm`, see the [PackageManager class](https://github.com/atom/settings-view/blob/master/lib/package-manager.coffee)
 in the `settings-view` package.
 
-*This API should be considered pre-release and is subject to change (though significant breaking changes are unlikely).*
-
 ### Authorization
 
 For calls to the API that require authentication, provide a valid token from your
@@ -19,18 +17,12 @@ For calls to the API that require authentication, provide a valid token from you
 
 All requests that take parameters require `application/json`.
 
-# API Resources
+## Resources
 
-## Packages
-
-### Listing packages
+### Packages
 
 #### GET /api/packages
 
-Parameters:
-
-- **page** (optional)
-
 Returns a list of all packages in the following format:
 ```json
   [
@@ -48,17 +40,6 @@ Returns a list of all packages in the following format:
   ]
 ```
 
-Results are paginated 30 at a time, and links to the next and last pages are
-provided in the `Link` header:
-
-```
-Link: <https://www.atom.io/api/packages?page=1>; rel="self",
-      <https://www.atom.io/api/packages?page=41>; rel="last",
-      <https://www.atom.io/api/packages?page=2>; rel="next"
-```
-
-### Showing package details
-
 #### GET /api/packages/:package_name
 
 Returns package details and versions for a single package
@@ -87,8 +68,6 @@ Returns:
   }
 ```
 
-### Creating a package
-
 #### POST /api/packages
 
 Create a new package; requires authentication.
@@ -113,7 +92,6 @@ Returns:
   - The package.json at owner/repo isn't valid
 - **409** - A package by that name already exists
 
-### Deleting a package
 
 #### DELETE /api/packages/:package_name
 
@@ -125,13 +103,6 @@ Returns:
 - **400** - Repository is inaccessible
 - **401** - Unauthorized
 
-### Renaming a package
-
-Packages are renamed by publishing a new version with the name changed in `package.json`
-See [Creating a new package version](#creating-a-new-package-version) for details.
-
-Requests made to the previous name will forward to the new name.
-
 ### Package Versions
 
 #### GET /api/packages/:package_name/versions/:version_name
@@ -173,9 +144,7 @@ Returns `package.json` with `dist` key added for e.g. tarball download:
 
 #### POST /api/packages/:package_name/versions
 
-Creates a new package version from a git tag; requires authentication. If `rename`
-is not `true`, the `name` field in `package.json` *must* match the current package
-name.
+Creates a new package version from a git tag; requires authentication.
 
 #### Parameters
 
@@ -183,15 +152,14 @@ name.
   that the version name will not be taken from the tag, but from the `version`
   key in the `package.json` file at that ref. The authenticating user *must* have
   access to the package repository.
-- **rename** - Boolean indicating whether this version contains a new name for the package.
 
 #### Returns
 
 - **201** - Successfully created. Returns created version.
-- **400** - Git tag not found / Repository inaccessible / package.json invalid
+- **400** - Git tag not found / Repository inaccessible
 - **409** - Version exists
 
-### Deleting a version
+### Delete a version
 
 #### DELETE /api/packages/:package_name/versions/:version_name
 
@@ -204,9 +172,7 @@ you'll need to increment the version when republishing.
 Returns 204 No Content
 
 
-## Stars
-
-### Listing user stars
+### Stars
 
 #### GET /api/users/:login/stars
 
@@ -220,40 +186,19 @@ List the authenticated user's starred packages; requires authentication.
 
 Return value is similar to **GET /api/packages**
 
-### Starring a package
-
 #### POST /api/packages/:name/star
 
 Star a package; requires authentication.
 
 Returns a package.
 
-### Unstarring a package
-
 #### DELETE /api/packages/:name/star
 
 Unstar a package; requires authentication.
 
 Returns 204 No Content.
 
-### Listing a package's stargazers
-
-#### GET /api/packages/:name/stargazers
-
-List the users that have starred a package.
-
-Returns a list of user objects:
-
-```json
-[
-  {"login":"aperson"},
-  {"login":"anotherperson"},
-]
-```
-
-## Atom updates
-
-### Listing Atom updates
+### Atom updates
 
 #### GET /api/updates
 
@@ -261,10 +206,10 @@ Atom update feed, following the format expected by [Squirrel](https://github.com
 
 Returns:
 
-```json
+```
 {
     "name": "0.96.0",
-    "notes": "[HTML release notes]",
+    "notes": "[HTML release notes]"
     "pub_date": "2014-05-19T15:52:06.000Z",
     "url": "https://www.atom.io/api/updates/download"
 }

docs/build-instructions/linux.md

@@ -6,85 +6,34 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
   * OS with 64-bit or 32-bit architecture
   * C++ toolchain
-  * [Git](http://git-scm.com/)
-  * [Node.js](http://nodejs.org/download/) v0.10.x
-  * [npm](http://www.npmjs.org/) v1.4.x (bundled with Node.js)
-    * `npm -v` to check the version.
-    * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2.
-      * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
-  * development headers for [GNOME Keyring](https://wiki.gnome.org/Projects/GnomeKeyring)
-
-### Ubuntu / Debian
-
-* `sudo apt-get install build-essential git libgnome-keyring-dev`
-* Instructions for  [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
-
-### Fedora
-
-* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel`
-* Instructions for [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).
-
-### Arch
-
-* `sudo pacman -S base-devel git nodejs libgnome-keyring`
-* `export PYTHON=/usr/bin/python2` before building Atom.
+    * on Ubuntu/Debian: `sudo apt-get install build-essential`
+  * [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 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).
 
 ## Instructions
 
-If you have problems with permissions don't forget to prefix with `sudo`
-
-1. Clone the Atom repository:
-
   ```sh
   git clone https://github.com/atom/atom
   cd atom
+  script/build # Creates application at $TMPDIR/atom-build/Atom
+  sudo script/grunt install # Installs command to /usr/local/bin/atom
+  script/grunt mkdeb # Generates a .deb package at $TMPDIR/atom-build
   ```
 
-2. Checkout the latest Atom release:
-
-  ```sh
-  git fetch
-  git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-  ```
-
-3. Build Atom:
-
-  ```sh
-  script/build
-  ```
-
-  This will create the atom application at `$TMPDIR/atom-build/Atom`.
-
-4. Install the `atom` and `apm` commands to `/usr/local/bin` by executing:
-
-  ```sh
-  sudo script/grunt install
-  ```
-
-5. *Optionally*, you may generate a `.deb` package at `$TMPDIR/atom-build`:
-
-  ```sh
-  script/grunt mkdeb
-  ```
-
-Use the newly installed Atom by fully quitting Atom and then reopening.
-
-## Advanced Options
-
-### Custom install directory
-
-```sh
-sudo script/grunt install --install-dir /install/atom/here
-```
-
-### Custom build directory
-
-```sh
-script/build --build-dir /build/atom/here
-```
-
 ## Troubleshooting
 
+
 ### Exception: "TypeError: Unable to watch path"
 
 If you get following error with a big traceback right after Atom starts:
@@ -103,27 +52,11 @@ this is the reason for this error you can issue
 and restart Atom.  If Atom now works fine, you can make this setting permanent:
 
   ```sh
-  echo 32768 | sudo tee -a /proc/sys/fs/inotify/max_user_watches
+  echo 32768 > /proc/sys/fs/inotify/max_user_watches
   ```
 
 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 Node.js installed, or node isn't identified as Node.js on your machine.
-If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
-your terminal may fix the issue.
-
-#### You can also use Alternatives
-
-On some variants (mostly Debian based distros) it's preferable for you to use
-Alternatives so that changes to the binary paths can be fixed or altered easily:
-
-```sh
-sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave /usr/bin/js js /usr/bin/nodejs
-```
-
 ### 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/windows.md

@@ -9,11 +9,8 @@
     * 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`
+
+  * [Python](http://www.python.org/download/) v2.7.x
   * [GitHub for Windows](http://windows.github.com/)
 
 ### On Windows 8
@@ -35,14 +32,10 @@
 
 ## Why do I have to use GitHub for Windows?
 
-You don't. You can use your existing Git! GitHub for Windows's Git Shell is just
-easier to set up. 
-
-If you _prefer_ using your existing Git installation, make sure git's cmd directory is in your PATH env variable (e.g. `C:\Program Files (x86)\Git\cmd`) before you open your powershell or command window.
-Note that you may have to open your command window as administrator. For powershell that doesn't seem to always be the case, though.
-
-If none of this works, do install Github for Windows and use its Git shell. Makes life easier.
-
+You don't, You can use your existing Git! GitHub for Windows's Git Shell is just
+easier to set up. You need to have Posix tools in your `%PATH%` (i.e. `grep`,
+`sed`, et al.), which isn't the default configuration when you install Git. To
+fix this, you probably need to fiddle with your system PATH.
 
 ## Troubleshooting
 
@@ -58,32 +51,5 @@ If none of this works, do install Github for Windows and use its Git shell. Make
   * 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
-
-* `script/build` stops at installing runas with 'Failed at the runas@0.5.4 install script.'
-  
-  See the next item.
-
-* `error MSB8020: The build tools for Visual Studio 2010 (Platform Toolset = 'v100') cannot be found.`
-   
-  * If you're building atom with Visual Studio 2013 try executing the following
-    command in your Git shell and then re-run `script/build`:
-
-    ```
-    $env:GYP_MSVS_VERSION=2013
-    ```
-
-* Other `node-gyp` errors on first build attempt, even though the right node and python versions are installed.
-  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.
-
-
 ### Windows build error reports in atom/atom
-* If all fails, use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows, and see if yours has already been reported.
-
-* If it hasn't, please open a new issue with your Windows version 32/64bit and a print/screenshot of your build output, incl. the node and python versions.
+* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows.

docs/creating-a-package.md

@@ -227,16 +227,15 @@ or one of its parents has the `tree-view` class applied to it.
 
 You can also add separators and submenus to your context menus. To add a
 submenu, pass in another object instead of a command. To add a separator, use
-`-` for the command of the item.
+`-` for the name and command of the item.
 
 ```coffeescript
 'context-menu':
   '.workspace':
     'Inspect Element': 'core:inspect'
-    'Separator': '-'
+    '-': '-'
     'Text':
       'Select All': 'core:select-all'
-      'Another Separator': '-'
       'Deleted Selected Text': 'core:delete'
 ```
 

docs/customizing-atom.md

@@ -169,7 +169,7 @@ For example, to change the color of the cursor, you could add the following
 rule to your _~/.atom/styles.less_ file:
 
 ```less
-.editor.is-focused .cursor {
+.editor .cursor {
   border-color: pink;
 }
 ```

docs/debugging.md

@@ -1,13 +1,6 @@
 # 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)
+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
 

docs/writing-specs.md

@@ -38,7 +38,7 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec
 
 0. Add one or more expectations
 
-  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Expectations) about them. Below is a simple example.
+  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/2.0/introduction.html#section-Expectations) about them. Below is a simple example.
 
   ```coffee
   describe "when a test is written", ->
@@ -47,74 +47,6 @@ Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec
       expect("oranges").not.toEqual("apples")
   ```
 
-## Asynchronous specs
-
-Writing Asynchronous specs can be tricky at first. Some examples.
-
-0. Promises
-
-  Working with promises is rather easy in Atom. You can use our `waitsForPromise` function.
-
-  ```coffee
-    describe "when we open a file", ->
-      it "should be opened in an editor", ->
-        waitsForPromise ->
-          atom.workspace.open('c.coffee').then (editor) ->
-            expect(editor.getPath()).toContain 'c.coffee'
-  ```
-
-  This method can be used in the `describe`, `it`, `beforeEach` and `afterEach` functions.
-
-  ```coffee
-  describe "when we open a file", ->
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open 'c.coffee'
-
-    it "should be opened in an editor", ->
-      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'
-
-  ```
-
-  If you need to wait for multiple promises use a new `waitsForPromise` function for each promise. (Caution: Without `beforeEach` this example will fail!)
-
-  ```coffee
-  describe "waiting for the packages to load", ->
-
-    beforeEach ->
-      waitsForPromise ->
-        atom.workspace.open('sample.js')
-      waitsForPromise ->
-        atom.packages.activatePackage('tabs')
-      waitsForPromise ->
-        atom.packages.activatePackage('tree-view')
-
-    it 'should have waited long enough', ->
-      expect(atom.packages.isPackageActive('tabs')).toBe true
-      expect(atom.packages.isPackageActive('tree-view')).toBe true
-  ```
-
-0. Asynchronous functions with callbacks
-
-  Specs for asynchronous functions can be done using the `waitsFor` and `runs` functions. A simple example.
-
-  ```coffee
-  describe "fs.readdir(path, cb)", ->
-    it "is async", ->
-      spy = jasmine.createSpy('fs.readdirSpy')
-
-      fs.readdir('/tmp/example', spy)
-      waitsFor ->
-        spy.callCount > 0
-      runs ->
-        exp = [null, ['example.coffee']]
-        expect(spy.mostRecentCall.args).toEqual exp
-        expect(spy).toHaveBeenCalledWith(null, ['example.coffee'])
-  ```
-
-For a more detailed documentation on asynchronous tests please visit the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Asynchronous_Support).
-
-
 ## Running specs
 
 Most of the time you'll want to run specs by triggering the `window:run-package-specs` command. This command is not only to run package specs, it is also for Atom core specs. This will run all the specs in the current project's spec directory. If you want to run the Atom core specs and **all** the default package specs trigger the `window:run-all-specs` command.

docs/your-first-package.md

@@ -53,7 +53,7 @@ module.exports =
 
   convert: ->
     # This assumes the active pane item is an editor
-    editor = atom.workspace.getActivePaneItem()
+    editor = atom.workspace.activePaneItem
     editor.insertText('Hello, World!')
 ```
 
@@ -131,8 +131,8 @@ inserting 'Hello, World!' convert the selected text to ASCII art.
 ```coffeescript
 convert: ->
   # This assumes the active pane item is an editor
-  editor = atom.workspace.getActivePaneItem()
-  selection = editor.getLastSelection()
+  editor = atom.workspace.activePaneItem
+  selection = editor.getSelection()
 
   figlet = require 'figlet'
   figlet selection.getText(), {font: "Larry 3D 2"}, (error, asciiArt) ->

dot-atom/init.coffee

@@ -11,4 +11,4 @@
 # atom.workspaceView.eachEditorView (editorView) ->
 #   editor = editorView.getEditor()
 #   if path.extname(editor.getPath()) is '.md'
-#     editor.setSoftWrapped(true)
+#     editor.setSoftWrap(true)

dot-atom/keymap.cson

@@ -13,9 +13,6 @@
 #   'enter': 'editor:newline'
 #
 # '.workspace':
-#   'ctrl-shift-p': 'core:move-up'
+#   'ctrl-P': 'core:move-up'
 #   'ctrl-p': 'core:move-down'
 #
-# You can find more information about keymaps in these guides:
-# * https://atom.io/docs/latest/customizing-atom#customizing-key-bindings
-# * https://atom.io/docs/latest/advanced/keymaps

exports/atom.coffee

@@ -1,17 +1,12 @@
 {Point, Range} = require 'text-buffer'
-{deprecate} = require 'grim'
 
 module.exports =
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
-  GitRepository: require '../src/git-repository'
+  Git: require '../src/git'
   Point: Point
   Range: Range
 
-Object.defineProperty module.exports, 'Git', get: ->
-  deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"
-  module.exports.GitRepository
-
 # The following classes can't be used from a Task handler and should therefore
 # only be exported when not running as a child node process
 unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
@@ -27,5 +22,3 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.View = View
   module.exports.WorkspaceView = require '../src/workspace-view'
   module.exports.Workspace = require '../src/workspace'
-  module.exports.React = require 'react-atom-fork'
-  module.exports.Reactionary = require 'reactionary-atom-fork'

keymaps/base.cson

@@ -12,6 +12,7 @@
   # Sublime Parity
   'tab': 'editor:indent'
   'enter': 'editor:newline'
+  'num-enter': 'editor:newline'
   'shift-tab': 'editor:outdent-selected-rows'
   'ctrl-K': 'editor:delete-line'
 
@@ -26,6 +27,7 @@
   '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,6 +21,7 @@
   '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'
@@ -52,8 +53,6 @@
   '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'
@@ -68,8 +67,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'
@@ -119,7 +116,7 @@
   'cmd-shift-right': 'editor:select-to-end-of-line'
   'alt-backspace': 'editor:delete-to-beginning-of-word'
   'alt-delete': 'editor:delete-to-end-of-word'
-  'ctrl-a': 'editor:move-to-first-character-of-line'
+  'ctrl-a': 'editor:move-to-beginning-of-line'
   'ctrl-e': 'editor:move-to-end-of-line'
   'ctrl-k': 'editor:cut-to-end-of-line'
 
@@ -143,8 +140,6 @@
   # Sublime Parity
   'cmd-enter': 'editor:newline-below'
   'cmd-shift-enter': 'editor:newline-above'
-  'alt-enter': 'editor:newline'
-  'shift-enter': 'editor:newline'
   'cmd-]': 'editor:indent-selected-rows'
   'cmd-[': 'editor:outdent-selected-rows'
   'ctrl-cmd-up': 'editor:move-line-up'

keymaps/linux.cson

@@ -1,6 +1,7 @@
 'body':
   # Atom Specific
   'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -10,12 +11,10 @@
   'ctrl-shift-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
   'ctrl-alt-s': 'application:run-all-specs'
-  'ctrl-alt-o': 'application:open-dev'
-  'ctrl-shift-o': 'application:open-folder'
+  'ctrl-shift-o': 'application:open-dev'
   'F11': 'window:toggle-full-screen'
 
   # Sublime Parity
-  'ctrl-,': 'application:show-settings'
   'ctrl-N': 'application:new-window'
   'ctrl-W': 'window:close'
   'ctrl-o': 'application:open-file'
@@ -27,7 +26,6 @@
   'ctrl-w': 'core:close'
   'ctrl-z': 'core:undo'
   'ctrl-y': 'core:redo'
-  'ctrl-shift-z': 'core:redo'
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
   'ctrl-v': 'core:paste'
@@ -37,18 +35,14 @@
   '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:cut'
+  'shift-delete': 'core:delete'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
   'shift-backspace': 'core:backspace'
   'ctrl-tab': 'pane:show-next-item'
   'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
   'ctrl-shift-up': 'core:move-up'
   'ctrl-shift-down': 'core:move-down'
   'ctrl-=': 'window:increase-font-size'
@@ -97,7 +91,6 @@
   'ctrl-alt-shift-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'
 
 '.workspace .editor:not(.mini)':
   # Atom specific

keymaps/win32.cson

@@ -5,6 +5,7 @@
 
   # Atom Specific
   'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -17,7 +18,6 @@
   'F11': 'window:toggle-full-screen'
 
   # Sublime Parity
-  'ctrl-,': 'application:show-settings'
   'ctrl-N': 'application:new-window'
   'ctrl-W': 'window:close'
   'ctrl-o': 'application:open-file'
@@ -25,10 +25,8 @@
   'ctrl-n': 'application:new-file'
   'ctrl-s': 'core:save'
   'ctrl-S': 'core:save-as'
-  'ctrl-f4': 'core:close'
   'ctrl-w': 'core:close'
   'ctrl-z': 'core:undo'
-  'ctrl-shift-z': 'core:redo'
   'ctrl-y': 'core:redo'
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
@@ -39,18 +37,14 @@
   '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:cut'
+  'shift-delete': 'core:delete'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
   'shift-backspace': 'core:backspace'
   'ctrl-tab': 'pane:show-next-item'
   'ctrl-shift-tab': 'pane:show-previous-item'
-  'ctrl-pageup': 'pane:show-previous-item'
-  'ctrl-pagedown': 'pane:show-next-item'
   'ctrl-shift-up': 'core:move-up'
   'ctrl-shift-down': 'core:move-down'
   'ctrl-alt-up': 'editor:add-selection-above'
@@ -84,15 +78,12 @@
   'ctrl-delete': 'editor:delete-to-end-of-word'
   'ctrl-home': 'core:move-to-top'
   'ctrl-end': 'core:move-to-bottom'
-  'ctrl-shift-home': 'core:select-to-top'
-  'ctrl-shift-end': 'core:select-to-bottom'
 
   # Sublime Parity
   'ctrl-a': 'core:select-all'
   'ctrl-alt-shift-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
-  'ctrl-l': 'editor:select-line'
 
 '.workspace .editor:not(.mini)':
   # Atom specific

menus/darwin.cson

@@ -18,8 +18,6 @@
       { type: 'separator' }
       { label: 'Install Shell Commands', command: 'window:install-shell-commands' }
       { type: 'separator' }
-      { label: 'Services', submenu: [] }
-      { type: 'separator' }
       { label: 'Hide Atom', command: 'application:hide' }
       { label: 'Hide Others', command: 'application:hide-other-applications' }
       { label: 'Show All', command: 'application:unhide-all-applications' }
@@ -39,7 +37,7 @@
       { label: 'Save As...', command: 'core:save-as' }
       { label: 'Save All', command: 'window:save-all' }
       { type: 'separator' }
-      { label: 'Close Tab', command: 'core:close' }
+      { label: 'Close Buffer', command: 'core:close' }
       { label: 'Close Pane', command: 'pane:close' }
       { label: 'Close Window', command: 'window:close' }
     ]
@@ -111,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' }
@@ -194,13 +191,3 @@
     ]
   }
 ]
-
-'context-menu':
-  '.overlayer':
-    'Undo': 'core:undo'
-    'Redo': 'core:redo'
-    'Cut': 'core:cut'
-    'Copy': 'core:copy'
-    'Paste': 'core:paste'
-    'Delete': 'core:delete'
-    'Select All': 'core:select-all'

menus/linux.cson

@@ -8,12 +8,14 @@
       { label: 'Open Folder...', command: 'application:open-folder' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
+      { label: '&Preferences...', command: 'application:show-settings' }
+      { type: 'separator' }
       { label: '&Save', command: 'core:save' }
       { label: 'Save &As...', command: 'core:save-as' }
       { label: 'Save A&ll', command: 'window:save-all' }
       { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
       { label: 'Clos&e Window', command: 'window:close' }
       { type: 'separator' }
       { label: 'Quit', command: 'application:quit' }
@@ -78,14 +80,6 @@
           { label: 'Fold Level 9', command: 'editor:fold-at-indent-level-9' }
         ]
       }
-      { type: 'separator' }
-      { label: '&Preferences', command: 'application:show-settings' }
-      { label: 'Open Your Config', command: 'application:open-your-config' }
-      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
-      { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
-      { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
-      { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
-      { type: 'separator' }
     ]
   }
 
@@ -114,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' }
@@ -139,6 +132,16 @@
     submenu: []
   }
 
+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
   {
     label: '&Help'
     submenu: [
@@ -151,13 +154,3 @@
     ]
   }
 ]
-
-'context-menu':
-  '.overlayer':
-    'Undo': 'core:undo'
-    'Redo': 'core:redo'
-    'Cut': 'core:cut'
-    'Copy': 'core:copy'
-    'Paste': 'core:paste'
-    'Delete': 'core:delete'
-    'Select All': 'core:select-all'

menus/win32.cson

@@ -9,18 +9,13 @@
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
       { label: 'Se&ttings', command: 'application:show-settings' }
-      { label: 'Open Your Config', command: 'application:open-your-config' }
-      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
-      { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
-      { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
-      { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
       { type: 'separator' }
       { label: '&Save', command: 'core:save' }
       { label: 'Save &As...', command: 'core:save-as' }
       { label: 'Save A&ll', command: 'window:save-all' }
       { type: 'separator' }
-      { label: '&Close Tab', command: 'core:close' }
-      { label: 'Close &Pane', command: 'pane:close' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
       { label: 'Clos&e Window', command: 'window:close' }
       { type: 'separator' }
       { label: 'E&xit', command: 'application:quit' }
@@ -132,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' }
@@ -157,6 +151,16 @@
     submenu: []
   }
 
+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
   {
     label: '&Help'
     submenu: [
@@ -169,13 +173,3 @@
     ]
   }
 ]
-
-'context-menu':
-  '.overlayer':
-    'Undo': 'core:undo'
-    'Redo': 'core:redo'
-    'Cut': 'core:cut'
-    'Copy': 'core:copy'
-    'Paste': 'core:paste'
-    'Delete': 'core:delete'
-    'Select All': 'core:select-all'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.131.0",
+  "version": "0.104.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,129 +17,125 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.16.2",
+  "atomShellVersion": "0.13.0",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.1.3",
+    "atom-keymap": "^0.27.0",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
     "delegato": "^1",
-    "emissary": "^1.3.1",
-    "event-kit": "0.7.2",
-    "first-mate": "^2.1.2",
-    "fs-plus": "^2.2.6",
+    "emissary": "^1.2.1",
+    "first-mate": "^1.7",
+    "fs-plus": "^2.2.3",
     "fstream": "0.1.24",
-    "fuzzaldrin": "^2.1",
-    "git-utils": "^2.1.4",
-    "grim": "0.12.0",
+    "fuzzaldrin": "^1.1",
+    "git-utils": "^1.3",
+    "grim": "0.11.0",
     "guid": "0.0.10",
     "jasmine-tagged": "^1.1.2",
-    "less-cache": "0.15.0",
+    "less-cache": "0.12.0",
     "mixto": "^1",
     "mkdirp": "0.3.5",
-    "nslog": "^1.0.1",
-    "oniguruma": "^3.0.4",
+    "nslog": "0.5.0",
+    "oniguruma": "^1.0.6",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.1.3",
+    "pathwatcher": "^1.3.2",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
-    "react-atom-fork": "^0.11.1",
-    "reactionary-atom-fork": "^1.0.0",
-    "runas": "1.0.1",
-    "scandal": "1.0.2",
+    "react-atom-fork": "^0.10.0",
+    "reactionary-atom-fork": "^0.9.0",
+    "runas": "^0.5",
+    "scandal": "0.15.2",
     "scoped-property-store": "^0.9.0",
-    "scrollbar-style": "^1.0.2",
+    "scrollbar-style": "^0.4.0",
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
-    "space-pen": "3.4.7",
-    "temp": "0.7.0",
-    "text-buffer": "^3.2.6",
-    "theorist": "^1.0.2",
-    "underscore-plus": "^1.5.1",
+    "space-pen": "3.2.0",
+    "temp": "0.5.0",
+    "text-buffer": "^2.3.0",
+    "theorist": "^1",
+    "underscore-plus": "^1.4.1",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.19.0",
-    "atom-dark-ui": "0.35.0",
-    "atom-light-syntax": "0.20.0",
-    "atom-light-ui": "0.30.0",
-    "base16-tomorrow-dark-theme": "0.21.0",
-    "base16-tomorrow-light-theme": "0.4.0",
-    "solarized-dark-syntax": "0.22.0",
-    "solarized-light-syntax": "0.12.0",
-    "archive-view": "0.37.0",
-    "autocomplete": "0.32.0",
-    "autoflow": "0.18.0",
-    "autosave": "0.17.0",
-    "background-tips": "0.17.0",
-    "bookmarks": "0.28.0",
-    "bracket-matcher": "0.59.0",
-    "command-palette": "0.25.0",
-    "deprecation-cop": "0.10.0",
-    "dev-live-reload": "0.34.0",
-    "exception-reporting": "0.20.0",
+    "atom-dark-syntax": "0.16.0",
+    "atom-dark-ui": "0.29.0",
+    "atom-light-syntax": "0.17.0",
+    "atom-light-ui": "0.25.0",
+    "base16-tomorrow-dark-theme": "0.16.0",
+    "solarized-dark-syntax": "0.17.0",
+    "solarized-light-syntax": "0.8.0",
+    "archive-view": "0.32.0",
+    "autocomplete": "0.28.0",
+    "autoflow": "0.17.0",
+    "autosave": "0.14.0",
+    "background-tips": "0.14.0",
+    "bookmarks": "0.24.0",
+    "bracket-matcher": "0.45.0",
+    "command-palette": "0.22.0",
+    "deprecation-cop": "0.7.0",
+    "dev-live-reload": "0.31.0",
+    "exception-reporting": "0.18.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.138.0",
-    "fuzzy-finder": "0.58.0",
-    "git-diff": "0.39.0",
-    "go-to-line": "0.25.0",
-    "grammar-selector": "0.34.0",
-    "image-view": "0.36.0",
-    "incompatible-packages": "0.9.0",
-    "keybinding-resolver": "0.20.0",
-    "link": "0.25.0",
-    "markdown-preview": "0.103.0",
-    "metrics": "0.34.0",
-    "open-on-github": "0.30.0",
-    "package-generator": "0.31.0",
-    "release-notes": "0.36.0",
-    "settings-view": "0.145.0",
-    "snippets": "0.53.0",
-    "spell-check": "0.42.0",
-    "status-bar": "0.45.0",
-    "styleguide": "0.30.0",
-    "symbols-view": "0.66.0",
-    "tabs": "0.52.0",
-    "timecop": "0.22.0",
-    "tree-view": "0.126.0",
+    "find-and-replace": "0.117.0",
+    "fuzzy-finder": "0.54.0",
+    "git-diff": "0.31.0",
+    "go-to-line": "0.22.0",
+    "grammar-selector": "0.27.0",
+    "image-view": "0.35.0",
+    "keybinding-resolver": "0.18.0",
+    "link": "0.22.0",
+    "markdown-preview": "0.76.0",
+    "metrics": "0.32.0",
+    "open-on-github": "0.28.0",
+    "package-generator": "0.30.0",
+    "release-notes": "0.32.0",
+    "settings-view": "0.121.0",
+    "snippets": "0.45.0",
+    "spell-check": "0.37.0",
+    "status-bar": "0.40.0",
+    "styleguide": "0.29.0",
+    "symbols-view": "0.55.0",
+    "tabs": "0.41.0",
+    "timecop": "0.19.0",
+    "tree-view": "0.100.0",
     "update-package-dependencies": "0.6.0",
-    "welcome": "0.18.0",
-    "whitespace": "0.25.0",
-    "wrap-guide": "0.22.0",
-    "language-c": "0.28.0",
-    "language-coffee-script": "0.34.0",
+    "welcome": "0.16.0",
+    "whitespace": "0.22.0",
+    "wrap-guide": "0.18.0",
+    "language-c": "0.17.0",
+    "language-coffee-script": "0.22.0",
     "language-css": "0.17.0",
-    "language-gfm": "0.50.0",
+    "language-gfm": "0.39.0",
     "language-git": "0.9.0",
-    "language-go": "0.17.0",
-    "language-html": "0.26.0",
-    "language-hyperlink": "0.12.0",
-    "language-java": "0.11.0",
-    "language-javascript": "0.40.0",
+    "language-go": "0.12.0",
+    "language-html": "0.22.0",
+    "language-hyperlink": "0.10.0",
+    "language-java": "0.10.0",
+    "language-javascript": "0.27.0",
     "language-json": "0.8.0",
-    "language-less": "0.15.0",
-    "language-make": "0.12.0",
-    "language-mustache": "0.10.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.16.0",
+    "language-php": "0.15.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.19.0",
-    "language-ruby": "0.38.0",
-    "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.21.0",
+    "language-python": "0.18.0",
+    "language-ruby": "0.27.0",
+    "language-ruby-on-rails": "0.14.0",
+    "language-sass": "0.13.0",
     "language-shellscript": "0.8.0",
-    "language-source": "0.8.0",
-    "language-sql": "0.11.0",
+    "language-source": "0.7.0",
+    "language-sql": "0.8.0",
     "language-text": "0.6.0",
-    "language-todo": "0.12.0",
+    "language-todo": "0.10.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.21.0",
-    "language-yaml": "0.17.0"
+    "language-xml": "0.14.0",
+    "language-yaml": "0.6.0"
   },
   "private": true,
   "scripts": {

resources/linux/Atom.desktop.in

@@ -1,9 +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;Development;
-MimeType=text/plain;
+Categories=GNOME;GTK;Utility;TextEditor;

resources/linux/debian/control.in

@@ -1,10 +1,8 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: python (>= 2.6), libc6
 Section: <%= section %>
 Priority: optional
 Architecture: <%= arch %>
-Installed-Size: <%= installedSize %>
+Installed-Size: `du -ks usr|cut -f 1`
 Maintainer: <%= maintainer %>
 Description: <%= description %>
- Atom is a free and open source text editor that is modern, approachable, and hackable to the core.

resources/linux/debian/lintian-overrides

@@ -1,7 +0,0 @@
-atom: arch-dependent-file-in-usr-share
-atom: changelog-file-missing-in-native-package
-atom: copyright-file-contains-full-apache-2-license
-atom: copyright-should-refer-to-common-license-file-for-apache-2
-atom: embedded-library
-atom: package-installs-python-bytecode
-atom: unstripped-binary-or-object

script/bootstrap

@@ -10,8 +10,6 @@ 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;
@@ -31,57 +29,22 @@ function bootstrap() {
     fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
   var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
-  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? ' --no-color' : '';
+  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 
   var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
   var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
   var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];
-
-  var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
-  var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
-  var apmInstallCommand = npmPath + npmFlags + 'install';
-  var apmInstallOptions = {cwd: apmInstallPath};
-  var moduleInstallCommand = apmPath + ' install' + apmFlags;
-  var dedupeApmCommand = apmPath + ' dedupe' + apmFlags;
-  var dedupeNpmCommand = npmPath + npmFlags + 'dedupe';
-
-  if (process.argv.indexOf('--no-quiet') === -1) {
-    buildInstallCommand  += ' --quiet';
-    apmInstallCommand    += ' --quiet';
-    moduleInstallCommand += ' --quiet';
-    dedupeApmCommand     += ' --quiet';
-    dedupeNpmCommand     += ' --quiet';
-    buildInstallOptions.ignoreStdout = true;
-    apmInstallOptions.ignoreStdout = true;
-  }
-
-  // apm ships with 32-bit node so make sure its native modules are compiled
-  // for a 32-bit target architecture
-  if (process.env.JANKY_SHA1 && process.platform === 'win32')
-    apmInstallCommand += ' --arch=ia32';
+  var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 
   var commands = [
-    {
-      command: buildInstallCommand,
-      message: 'Installing build modules...',
-      options: buildInstallOptions
-    },
-    {
-      command: apmInstallCommand,
-      message: 'Installing apm...',
-      options: apmInstallOptions
-    },
-    apmPath + ' clean' + apmFlags,
-    moduleInstallCommand,
-    dedupeApmCommand + ' ' + packagesToDedupe.join(' '),
-    {
-      command: dedupeNpmCommand + ' request semver',
-      options: {
-        cwd: path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager')
-      }
-    },
+    {command: initialNpmCommand + npmFlags + 'install --quiet', 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(' '),
   ];
 
   process.chdir(path.dirname(__dirname));

script/cibuild

@@ -5,6 +5,9 @@ var path = require('path');
 
 process.chdir(path.dirname(__dirname));
 
+if (process.platform == 'linux')
+  throw new Error('cibuild can not run on linux yet!');
+
 var homeDir = process.platform == 'win32' ? process.env.USERPROFILE : process.env.HOME;
 
 function loadEnvironmentVariables(filePath) {
@@ -16,18 +19,12 @@ 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 if (process.platform === 'darwin') {
-    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();

script/cibuild-atom-linux

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export ATOM_ACCESS_TOKEN=$BUILD_ATOM_LINUX_ACCESS_TOKEN
-
-if [ -d /usr/local/share/nodenv ]; then
-  export NODENV_ROOT=/usr/local/share/nodenv
-  export PATH=/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:$PATH
-  export NODENV_VERSION="v0.10.21"
-fi
-
-script/cibuild

script/clean

@@ -24,7 +24,6 @@ var commands = [
   [home, '.atom', 'storage'],
   [home, '.atom', '.npm'],
   [home, '.atom', 'compile-cache'],
-  [home, '.atom', 'atom-shell'],
   [tmpdir, 'atom-build'],
   [tmpdir, 'atom-cached-atom-shells'],
 ];

script/mkdeb

@@ -13,35 +13,23 @@ CONTROL_FILE="$3"
 DESKTOP_FILE="$4"
 ICON_FILE="$5"
 DEB_PATH="$6"
-FILE_MODE=755
 
 TARGET_ROOT="`mktemp -d`"
-chmod $FILE_MODE "$TARGET_ROOT"
+chmod 755 "$TARGET_ROOT"
 TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
 
-mkdir -m $FILE_MODE -p "$TARGET/usr"
+mkdir -p "$TARGET/usr"
 env INSTALL_PREFIX="$TARGET/usr" script/grunt install
 
-mkdir -m $FILE_MODE -p "$TARGET/DEBIAN"
+mkdir -p "$TARGET/DEBIAN"
 cp "$CONTROL_FILE" "$TARGET/DEBIAN/control"
 
-mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
+mkdir -p "$TARGET/usr/share/applications"
 cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"
 
-mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps"
+mkdir -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
 
-# Copy generated LICENSE.md to /usr/share/doc/atom/copyright
-mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/atom"
-cp "$TARGET/usr/share/atom/resources/app/LICENSE.md" "$TARGET/usr/share/doc/atom/copyright"
-
-# Add lintian overrides
-mkdir -m $FILE_MODE -p "$TARGET/usr/share/lintian/overrides"
-cp "$ROOT/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/atom"
-
-# Remove executable bit from .node files
-find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \;
-
-fakeroot dpkg-deb -b "$TARGET"
+dpkg-deb -b "$TARGET"
 mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
-rm -rf "$TARGET_ROOT"
+rm -rf $TARGET_ROOT

script/utils/verify-requirements.js

@@ -31,7 +31,7 @@ function verifyNode(cb) {
   var nodeMajorVersion = +versionArray[0];
   var nodeMinorVersion = +versionArray[1];
   if (nodeMajorVersion === 0 && nodeMinorVersion < 10) {
-    error = "node v0.10 is required to build Atom, node " + nodeVersion + " is installed.";
+    error = "node v0.10 is required to build Atom.";
     cb(error);
   }
   else {

spec/atom-reporter.coffee

@@ -2,7 +2,6 @@ path = require 'path'
 _ = require 'underscore-plus'
 {convertStackTrace} = require 'coffeestack'
 {View, $, $$} = require '../src/space-pen-extensions'
-grim = require 'grim'
 
 sourceMaps = {}
 formatStackTrace = (spec, message='', stackTrace) ->
@@ -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,44 +88,14 @@ 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}) ->
+    $(document).on "click", ".spec-toggle", ({currentTarget}) =>
       element = $(currentTarget)
       specFailures = element.parent().find('.spec-failures')
       specFailures.toggle()
       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

@@ -6,24 +6,7 @@ ThemeManager = require '../src/theme-manager'
 
 describe "the `atom` global", ->
   beforeEach ->
-    atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
-
-  describe 'window sizing methods', ->
-    describe '::getPosition and ::setPosition', ->
-      it 'sets the position of the window, and can retrieve the position just set', ->
-        atom.setPosition(22, 45)
-        expect(atom.getPosition()).toEqual x: 22, y: 45
-
-    describe '::getSize and ::setSize', ->
-      originalSize = null
-      beforeEach ->
-        originalSize = atom.getSize()
-      afterEach ->
-        atom.setSize(originalSize.width, originalSize.height)
-
-      it 'sets the size of the window, and can retrieve the size just set', ->
-        atom.setSize(100, 400)
-        expect(atom.getSize()).toEqual width: 100, height: 400
+    atom.workspaceView = new WorkspaceView
 
   describe "package lifecycle methods", ->
     describe ".loadPackage(name)", ->
@@ -258,15 +241,15 @@ describe "the `atom` global", ->
               two = atom.themes.stringToId(two)
               three = atom.themes.stringToId(three)
 
-              expect(atom.themes.stylesheetElementForId(one)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+              expect(atom.themes.stylesheetElementForId(one)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
 
               atom.packages.activatePackage("package-with-stylesheets-manifest")
 
-              expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+              expect(atom.themes.stylesheetElementForId(one)).toExist()
+              expect(atom.themes.stylesheetElementForId(two)).toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
               expect($('#jasmine-content').css('font-size')).toBe '1px'
 
           describe "when the metadata does not contain a 'stylesheets' manifest", ->
@@ -280,14 +263,14 @@ describe "the `atom` global", ->
               two = atom.themes.stringToId(two)
               three = atom.themes.stringToId(three)
 
-              expect(atom.themes.stylesheetElementForId(one)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).toBeNull()
+              expect(atom.themes.stylesheetElementForId(one)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+              expect(atom.themes.stylesheetElementForId(three)).not.toExist()
 
               atom.packages.activatePackage("package-with-stylesheets")
-              expect(atom.themes.stylesheetElementForId(one)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(two)).not.toBeNull()
-              expect(atom.themes.stylesheetElementForId(three)).not.toBeNull()
+              expect(atom.themes.stylesheetElementForId(one)).toExist()
+              expect(atom.themes.stylesheetElementForId(two)).toExist()
+              expect(atom.themes.stylesheetElementForId(three)).toExist()
               expect($('#jasmine-content').css('font-size')).toBe '3px'
 
         describe "grammar loading", ->
@@ -367,7 +350,7 @@ describe "the `atom` global", ->
             atom.packages.deactivatePackage("package-that-throws-on-activate")
             expect(badPack.mainModule.serialize).not.toHaveBeenCalled()
 
-        it "absorbs exceptions that are thrown by the package module's serialize method", ->
+        it "absorbs exceptions that are thrown by the package module's serialize methods", ->
           spyOn(console, 'error')
 
           waitsForPromise ->
@@ -382,16 +365,6 @@ describe "the `atom` global", ->
             expect(atom.packages.packageStates['package-with-serialization']).toEqual someNumber: 1
             expect(console.error).toHaveBeenCalled()
 
-        it "absorbs exceptions that are thrown by the package module's deactivate method", ->
-          spyOn(console, 'error')
-
-          waitsForPromise ->
-            atom.packages.activatePackage("package-that-throws-on-deactivate")
-
-          runs ->
-            expect(-> atom.packages.deactivatePackage("package-that-throws-on-deactivate")).not.toThrow()
-            expect(console.error).toHaveBeenCalled()
-
         it "removes the package's grammars", ->
           waitsForPromise ->
             atom.packages.activatePackage('package-with-grammars')
@@ -520,14 +493,13 @@ describe "the `atom` global", ->
             expect(atom.config.get('core.disabledPackages')).toContain packageName
 
       describe "with themes", ->
-        reloadedHandler = null
-
         beforeEach ->
           waitsForPromise ->
             atom.themes.activateThemes()
 
         afterEach ->
           atom.themes.deactivateThemes()
+          atom.config.unobserve('core.themes')
 
         it ".enablePackage() and .disablePackage() enables and disables a theme", ->
           packageName = 'theme-with-package-file'
@@ -545,17 +517,13 @@ describe "the `atom` global", ->
             expect(atom.config.get('core.themes')).toContain packageName
             expect(atom.config.get('core.disabledPackages')).not.toContain packageName
 
-            reloadedHandler = jasmine.createSpy('reloadedHandler')
-            reloadedHandler.reset()
-            atom.themes.onDidReloadAll reloadedHandler
-
+            # disabling of theme
             pack = atom.packages.disablePackage(packageName)
 
           waitsFor ->
-            reloadedHandler.callCount is 1
+            not (pack in atom.packages.getActivePackages())
 
           runs ->
-            expect(atom.packages.getActivePackages()).not.toContain pack
             expect(atom.config.get('core.themes')).not.toContain packageName
             expect(atom.config.get('core.themes')).not.toContain packageName
             expect(atom.config.get('core.disabledPackages')).not.toContain packageName
@@ -563,22 +531,7 @@ describe "the `atom` global", ->
   describe ".isReleasedVersion()", ->
     it "returns false if the version is a SHA and true otherwise", ->
       version = '0.1.0'
-      spyOn(atom, 'getVersion').andCallFake -> version
+      spyOn(atom.constructor, 'getVersion').andCallFake -> version
       expect(atom.isReleasedVersion()).toBe true
       version = '36b5518'
       expect(atom.isReleasedVersion()).toBe false
-
-  describe "window:update-available", ->
-    it "is triggered when the auto-updater sends the update-downloaded event", ->
-      updateAvailableHandler = jasmine.createSpy("update-available-handler")
-      atom.workspaceView.on 'window:update-available', updateAvailableHandler
-      autoUpdater = require('remote').require('auto-updater')
-      autoUpdater.emit 'update-downloaded', null, "notes", "version"
-
-      waitsFor ->
-        updateAvailableHandler.callCount > 0
-
-      runs ->
-        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
-        expect(notes).toBe 'notes'
-        expect(version).toBe 'version'

spec/command-registry-spec.coffee

@@ -1,126 +0,0 @@
-CommandRegistry = require '../src/command-registry'
-
-describe "CommandRegistry", ->
-  [registry, parent, child, grandchild] = []
-
-  beforeEach ->
-    parent = document.createElement("div")
-    child = document.createElement("div")
-    grandchild = document.createElement("div")
-    parent.classList.add('parent')
-    child.classList.add('child')
-    grandchild.classList.add('grandchild')
-    child.appendChild(grandchild)
-    parent.appendChild(child)
-    document.querySelector('#jasmine-content').appendChild(parent)
-
-    registry = new CommandRegistry(parent)
-
-  describe "command dispatch", ->
-    it "invokes callbacks with selectors matching the target", ->
-      called = false
-      registry.add '.grandchild', 'command', (event) ->
-        expect(this).toBe grandchild
-        expect(event.type).toBe 'command'
-        expect(event.eventPhase).toBe Event.BUBBLING_PHASE
-        expect(event.target).toBe grandchild
-        expect(event.currentTarget).toBe grandchild
-        called = true
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(called).toBe true
-
-    it "invokes callbacks with selectors matching ancestors of the target", ->
-      calls = []
-
-      registry.add '.child', 'command', (event) ->
-        expect(this).toBe child
-        expect(event.target).toBe grandchild
-        expect(event.currentTarget).toBe child
-        calls.push('child')
-
-      registry.add '.parent', 'command', (event) ->
-        expect(this).toBe parent
-        expect(event.target).toBe grandchild
-        expect(event.currentTarget).toBe parent
-        calls.push('parent')
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['child', 'parent']
-
-    it "orders multiple matching listeners for an element by selector specificity", ->
-      child.classList.add('foo', 'bar')
-      calls = []
-
-      registry.add '.foo.bar', 'command', -> calls.push('.foo.bar')
-      registry.add '.foo', 'command', -> calls.push('.foo')
-      registry.add '.bar', 'command', -> calls.push('.bar') # specificity ties favor commands added later, like CSS
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['.foo.bar', '.bar', '.foo']
-
-    it "stops bubbling through ancestors when .stopPropagation() is called on the event", ->
-      calls = []
-
-      registry.add '.parent', 'command', -> calls.push('parent')
-      registry.add '.child', 'command', -> calls.push('child-2')
-      registry.add '.child', 'command', (event) -> calls.push('child-1'); event.stopPropagation()
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['child-1', 'child-2']
-
-    it "stops invoking callbacks when .stopImmediatePropagation() is called on the event", ->
-      calls = []
-
-      registry.add '.parent', 'command', -> calls.push('parent')
-      registry.add '.child', 'command', -> calls.push('child-2')
-      registry.add '.child', 'command', (event) -> calls.push('child-1'); event.stopImmediatePropagation()
-
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['child-1']
-
-    it "allows listeners to be removed via a disposable returned by ::add", ->
-      calls = []
-
-      disposable1 = registry.add '.parent', 'command', -> calls.push('parent')
-      disposable2 = registry.add '.child', 'command', -> calls.push('child')
-
-      disposable1.dispose()
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual ['child']
-
-      calls = []
-      disposable2.dispose()
-      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
-      expect(calls).toEqual []
-
-    it "allows multiple commands to be registered under one selector when called with an object", ->
-      calls = []
-
-      disposable = registry.add '.child',
-        'command-1': -> calls.push('command-1')
-        'command-2': -> calls.push('command-2')
-
-      grandchild.dispatchEvent(new CustomEvent('command-1', bubbles: true))
-      grandchild.dispatchEvent(new CustomEvent('command-2', bubbles: true))
-
-      expect(calls).toEqual ['command-1', 'command-2']
-
-      calls = []
-      disposable.dispose()
-      grandchild.dispatchEvent(new CustomEvent('command-1', bubbles: true))
-      grandchild.dispatchEvent(new CustomEvent('command-2', bubbles: true))
-      expect(calls).toEqual []
-
-  describe "::findCommands({target})", ->
-    it "returns commands that can be invoked on the target or its ancestors", ->
-      registry.add '.parent', 'namespace:command-1', ->
-      registry.add '.child', 'namespace:command-2', ->
-      registry.add '.grandchild', 'namespace:command-3', ->
-      registry.add '.grandchild.no-match', 'namespace:command-4', ->
-
-      expect(registry.findCommands(target: grandchild)[0..2]).toEqual [
-        {name: 'namespace:command-3', displayName: 'Namespace: Command 3'}
-        {name: 'namespace:command-2', displayName: 'Namespace: Command 2'}
-        {name: 'namespace:command-1', displayName: 'Namespace: Command 1'}
-      ]

spec/config-spec.coffee

@@ -23,18 +23,6 @@ describe "Config", ->
       retrievedValue.array[1].b = 2.1
       expect(atom.config.get('value')).toEqual(array: [1, b: 2, 3])
 
-    it "merges defaults into the returned value if both the assigned value and the default value are objects", ->
-      atom.config.setDefaults("foo", a: 1, b: 2)
-      atom.config.set("foo", a: 3)
-      expect(atom.config.get("foo")).toEqual {a: 3, b: 2}
-
-      atom.config.set("foo", 7)
-      expect(atom.config.get("foo")).toBe 7
-
-      atom.config.set("bar.baz", a: 3)
-      atom.config.setDefaults("bar", baz: 7)
-      expect(atom.config.get("bar.baz")).toEqual {a: 3}
-
   describe ".set(keyPath, value)", ->
     it "allows a key path's value to be written", ->
       expect(atom.config.set("foo.bar.baz", 42)).toBe 42

spec/context-menu-manager-spec.coffee

@@ -6,8 +6,7 @@ describe "ContextMenuManager", ->
   [contextMenu] = []
 
   beforeEach ->
-    {resourcePath} = atom.getLoadSettings()
-    contextMenu = new ContextMenuManager({resourcePath})
+    contextMenu = new ContextMenuManager
 
   describe "adding definitions", ->
     it 'loads',  ->
@@ -18,43 +17,6 @@ describe "ContextMenuManager", ->
       expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
       expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
 
-    it 'does not add duplicate menu items',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'].length).toBe 1
-
-    it 'allows multiple separators', ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'separator1': '-'
-          'separator2': '-'
-
-      expect(contextMenu.definitions['.selector'].length).toBe 2
-      expect(contextMenu.definitions['.selector'][0].type).toEqual 'separator'
-      expect(contextMenu.definitions['.selector'][1].type).toEqual 'separator'
-
-    it 'allows duplicate commands with different labels',  ->
-      contextMenu.add 'file-path',
-        '.selector':
-          'label': 'command'
-
-      contextMenu.add 'file-path',
-        '.selector':
-          'another label': 'command'
-
-      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
-      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
-      expect(contextMenu.definitions['.selector'][1].label).toEqual 'another label'
-      expect(contextMenu.definitions['.selector'][1].command).toEqual 'command'
-
     it "loads submenus", ->
       contextMenu.add 'file-path',
         '.selector':

spec/display-buffer-spec.coffee

@@ -9,7 +9,7 @@ describe "DisplayBuffer", ->
     buffer = atom.project.bufferForPathSync('sample.js')
     displayBuffer = new DisplayBuffer({buffer, tabLength})
     changeHandler = jasmine.createSpy 'changeHandler'
-    displayBuffer.onDidChange changeHandler
+    displayBuffer.on 'changed', changeHandler
 
     waitsForPromise ->
       atom.packages.activatePackage('language-javascript')
@@ -47,18 +47,9 @@ 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.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
       displayBuffer.setEditorWidthInChars(50)
       changeHandler.reset()
 
@@ -67,48 +58,48 @@ describe "DisplayBuffer", ->
         it "uses the preferred line length as the soft wrap column when it is less than the configured soft wrap column", ->
           atom.config.set('editor.preferredLineLength', 100)
           atom.config.set('editor.softWrapAtPreferredLineLength', true)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
+          expect(displayBuffer.lineForRow(10).text).toBe '    return '
 
           atom.config.set('editor.preferredLineLength', 5)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe 'funct'
+          expect(displayBuffer.lineForRow(10).text).toBe 'funct'
 
           atom.config.set('editor.softWrapAtPreferredLineLength', false)
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
+          expect(displayBuffer.lineForRow(10).text).toBe '    return '
 
       describe "when the line is shorter than the max line length", ->
         it "renders the line unchanged", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe buffer.lineForRow(0)
+          expect(displayBuffer.lineForRow(0).text).toBe buffer.lineForRow(0)
 
       describe "when the line is empty", ->
         it "renders the empty line", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(13).text).toBe ''
+          expect(displayBuffer.lineForRow(13).text).toBe ''
 
       describe "when there is a non-whitespace character at the max length boundary", ->
         describe "when there is whitespace before the boundary", ->
           it "wraps the line at the end of the first whitespace preceding the boundary", ->
-            expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    return '
-            expect(displayBuffer.tokenizedLineForScreenRow(11).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
+            expect(displayBuffer.lineForRow(10).text).toBe '    return '
+            expect(displayBuffer.lineForRow(11).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
 
         describe "when there is no whitespace before the boundary", ->
           it "wraps the line exactly at the boundary since there's no more graceful place to wrap it", ->
             buffer.setTextInRange([[0, 0], [1, 0]], 'abcdefghijklmnopqrstuvwxyz\n')
             displayBuffer.setEditorWidthInChars(10)
-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe 'abcdefghij'
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe 'klmnopqrst'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe 'uvwxyz'
+            expect(displayBuffer.lineForRow(0).text).toBe 'abcdefghij'
+            expect(displayBuffer.lineForRow(1).text).toBe 'klmnopqrst'
+            expect(displayBuffer.lineForRow(2).text).toBe 'uvwxyz'
 
       describe "when there is a whitespace character at the max length boundary", ->
         it "wraps the line at the first non-whitespace character following the boundary", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '    var pivot = items.shift(), current, left = [], '
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe 'right = [];'
+          expect(displayBuffer.lineForRow(3).text).toBe '    var pivot = items.shift(), current, left = [], '
+          expect(displayBuffer.lineForRow(4).text).toBe 'right = [];'
 
       describe "when there are hard tabs", ->
         beforeEach ->
           buffer.setText(buffer.getText().replace(new RegExp('  ', 'g'), '\t'))
 
         it "correctly tokenizes the hard tabs", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(3).tokens[0].isHardTab).toBeTruthy()
-          expect(displayBuffer.tokenizedLineForScreenRow(3).tokens[1].isHardTab).toBeTruthy()
+          expect(displayBuffer.lineForRow(3).tokens[0].isHardTab).toBeTruthy()
+          expect(displayBuffer.lineForRow(3).tokens[1].isHardTab).toBeTruthy()
 
     describe "when the buffer changes", ->
       describe "when buffer lines are updated", ->
@@ -121,57 +112,57 @@ describe "DisplayBuffer", ->
         describe "when the update makes a soft-wrapped line shorter than the max line length", ->
           it "rewraps the line and emits a change event", ->
             buffer.delete([[6, 24], [6, 42]])
-            expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot ?  : right.push(current);'
-            expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe '    }'
+            expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot ?  : right.push(current);'
+            expect(displayBuffer.lineForRow(8).text).toBe '    }'
 
             expect(changeHandler).toHaveBeenCalled()
             [[event]]= changeHandler.argsForCall
 
             expect(event).toEqual(start: 7, end: 8, screenDelta: -1, bufferDelta: 0)
 
-        describe "when the update causes a line to soft wrap an additional time", ->
+        describe "when the update causes a line to softwrap an additional time", ->
           it "rewraps the line and emits a change event", ->
             buffer.insert([6, 28], '1234567890')
-            expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot ? '
-            expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe 'left1234567890.push(current) : '
-            expect(displayBuffer.tokenizedLineForScreenRow(9).text).toBe 'right.push(current);'
-            expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe '    }'
+            expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot ? '
+            expect(displayBuffer.lineForRow(8).text).toBe 'left1234567890.push(current) : '
+            expect(displayBuffer.lineForRow(9).text).toBe 'right.push(current);'
+            expect(displayBuffer.lineForRow(10).text).toBe '    }'
 
             expect(changeHandler).toHaveBeenCalledWith(start: 7, end: 8, screenDelta: 1, bufferDelta: 0)
 
       describe "when buffer lines are inserted", ->
         it "inserts / updates wrapped lines and emits a change event", ->
           buffer.insert([6, 21], '1234567890 abcdefghij 1234567890\nabcdefghij')
-          expect(displayBuffer.tokenizedLineForScreenRow(7).text).toBe '      current < pivot1234567890 abcdefghij '
-          expect(displayBuffer.tokenizedLineForScreenRow(8).text).toBe '1234567890'
-          expect(displayBuffer.tokenizedLineForScreenRow(9).text).toBe 'abcdefghij ? left.push(current) : '
-          expect(displayBuffer.tokenizedLineForScreenRow(10).text).toBe 'right.push(current);'
+          expect(displayBuffer.lineForRow(7).text).toBe '      current < pivot1234567890 abcdefghij '
+          expect(displayBuffer.lineForRow(8).text).toBe '1234567890'
+          expect(displayBuffer.lineForRow(9).text).toBe 'abcdefghij ? left.push(current) : '
+          expect(displayBuffer.lineForRow(10).text).toBe 'right.push(current);'
 
           expect(changeHandler).toHaveBeenCalledWith(start: 7, end: 8, screenDelta: 2, bufferDelta: 1)
 
       describe "when buffer lines are removed", ->
         it "removes lines and emits a change event", ->
           buffer.setTextInRange([[3, 21], [7, 5]], ';')
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '    var pivot = items;'
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe '    return '
-          expect(displayBuffer.tokenizedLineForScreenRow(5).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
-          expect(displayBuffer.tokenizedLineForScreenRow(6).text).toBe '  };'
+          expect(displayBuffer.lineForRow(3).text).toBe '    var pivot = items;'
+          expect(displayBuffer.lineForRow(4).text).toBe '    return '
+          expect(displayBuffer.lineForRow(5).text).toBe 'sort(left).concat(pivot).concat(sort(right));'
+          expect(displayBuffer.lineForRow(6).text).toBe '  };'
 
           expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 9, screenDelta: -6, bufferDelta: -4)
 
       describe "when a newline is inserted, deleted, and re-inserted at the end of a wrapped line (regression)", ->
         it "correctly renders the original wrapped line", ->
           buffer = atom.project.buildBufferSync(null, '')
-          displayBuffer = new DisplayBuffer({buffer, tabLength, editorWidthInChars: 30, softWrapped: true})
+          displayBuffer = new DisplayBuffer({buffer, tabLength, editorWidthInChars: 30, softWrap: true})
 
           buffer.insert([0, 0], "the quick brown fox jumps over the lazy dog.")
           buffer.insert([0, Infinity], '\n')
           buffer.delete([[0, Infinity], [1, 0]])
           buffer.insert([0, Infinity], '\n')
 
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "the quick brown fox jumps over "
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "the lazy dog."
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe ""
+          expect(displayBuffer.lineForRow(0).text).toBe "the quick brown fox jumps over "
+          expect(displayBuffer.lineForRow(1).text).toBe "the lazy dog."
+          expect(displayBuffer.lineForRow(2).text).toBe ""
 
     describe "position translation", ->
       it "translates positions accounting for wrapped lines", ->
@@ -204,9 +195,9 @@ describe "DisplayBuffer", ->
     describe ".setEditorWidthInChars(length)", ->
       it "changes the length at which lines are wrapped and emits a change event for all screen lines", ->
         displayBuffer.setEditorWidthInChars(40)
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(4).tokens).toBe 'left = [], right = [];'
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(5).tokens).toBe '    while(items.length > 0) {'
-        expect(tokensText displayBuffer.tokenizedLineForScreenRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
+        expect(tokensText displayBuffer.lineForRow(4).tokens).toBe 'left = [], right = [];'
+        expect(tokensText displayBuffer.lineForRow(5).tokens).toBe '    while(items.length > 0) {'
+        expect(tokensText displayBuffer.lineForRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
         expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 15, screenDelta: 3, bufferDelta: 0)
 
       it "only allows positive widths to be assigned", ->
@@ -215,26 +206,13 @@ describe "DisplayBuffer", ->
         displayBuffer.setEditorWidthInChars(-1)
         expect(displayBuffer.editorWidthInChars).not.toBe -1
 
-    it "sets ::scrollLeft to 0 and keeps it there when soft wrapping is enabled", ->
-      displayBuffer.setDefaultCharWidth(10)
-      displayBuffer.setWidth(50)
-      displayBuffer.manageScrollPosition = true
-
-      displayBuffer.setSoftWrapped(false)
-      displayBuffer.setScrollLeft(Infinity)
-      expect(displayBuffer.getScrollLeft()).toBeGreaterThan 0
-      displayBuffer.setSoftWrapped(true)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-      displayBuffer.setScrollLeft(10)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-
   describe "primitive folding", ->
     beforeEach ->
       displayBuffer.destroy()
       buffer.release()
       buffer = atom.project.bufferForPathSync('two-hundred.txt')
       displayBuffer = new DisplayBuffer({buffer, tabLength})
-      displayBuffer.onDidChange changeHandler
+      displayBuffer.on 'changed', changeHandler
 
     describe "when folds are created and destroyed", ->
       describe "when a fold spans multiple lines", ->
@@ -242,7 +220,7 @@ describe "DisplayBuffer", ->
           fold = displayBuffer.createFold(4, 7)
           expect(fold).toBeDefined()
 
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBe fold
           expect(line4.text).toMatch /^4-+/
           expect(line5.text).toBe '8'
@@ -251,7 +229,7 @@ describe "DisplayBuffer", ->
           changeHandler.reset()
 
           fold.destroy()
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBeUndefined()
           expect(line4.text).toMatch /^4-+/
           expect(line5.text).toBe '5'
@@ -262,7 +240,7 @@ describe "DisplayBuffer", ->
         it "renders a fold placeholder for the folded line but does not skip any lines", ->
           fold = displayBuffer.createFold(4, 4)
 
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBe fold
           expect(line4.text).toMatch /^4-+/
           expect(line5.text).toBe '5'
@@ -275,7 +253,7 @@ describe "DisplayBuffer", ->
 
           fold.destroy()
 
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBeUndefined()
           expect(line4.text).toMatch /^4-+/
           expect(line5.text).toBe '5'
@@ -287,13 +265,13 @@ describe "DisplayBuffer", ->
           innerFold = displayBuffer.createFold(6, 7)
           outerFold = displayBuffer.createFold(4, 8)
 
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBe outerFold
           expect(line4.text).toMatch /4-+/
           expect(line5.text).toMatch /9-+/
 
           outerFold.destroy()
-          [line4, line5, line6, line7] = displayBuffer.tokenizedLinesForScreenRows(4, 7)
+          [line4, line5, line6, line7] = displayBuffer.linesForRows(4, 7)
           expect(line4.fold).toBeUndefined()
           expect(line4.text).toMatch /^4-+/
           expect(line5.text).toBe '5'
@@ -305,7 +283,7 @@ describe "DisplayBuffer", ->
           innerFold = displayBuffer.createFold(4, 6)
           outerFold = displayBuffer.createFold(4, 8)
 
-          [line4, line5] = displayBuffer.tokenizedLinesForScreenRows(4, 5)
+          [line4, line5] = displayBuffer.linesForRows(4, 5)
           expect(line4.fold).toBe outerFold
           expect(line4.text).toMatch /4-+/
           expect(line5.text).toMatch /9-+/
@@ -326,25 +304,17 @@ describe "DisplayBuffer", ->
 
           innerFold = displayBuffer.createFold(2, 5)
           expect(changeHandler).not.toHaveBeenCalled()
-          [line0, line1] = displayBuffer.tokenizedLinesForScreenRows(0, 1)
+          [line0, line1] = displayBuffer.linesForRows(0, 1)
           expect(line0.fold).toBe outerFold
           expect(line1.fold).toBeUndefined()
 
           changeHandler.reset()
           innerFold.destroy()
           expect(changeHandler).not.toHaveBeenCalled()
-          [line0, line1] = displayBuffer.tokenizedLinesForScreenRows(0, 1)
+          [line0, line1] = displayBuffer.linesForRows(0, 1)
           expect(line0.fold).toBe outerFold
           expect(line1.fold).toBeUndefined()
 
-      describe "when a fold ends where another fold begins", ->
-        it "continues to hide the lines inside the second fold", ->
-          fold2 = displayBuffer.createFold(4, 9)
-          fold1 = displayBuffer.createFold(0, 4)
-
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toMatch /^0/
-          expect(displayBuffer.tokenizedLineForScreenRow(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})
@@ -363,19 +333,19 @@ describe "DisplayBuffer", ->
           buffer.setTextInRange([[1, 0], [5, 1]], 'party!')
 
         it "removes the fold and replaces the selection with the new text", ->
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "0"
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "party!"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(0).text).toBe "0"
+          expect(displayBuffer.lineForRow(1).text).toBe "party!"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold2
+          expect(displayBuffer.lineForRow(3).text).toMatch /^9-+/
 
           expect(changeHandler).toHaveBeenCalledWith(start: 1, end: 3, screenDelta: -2, bufferDelta: -4)
 
         describe "when the changes is subsequently undone", ->
           xit "restores destroyed folds", ->
             buffer.undo()
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '5'
+            expect(displayBuffer.lineForRow(2).text).toBe '2'
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toBe '5'
 
       describe "when the old range surrounds two nested folds", ->
         it "removes both folds and replaces the selection with the new text", ->
@@ -384,9 +354,9 @@ describe "DisplayBuffer", ->
 
           buffer.setTextInRange([[1, 0], [10, 0]], 'goodbye')
 
-          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "0"
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "goodbye10"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "11"
+          expect(displayBuffer.lineForRow(0).text).toBe "0"
+          expect(displayBuffer.lineForRow(1).text).toBe "goodbye10"
+          expect(displayBuffer.lineForRow(2).text).toBe "11"
 
           expect(changeHandler).toHaveBeenCalledWith(start: 1, end: 3, screenDelta: -2, bufferDelta: -9)
 
@@ -403,42 +373,42 @@ describe "DisplayBuffer", ->
           it "updates the buffer and re-positions subsequent folds", ->
             buffer.setTextInRange([[0, 0], [1, 1]], 'abc')
 
-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "abc"
-            expect(displayBuffer.tokenizedLineForScreenRow(1).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(3).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(0).text).toBe "abc"
+            expect(displayBuffer.lineForRow(1).fold).toBe fold1
+            expect(displayBuffer.lineForRow(2).text).toBe "5"
+            expect(displayBuffer.lineForRow(3).fold).toBe fold2
+            expect(displayBuffer.lineForRow(4).text).toMatch /^9-+/
 
             expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 1, screenDelta: -1, bufferDelta: -1)
             changeHandler.reset()
 
             fold1.destroy()
-            expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe "abc"
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch /^4-+/
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(5).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(6).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(0).text).toBe "abc"
+            expect(displayBuffer.lineForRow(1).text).toBe "2"
+            expect(displayBuffer.lineForRow(3).text).toMatch /^4-+/
+            expect(displayBuffer.lineForRow(4).text).toBe "5"
+            expect(displayBuffer.lineForRow(5).fold).toBe fold2
+            expect(displayBuffer.lineForRow(6).text).toMatch /^9-+/
 
             expect(changeHandler).toHaveBeenCalledWith(start: 1, end: 1, screenDelta: 2, bufferDelta: 0)
 
       describe "when the old range straddles the beginning of a fold", ->
         it "destroys the fold", ->
           buffer.setTextInRange([[1, 1], [3, 0]], "a\nb\nc\nd\n")
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe '1a'
-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe 'b'
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBeUndefined()
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe 'c'
+          expect(displayBuffer.lineForRow(1).text).toBe '1a'
+          expect(displayBuffer.lineForRow(2).text).toBe 'b'
+          expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
+          expect(displayBuffer.lineForRow(3).text).toBe 'c'
 
       describe "when the old range follows a fold", ->
         it "re-positions the screen ranges for the change event based on the preceding fold", ->
           buffer.setTextInRange([[10, 0], [11, 0]], 'abc')
 
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe "5"
-          expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(1).text).toBe "1"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold1
+          expect(displayBuffer.lineForRow(3).text).toBe "5"
+          expect(displayBuffer.lineForRow(4).fold).toBe fold2
+          expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/
 
           expect(changeHandler).toHaveBeenCalledWith(start: 6, end: 7, screenDelta: -1, bufferDelta: -1)
 
@@ -449,12 +419,12 @@ describe "DisplayBuffer", ->
             expect(fold1.getStartRow()).toBe 2
             expect(fold1.getEndRow()).toBe 5
 
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(1).text).toBe "1"
+            expect(displayBuffer.lineForRow(2).text).toBe "2"
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toMatch "5"
+            expect(displayBuffer.lineForRow(4).fold).toBe fold2
+            expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/
 
             expect(changeHandler).toHaveBeenCalledWith(start: 2, end: 2, screenDelta: 0, bufferDelta: 1)
 
@@ -464,12 +434,12 @@ describe "DisplayBuffer", ->
             expect(fold1.getStartRow()).toBe 2
             expect(fold1.getEndRow()).toBe 7
 
-            expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe "2"
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "5"
-            expect(displayBuffer.tokenizedLineForScreenRow(4).fold).toBe fold2
-            expect(displayBuffer.tokenizedLineForScreenRow(5).text).toMatch /^9-+/
+            expect(displayBuffer.lineForRow(1).text).toBe "1"
+            expect(displayBuffer.lineForRow(2).text).toBe "2"
+            expect(displayBuffer.lineForRow(2).fold).toBe fold1
+            expect(displayBuffer.lineForRow(3).text).toMatch "5"
+            expect(displayBuffer.lineForRow(4).fold).toBe fold2
+            expect(displayBuffer.lineForRow(5).text).toMatch /^9-+/
 
             expect(changeHandler).toHaveBeenCalledWith(start: 2, end: 2, screenDelta: 0, bufferDelta: 3)
 
@@ -478,21 +448,21 @@ describe "DisplayBuffer", ->
           it "destroys the fold", ->
             fold2.destroy()
             buffer.setTextInRange([[3, 0], [6, 0]], 'a\n')
-            expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-            expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBeUndefined()
-            expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe 'a'
-            expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe '6'
+            expect(displayBuffer.lineForRow(2).text).toBe '2'
+            expect(displayBuffer.lineForRow(2).fold).toBeUndefined()
+            expect(displayBuffer.lineForRow(3).text).toBe 'a'
+            expect(displayBuffer.lineForRow(4).text).toBe '6'
 
       describe "when the old range is contained to a single line in-between two folds", ->
         it "re-renders the line with the placeholder and re-positions the second fold", ->
           buffer.insert([5, 0], 'abc\n')
 
-          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe "1"
-          expect(displayBuffer.tokenizedLineForScreenRow(2).fold).toBe fold1
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toMatch "abc"
-          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe "5"
-          expect(displayBuffer.tokenizedLineForScreenRow(5).fold).toBe fold2
-          expect(displayBuffer.tokenizedLineForScreenRow(6).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(1).text).toBe "1"
+          expect(displayBuffer.lineForRow(2).fold).toBe fold1
+          expect(displayBuffer.lineForRow(3).text).toMatch "abc"
+          expect(displayBuffer.lineForRow(4).text).toBe "5"
+          expect(displayBuffer.lineForRow(5).fold).toBe fold2
+          expect(displayBuffer.lineForRow(6).text).toMatch /^9-+/
 
           expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 3, screenDelta: 1, bufferDelta: 1)
 
@@ -545,15 +515,15 @@ describe "DisplayBuffer", ->
         displayBuffer.createFold(1, 9)
         displayBuffer.createFold(11, 12)
 
-        expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe '1'
-        expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '10'
+        expect(displayBuffer.lineForRow(1).text).toBe '1'
+        expect(displayBuffer.lineForRow(2).text).toBe '10'
 
         displayBuffer.unfoldBufferRow(2)
-        expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe '1'
-        expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-        expect(displayBuffer.tokenizedLineForScreenRow(7).fold).toBeDefined()
-        expect(displayBuffer.tokenizedLineForScreenRow(8).text).toMatch /^9-+/
-        expect(displayBuffer.tokenizedLineForScreenRow(10).fold).toBeDefined()
+        expect(displayBuffer.lineForRow(1).text).toBe '1'
+        expect(displayBuffer.lineForRow(2).text).toBe '2'
+        expect(displayBuffer.lineForRow(7).fold).toBeDefined()
+        expect(displayBuffer.lineForRow(8).text).toMatch /^9-+/
+        expect(displayBuffer.lineForRow(10).fold).toBeDefined()
 
     describe ".outermostFoldsInBufferRowRange(startRow, endRow)", ->
       it "returns the outermost folds entirely contained in the given row range, exclusive of end row", ->
@@ -568,7 +538,7 @@ describe "DisplayBuffer", ->
 
   describe "::clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
     beforeEach ->
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
       displayBuffer.setEditorWidthInChars(50)
 
     it "allows valid positions", ->
@@ -643,7 +613,7 @@ describe "DisplayBuffer", ->
 
     it "correctly translates positions on soft wrapped lines containing tabs", ->
       buffer.setText('\t\taa  bb  cc  dd  ee  ff  gg')
-      displayBuffer.setSoftWrapped(true)
+      displayBuffer.setSoftWrap(true)
       displayBuffer.setEditorWidthInChars(10)
       expect(displayBuffer.screenPositionForBufferPosition([0, 10], wrapAtSoftNewlines: true)).toEqual [1, 0]
       expect(displayBuffer.bufferPositionForScreenPosition([1, 0])).toEqual [0, 10]
@@ -654,19 +624,6 @@ describe "DisplayBuffer", ->
       buffer.delete([[6, 0], [6, 65]])
       expect(displayBuffer.getMaxLineLength()).toBe 62
 
-    it "correctly updates the location of the longest screen line when changes occur", ->
-      expect(displayBuffer.getLongestScreenRow()).toBe 6
-      buffer.delete([[0, 0], [2, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 4
-      buffer.delete([[4, 0], [5, 0]])
-
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
-      buffer.delete([[2, 0], [4, 0]])
-      expect(displayBuffer.getLongestScreenRow()).toBe 1
-      expect(displayBuffer.getMaxLineLength()).toBe 62
-
   describe "::destroy()", ->
     it "unsubscribes all display buffer markers from their underlying buffer marker (regression)", ->
       marker = displayBuffer.markBufferPosition([12, 2])
@@ -686,7 +643,7 @@ describe "DisplayBuffer", ->
         expect(marker2.getScreenRange()).toEqual [[5, 4], [5, 10]]
 
       it "emits a 'marker-created' event on the DisplayBuffer whenever a marker is created", ->
-        displayBuffer.onDidCreateMarker markerCreatedHandler = jasmine.createSpy("markerCreatedHandler")
+        displayBuffer.on 'marker-created', markerCreatedHandler = jasmine.createSpy("markerCreatedHandler")
 
         marker1 = displayBuffer.markScreenRange([[5, 4], [5, 10]])
         expect(markerCreatedHandler).toHaveBeenCalledWith(marker1)
@@ -722,7 +679,7 @@ describe "DisplayBuffer", ->
 
       beforeEach ->
         marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker.onDidChange markerChangedHandler = jasmine.createSpy("markerChangedHandler")
+        marker.on 'changed', markerChangedHandler = jasmine.createSpy("markerChangedHandler")
 
       it "triggers the 'changed' event whenever the markers head's screen position changes in the buffer or on screen", ->
         marker.setHeadScreenPosition([8, 20])
@@ -859,8 +816,8 @@ describe "DisplayBuffer", ->
 
       it "updates markers before emitting buffer change events, but does not notify their observers until the change event", ->
         marker2 = displayBuffer.markBufferRange([[8, 1], [8, 1]])
-        marker2.onDidChange marker2ChangedHandler = jasmine.createSpy("marker2ChangedHandler")
-        displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake -> onDisplayBufferChange()
+        marker2.on 'changed', marker2ChangedHandler = jasmine.createSpy("marker2ChangedHandler")
+        displayBuffer.on 'changed', changeHandler = jasmine.createSpy("changeHandler").andCallFake -> onDisplayBufferChange()
 
         # New change ----
 
@@ -886,7 +843,7 @@ describe "DisplayBuffer", ->
         marker2ChangedHandler.reset()
 
         marker3 = displayBuffer.markBufferRange([[8, 1], [8, 2]])
-        marker3.onDidChange marker3ChangedHandler = jasmine.createSpy("marker3ChangedHandler")
+        marker3.on 'changed', marker3ChangedHandler = jasmine.createSpy("marker3ChangedHandler")
 
         onDisplayBufferChange = ->
           # calls change handler first
@@ -932,7 +889,7 @@ describe "DisplayBuffer", ->
         expect(marker3ChangedHandler).toHaveBeenCalled()
 
       it "updates the position of markers before emitting change events that aren't caused by a buffer change", ->
-        displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake ->
+        displayBuffer.on 'changed', changeHandler = jasmine.createSpy("changeHandler").andCallFake ->
           # calls change handler first
           expect(markerChangedHandler).not.toHaveBeenCalled()
           # but still updates the markers
@@ -955,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]])
@@ -998,20 +919,20 @@ describe "DisplayBuffer", ->
         expect(marker.isValid()).toBeFalsy()
         expect(displayBuffer.getMarker(marker.id)).toBeUndefined()
 
-      it "notifies ::onDidDestroy observers when markers are destroyed", ->
+      it "emits 'destroyed' events when markers are destroyed", ->
         destroyedHandler = jasmine.createSpy("destroyedHandler")
         marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker.onDidDestroy destroyedHandler
+        marker.on 'destroyed', destroyedHandler
         marker.destroy()
         expect(destroyedHandler).toHaveBeenCalled()
         destroyedHandler.reset()
 
         marker2 = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-        marker2.onDidDestroy destroyedHandler
+        marker2.on 'destroyed', destroyedHandler
         buffer.getMarker(marker2.id).destroy()
         expect(destroyedHandler).toHaveBeenCalled()
 
-    describe "Marker::copy(attributes)", ->
+    describe "DisplayBufferMarker::copy(attributes)", ->
       it "creates a copy of the marker with the given attributes merged in", ->
         initialMarkerCount = displayBuffer.getMarkerCount()
         marker1 = displayBuffer.markScreenRange([[5, 4], [5, 10]], a: 1, b: 2)
@@ -1020,66 +941,21 @@ describe "DisplayBuffer", ->
         marker2 = marker1.copy(b: 3)
         expect(marker2.getBufferRange()).toEqual marker1.getBufferRange()
         expect(displayBuffer.getMarkerCount()).toBe initialMarkerCount + 2
-        expect(marker1.getProperties()).toEqual a: 1, b: 2
-        expect(marker2.getProperties()).toEqual a: 1, b: 3
+        expect(marker1.getAttributes()).toEqual a: 1, b: 2
+        expect(marker2.getAttributes()).toEqual a: 1, b: 3
 
-    describe "Marker::getPixelRange()", ->
+    describe "DisplayBufferMarker::getPixelRange()", ->
       it "returns the start and end positions of the marker based on the line height and character widths assigned to the DisplayBuffer", ->
         marker = displayBuffer.markScreenRange([[5, 10], [6, 4]])
 
         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 'when there are multiple DisplayBuffers for a buffer', ->
-      describe 'when a marker is created', ->
-        it 'the second display buffer will not emit a marker-created event when the marker has been deleted in the first marker-created event', ->
-          displayBuffer2 = new DisplayBuffer({buffer, tabLength})
-          displayBuffer.onDidCreateMarker markerCreated1 = jasmine.createSpy().andCallFake (marker) -> marker.destroy()
-          displayBuffer2.onDidCreateMarker markerCreated2 = jasmine.createSpy()
-
-          displayBuffer.markBufferRange([[0, 0], [1, 5]], {})
-
-          expect(markerCreated1).toHaveBeenCalled()
-          expect(markerCreated2).not.toHaveBeenCalled()
-
-  describe "decorations", ->
-    [marker, decoration, decorationProperties] = []
-    beforeEach ->
-      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
-      decorationProperties = {type: 'gutter', class: 'one'}
-      decoration = displayBuffer.decorateMarker(marker, decorationProperties)
-
-    it "can add decorations associated with markers and remove them", ->
-      expect(decoration).toBeDefined()
-      expect(decoration.getProperties()).toBe decorationProperties
-      expect(displayBuffer.decorationForId(decoration.id)).toBe decoration
-      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id][0]).toBe decoration
-
-      decoration.destroy()
-      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).not.toBeDefined()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    it "will not fail if the decoration is removed twice", ->
-      decoration.destroy()
-      decoration.destroy()
-      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
-
-    describe "when a decoration is updated via Decoration::update()", ->
-      it "emits an 'updated' event containing the new and old params", ->
-        decoration.onDidChangeProperties updatedSpy = jasmine.createSpy()
-        decoration.setProperties type: 'gutter', class: 'two'
-
-        {oldProperties, newProperties} = updatedSpy.mostRecentCall.args[0]
-        expect(oldProperties).toEqual decorationProperties
-        expect(newProperties).toEqual type: 'gutter', class: 'two', id: decoration.id
-
   describe "::setScrollTop", ->
     beforeEach ->
       displayBuffer.manageScrollPosition = true
@@ -1121,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.onDidChangeCharacterWidths 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/fixtures/js

@@ -0,0 +1 @@
+this tests files with no extensions

spec/fixtures/packages/package-that-throws-on-deactivate/index.coffee

@@ -1,4 +0,0 @@
-module.exports =
-  activate: ->
-  deactivate: -> throw new Error('Top that')
-  serialize: ->

spec/fixtures/packages/package-with-incompatible-native-module/node_modules/native-module/main.js

@@ -1 +0,0 @@
-throw new Error("this simulates a native module's failure to load")

spec/fixtures/packages/package-with-incompatible-native-module/node_modules/native-module/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "native-module",
-  "main": "./main.js"
-}

spec/fixtures/packages/package-with-incompatible-native-module/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "package-with-incompatible-native-module",
-  "version": "1.0",
-  "main": "./main.js"
-}

spec/fixtures/packages/package-with-infinite-loop-grammar/grammars/grammar.cson

@@ -0,0 +1,18 @@
+'fileTypes': ['package-with-infinite-loop-grammar']
+'name': 'package-with-infinite-loop-grammar'
+'scopeName': 'source.package-with-infinite-loop-grammar'
+
+# This grammar should loop forever if the line contains an `a`
+'patterns': [
+  {
+    'name': 'start'
+    'begin': '^'
+    'end': '$'
+    'patterns': [
+      {
+        name: 'negative-look-ahead'
+        match: "(?!a)"
+      }
+    ]
+  }
+]

spec/fixtures/packages/package-with-snippets/snippets/.hidden-file

@@ -0,0 +1 @@
+This is a hidden file. Don't even try to load it as a snippet

spec/fixtures/packages/package-with-snippets/snippets/junk-file

@@ -0,0 +1 @@
+This file isn't CSON, but shouldn't be a big deal

spec/fixtures/packages/package-with-snippets/snippets/test.cson

@@ -0,0 +1,4 @@
+".test":
+  "Test Snippet":
+    prefix: "test"
+    body: "testing 123"

spec/fixtures/packages/theme-with-incomplete-ui-variables/package.json

@@ -1,4 +0,0 @@
-{
-  "theme": "ui",
-  "stylesheets": ["editor.less"]
-}

spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/editor.less

@@ -1,10 +0,0 @@
-@import "ui-variables";
-
-.editor {
-  padding-top: @component-padding;
-  padding-right: @component-padding;
-  padding-bottom: @component-padding;
-
-  color: @input-background-color;
-  background-color: @background-color-info; // From the fallback variables, not overridden
-}

spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/ui-variables.less

@@ -1,3 +0,0 @@
-// This does not contain all of the ui-variables available.
-@app-background-color: #00f; // Changed
-@input-background-color: #f00; // Changed

spec/fixtures/packages/theme-with-multiple-imported-files/index.less

@@ -0,0 +1,3 @@
+@import "stylesheets/first";
+@import "stylesheets/second";
+@import "stylesheets/last";

spec/fixtures/packages/theme-with-multiple-imported-files/package.json

@@ -0,0 +1,3 @@
+{
+  "theme": "ui"
+}

spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/first.less

@@ -0,0 +1,7 @@
+.editor {
+  padding-top: 101px;
+  padding-right: 101px;
+  padding-bottom: 101px;
+
+  color: red;
+}

spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/last.less

@@ -0,0 +1,5 @@
+.editor {
+/*  padding-top: 103px;
+  padding-right: 103px;*/
+  padding-bottom: 103px;
+}

spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/second.less

@@ -0,0 +1,9 @@
+@import "ui-variables";
+
+@number: 102px;
+
+.editor {
+/*  padding-top: 102px;*/
+  padding-right: @number;
+  padding-bottom: @number;
+}

spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less

@@ -0,0 +1,75 @@
+// Variables different from the original are marked 'Changed'
+
+@text-color: #333;
+@text-color-subtle: #777;
+@text-color-highlight: #111;
+@text-color-selected: @text-color-highlight;
+
+@text-color-info: #5293d8;
+@text-color-success: #1fe977;
+@text-color-warning: #f78a46;
+@text-color-error: #c00;
+
+@background-color-info: #0098ff;
+@background-color-success: #17ca65;
+@background-color-warning: #ff4800;
+@background-color-error: #c00;
+@background-color-highlight: rgba(255, 255, 255, 0.10);
+@background-color-selected: @background-color-highlight;
+
+@app-background-color: #00f; // Changed
+
+@base-background-color: #fff;
+@base-border-color: #eee;
+
+@pane-item-background-color: @base-background-color;
+@pane-item-border-color: @base-border-color;
+
+@input-background-color: #f00; // Changed
+@input-border-color: @base-border-color;
+
+@tool-panel-background-color: #f4f4f4;
+@tool-panel-border-color: @base-border-color;
+
+@inset-panel-background-color: #eee;
+@inset-panel-border-color: @base-border-color;
+
+@panel-heading-background-color: #ddd;
+@panel-heading-border-color: transparent;
+
+@overlay-background-color: #f4f4f4;
+@overlay-border-color: @base-border-color;
+
+@button-background-color: #ccc;
+@button-background-color-hover: lighten(@button-background-color, 5%);
+@button-background-color-selected: @button-background-color-hover;
+@button-border-color: #aaa;
+
+@tab-bar-background-color: #fff;
+@tab-bar-border-color: darken(@tab-background-color-active, 10%);
+@tab-background-color: #f4f4f4;
+@tab-background-color-active: #fff;
+@tab-border-color: @base-border-color;
+
+@tree-view-background-color: @tool-panel-background-color;
+@tree-view-border-color: @tool-panel-border-color;
+
+@ui-site-color-1: @background-color-success; // green
+@ui-site-color-2: @background-color-info; // blue
+@ui-site-color-3: @background-color-warning; // orange
+@ui-site-color-4: #db2ff4; // purple
+@ui-site-color-5: #f5e11d; // yellow
+
+@font-size: 12px;
+
+@disclosure-arrow-size: 12px;
+
+@component-padding: 150px;
+@component-icon-padding: 5px;
+@component-icon-size: 16px;
+@component-line-height: 25px;
+@component-border-radius: 2px;
+
+@tab-height: 30px;
+
+@font-family: Arial;

spec/fixtures/replication/home-1/project/file-1.txt

@@ -0,0 +1 @@
+Hello World!

spec/fixtures/replication/home-1/project/file-2.txt

@@ -0,0 +1 @@
+Goodbye World!

spec/fixtures/replication/home-2/project/file-1.txt

@@ -0,0 +1 @@
+Hello World!

spec/fixtures/replication/home-2/project/file-2.txt

@@ -0,0 +1 @@
+Goodbye World!

spec/fixtures/sample-with-error.less

@@ -0,0 +1 @@
+#header {

spec/fixtures/sample.plist

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>fileTypes</key>
+	<array>
+		<string>txt</string>
+	</array>
+	<key>keyEquivalent</key>
+	<string>^~P</string>
+	<key>name</key>
+	<string>Plain Text</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(•).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.strong.text</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(·).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.light.text</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.item.text</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(\*).*$\n?</string>
+			<key>name</key>
+			<string>meta.bullet-point.star.text</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^([ \t]*)(?=\S)</string>
+			<key>contentName</key>
+			<string>meta.paragraph.text</string>
+			<key>end</key>
+			<string>^(?!\1(?=\S))</string>
+		</dict>
+	</array>
+	<key>scopeName</key>
+	<string>text.plain</string>
+	<key>uuid</key>
+	<string>3130E4FA-B10E-11D9-9F75-000D93589AF6</string>
+</dict>
+</plist>

spec/fixtures/symlink-to-dir

@@ -0,0 +1 @@
+dir

spec/fixtures/symlink-to-file

@@ -0,0 +1 @@
+sample.js

spec/fixtures/zed/a

@@ -0,0 +1 @@
+a

spec/git-spec.coffee

@@ -1,5 +1,5 @@
 temp = require 'temp'
-GitRepository = require '../src/git-repository'
+Git = require '../src/git'
 fs = require 'fs-plus'
 path = require 'path'
 Task = require '../src/task'
@@ -10,7 +10,7 @@ copyRepository = ->
   fs.renameSync(path.join(workingDirPath, 'git.git'), path.join(workingDirPath, '.git'))
   workingDirPath
 
-describe "GitRepository", ->
+describe "Git", ->
   repo = null
 
   beforeEach ->
@@ -22,28 +22,28 @@ describe "GitRepository", ->
 
   describe "@open(path)", ->
     it "returns null when no repository is found", ->
-      expect(GitRepository.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()
+      expect(Git.open(path.join(temp.dir, 'nogit.txt'))).toBeNull()
 
-  describe "new GitRepository(path)", ->
+  describe "new Git(path)", ->
     it "throws an exception when no repository is found", ->
-      expect(-> new GitRepository(path.join(temp.dir, 'nogit.txt'))).toThrow()
+      expect(-> new Git(path.join(temp.dir, 'nogit.txt'))).toThrow()
 
   describe ".getPath()", ->
     it "returns the repository path for a .git directory path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
       expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
 
     it "returns the repository path for a repository path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'master.git'))
       expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
 
   describe ".isPathIgnored(path)", ->
     it "returns true for an ignored path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
       expect(repo.isPathIgnored('a.txt')).toBeTruthy()
 
     it "returns false for a non-ignored path", ->
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
+      repo = new Git(path.join(__dirname, 'fixtures', 'git', 'ignore.git'))
       expect(repo.isPathIgnored('b.txt')).toBeFalsy()
 
   describe ".isPathModified(path)", ->
@@ -51,7 +51,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
       newPath = path.join(workingDirPath, 'new-path.txt')
 
@@ -75,7 +75,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
       newPath = path.join(workingDirPath, 'new-path.txt')
       fs.writeFileSync(newPath, "i'm new here")
@@ -92,7 +92,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
+      repo = new Git(workingDirPath)
       filePath = path.join(workingDirPath, 'a.txt')
 
     it "no longer reports a path as modified after checkout", ->
@@ -111,49 +111,17 @@ describe "GitRepository", ->
       fs.writeFileSync(filePath, 'ch ch changes')
       repo.getPathStatus(filePath)
       statusHandler = jasmine.createSpy('statusHandler')
-      repo.onDidChangeStatus statusHandler
+      repo.on 'status-changed', statusHandler
       repo.checkoutHead(filePath)
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler.argsForCall[0][0]).toEqual {path: filePath, pathStatus: 0}
+      expect(statusHandler.argsForCall[0][0..1]).toEqual [filePath, 0]
 
       repo.checkoutHead(filePath)
       expect(statusHandler.callCount).toBe 1
 
-  describe ".checkoutHeadForEditor(editor)", ->
-    [filePath, editor] = []
-
-    beforeEach ->
-      workingDirPath = copyRepository()
-      repo = new GitRepository(workingDirPath)
-      filePath = path.join(workingDirPath, 'a.txt')
-      fs.writeFileSync(filePath, 'ch ch changes')
-
-      waitsForPromise ->
-        atom.workspace.open(filePath)
-
-      runs ->
-        editor = atom.workspace.getActiveEditor()
-
-    it "displays a confirmation dialog by default", ->
-      spyOn(atom, 'confirm').andCallFake ({buttons}) -> buttons.OK()
-      atom.config.set('editor.confirmCheckoutHeadRevision', true)
-
-      repo.checkoutHeadForEditor(editor)
-
-      expect(fs.readFileSync(filePath, 'utf8')).toBe ''
-
-    it "does not display a dialog when confirmation is disabled", ->
-      spyOn(atom, 'confirm')
-      atom.config.set('editor.confirmCheckoutHeadRevision', false)
-
-      repo.checkoutHeadForEditor(editor)
-
-      expect(fs.readFileSync(filePath, 'utf8')).toBe ''
-      expect(atom.confirm).not.toHaveBeenCalled()
-
   describe ".destroy()", ->
     it "throws an exception when any method is called after it is called", ->
-      repo = new GitRepository(require.resolve('./fixtures/git/master.git/HEAD'))
+      repo = new Git(require.resolve('./fixtures/git/master.git/HEAD'))
       repo.destroy()
       expect(-> repo.getShortHead()).toThrow()
 
@@ -162,16 +130,16 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
       filePath = path.join(workingDirectory, 'file.txt')
 
     it "trigger a status-changed event when the new status differs from the last cached one", ->
       statusHandler = jasmine.createSpy("statusHandler")
-      repo.onDidChangeStatus statusHandler
+      repo.on 'status-changed', statusHandler
       fs.writeFileSync(filePath, '')
       status = repo.getPathStatus(filePath)
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler.argsForCall[0][0]).toEqual {path: filePath, pathStatus: status}
+      expect(statusHandler.argsForCall[0][0..1]).toEqual [filePath, status]
 
       fs.writeFileSync(filePath, 'abc')
       status = repo.getPathStatus(filePath)
@@ -182,7 +150,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
       directoryPath = path.join(workingDirectory, 'dir')
       filePath = path.join(directoryPath, 'b.txt')
 
@@ -197,7 +165,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new Git(workingDirectory)
       modifiedPath = path.join(workingDirectory, 'file.txt')
       newPath = path.join(workingDirectory, 'untracked.txt')
       cleanPath = path.join(workingDirectory, 'other.txt')
@@ -208,7 +176,7 @@ describe "GitRepository", ->
     it "returns status information for all new and modified files", ->
       fs.writeFileSync(modifiedPath, 'making this path modified')
       statusHandler = jasmine.createSpy('statusHandler')
-      repo.onDidChangeStatuses statusHandler
+      repo.on 'statuses-changed', statusHandler
       repo.refreshStatus()
 
       waitsFor ->
@@ -232,19 +200,19 @@ describe "GitRepository", ->
       editor.insertNewline()
 
       statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepo().onDidChangeStatus statusHandler
+      atom.project.getRepo().on 'status-changed', statusHandler
       editor.save()
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256
 
     it "emits a status-changed event when a buffer is reloaded", ->
       fs.writeFileSync(editor.getPath(), 'changed')
 
       statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepo().onDidChangeStatus statusHandler
+      atom.project.getRepo().on 'status-changed', statusHandler
       editor.getBuffer().reload()
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256
       editor.getBuffer().reload()
       expect(statusHandler.callCount).toBe 1
 
@@ -252,11 +220,11 @@ describe "GitRepository", ->
       fs.writeFileSync(editor.getPath(), 'changed')
 
       statusHandler = jasmine.createSpy('statusHandler')
-      atom.project.getRepo().onDidChangeStatus statusHandler
-      editor.getBuffer().emitter.emit 'did-change-path'
+      atom.project.getRepo().on 'status-changed', statusHandler
+      editor.getBuffer().emit 'path-changed'
       expect(statusHandler.callCount).toBe 1
-      expect(statusHandler).toHaveBeenCalledWith {path: editor.getPath(), pathStatus: 256}
-      editor.getBuffer().emitter.emit 'did-change-path'
+      expect(statusHandler).toHaveBeenCalledWith editor.getPath(), 256
+      editor.getBuffer().emit 'path-changed'
       expect(statusHandler.callCount).toBe 1
 
   describe "when a project is deserialized", ->
@@ -283,7 +251,7 @@ describe "GitRepository", ->
         buffer.append('changes')
 
         statusHandler = jasmine.createSpy('statusHandler')
-        project2.getRepo().onDidChangeStatus statusHandler
+        project2.getRepo().on 'status-changed', statusHandler
         buffer.save()
         expect(statusHandler.callCount).toBe 1
-        expect(statusHandler).toHaveBeenCalledWith {path: buffer.getPath(), pathStatus: 256}
+        expect(statusHandler).toHaveBeenCalledWith buffer.getPath(), 256

spec/jasmine-helper.coffee

@@ -1,14 +1,11 @@
 fs = require 'fs'
 
 module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
-  {$, $$} = require '../src/space-pen-extensions'
-
+  {$, $$} = require 'atom'
   window[key] = value for key, value of require '../vendor/jasmine'
 
   {TerminalReporter} = require 'jasmine-tagged'
 
-  disableFocusMethods() if process.env.JANKY_SHA1
-
   TimeReporter = require './time-reporter'
   timeReporter = new TimeReporter()
 
@@ -40,10 +37,3 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
   $('body').append $$ -> @div id: 'jasmine-content'
 
   jasmineEnv.execute()
-
-disableFocusMethods = ->
-  ['fdescribe', 'ffdescribe', 'fffdescribe', 'fit', 'ffit', 'fffit'].forEach (methodName) ->
-    focusMethod = window[methodName]
-    window[methodName] = (description) ->
-      error = new Error('Focused spec is running on CI')
-      focusMethod description, -> throw error

spec/language-mode-spec.coffee

@@ -70,28 +70,6 @@ describe "LanguageMode", ->
         expect(languageMode.rowRangeForCodeFoldAtBufferRow(2)).toBeNull()
         expect(languageMode.rowRangeForCodeFoldAtBufferRow(4)).toEqual [4, 7]
 
-    describe ".rowRangeForCommentAtBufferRow(bufferRow)", ->
-      it "returns the start/end rows of the foldable comment starting at the given row", ->
-        buffer.setText("//this is a multi line comment\n//another line")
-        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toEqual [0, 1]
-        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toEqual [0, 1]
-
-        buffer.setText("//this is a multi line comment\n//another line\n//and one more")
-        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toEqual [0, 2]
-        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toEqual [0, 2]
-
-        buffer.setText("//this is a multi line comment\n\n//with an empty line")
-        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
-        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toBeUndefined()
-        expect(languageMode.rowRangeForCommentAtBufferRow(2)).toBeUndefined()
-
-        buffer.setText("//this is a single line comment\n")
-        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
-        expect(languageMode.rowRangeForCommentAtBufferRow(1)).toBeUndefined()
-
-        buffer.setText("//this is a single line comment")
-        expect(languageMode.rowRangeForCommentAtBufferRow(0)).toBeUndefined()
-
     describe "suggestedIndentForBufferRow", ->
       it "returns the suggested indentation based on auto-indent/outdent rules", ->
         expect(languageMode.suggestedIndentForBufferRow(0)).toBe 0
@@ -297,46 +275,46 @@ describe "LanguageMode", ->
       it "folds every foldable line", ->
         languageMode.foldAll()
 
-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
         expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 12]
         fold1.destroy()
 
-        fold2 = editor.tokenizedLineForScreenRow(1).fold
+        fold2 = editor.lineForScreenRow(1).fold
         expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [1, 9]
         fold2.destroy()
 
-        fold3 = editor.tokenizedLineForScreenRow(4).fold
+        fold3 = editor.lineForScreenRow(4).fold
         expect([fold3.getStartRow(), fold3.getEndRow()]).toEqual [4, 7]
 
     describe ".foldBufferRow(bufferRow)", ->
       describe "when bufferRow can be folded", ->
         it "creates a fold based on the syntactic region starting at the given row", ->
           languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
           expect(fold.getStartRow()).toBe 1
           expect(fold.getEndRow()).toBe 9
 
       describe "when bufferRow can't be folded", ->
         it "searches upward for the first row that begins a syntatic region containing the given buffer row (and folds it)", ->
           languageMode.foldBufferRow(8)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
           expect(fold.getStartRow()).toBe 1
           expect(fold.getEndRow()).toBe 9
 
       describe "when the bufferRow is already folded", ->
         it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
           languageMode.foldBufferRow(2)
-          expect(editor.tokenizedLineForScreenRow(1).fold).toBeDefined()
-          expect(editor.tokenizedLineForScreenRow(0).fold).not.toBeDefined()
+          expect(editor.lineForScreenRow(1).fold).toBeDefined()
+          expect(editor.lineForScreenRow(0).fold).not.toBeDefined()
 
           languageMode.foldBufferRow(1)
-          expect(editor.tokenizedLineForScreenRow(0).fold).toBeDefined()
+          expect(editor.lineForScreenRow(0).fold).toBeDefined()
 
       describe "when the bufferRow is in a multi-line comment", ->
         it "searches upward and downward for surrounding comment lines and folds them as a single fold", ->
           buffer.insert([1,0], "  //this is a comment\n  // and\n  //more docs\n\n//second comment")
           languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(1).fold
+          fold = editor.lineForScreenRow(1).fold
           expect(fold.getStartRow()).toBe 1
           expect(fold.getEndRow()).toBe 3
 
@@ -344,7 +322,7 @@ describe "LanguageMode", ->
         it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
           buffer.insert([1,0], "  //this is a single line comment\n")
           languageMode.foldBufferRow(1)
-          fold = editor.tokenizedLineForScreenRow(0).fold
+          fold = editor.lineForScreenRow(0).fold
           expect(fold.getStartRow()).toBe 0
           expect(fold.getEndRow()).toBe 13
 
@@ -379,38 +357,38 @@ describe "LanguageMode", ->
       it "folds every foldable line", ->
         languageMode.foldAll()
 
-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
         expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 19]
         fold1.destroy()
 
-        fold2 = editor.tokenizedLineForScreenRow(1).fold
+        fold2 = editor.lineForScreenRow(1).fold
         expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [1, 4]
 
-        fold3 = editor.tokenizedLineForScreenRow(2).fold.destroy()
+        fold3 = editor.lineForScreenRow(2).fold.destroy()
 
-        fold4 = editor.tokenizedLineForScreenRow(3).fold
+        fold4 = editor.lineForScreenRow(3).fold
         expect([fold4.getStartRow(), fold4.getEndRow()]).toEqual [6, 8]
 
     describe ".foldAllAtIndentLevel()", ->
       it "folds every foldable range at a given indentLevel", ->
         languageMode.foldAllAtIndentLevel(2)
 
-        fold1 = editor.tokenizedLineForScreenRow(6).fold
+        fold1 = editor.lineForScreenRow(6).fold
         expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [6, 8]
         fold1.destroy()
 
-        fold2 = editor.tokenizedLineForScreenRow(11).fold
+        fold2 = editor.lineForScreenRow(11).fold
         expect([fold2.getStartRow(), fold2.getEndRow()]).toEqual [11, 14]
         fold2.destroy()
 
       it "does not fold anything but the indentLevel", ->
         languageMode.foldAllAtIndentLevel(0)
 
-        fold1 = editor.tokenizedLineForScreenRow(0).fold
+        fold1 = editor.lineForScreenRow(0).fold
         expect([fold1.getStartRow(), fold1.getEndRow()]).toEqual [0, 19]
         fold1.destroy()
 
-        fold2 = editor.tokenizedLineForScreenRow(5).fold
+        fold2 = editor.lineForScreenRow(5).fold
         expect(fold2).toBeFalsy()
 
     describe ".isFoldableAtBufferRow(bufferRow)", ->

spec/package-spec.coffee

@@ -1,39 +1,8 @@
 {$} = require 'atom'
 path = require 'path'
-Package = require '../src/package'
 ThemePackage = require '../src/theme-package'
 
 describe "Package", ->
-  describe "when the package contains incompatible native modules", ->
-    beforeEach ->
-      spyOn(atom, 'inDevMode').andReturn(false)
-
-    it "does not activate it", ->
-      packagePath = atom.project.resolve('packages/package-with-incompatible-native-module')
-      pack = new Package(packagePath)
-      expect(pack.isCompatible()).toBe false
-      expect(pack.incompatibleModules[0].name).toBe 'native-module'
-      expect(pack.incompatibleModules[0].path).toBe path.join(packagePath, 'node_modules', 'native-module')
-
-    it "caches the incompatible native modules in local storage", ->
-      packagePath = atom.project.resolve('packages/package-with-incompatible-native-module')
-      cacheKey = null
-      cacheItem = null
-
-      spyOn(global.localStorage, 'setItem').andCallFake (key, item) ->
-        cacheKey = key
-        cacheItem = item
-      spyOn(global.localStorage, 'getItem').andCallFake (key) ->
-        return cacheItem if cacheKey is key
-
-      expect(new Package(packagePath).isCompatible()).toBe false
-      expect(global.localStorage.getItem.callCount).toBe 1
-      expect(global.localStorage.setItem.callCount).toBe 1
-
-      expect(new Package(packagePath).isCompatible()).toBe false
-      expect(global.localStorage.getItem.callCount).toBe 2
-      expect(global.localStorage.setItem.callCount).toBe 1
-
   describe "theme", ->
     theme = null
 
@@ -102,6 +71,6 @@ describe "Package", ->
         theme.activate()
 
       it "deactivated event fires on .deactivate()", ->
-        theme.onDidDeactivate spy = jasmine.createSpy()
+        theme.on 'deactivated', spy = jasmine.createSpy()
         theme.deactivate()
         expect(spy).toHaveBeenCalled()

spec/pane-container-spec.coffee

@@ -27,91 +27,42 @@ describe "PaneContainer", ->
 
     it "preserves the active pane across serialization, independent of focus", ->
       pane3A.activate()
-      expect(containerA.getActivePane()).toBe pane3A
+      expect(containerA.activePane).toBe pane3A
 
       containerB = containerA.testSerialization()
       [pane1B, pane2B, pane3B] = containerB.getPanes()
-      expect(containerB.getActivePane()).toBe pane3B
+      expect(containerB.activePane).toBe pane3B
 
-  it "does not allow the root pane to be destroyed", ->
-    container = new PaneContainer
-    container.getRoot().destroy()
-    expect(container.getRoot()).toBeDefined()
-    expect(container.getRoot().isDestroyed()).toBe false
-
-  describe "::getActivePane()", ->
+  describe "::activePane", ->
     [container, pane1, pane2] = []
 
     beforeEach ->
       container = new PaneContainer
-      pane1 = container.getRoot()
+      pane1 = container.root
 
-    it "returns the first pane if no pane has been made active", ->
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
+    it "references the first pane if no pane has been made active", ->
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true
 
-    it "returns the most pane on which ::activate() was most recently called", ->
+    it "references the most pane on which ::activate was most recently called", ->
       pane2 = pane1.splitRight()
       pane2.activate()
-      expect(container.getActivePane()).toBe pane2
-      expect(pane1.isActive()).toBe false
-      expect(pane2.isActive()).toBe true
+      expect(container.activePane).toBe pane2
+      expect(pane1.active).toBe false
+      expect(pane2.active).toBe true
       pane1.activate()
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
-      expect(pane2.isActive()).toBe false
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true
+      expect(pane2.active).toBe false
 
-    it "returns the next pane if the current active pane is destroyed", ->
+    it "is reassigned to the next pane if the current active pane is destroyed", ->
       pane2 = pane1.splitRight()
       pane2.activate()
       pane2.destroy()
-      expect(container.getActivePane()).toBe pane1
-      expect(pane1.isActive()).toBe true
+      expect(container.activePane).toBe pane1
+      expect(pane1.active).toBe true
 
-  describe "::onDidChangeActivePaneItem()", ->
-    [container, pane1, pane2, observed] = []
-
-    beforeEach ->
-      container = new PaneContainer(root: new Pane(items: [new Object, new Object]))
-      container.getRoot().splitRight(items: [new Object, new Object])
-      [pane1, pane2] = container.getPanes()
-
-      observed = []
-      container.onDidChangeActivePaneItem (item) -> observed.push(item)
-
-    it "invokes observers when the active item of the active pane changes", ->
-      pane2.activateNextItem()
-      pane2.activateNextItem()
-      expect(observed).toEqual [pane2.itemAtIndex(1), pane2.itemAtIndex(0)]
-
-    it "invokes observers when the active pane changes", ->
-      pane1.activate()
-      pane2.activate()
-      expect(observed).toEqual [pane1.itemAtIndex(0), pane2.itemAtIndex(0)]
-
-  describe "::observePanes()", ->
-    it "invokes observers with all current and future panes", ->
-      container = new PaneContainer
-      container.getRoot().splitRight()
-      [pane1, pane2] = container.getPanes()
-
-      observed = []
-      container.observePanes (pane) -> observed.push(pane)
-
-      pane3 = pane2.splitDown()
-      pane4 = pane2.splitRight()
-
-      expect(observed).toEqual [pane1, pane2, pane3, pane4]
-
-  describe "::observePaneItems()", ->
-    it "invokes observers with all current and future pane items", ->
-      container = new PaneContainer(root: new Pane(items: [new Object, new Object]))
-      container.getRoot().splitRight(items: [new Object])
-      [pane1, pane2] = container.getPanes()
-      observed = []
-      container.observePaneItems (pane) -> observed.push(pane)
-
-      pane3 = pane2.splitDown(items: [new Object])
-      pane3.addItems([new Object, new Object])
-
-      expect(observed).toEqual container.getPaneItems()
+    it "does not allow the root pane to be destroyed", ->
+      pane1.destroy()
+      expect(container.root).toBe pane1
+      expect(pane1.isDestroyed()).toBe false

spec/pane-spec.coffee

@@ -21,90 +21,39 @@ describe "Pane", ->
   describe "construction", ->
     it "sets the active item to the first item", ->
       pane = new Pane(items: [new Item("A"), new Item("B")])
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
+      expect(pane.activeItem).toBe pane.items[0]
 
     it "compacts the items array", ->
       pane = new Pane(items: [undefined, new Item("A"), null, new Item("B")])
-      expect(pane.getItems().length).toBe 2
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
-
-  describe "::activate()", ->
-    [container, pane1, pane2] = []
-
-    beforeEach ->
-      container = new PaneContainer(root: new Pane)
-      container.getRoot().splitRight()
-      [pane1, pane2] = container.getPanes()
-
-    it "changes the active pane on the container", ->
-      expect(container.getActivePane()).toBe pane2
-      pane1.activate()
-      expect(container.getActivePane()).toBe pane1
-      pane2.activate()
-      expect(container.getActivePane()).toBe pane2
-
-    it "invokes ::onDidChangeActivePane observers on the container", ->
-      observed = []
-      container.onDidChangeActivePane (activePane) -> observed.push(activePane)
-
-      pane1.activate()
-      pane1.activate()
-      pane2.activate()
-      pane1.activate()
-      expect(observed).toEqual [pane1, pane2, pane1]
-
-    it "invokes ::onDidChangeActive observers on the relevant panes", ->
-      observed = []
-      pane1.onDidChangeActive (active) -> observed.push(active)
-      pane1.activate()
-      pane2.activate()
-      expect(observed).toEqual [true, false]
-
-    it "invokes ::onDidActivate() observers", ->
-      eventCount = 0
-      pane1.onDidActivate -> eventCount++
-      pane1.activate()
-      pane1.activate()
-      pane2.activate()
-      expect(eventCount).toBe 2
+      expect(pane.items.length).toBe 2
+      expect(pane.activeItem).toBe pane.items[0]
 
   describe "::addItem(item, index)", ->
     it "adds the item at the given index", ->
       pane = new Pane(items: [new Item("A"), new Item("B")])
-      [item1, item2] = pane.getItems()
+      [item1, item2] = pane.items
       item3 = new Item("C")
       pane.addItem(item3, 1)
-      expect(pane.getItems()).toEqual [item1, item3, item2]
+      expect(pane.items).toEqual [item1, item3, item2]
 
-    it "adds the item after the active item if no index is provided", ->
+    it "adds the item after the active item ", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
       pane.activateItem(item2)
       item4 = new Item("D")
       pane.addItem(item4)
-      expect(pane.getItems()).toEqual [item1, item2, item4, item3]
+      expect(pane.items).toEqual [item1, item2, item4, item3]
 
     it "sets the active item after adding the first item", ->
       pane = new Pane
       item = new Item("A")
-      pane.addItem(item)
-      expect(pane.getActiveItem()).toBe item
-
-    it "invokes ::onDidAddItem() observers", ->
-      pane = new Pane(items: [new Item("A"), new Item("B")])
       events = []
-      pane.onDidAddItem (event) -> events.push(event)
+      pane.on 'item-added', -> events.push('item-added')
+      pane.$activeItem.changes.onValue -> events.push('active-item-changed')
 
-      item = new Item("C")
-      pane.addItem(item, 1)
-      expect(events).toEqual [{item, index: 1}]
-
-    it "throws an exception if the item is already present on a pane", ->
-      item = new Item("A")
-      pane1 = new Pane(items: [item])
-      container = new PaneContainer(root: pane1)
-      pane2 = pane1.splitRight()
-      expect(-> pane2.addItem(item)).toThrow()
+      pane.addItem(item)
+      expect(pane.activeItem).toBe item
+      expect(events).toEqual ['item-added', 'active-item-changed']
 
   describe "::activateItem(item)", ->
     pane = null
@@ -113,102 +62,83 @@ describe "Pane", ->
       pane = new Pane(items: [new Item("A"), new Item("B")])
 
     it "changes the active item to the current item", ->
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(0)
-      pane.activateItem(pane.itemAtIndex(1))
-      expect(pane.getActiveItem()).toBe pane.itemAtIndex(1)
+      expect(pane.activeItem).toBe pane.items[0]
+      pane.activateItem(pane.items[1])
+      expect(pane.activeItem).toBe pane.items[1]
 
     it "adds the given item if it isn't present in ::items", ->
       item = new Item("C")
       pane.activateItem(item)
-      expect(item in pane.getItems()).toBe true
-      expect(pane.getActiveItem()).toBe item
-
-    it "invokes ::onDidChangeActiveItem() observers", ->
-      observed = []
-      pane.onDidChangeActiveItem (item) -> observed.push(item)
-      pane.activateItem(pane.itemAtIndex(1))
-      expect(observed).toEqual [pane.itemAtIndex(1)]
+      expect(item in pane.items).toBe true
+      expect(pane.activeItem).toBe item
 
   describe "::activateNextItem() and ::activatePreviousItem()", ->
     it "sets the active item to the next/previous item, looping around at either end", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
 
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
       pane.activatePreviousItem()
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
       pane.activatePreviousItem()
-      expect(pane.getActiveItem()).toBe item2
+      expect(pane.activeItem).toBe item2
       pane.activateNextItem()
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
       pane.activateNextItem()
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
 
   describe "::activateItemAtIndex(index)", ->
     it "activates the item at the given index", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
       pane.activateItemAtIndex(2)
-      expect(pane.getActiveItem()).toBe item3
+      expect(pane.activeItem).toBe item3
       pane.activateItemAtIndex(1)
-      expect(pane.getActiveItem()).toBe item2
+      expect(pane.activeItem).toBe item2
       pane.activateItemAtIndex(0)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
 
       # Doesn't fail with out-of-bounds indices
       pane.activateItemAtIndex(100)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
       pane.activateItemAtIndex(-1)
-      expect(pane.getActiveItem()).toBe item1
+      expect(pane.activeItem).toBe item1
 
   describe "::destroyItem(item)", ->
     [pane, item1, item2, item3] = []
 
     beforeEach ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
 
-    it "removes the item from the items list and destroyes it", ->
-      expect(pane.getActiveItem()).toBe item1
+    it "removes the item from the items list", ->
+      expect(pane.activeItem).toBe item1
       pane.destroyItem(item2)
-      expect(item2 in pane.getItems()).toBe false
-      expect(item2.isDestroyed()).toBe true
-      expect(pane.getActiveItem()).toBe item1
+      expect(item2 in pane.items).toBe false
+      expect(pane.activeItem).toBe item1
 
       pane.destroyItem(item1)
-      expect(item1 in pane.getItems()).toBe false
-      expect(item1.isDestroyed()).toBe true
-
-    it "invokes ::onWillDestroyItem() observers before destroying the item", ->
-      events = []
-      pane.onWillDestroyItem (event) ->
-        expect(item2.isDestroyed()).toBe false
-        events.push(event)
-
-      pane.destroyItem(item2)
-      expect(item2.isDestroyed()).toBe true
-      expect(events).toEqual [{item: item2, index: 1}]
-
-    it "invokes ::onDidRemoveItem() observers", ->
-      events = []
-      pane.onDidRemoveItem (event) -> events.push(event)
-      pane.destroyItem(item2)
-      expect(events).toEqual [{item: item2, index: 1, destroyed: true}]
+      expect(item1 in pane.items).toBe false
 
     describe "when the destroyed item is the active item and is the first item", ->
       it "activates the next item", ->
-        expect(pane.getActiveItem()).toBe item1
+        expect(pane.activeItem).toBe item1
         pane.destroyItem(item1)
-        expect(pane.getActiveItem()).toBe item2
+        expect(pane.activeItem).toBe item2
 
     describe "when the destroyed item is the active item and is not the first item", ->
       beforeEach ->
         pane.activateItem(item2)
 
       it "activates the previous item", ->
-        expect(pane.getActiveItem()).toBe item2
+        expect(pane.activeItem).toBe item2
         pane.destroyItem(item2)
-        expect(pane.getActiveItem()).toBe item1
+        expect(pane.activeItem).toBe item1
+
+    it "emits 'item-removed' with the item, its index, and true indicating the item is being destroyed", ->
+      pane.on 'item-removed', itemRemovedHandler = jasmine.createSpy("itemRemovedHandler")
+      pane.destroyItem(item2)
+      expect(itemRemovedHandler).toHaveBeenCalledWith(item2, 1, true)
 
     describe "if the item is modified", ->
       itemUri = null
@@ -227,7 +157,7 @@ describe "Pane", ->
             pane.destroyItem(item1)
 
             expect(item1.save).toHaveBeenCalled()
-            expect(item1 in pane.getItems()).toBe false
+            expect(item1 in pane.items).toBe false
             expect(item1.isDestroyed()).toBe true
 
         describe "when the item has no uri", ->
@@ -240,7 +170,7 @@ describe "Pane", ->
 
             expect(atom.showSaveDialogSync).toHaveBeenCalled()
             expect(item1.saveAs).toHaveBeenCalledWith("/selected/path")
-            expect(item1 in pane.getItems()).toBe false
+            expect(item1 in pane.items).toBe false
             expect(item1.isDestroyed()).toBe true
 
       describe "if the [Don't Save] option is selected", ->
@@ -249,7 +179,7 @@ describe "Pane", ->
           pane.destroyItem(item1)
 
           expect(item1.save).not.toHaveBeenCalled()
-          expect(item1 in pane.getItems()).toBe false
+          expect(item1 in pane.items).toBe false
           expect(item1.isDestroyed()).toBe true
 
       describe "if the [Cancel] option is selected", ->
@@ -258,7 +188,7 @@ describe "Pane", ->
           pane.destroyItem(item1)
 
           expect(item1.save).not.toHaveBeenCalled()
-          expect(item1 in pane.getItems()).toBe true
+          expect(item1 in pane.items).toBe true
           expect(item1.isDestroyed()).toBe false
 
     describe "when the last item is destroyed", ->
@@ -267,7 +197,7 @@ describe "Pane", ->
           expect(atom.config.get('core.destroyEmptyPanes')).toBe false
           pane.destroyItem(item) for item in pane.getItems()
           expect(pane.isDestroyed()).toBe false
-          expect(pane.getActiveItem()).toBeUndefined()
+          expect(pane.activeItem).toBeUndefined()
           expect(-> pane.saveActiveItem()).not.toThrow()
           expect(-> pane.saveActiveItemAs()).not.toThrow()
 
@@ -280,10 +210,10 @@ describe "Pane", ->
   describe "::destroyActiveItem()", ->
     it "destroys the active item", ->
       pane = new Pane(items: [new Item("A"), new Item("B")])
-      activeItem = pane.getActiveItem()
+      activeItem = pane.activeItem
       pane.destroyActiveItem()
       expect(activeItem.isDestroyed()).toBe true
-      expect(activeItem in pane.getItems()).toBe false
+      expect(activeItem in pane.items).toBe false
 
     it "does not throw an exception if there are no more items", ->
       pane = new Pane
@@ -292,40 +222,27 @@ describe "Pane", ->
   describe "::destroyItems()", ->
     it "destroys all items", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
       pane.destroyItems()
       expect(item1.isDestroyed()).toBe true
       expect(item2.isDestroyed()).toBe true
       expect(item3.isDestroyed()).toBe true
-      expect(pane.getItems()).toEqual []
-
-  describe "::observeItems()", ->
-    it "invokes the observer with all current and future items", ->
-      pane = new Pane(items: [new Item, new Item])
-      [item1, item2] = pane.getItems()
-
-      observed = []
-      pane.observeItems (item) -> observed.push(item)
-
-      item3 = new Item
-      pane.addItem(item3)
-
-      expect(observed).toEqual [item1, item2, item3]
+      expect(pane.items).toEqual []
 
   describe "when an item emits a destroyed event", ->
     it "removes it from the list of items", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
-      pane.itemAtIndex(1).destroy()
-      expect(pane.getItems()).toEqual [item1, item3]
+      [item1, item2, item3] = pane.items
+      pane.items[1].destroy()
+      expect(pane.items).toEqual [item1, item3]
 
   describe "::destroyInactiveItems()", ->
     it "destroys all items but the active item", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
       pane.activateItem(item2)
       pane.destroyInactiveItems()
-      expect(pane.getItems()).toEqual [item2]
+      expect(pane.items).toEqual [item2]
 
   describe "::saveActiveItem()", ->
     pane = null
@@ -336,30 +253,30 @@ describe "Pane", ->
 
     describe "when the active item has a uri", ->
       beforeEach ->
-        pane.getActiveItem().uri = "test"
+        pane.activeItem.uri = "test"
 
       describe "when the active item has a save method", ->
         it "saves the current item", ->
-          pane.getActiveItem().save = jasmine.createSpy("save")
+          pane.activeItem.save = jasmine.createSpy("save")
           pane.saveActiveItem()
-          expect(pane.getActiveItem().save).toHaveBeenCalled()
+          expect(pane.activeItem.save).toHaveBeenCalled()
 
       describe "when the current item has no save method", ->
         it "does nothing", ->
-          expect(pane.getActiveItem().save).toBeUndefined()
+          expect(pane.activeItem.save).toBeUndefined()
           pane.saveActiveItem()
 
     describe "when the current item has no uri", ->
       describe "when the current item has a saveAs method", ->
         it "opens a save dialog and saves the current item as the selected path", ->
-          pane.getActiveItem().saveAs = jasmine.createSpy("saveAs")
+          pane.activeItem.saveAs = jasmine.createSpy("saveAs")
           pane.saveActiveItem()
           expect(atom.showSaveDialogSync).toHaveBeenCalled()
-          expect(pane.getActiveItem().saveAs).toHaveBeenCalledWith('/selected/path')
+          expect(pane.activeItem.saveAs).toHaveBeenCalledWith('/selected/path')
 
       describe "when the current item has no saveAs method", ->
         it "does nothing", ->
-          expect(pane.getActiveItem().saveAs).toBeUndefined()
+          expect(pane.activeItem.saveAs).toBeUndefined()
           pane.saveActiveItem()
           expect(atom.showSaveDialogSync).not.toHaveBeenCalled()
 
@@ -372,22 +289,22 @@ describe "Pane", ->
 
     describe "when the current item has a saveAs method", ->
       it "opens the save dialog and calls saveAs on the item with the selected path", ->
-        pane.getActiveItem().path = __filename
-        pane.getActiveItem().saveAs = jasmine.createSpy("saveAs")
+        pane.activeItem.path = __filename
+        pane.activeItem.saveAs = jasmine.createSpy("saveAs")
         pane.saveActiveItemAs()
         expect(atom.showSaveDialogSync).toHaveBeenCalledWith(__filename)
-        expect(pane.getActiveItem().saveAs).toHaveBeenCalledWith('/selected/path')
+        expect(pane.activeItem.saveAs).toHaveBeenCalledWith('/selected/path')
 
     describe "when the current item does not have a saveAs method", ->
       it "does nothing", ->
-        expect(pane.getActiveItem().saveAs).toBeUndefined()
+        expect(pane.activeItem.saveAs).toBeUndefined()
         pane.saveActiveItemAs()
         expect(atom.showSaveDialogSync).not.toHaveBeenCalled()
 
   describe "::itemForUri(uri)", ->
     it "returns the item for which a call to .getUri() returns the given uri", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D")])
-      [item1, item2, item3] = pane.getItems()
+      [item1, item2, item3] = pane.items
       item1.uri = "a"
       item2.uri = "b"
       expect(pane.itemForUri("a")).toBe item1
@@ -395,32 +312,24 @@ describe "Pane", ->
       expect(pane.itemForUri("bogus")).toBeUndefined()
 
   describe "::moveItem(item, index)", ->
-    [pane, item1, item2, item3, item4] = []
-
-    beforeEach ->
+    it "moves the item to the given index and emits an 'item-moved' event with the item and its new index", ->
       pane = new Pane(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D")])
-      [item1, item2, item3, item4] = pane.getItems()
+      [item1, item2, item3, item4] = pane.items
+      pane.on 'item-moved', itemMovedHandler = jasmine.createSpy("itemMovedHandler")
 
-    it "moves the item to the given index and invokes ::onDidMoveItem observers", ->
       pane.moveItem(item1, 2)
       expect(pane.getItems()).toEqual [item2, item3, item1, item4]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item1, 2)
+      itemMovedHandler.reset()
 
       pane.moveItem(item2, 3)
       expect(pane.getItems()).toEqual [item3, item1, item4, item2]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item2, 3)
+      itemMovedHandler.reset()
 
       pane.moveItem(item2, 1)
       expect(pane.getItems()).toEqual [item3, item2, item1, item4]
-
-    it "invokes ::onDidMoveItem() observers", ->
-      events = []
-      pane.onDidMoveItem (event) -> events.push(event)
-
-      pane.moveItem(item1, 2)
-      pane.moveItem(item2, 3)
-      expect(events).toEqual [
-        {item: item1, oldIndex: 0, newIndex: 2}
-        {item: item2, oldIndex: 0, newIndex: 3}
-      ]
+      expect(itemMovedHandler).toHaveBeenCalledWith(item2, 1)
 
   describe "::moveItemToPane(item, pane, index)", ->
     [container, pane1, pane2] = []
@@ -430,20 +339,13 @@ describe "Pane", ->
       pane1 = new Pane(items: [new Item("A"), new Item("B"), new Item("C")])
       container = new PaneContainer(root: pane1)
       pane2 = pane1.splitRight(items: [new Item("D"), new Item("E")])
-      [item1, item2, item3] = pane1.getItems()
-      [item4, item5] = pane2.getItems()
+      [item1, item2, item3] = pane1.items
+      [item4, item5] = pane2.items
 
     it "moves the item to the given pane at the given index", ->
       pane1.moveItemToPane(item2, pane2, 1)
-      expect(pane1.getItems()).toEqual [item1, item3]
-      expect(pane2.getItems()).toEqual [item4, item2, item5]
-
-    it "invokes ::onDidRemoveItem() observers", ->
-      events = []
-      pane1.onDidRemoveItem (event) -> events.push(event)
-      pane1.moveItemToPane(item2, pane2, 1)
-
-      expect(events).toEqual [{item: item2, index: 1, destroyed: false}]
+      expect(pane1.items).toEqual [item1, item3]
+      expect(pane2.items).toEqual [item4, item2, item5]
 
     describe "when the moved item the last item in the source pane", ->
       beforeEach ->
@@ -466,27 +368,22 @@ describe "Pane", ->
     [pane1, container] = []
 
     beforeEach ->
-      pane1 = new Pane(items: [new Item("A")])
+      pane1 = new Pane(items: ["A"])
       container = new PaneContainer(root: pane1)
 
     describe "::splitLeft(params)", ->
       describe "when the parent is the container root", ->
         it "replaces itself with a row and inserts a new pane to the left of itself", ->
-          pane2 = pane1.splitLeft(items: [new Item("B")])
-          pane3 = pane1.splitLeft(items: [new Item("C")])
+          pane2 = pane1.splitLeft(items: ["B"])
+          pane3 = pane1.splitLeft(items: ["C"])
           expect(container.root.orientation).toBe 'horizontal'
           expect(container.root.children).toEqual [pane2, pane3, pane1]
 
-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitLeft(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
       describe "when the parent is a column", ->
         it "replaces itself with a row and inserts a new pane to the left of itself", ->
           pane1.splitDown()
-          pane2 = pane1.splitLeft(items: [new Item("B")])
-          pane3 = pane1.splitLeft(items: [new Item("C")])
+          pane2 = pane1.splitLeft(items: ["B"])
+          pane3 = pane1.splitLeft(items: ["C"])
           row = container.root.children[0]
           expect(row.orientation).toBe 'horizontal'
           expect(row.children).toEqual [pane2, pane3, pane1]
@@ -494,21 +391,16 @@ describe "Pane", ->
     describe "::splitRight(params)", ->
       describe "when the parent is the container root", ->
         it "replaces itself with a row and inserts a new pane to the right of itself", ->
-          pane2 = pane1.splitRight(items: [new Item("B")])
-          pane3 = pane1.splitRight(items: [new Item("C")])
+          pane2 = pane1.splitRight(items: ["B"])
+          pane3 = pane1.splitRight(items: ["C"])
           expect(container.root.orientation).toBe 'horizontal'
           expect(container.root.children).toEqual [pane1, pane3, pane2]
 
-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitRight(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
       describe "when the parent is a column", ->
         it "replaces itself with a row and inserts a new pane to the right of itself", ->
           pane1.splitDown()
-          pane2 = pane1.splitRight(items: [new Item("B")])
-          pane3 = pane1.splitRight(items: [new Item("C")])
+          pane2 = pane1.splitRight(items: ["B"])
+          pane3 = pane1.splitRight(items: ["C"])
           row = container.root.children[0]
           expect(row.orientation).toBe 'horizontal'
           expect(row.children).toEqual [pane1, pane3, pane2]
@@ -516,21 +408,16 @@ describe "Pane", ->
     describe "::splitUp(params)", ->
       describe "when the parent is the container root", ->
         it "replaces itself with a column and inserts a new pane above itself", ->
-          pane2 = pane1.splitUp(items: [new Item("B")])
-          pane3 = pane1.splitUp(items: [new Item("C")])
+          pane2 = pane1.splitUp(items: ["B"])
+          pane3 = pane1.splitUp(items: ["C"])
           expect(container.root.orientation).toBe 'vertical'
           expect(container.root.children).toEqual [pane2, pane3, pane1]
 
-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitUp(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
       describe "when the parent is a row", ->
         it "replaces itself with a column and inserts a new pane above itself", ->
           pane1.splitRight()
-          pane2 = pane1.splitUp(items: [new Item("B")])
-          pane3 = pane1.splitUp(items: [new Item("C")])
+          pane2 = pane1.splitUp(items: ["B"])
+          pane3 = pane1.splitUp(items: ["C"])
           column = container.root.children[0]
           expect(column.orientation).toBe 'vertical'
           expect(column.children).toEqual [pane2, pane3, pane1]
@@ -538,21 +425,16 @@ describe "Pane", ->
     describe "::splitDown(params)", ->
       describe "when the parent is the container root", ->
         it "replaces itself with a column and inserts a new pane below itself", ->
-          pane2 = pane1.splitDown(items: [new Item("B")])
-          pane3 = pane1.splitDown(items: [new Item("C")])
+          pane2 = pane1.splitDown(items: ["B"])
+          pane3 = pane1.splitDown(items: ["C"])
           expect(container.root.orientation).toBe 'vertical'
           expect(container.root.children).toEqual [pane1, pane3, pane2]
 
-      describe "when `copyActiveItem: true` is passed in the params", ->
-        it "duplicates the active item", ->
-          pane2 = pane1.splitDown(copyActiveItem: true)
-          expect(pane2.getActiveItem()).toEqual pane1.getActiveItem()
-
       describe "when the parent is a row", ->
         it "replaces itself with a column and inserts a new pane below itself", ->
           pane1.splitRight()
-          pane2 = pane1.splitDown(items: [new Item("B")])
-          pane3 = pane1.splitDown(items: [new Item("C")])
+          pane2 = pane1.splitDown(items: ["B"])
+          pane3 = pane1.splitDown(items: ["C"])
           column = container.root.children[0]
           expect(column.orientation).toBe 'vertical'
           expect(column.children).toEqual [pane1, pane3, pane2]
@@ -573,7 +455,7 @@ describe "Pane", ->
       pane2 = pane1.splitRight()
 
     it "destroys the pane's destroyable items", ->
-      [item1, item2] = pane1.getItems()
+      [item1, item2] = pane1.items
       pane1.destroy()
       expect(item1.isDestroyed()).toBe true
       expect(item2.isDestroyed()).toBe true
@@ -611,12 +493,12 @@ describe "Pane", ->
 
     it "can serialize and deserialize the pane and all its items", ->
       newPane = pane.testSerialization()
-      expect(newPane.getItems()).toEqual pane.getItems()
+      expect(newPane.items).toEqual pane.items
 
     it "restores the active item on deserialization", ->
       pane.activateItemAtIndex(1)
       newPane = pane.testSerialization()
-      expect(newPane.getActiveItem()).toEqual newPane.itemAtIndex(1)
+      expect(newPane.activeItem).toEqual newPane.items[1]
 
     it "does not include items that cannot be deserialized", ->
       spyOn(console, 'warn')
@@ -624,8 +506,8 @@ describe "Pane", ->
       pane.activateItem(unserializable)
 
       newPane = pane.testSerialization()
-      expect(newPane.getActiveItem()).toEqual pane.itemAtIndex(0)
-      expect(newPane.getItems().length).toBe pane.getItems().length - 1
+      expect(newPane.activeItem).toEqual pane.items[0]
+      expect(newPane.items.length).toBe pane.items.length - 1
 
     it "includes the pane's focus state in the serialized state", ->
       pane.focus()