Merge branch 'master' into as-ns-startup-snapshot

package.json

@@ -15,8 +15,8 @@
   "electronVersion": "1.3.13",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "7.1.20",
-    "atom-select-list": "0.0.12",
+    "atom-keymap": "7.1.21",
+    "atom-select-list": "0.0.15",
     "atom-ui": "0.4.1",
     "babel-core": "6.22.1",
     "babel-plugin-add-module-exports": "0.2.1",
@@ -76,7 +76,7 @@
     "sinon": "1.17.4",
     "source-map-support": "^0.3.2",
     "temp": "0.8.1",
-    "text-buffer": "10.3.11",
+    "text-buffer": "10.3.12",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",
@@ -95,7 +95,7 @@
     "one-light-syntax": "1.7.1",
     "solarized-dark-syntax": "1.1.2",
     "solarized-light-syntax": "1.1.2",
-    "about": "1.7.2",
+    "about": "1.7.4",
     "archive-view": "0.62.2",
     "autocomplete-atom-api": "0.10.0",
     "autocomplete-css": "0.15.0",
@@ -105,45 +105,46 @@
     "autoflow": "0.29.0",
     "autosave": "0.24.0",
     "background-tips": "0.26.1",
-    "bookmarks": "0.44.1",
-    "bracket-matcher": "0.85.2",
-    "command-palette": "0.40.2",
+    "bookmarks": "0.44.2",
+    "bracket-matcher": "0.85.3",
+    "command-palette": "0.40.3",
+    "dalek": "0.2.0",
     "deprecation-cop": "0.56.2",
     "dev-live-reload": "0.47.0",
-    "encoding-selector": "0.23.1",
+    "encoding-selector": "0.23.2",
     "exception-reporting": "0.41.1",
     "find-and-replace": "0.206.3",
     "fuzzy-finder": "1.4.1",
-    "git-diff": "1.3.1",
+    "git-diff": "1.3.2",
     "go-to-line": "0.32.0",
-    "grammar-selector": "0.49.2",
-    "image-view": "0.61.0",
-    "incompatible-packages": "0.27.0",
-    "keybinding-resolver": "0.36.1",
-    "line-ending-selector": "0.6.1",
+    "grammar-selector": "0.49.3",
+    "image-view": "0.61.1",
+    "incompatible-packages": "0.27.1",
+    "keybinding-resolver": "0.36.3",
+    "line-ending-selector": "0.6.2",
     "link": "0.31.2",
     "markdown-preview": "0.159.7",
     "metrics": "1.2.1",
     "notifications": "0.66.2",
     "open-on-github": "1.2.1",
     "package-generator": "1.1.0",
-    "settings-view": "0.247.0",
+    "settings-view": "0.247.2",
     "snippets": "1.0.5",
-    "spell-check": "0.71.0",
+    "spell-check": "0.71.1",
     "status-bar": "1.8.1",
-    "styleguide": "0.49.2",
+    "styleguide": "0.49.3",
     "symbols-view": "0.114.0",
     "tabs": "0.104.1",
-    "timecop": "0.35.0",
+    "timecop": "0.36.0",
     "tree-view": "0.214.1",
     "update-package-dependencies": "0.10.0",
-    "welcome": "0.36.1",
+    "welcome": "0.36.2",
     "whitespace": "0.36.2",
     "wrap-guide": "0.39.1",
     "language-c": "0.56.0",
     "language-clojure": "0.22.2",
     "language-coffee-script": "0.48.4",
-    "language-csharp": "0.14.1",
+    "language-csharp": "0.14.2",
     "language-css": "0.42.0",
     "language-gfm": "0.88.0",
     "language-git": "0.19.0",
@@ -151,7 +152,7 @@
     "language-html": "0.47.2",
     "language-hyperlink": "0.16.1",
     "language-java": "0.26.0",
-    "language-javascript": "0.126.0",
+    "language-javascript": "0.126.1",
     "language-json": "0.18.3",
     "language-less": "0.30.1",
     "language-make": "0.22.3",

resources/win/apm.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-"$(dirname "$0")/../app/apm/apm.sh" "$@"
+"$(dirname "$0")/../app/apm/bin/apm" "$@"

spec/atom-reporter.coffee

@@ -1,4 +1,5 @@
 path = require 'path'
+process = require 'process'
 _ = require 'underscore-plus'
 grim = require 'grim'
 marked = require 'marked'
@@ -20,12 +21,15 @@ formatStackTrace = (spec, message='', stackTrace) ->
   lines.shift() if message.trim() is errorMatch?[1]?.trim()
 
   for line, index in lines
-    # Remove prefix of lines matching: at [object Object].<anonymous> (path:1:2)
-    prefixMatch = line.match(/at \[object Object\]\.<anonymous> \(([^)]+)\)/)
+    # Remove prefix of lines matching: at .<anonymous> (path:1:2)
+    prefixMatch = line.match(/at \.<anonymous> \(([^)]+)\)/)
     line = "at #{prefixMatch[1]}" if prefixMatch
 
     # Relativize locations to spec directory
-    lines[index] = line.replace("at #{spec.specDirectory}#{path.sep}", 'at ')
+    if process.platform is 'win32'
+      line = line.replace('file:///', '').replace(///#{path.posix.sep}///g, path.win32.sep)
+    line = line.replace("at #{spec.specDirectory}#{path.sep}", 'at ')
+    lines[index] = line.replace("(#{spec.specDirectory}#{path.sep}", '(') # at step (path:1:2)
 
   lines = lines.map (line) -> line.trim()
   lines.join('\n').trim()

src/text-editor.coffee

@@ -353,7 +353,8 @@ class TextEditor extends Model
             cursor.setShowCursorOnSelection(value) for cursor in @getCursors()
 
         else
-          throw new TypeError("Invalid TextEditor parameter: '#{param}'")
+          if param isnt 'ref' and param isnt 'key'
+            throw new TypeError("Invalid TextEditor parameter: '#{param}'")
 
     @displayLayer.reset(displayLayerParams)