Merge pull request #3248 from atom/atom-shell-0.15.6

Uprade to atom-shell@0.15.6

apm/package.json

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

build/Gruntfile.coffee

@@ -144,12 +144,7 @@ module.exports = (grunt) ->
 
     coffeelint:
       options:
-        no_empty_param_list:
-          level: 'error'
-        max_line_length:
-          level: 'ignore'
-        indentation:
-          level: 'ignore'
+        configFile: 'coffeelint.json'
       src: [
         'dot-atom/**/*.coffee'
         'exports/**/*.coffee'

build/package.json

@@ -13,7 +13,7 @@
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
+    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
     "grunt-contrib-coffee": "~0.9.0",
     "grunt-contrib-csslint": "~0.1.2",
     "grunt-contrib-less": "~0.8.0",

build/tasks/build-task.coffee

@@ -148,9 +148,6 @@ module.exports = (grunt) ->
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
     if process.platform is 'win32'
-      cp path.join('resources', 'win', 'msvcp100.dll'), path.join(shellAppDir, 'msvcp100.dll')
-      cp path.join('resources', 'win', 'msvcr100.dll'), path.join(shellAppDir, 'msvcr100.dll')
-
       # Set up chocolatey ignore and gui files
       fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
       fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''

build/tasks/set-version-task.coffee

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

coffeelint.json

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

docs/build-instructions/linux.md

@@ -6,21 +6,21 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
   * OS with 64-bit or 32-bit architecture
   * C++ toolchain
-  * git
-  * [node.js](http://nodejs.org/download/) v0.10.x
-  * [npm](http://www.npmjs.org/) v1.4.x (bundled with node.js)
+  * [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).
-  * libgnome-keyring-dev
+  * 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).
+* 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).
+* 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`
@@ -30,23 +30,24 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
 If you have problems with permissions don't forget to prefix with `sudo`
 
-Create the atom application at `$TMPDIR/atom-build/Atom`:
+From the cloned repository directory:
 
-```sh
-script/build
-```
+ 1. Build:
 
-Install the `atom` and `apm` commands to `/usr/local/bin`:
+    ```sh
+    $ script/build
+    ```
+    This will create the atom application at `$TMPDIR/atom-build/Atom`.
+ 2. Install the `atom` and `apm` commands to `/usr/local/bin` by executing:
 
-```sh
-sudo script/grunt install
-```
+    ```sh
+    $ sudo script/grunt install
+    ```
+ 3. *Optionally*, you may generate a `.deb` package at `$TMPDIR/atom-build`:
 
-Generate a `.deb` package at `$TMPDIR/atom-build`: (*optional*)
-
-```sh
-script/grunt mkdeb
-```
+    ```sh
+    $ script/grunt mkdeb
+    ```
 
 Use the newly installed atom by restarting any running atom instances.
 
@@ -78,7 +79,7 @@ See also https://github.com/atom/atom/issues/2082.
 ### /usr/bin/env: node: No such file or directory
 
 If you get this notice when attempting to `script/build`, you either do not
-have nodejs installed, or node isn't identified as nodejs on your machine.
+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.
 

docs/build-instructions/windows.md

@@ -66,6 +66,19 @@ If none of this works, do install Github for Windows and use its Git shell. Make
     * https://github.com/TooTallNate/node-gyp/issues/297
     * https://code.google.com/p/gyp/issues/detail?id=393
 
+* `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.
 

keymaps/base.cson

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

keymaps/darwin.cson

@@ -21,7 +21,6 @@
   'cmd-O': 'application:open-dev'
   'cmd-alt-ctrl-s': 'application:run-all-specs'
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'

keymaps/linux.cson

@@ -1,7 +1,6 @@
 'body':
   # Atom Specific
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'

keymaps/win32.cson

@@ -5,7 +5,6 @@
 
   # Atom Specific
   'enter': 'core:confirm'
-  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'

package.json

@@ -17,21 +17,21 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.15.0",
+  "atomShellVersion": "0.15.6",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^1.0.0",
+    "atom-keymap": "^2",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
     "delegato": "^1",
-    "emissary": "^1.2.1",
+    "emissary": "^1.2.2",
     "first-mate": "^2.0.1",
     "fs-plus": "^2.2.6",
     "fstream": "0.1.24",
     "fuzzaldrin": "^1.1",
-    "git-utils": "^2.1.3",
+    "git-utils": "^2.1.4",
     "grim": "0.11.0",
     "guid": "0.0.10",
     "jasmine-tagged": "^1.1.2",
@@ -50,7 +50,7 @@
     "runas": "1.0.1",
     "scandal": "1.0.0",
     "scoped-property-store": "^0.9.0",
-    "scrollbar-style": "^1.0.1",
+    "scrollbar-style": "^1.0.2",
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
@@ -66,43 +66,43 @@
     "atom-dark-ui": "0.33.0",
     "atom-light-syntax": "0.20.0",
     "atom-light-ui": "0.29.0",
-    "base16-tomorrow-dark-theme": "0.20.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.35.0",
-    "autocomplete": "0.29.0",
+    "autocomplete": "0.31.0",
     "autoflow": "0.17.0",
     "autosave": "0.14.0",
     "background-tips": "0.15.0",
     "bookmarks": "0.27.0",
-    "bracket-matcher": "0.51.0",
+    "bracket-matcher": "0.53.0",
     "command-palette": "0.24.0",
     "deprecation-cop": "0.7.0",
-    "dev-live-reload": "0.33.0",
-    "exception-reporting": "0.19.0",
+    "dev-live-reload": "0.34.0",
+    "exception-reporting": "0.20.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.127.0",
+    "find-and-replace": "0.128.0",
     "fuzzy-finder": "0.57.0",
     "git-diff": "0.37.0",
-    "go-to-line": "0.23.0",
+    "go-to-line": "0.24.0",
     "grammar-selector": "0.27.0",
     "image-view": "0.36.0",
-    "incompatible-packages": "0.3.0",
-    "keybinding-resolver": "0.18.0",
+    "incompatible-packages": "0.6.0",
+    "keybinding-resolver": "0.19.0",
     "link": "0.25.0",
-    "markdown-preview": "0.94.0",
+    "markdown-preview": "0.99.0",
     "metrics": "0.33.0",
     "open-on-github": "0.29.0",
     "package-generator": "0.31.0",
     "release-notes": "0.36.0",
-    "settings-view": "0.137.0",
-    "snippets": "0.50.0",
+    "settings-view": "0.139.0",
+    "snippets": "0.51.0",
     "spell-check": "0.40.0",
-    "status-bar": "0.41.0",
+    "status-bar": "0.42.0",
     "styleguide": "0.29.0",
     "symbols-view": "0.63.0",
-    "tabs": "0.48.0",
+    "tabs": "0.49.0",
     "timecop": "0.22.0",
     "tree-view": "0.112.0",
     "update-package-dependencies": "0.6.0",
@@ -110,13 +110,13 @@
     "whitespace": "0.25.0",
     "wrap-guide": "0.21.0",
 
-    "language-c": "0.26.0",
-    "language-coffee-script": "0.27.0",
+    "language-c": "0.27.0",
+    "language-coffee-script": "0.29.0",
     "language-css": "0.17.0",
-    "language-gfm": "0.44.0",
+    "language-gfm": "0.46.0",
     "language-git": "0.9.0",
     "language-go": "0.16.0",
-    "language-html": "0.22.0",
+    "language-html": "0.24.0",
     "language-hyperlink": "0.10.0",
     "language-java": "0.11.0",
     "language-javascript": "0.39.0",
@@ -128,17 +128,17 @@
     "language-php": "0.15.0",
     "language-property-list": "0.7.0",
     "language-python": "0.18.0",
-    "language-ruby": "0.33.0",
+    "language-ruby": "0.34.0",
     "language-ruby-on-rails": "0.15.0",
-    "language-sass": "0.14.0",
+    "language-sass": "0.15.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.8.0",
-    "language-sql": "0.9.0",
+    "language-sql": "0.10.0",
     "language-text": "0.6.0",
     "language-todo": "0.10.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.17.0",
-    "language-yaml": "0.13.0"
+    "language-xml": "0.18.0",
+    "language-yaml": "0.15.0"
   },
   "private": true,
   "scripts": {

spec/editor-component-spec.coffee

@@ -2103,6 +2103,9 @@ describe "EditorComponent", ->
     it "adds the 'mini' class to the wrapper view", ->
       expect(wrapperNode.classList.contains('mini')).toBe true
 
+    it "does not have an opaque background on lines", ->
+      expect(component.refs.lines.getDOMNode().getAttribute('style')).not.toContain 'background-color'
+
     it "does not render invisible characters", ->
       component.setInvisibles(eol: 'E')
       component.setShowInvisibles(true)

spec/editor-spec.coffee

@@ -1470,6 +1470,15 @@ describe "Editor", ->
 
   describe "buffer manipulation", ->
     describe ".insertText(text)", ->
+      describe "when there is a single selection", ->
+        beforeEach ->
+          editor.setSelectedBufferRange([[1, 0], [1, 2]])
+
+        it "will-insert-text and did-insert-text events are emitted when inserting text", ->
+          range = editor.insertText('xxx')
+          expect(range).toEqual [ [[1, 0], [1, 3]] ]
+          expect(buffer.lineForRow(1)).toBe 'xxxvar sort = function(items) {'
+
       describe "when there are multiple empty selections", ->
         describe "when the cursors are on the same line", ->
           it "inserts the given text at the location of each cursor and moves the cursors to the end of each cursor's inserted text", ->
@@ -1547,6 +1556,48 @@ describe "Editor", ->
           editor.insertText('holy cow')
           expect(editor.lineForScreenRow(2).fold).toBeUndefined()
 
+      describe "when will-insert-text and did-insert-text events are used", ->
+        beforeEach ->
+          editor.setSelectedBufferRange([[1, 0], [1, 2]])
+
+        it "will-insert-text and did-insert-text events are emitted when inserting text", ->
+          willInsertSpy = jasmine.createSpy().andCallFake ->
+            expect(buffer.lineForRow(1)).toBe '  var sort = function(items) {'
+
+          didInsertSpy = jasmine.createSpy().andCallFake ->
+            expect(buffer.lineForRow(1)).toBe 'xxxvar sort = function(items) {'
+
+          editor.on('will-insert-text', willInsertSpy)
+          editor.on('did-insert-text', didInsertSpy)
+
+          expect(editor.insertText('xxx')).toBeTruthy()
+          expect(buffer.lineForRow(1)).toBe 'xxxvar sort = function(items) {'
+
+          expect(willInsertSpy).toHaveBeenCalled()
+          expect(didInsertSpy).toHaveBeenCalled()
+
+          options = willInsertSpy.mostRecentCall.args[0]
+          expect(options.text).toBe 'xxx'
+          expect(options.cancel).toBeDefined()
+
+          options = didInsertSpy.mostRecentCall.args[0]
+          expect(options.text).toBe 'xxx'
+
+        it "text insertion is prevented when cancel is called from a will-insert-text handler", ->
+          willInsertSpy = jasmine.createSpy().andCallFake ({cancel}) ->
+            cancel()
+
+          didInsertSpy = jasmine.createSpy()
+
+          editor.on('will-insert-text', willInsertSpy)
+          editor.on('did-insert-text', didInsertSpy)
+
+          expect(editor.insertText('xxx')).toBe false
+          expect(buffer.lineForRow(1)).toBe '  var sort = function(items) {'
+
+          expect(willInsertSpy).toHaveBeenCalled()
+          expect(didInsertSpy).not.toHaveBeenCalled()
+
     describe ".insertNewline()", ->
       describe "when there is a single cursor", ->
         describe "when the cursor is at the beginning of a line", ->
@@ -3301,20 +3352,25 @@ describe "Editor", ->
       expect(editor.getText()).toBe '     '
 
   describe ".scrollToCursorPosition()", ->
-    it "scrolls the last cursor into view", ->
+    it "scrolls the last cursor into view, centering around the cursor if possible and the 'center' option isn't false", ->
       editor.setCursorScreenPosition([8, 8])
       editor.setLineHeightInPixels(10)
       editor.setDefaultCharWidth(10)
-      editor.setHeight(50)
+      editor.setHeight(60)
       editor.setWidth(50)
       editor.setHorizontalScrollbarHeight(0)
       expect(editor.getScrollTop()).toBe 0
       expect(editor.getScrollLeft()).toBe 0
 
       editor.scrollToCursorPosition()
-      expect(editor.getScrollBottom()).toBe (9 + editor.getVerticalScrollMargin()) * 10
+      expect(editor.getScrollTop()).toBe (8.5 * 10) - 30
+      expect(editor.getScrollBottom()).toBe (8.5 * 10) + 30
       expect(editor.getScrollRight()).toBe (9 + editor.getHorizontalScrollMargin()) * 10
 
+      editor.setScrollTop(0)
+      editor.scrollToCursorPosition(center: false)
+      expect(editor.getScrollBottom()).toBe (9 + editor.getVerticalScrollMargin()) * 10
+
   describe ".pageUp/Down()", ->
     it "scrolls one screen height up or down and moves the cursor one page length", ->
       editor.manageScrollPosition = true

spec/package-spec.coffee

@@ -5,6 +5,9 @@ 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)

