Merge branch 'master' into as-tiled-rendering

apm/package.json

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

atom.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ "$(uname)" == 'Darwin' ]; then
   OS='Mac'

build/tasks/generate-asar-task.coffee

@@ -14,6 +14,7 @@ module.exports = (grunt) ->
       'ctags-darwin'
       'ctags-linux'
       'ctags-win32.exe'
+      '**/node_modules/spellchecker/**'
     ]
     unpack = "{#{unpack.join(',')}}"
 

build/tasks/spec-task.coffee

@@ -54,14 +54,14 @@ module.exports = (grunt) ->
       if process.platform in ['darwin', 'linux']
         options =
           cmd: appPath
-          args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}"]
+          args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", '--one']
           opts:
             cwd: packagePath
             env: _.extend({}, process.env, ATOM_PATH: rootDir)
       else if process.platform is 'win32'
         options =
           cmd: process.env.comspec
-          args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", "--log-file=ci.log"]
+          args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", "--log-file=ci.log", '--one']
           opts:
             cwd: packagePath
             env: _.extend({}, process.env, ATOM_PATH: rootDir)

package.json

@@ -83,24 +83,23 @@
     "one-light-ui": "0.8.1",
     "solarized-dark-syntax": "0.35.0",
     "solarized-light-syntax": "0.21.0",
-    "archive-view": "0.56.0",
-    "autocomplete": "0.46.0",
-    "autoflow": "0.22.0",
+    "archive-view": "0.57.0",
+    "autocomplete": "0.47.0",
+    "autoflow": "0.23.0",
     "autosave": "0.20.0",
     "background-tips": "0.24.0",
     "bookmarks": "0.35.0",
     "bracket-matcher": "0.74.0",
     "command-palette": "0.35.0",
-    "deprecation-cop": "0.43.0",
+    "deprecation-cop": "0.46.0",
     "dev-live-reload": "0.46.0",
     "encoding-selector": "0.20.0",
     "exception-reporting": "0.24.0",
-    "feedback": "0.38.0",
-    "find-and-replace": "0.161.0",
+    "find-and-replace": "0.162.0",
     "fuzzy-finder": "0.83.0",
     "git-diff": "0.55.0",
     "go-to-line": "0.30.0",
-    "grammar-selector": "0.46.0",
+    "grammar-selector": "0.47.0",
     "image-view": "0.54.0",
     "incompatible-packages": "0.24.0",
     "keybinding-resolver": "0.32.0",
@@ -109,12 +108,12 @@
     "metrics": "0.45.0",
     "notifications": "0.43.0",
     "open-on-github": "0.36.0",
-    "package-generator": "0.38.0",
+    "package-generator": "0.39.0",
     "release-notes": "0.52.0",
-    "settings-view": "0.198.0",
+    "settings-view": "0.199.0",
     "snippets": "0.89.0",
-    "spell-check": "0.56.0",
-    "status-bar": "0.69.0",
+    "spell-check": "0.58.0",
+    "status-bar": "0.71.0",
     "styleguide": "0.44.0",
     "symbols-view": "0.96.0",
     "tabs": "0.68.0",
@@ -123,15 +122,15 @@
     "update-package-dependencies": "0.9.0",
     "welcome": "0.27.0",
     "whitespace": "0.29.0",
-    "wrap-guide": "0.32.0",
+    "wrap-guide": "0.33.0",
     "language-c": "0.44.0",
     "language-clojure": "0.14.0",
     "language-coffee-script": "0.40.0",
     "language-csharp": "0.5.0",
     "language-css": "0.29.0",
-    "language-gfm": "0.72.0",
+    "language-gfm": "0.73.0",
     "language-git": "0.10.0",
-    "language-go": "0.25.0",
+    "language-go": "0.26.0",
     "language-html": "0.37.0",
     "language-hyperlink": "0.13.0",
     "language-java": "0.15.0",
@@ -141,19 +140,19 @@
     "language-make": "0.14.0",
     "language-mustache": "0.11.0",
     "language-objective-c": "0.15.0",
-    "language-perl": "0.23.0",
+    "language-perl": "0.24.0",
     "language-php": "0.22.0",
     "language-property-list": "0.8.0",
     "language-python": "0.34.0",
     "language-ruby": "0.52.0",
     "language-ruby-on-rails": "0.21.0",
-    "language-sass": "0.37.0",
+    "language-sass": "0.38.0",
     "language-shellscript": "0.14.0",
     "language-source": "0.9.0",
     "language-sql": "0.15.0",
     "language-text": "0.6.0",
-    "language-todo": "0.19.0",
-    "language-toml": "0.15.0",
+    "language-todo": "0.20.0",
+    "language-toml": "0.16.0",
     "language-xml": "0.28.0",
     "language-yaml": "0.22.0"
   },

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

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

src/browser/application-menu.coffee

@@ -162,8 +162,8 @@ class ApplicationMenu
     firstKeystroke = keystrokesByCommand[command]?[0]
     return null unless firstKeystroke
 
-    modifiers = firstKeystroke.split('-')
-    key = modifiers.pop()
+    modifiers = firstKeystroke.split(/-(?=.)/)
+    key = modifiers.pop().toUpperCase().replace('+', 'Plus')
 
     modifiers = modifiers.map (modifier) ->
       modifier.replace(/shift/ig, "Shift")
@@ -171,5 +171,5 @@ class ApplicationMenu
               .replace(/ctrl/ig, "Ctrl")
               .replace(/alt/ig, "Alt")
 
-    keys = modifiers.concat([key.toUpperCase()])
+    keys = modifiers.concat([key])
     keys.join("+")

src/decoration.coffee

@@ -201,6 +201,6 @@ if Grim.includeDeprecatedAPIs
     Grim.deprecate 'Use Decoration::getProperties instead'
     @getProperties()
 
-  Decoration::update = -> (newProperties) ->
+  Decoration::update = (newProperties) ->
     Grim.deprecate 'Use Decoration::setProperties instead'
     @setProperties(newProperties)

src/tooltip-manager.coffee

@@ -87,8 +87,9 @@ class TooltipManager
 
     new Disposable ->
       tooltip = $target.data('bs.tooltip')
-      tooltip.leave(currentTarget: target)
-      tooltip.hide()
+      if tooltip?
+        tooltip.leave(currentTarget: target)
+        tooltip.hide()
       $target.tooltip('destroy')
 
 humanizeKeystrokes = (keystroke) ->