spec/spec-helper.coffee

@@ -28,7 +28,7 @@ atom.keymaps.loadBundledKeymaps()
 keyBindingsToRestore = atom.keymaps.getKeyBindings()
 
 $(window).on 'core:close', -> window.close()
-$(window).on 'unload', ->
+$(window).on 'beforeunload', ->
   atom.storeWindowDimensions()
   atom.saveSync()
 $('html,body').css('overflow', 'auto')

spec/theme-manager-spec.coffee

@@ -310,3 +310,59 @@ describe "ThemeManager", ->
       runs ->
         expect(console.warn.callCount).toBe 1
         expect(console.warn.argsForCall[0][0].length).toBeGreaterThan 0
+
+  describe "when in safe mode", ->
+    beforeEach ->
+      themeManager = new ThemeManager({packageManager: atom.packages, resourcePath, configDirPath, safeMode: true})
+
+    describe 'when the enabled UI and syntax themes are bundled with Atom', ->
+      beforeEach ->
+        atom.config.set('core.themes', ['atom-light-ui', 'atom-dark-syntax'])
+
+        waitsForPromise ->
+          themeManager.activateThemes()
+
+      it 'uses the enabled themes', ->
+        activeThemeNames = themeManager.getActiveNames()
+        expect(activeThemeNames.length).toBe(2)
+        expect(activeThemeNames).toContain('atom-light-ui')
+        expect(activeThemeNames).toContain('atom-dark-syntax')
+
+    describe 'when the enabled UI and syntax themes are not bundled with Atom', ->
+      beforeEach ->
+        atom.config.set('core.themes', ['installed-dark-ui', 'installed-dark-syntax'])
+
+        waitsForPromise ->
+          themeManager.activateThemes()
+
+      it 'uses the default dark UI and syntax themes', ->
+        activeThemeNames = themeManager.getActiveNames()
+        expect(activeThemeNames.length).toBe(2)
+        expect(activeThemeNames).toContain('atom-dark-ui')
+        expect(activeThemeNames).toContain('atom-dark-syntax')
+
+    describe 'when the enabled UI theme is not bundled with Atom', ->
+      beforeEach ->
+        atom.config.set('core.themes', ['installed-dark-ui', 'atom-light-syntax'])
+
+        waitsForPromise ->
+          themeManager.activateThemes()
+
+      it 'uses the default dark UI theme', ->
+        activeThemeNames = themeManager.getActiveNames()
+        expect(activeThemeNames.length).toBe(2)
+        expect(activeThemeNames).toContain('atom-dark-ui')
+        expect(activeThemeNames).toContain('atom-light-syntax')
+
+    describe 'when the enabled syntax theme is not bundled with Atom', ->
+      beforeEach ->
+        atom.config.set('core.themes', ['atom-light-ui', 'installed-dark-syntax'])
+
+        waitsForPromise ->
+          themeManager.activateThemes()
+
+      it 'uses the default dark syntax theme', ->
+        activeThemeNames = themeManager.getActiveNames()
+        expect(activeThemeNames.length).toBe(2)
+        expect(activeThemeNames).toContain('atom-light-ui')
+        expect(activeThemeNames).toContain('atom-dark-syntax')

spec/window-spec.coffee

@@ -113,6 +113,7 @@ describe "Window", ->
       expect(atom.state.project).toEqual projectState
       expect(atom.saveSync).toHaveBeenCalled()
 
+  describe ".removeEditorWindow()", ->
     it "unsubscribes from all buffers", ->
       waitsForPromise ->
         atom.workspace.open("sample.js")
@@ -123,7 +124,7 @@ describe "Window", ->
         pane.splitRight(pane.copyActiveItem())
         expect(atom.workspaceView.find('.editor').length).toBe 2
 
-        atom.unloadEditorWindow()
+        atom.removeEditorWindow()
 
         expect(buffer.getSubscriptionCount()).toBe 0
 

src/atom.coffee

@@ -156,7 +156,7 @@ class Atom extends Model
     @keymaps = new KeymapManager({configDirPath, resourcePath})
     @keymap = @keymaps # Deprecated
     @packages = new PackageManager({devMode, configDirPath, resourcePath, safeMode})
-    @themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath})
+    @themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath, safeMode})
     @contextMenu = new ContextMenuManager(devMode)
     @menu = new MenuManager({resourcePath})
     @clipboard = new Clipboard()
@@ -311,11 +311,6 @@ class Atom extends Model
     @requireUserInitScript()
     @menu.update()
 
-    $(window).on 'unload', =>
-      $(document.body).css('visibility', 'hidden')
-      @unloadEditorWindow()
-      false
-
     @displayWindow()
 
   unloadEditorWindow: ->
@@ -327,13 +322,18 @@ class Atom extends Model
     @packages.deactivatePackages()
     @state.packageStates = @packages.packageStates
     @saveSync()
-    @workspaceView.remove()
-    @workspaceView = null
-    @project.destroy()
-    @windowEventHandler?.unsubscribe()
-    @keymaps.destroy()
     @windowState = null
 
+  removeEditorWindow: ->
+    return if not @project and not @workspaceView
+
+    @workspaceView?.remove()
+    @workspaceView = null
+    @project?.destroy()
+    @project = null
+
+    @windowEventHandler?.unsubscribe()
+
   loadThemes: ->
     @themes.load()
 

src/browser/atom-application.coffee

@@ -135,7 +135,7 @@ class AtomApplication
 
   # Registers basic application commands, non-idempotent.
   handleEvents: ->
-    @on 'application:run-all-specs', -> @runSpecs(exitWhenDone: false, resourcePath: global.devResourcePath)
+    @on 'application:run-all-specs', -> @runSpecs(exitWhenDone: false, resourcePath: global.devResourcePath, safeMode: @focusedWindow()?.safeMode)
     @on 'application:run-benchmarks', -> @runBenchmarks()
     @on 'application:quit', -> app.quit()
     @on 'application:new-window', -> @openPath(windowDimensions: @focusedWindow()?.getDimensions())
@@ -387,11 +387,13 @@ class AtomApplication
   # Opens up a new {AtomWindow} to run specs within.
   #
   # options -
-  #   :exitWhenDone - A Boolean that if true, will close the window upon
+  #   :exitWhenDone - A Boolean that, if true, will close the window upon
   #                   completion.
   #   :resourcePath - The path to include specs from.
   #   :specPath - The directory to load specs from.
-  runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile}) ->
+  #   :safeMode - A Boolean that, if true, won't run specs from ~/.atom/packages
+  #               and ~/.atom/dev/packages, defaults to false.
+  runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile, safeMode}) ->
     if resourcePath isnt @resourcePath and not fs.existsSync(resourcePath)
       resourcePath = @resourcePath
 
@@ -402,7 +404,8 @@ class AtomApplication
 
     isSpec = true
     devMode = true
-    new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile})
+    safeMode ?= false
+    new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile, safeMode})
 
   runBenchmarks: ->
     try

src/browser/atom-window.coffee

@@ -20,7 +20,7 @@ class AtomWindow
   isSpec: null
 
   constructor: (settings={}) ->
-    {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone} = settings
+    {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone, @safeMode} = settings
 
     # Normalize to make sure drive letter case is consistent on Windows
     @resourcePath = path.normalize(@resourcePath) if @resourcePath

src/buffered-process.coffee

@@ -40,8 +40,6 @@ class BufferedProcess
   #           containing the exit status (optional).
   constructor: ({command, args, options, stdout, stderr, exit}={}) ->
     options ?= {}
-    # Quick hack. Killing @process will only kill cmd.exe, and not the child
-    # process and will just orphan it. Does not escape ^ (cmd's escape symbol).
     # Related to joyent/node#2318
     if process.platform is "win32"
       # Quote all arguments and escapes inner quotes
@@ -55,7 +53,10 @@ class BufferedProcess
             "\"#{arg.replace(/"/g, '\\"')}\""
       else
         cmdArgs = []
-      cmdArgs.unshift("\"#{command}\"")
+      if /\s/.test(command)
+        cmdArgs.unshift("\"#{command}\"")
+      else
+        cmdArgs.unshift(command)
       cmdArgs = ['/s', '/c', "\"#{cmdArgs.join(' ')}\""]
       cmdOptions = _.clone(options)
       cmdOptions.windowsVerbatimArguments = true
@@ -114,8 +115,48 @@ class BufferedProcess
       onLines(buffered) if buffered.length > 0
       onDone()
 
+  # Kill all child processes of the spawned cmd.exe process on Windows.
+  #
+  # This is required since killing the cmd.exe does not terminate child
+  # processes.
+  killOnWindows: ->
+    parentPid = @process.pid
+    cmd = 'wmic'
+    args = [
+      'process'
+      'where'
+      "(ParentProcessId=#{parentPid})"
+      'get'
+      'processid'
+    ]
+
+    wmicProcess = ChildProcess.spawn(cmd, args)
+    wmicProcess.on 'error', -> # ignore errors
+    output = ''
+    wmicProcess.stdout.on 'data', (data) -> output += data
+    wmicProcess.stdout.on 'close', =>
+      pidsToKill = output.split(/\s+/)
+                    .filter (pid) -> /^\d+$/.test(pid)
+                    .map (pid) -> parseInt(pid)
+                    .filter (pid) -> pid isnt parentPid and 0 < pid < Infinity
+
+      for pid in pidsToKill
+        try
+          process.kill(pid)
+      @killProcess()
+
+  killProcess: ->
+    @process?.kill()
+    @process = null
+
   # Public: Terminate the process.
   kill: ->
+    return if @killed
+
     @killed = true
-    @process.kill()
-    @process = null
+    if process.platform is 'win32'
+      @killOnWindows()
+    else
+      @killProcess()
+
+    undefined

src/cursor.coffee

@@ -95,8 +95,8 @@ class Cursor extends Model
   getBufferPosition: ->
     @marker.getHeadBufferPosition()
 
-  autoscroll: ->
-    @editor.scrollToScreenRange(@getScreenRange())
+  autoscroll: (options) ->
+    @editor.scrollToScreenRange(@getScreenRange(), options)
 
   # Public: If the marker range is empty, the cursor is marked as being visible.
   updateVisibility: ->

src/editor-component.coffee

@@ -112,7 +112,7 @@ EditorComponent = React.createClass
           @scrollingVertically, scrollHeight, scrollWidth, mouseWheelScreenRow, invisibles,
           @visible, scrollViewHeight, @scopedCharacterWidthsChangeCount, lineWidth, @useHardwareAcceleration,
           placeholderText, @performedInitialMeasurement, @backgroundColor, cursorPixelRects,
-          cursorBlinkPeriod, cursorBlinkResumeDelay
+          cursorBlinkPeriod, cursorBlinkResumeDelay, mini
         }
 
         ScrollbarComponent
@@ -186,8 +186,10 @@ EditorComponent = React.createClass
   componentWillUnmount: ->
     @props.parentView.trigger 'editor:will-be-removed', [@props.parentView]
     @unsubscribe()
+    window.removeEventListener 'resize', @requestHeightAndWidthMeasurement
     clearInterval(@domPollingIntervalId)
     @domPollingIntervalId = null
+    @props.editor.destroy()
 
   componentWillUpdate: ->
     wasVisible = @visible
@@ -509,8 +511,14 @@ EditorComponent = React.createClass
   addCommandListeners: (listenersByCommandName) ->
     {parentView} = @props
 
-    for command, listener of listenersByCommandName
-      parentView.command command, listener
+    addListener = (command, listener) ->
+      parentView.command command, (event) ->
+        event.stopPropagation()
+        listener(event)
+
+    addListener(command, listener) for command, listener of listenersByCommandName
+
+    return
 
   observeConfig: ->
     @subscribe atom.config.observe 'editor.showIndentGuide', @setShowIndentGuide
@@ -521,9 +529,15 @@ EditorComponent = React.createClass
     @subscribe atom.config.observe 'editor.useHardwareAcceleration', @setUseHardwareAcceleration
 
   onFocus: ->
-    @refs.input.focus()
+    @refs.input.focus() if @isMounted()
 
   onTextInput: (event) ->
+    event.stopPropagation()
+
+    # If we prevent the insertion of a space character, then the browser
+    # interprets the spacebar keypress as a page-down command.
+    event.preventDefault() unless event.data is ' '
+
     return unless @isInputEnabled()
 
     {editor} = @props
@@ -536,12 +550,8 @@ EditorComponent = React.createClass
     selectedLength = inputNode.selectionEnd - inputNode.selectionStart
     editor.selectLeft() if selectedLength is 1
 
-    editor.insertText(event.data)
-    inputNode.value = event.data
+    inputNode.value = event.data if editor.insertText(event.data)
 
-    # If we prevent the insertion of a space character, then the browser
-    # interprets the spacebar keypress as a page-down command.
-    event.preventDefault() unless event.data is ' '
 
   onInputFocused: ->
     @setState(focused: true)

src/editor-view.coffee

@@ -641,9 +641,9 @@ class EditorView extends View
     @scrollBottom(@editor.getScreenLineCount() * @lineHeight)
 
   # Public: Scrolls the editor to the position of the most recently added
-  # cursor.
+  # cursor if it isn't current on screen.
   #
-  # The editor is also centered.
+  # The editor is centered around the cursor's position if possible.
   scrollToCursorPosition: ->
     @scrollToBufferPosition(@editor.getCursorBufferPosition(), center: true)
 

src/editor.coffee

@@ -629,12 +629,29 @@ class Editor extends Model
 
   # Public: For each selection, replace the selected text with the given text.
   #
+  # Emits: `will-insert-text -> ({text, cancel})` before the text has
+  # been inserted. Calling `cancel` will prevent the text from being
+  # inserted.
+  # Emits: `did-insert-text -> ({text})` after the text has been inserted.
+  #
   # text - A {String} representing the text to insert.
   # options - See {Selection::insertText}.
+  #
+  # Returns a {Bool} indicating whether or not the text was inserted.
   insertText: (text, options={}) ->
-    options.autoIndentNewline ?= @shouldAutoIndent()
-    options.autoDecreaseIndent ?= @shouldAutoIndent()
-    @mutateSelectedText (selection) -> selection.insertText(text, options)
+    willInsert = true
+    cancel = -> willInsert = false
+    @emit('will-insert-text', {cancel, text})
+
+    if willInsert
+      options.autoIndentNewline ?= @shouldAutoIndent()
+      options.autoDecreaseIndent ?= @shouldAutoIndent()
+      @mutateSelectedText (selection) =>
+        range = selection.insertText(text, options)
+        @emit('did-insert-text', {text, range})
+        range
+    else
+      false
 
   # Public: For each selection, replace the selected text with a newline.
   insertNewline: ->
@@ -1588,8 +1605,14 @@ class Editor extends Model
   moveCursorToBeginningOfPreviousParagraph: ->
     @moveCursors (cursor) -> cursor.moveToBeginningOfPreviousParagraph()
 
-  scrollToCursorPosition: ->
-    @getCursor().autoscroll()
+  # Public: Scroll the editor to reveal the most recently added cursor if it is
+  # off-screen.
+  #
+  # options - An optional hash of options.
+  #   :center - Center the editor around the cursor if possible. Defauls to
+  #             true.
+  scrollToCursorPosition: (options) ->
+    @getCursor().autoscroll(center: options?.center ? true)
 
   pageUp: ->
     newScrollTop = @getScrollTop() - @getHeight()
@@ -2017,7 +2040,7 @@ class Editor extends Model
   setScrollRight: (scrollRight) -> @displayBuffer.setScrollRight(scrollRight)
 
   getScrollHeight: -> @displayBuffer.getScrollHeight()
-  getScrollWidth: (scrollWidth) -> @displayBuffer.getScrollWidth(scrollWidth)
+  getScrollWidth: -> @displayBuffer.getScrollWidth()
 
   getVisibleRowRange: -> @displayBuffer.getVisibleRowRange()
 

src/lines-component.coffee

@@ -22,12 +22,12 @@ LinesComponent = React.createClass
     if performedInitialMeasurement
       {editor, highlightDecorations, scrollHeight, scrollWidth, placeholderText, backgroundColor} = @props
       {lineHeightInPixels, defaultCharWidth, scrollViewHeight, scopedCharacterWidthsChangeCount} = @props
-      {scrollTop, scrollLeft, cursorPixelRects} = @props
+      {scrollTop, scrollLeft, cursorPixelRects, mini} = @props
       style =
         height: Math.max(scrollHeight, scrollViewHeight)
         width: scrollWidth
         WebkitTransform: @getTransform()
-        backgroundColor: backgroundColor
+        backgroundColor: if mini then null else backgroundColor
 
     div {className: 'lines', style},
       div className: 'placeholder-text', placeholderText if placeholderText?

src/menu-manager.coffee

@@ -15,6 +15,7 @@ class MenuManager
     @pendingUpdateOperation = null
     @template = []
     atom.keymaps.on 'bundled-keymaps-loaded', => @loadPlatformItems()
+    atom.packages.on 'activated', => @sortPackagesMenu()
 
   # Public: Adds the given item definition to the existing template.
   #
@@ -130,3 +131,14 @@ class MenuManager
   # Get an {Array} of {String} classes for the given element.
   classesForElement: (element) ->
     element?.classList.toString().split(' ') ? []
+
+  sortPackagesMenu: ->
+    packagesMenu = @template.find ({label}) => @normalizeLabel(label) is 'Packages'
+    return unless packagesMenu?.submenu?
+
+    packagesMenu.submenu.sort (item1, item2) =>
+      if item1.label and item2.label
+        @normalizeLabel(item1.label).localeCompare(@normalizeLabel(item2.label))
+      else
+        0
+    @update()

src/package.coffee

@@ -371,9 +371,10 @@ class Package
   # to minimize the impact on startup time.
   getIncompatibleNativeModules: ->
     localStorageKey = "installed-packages:#{@name}:#{@metadata.version}"
-    try
-      {incompatibleNativeModules} = JSON.parse(global.localStorage.getItem(localStorageKey)) ? {}
-    return incompatibleNativeModules if incompatibleNativeModules?
+    unless atom.inDevMode()
+      try
+        {incompatibleNativeModules} = JSON.parse(global.localStorage.getItem(localStorageKey)) ? {}
+      return incompatibleNativeModules if incompatibleNativeModules?
 
     incompatibleNativeModules = []
     for nativeModulePath in @getNativeModuleDependencyPaths()

src/react-editor-view.coffee

@@ -10,6 +10,7 @@ class ReactEditorView extends View
   @content: (params) ->
     attributes = params.attributes ? {}
     attributes.class = 'editor react editor-colors'
+    attributes.tabIndex = -1
     @div attributes
 
   focusOnAttach: false
@@ -55,6 +56,11 @@ class ReactEditorView extends View
         lines.addClass(klass)
         lines.length > 0
 
+    @on 'focus', =>
+      if @component?
+        @component.onFocus()
+      else
+        @focusOnAttach = true
 
   getEditor: -> @editor
 
@@ -66,6 +72,7 @@ class ReactEditorView extends View
   Object.defineProperty @::, 'lastRenderedScreenRow', get: -> @component.getRenderedRowRange()[1]
   Object.defineProperty @::, 'active', get: -> @is(@getPane()?.activeView)
   Object.defineProperty @::, 'isFocused', get: -> @component?.state.focused
+  Object.defineProperty @::, 'mini', get: -> @component?.props.mini
 
   afterAttach: (onDom) ->
     return unless onDom
@@ -115,8 +122,9 @@ class ReactEditorView extends View
     @find('.lines').prepend(view)
 
   beforeRemove: ->
-    React.unmountComponentAtNode(@element) if @component.isMounted()
+    return unless @attached
     @attached = false
+    React.unmountComponentAtNode(@element) if @component.isMounted()
     @trigger 'editor:detached', this
 
   # Public: Split the editor view left.
@@ -142,12 +150,6 @@ class ReactEditorView extends View
   getPane: ->
     @parent('.item-views').parents('.pane').view()
 
-  focus: ->
-    if @component?
-      @component.onFocus()
-    else
-      @focusOnAttach = true
-
   hide: ->
     super
     @pollComponentDOM()
@@ -169,9 +171,6 @@ class ReactEditorView extends View
   pageUp: ->
     @editor.pageUp()
 
-  getModel: ->
-    @component?.getModel()
-
   getFirstVisibleScreenRow: ->
     @editor.getVisibleRowRange()[0]
 

src/theme-manager.coffee

@@ -16,7 +16,7 @@ module.exports =
 class ThemeManager
   Emitter.includeInto(this)
 
-  constructor: ({@packageManager, @resourcePath, @configDirPath}) ->
+  constructor: ({@packageManager, @resourcePath, @configDirPath, @safeMode}) ->
     @lessCache = null
     @packageManager.registerPackageActivator(this, ['theme'])
 
@@ -51,6 +51,28 @@ class ThemeManager
     themeNames = themeNames.filter (themeName) ->
       themeName and typeof themeName is 'string'
 
+    # Use a built-in syntax and UI theme when in safe mode since themes
+    # installed to ~/.atom/packages will not be loaded.
+    if @safeMode
+      builtInThemeNames = [
+        'atom-dark-syntax'
+        'atom-dark-ui'
+        'atom-light-syntax'
+        'atom-light-ui'
+        'base16-tomorrow-dark-theme'
+        'base16-tomorrow-light-theme'
+        'solarized-dark-syntax'
+        'solarized-light-syntax'
+      ]
+      themeNames = _.intersection(themeNames, builtInThemeNames)
+      if themeNames.length is 0
+        themeNames = ['atom-dark-syntax', 'atom-dark-ui']
+      else if themeNames.length is 1
+        if _.endsWith(themeNames[0], '-ui')
+          themeNames.unshift('atom-dark-syntax')
+        else
+          themeNames.push('atom-dark-ui')
+
     # Reverse so the first (top) theme is loaded after the others. We want
     # the first/top theme to override later themes in the stack.
     themeNames.reverse()

src/window-event-handler.coffee

@@ -23,9 +23,9 @@ class WindowEventHandler
     @subscribe ipc, 'context-command', (command, args...) ->
       $(atom.contextMenu.activeElement).trigger(command, args...)
 
-    @subscribe $(window), 'focus', -> $("body").removeClass('is-blurred')
+    @subscribe $(window), 'focus', -> document.body.classList.remove('is-blurred')
 
-    @subscribe $(window), 'blur', -> $("body").addClass('is-blurred')
+    @subscribe $(window), 'blur', -> document.body.classList.add('is-blurred')
 
     @subscribe $(window), 'window:open-path', (event, {pathToOpen, initialLine, initialColumn}) ->
       unless fs.isDirectorySync(pathToOpen)
@@ -35,13 +35,16 @@ class WindowEventHandler
       confirmed = atom.workspaceView?.confirmClose()
       atom.hide() if confirmed and not @reloadRequested and atom.getCurrentWindow().isWebViewFocused()
       @reloadRequested = false
+
+      atom.storeDefaultWindowDimensions()
+      atom.storeWindowDimensions()
+      atom.unloadEditorWindow() if confirmed
+
       confirmed
 
-    @subscribe $(window), 'blur unload', ->
-      atom.storeDefaultWindowDimensions()
+    @subscribe $(window), 'blur', -> atom.storeDefaultWindowDimensions()
 
-    @subscribe $(window), 'unload', ->
-      atom.storeWindowDimensions()
+    @subscribe $(window), 'unload', -> atom.removeEditorWindow()
 
     @subscribeToCommand $(window), 'window:toggle-full-screen', -> atom.toggleFullScreen()
 
@@ -57,8 +60,7 @@ class WindowEventHandler
 
     @subscribeToCommand $(document), 'core:focus-previous', @focusPrevious
 
-    @subscribe $(document), 'keydown', (event) ->
-      atom.keymaps.handleKeyboardEvent(event.originalEvent)
+    document.addEventListener 'keydown', @onKeydown
 
     @subscribe $(document), 'drop', (e) ->
       e.preventDefault()
@@ -95,6 +97,10 @@ class WindowEventHandler
     bindCommandToAction('core:redo', 'redo:')
     bindCommandToAction('core:select-all', 'selectAll:')
 
+  onKeydown: (event) ->
+    atom.keymaps.handleKeyboardEvent(event)
+    event.stopImmediatePropagation()
+
   openLink: ({target, currentTarget}) ->
     location = target?.getAttribute('href') or currentTarget?.getAttribute('href')
     if location and location[0] isnt '#' and /^https?:\/\//.test(location)