Merge branch 'master' into as-cjk-soft-wrap

# Conflicts: # spec/display-buffer-spec.coffee
Shazzaam · Oct 16, 2015 · b03aa4b · b03aa4b
2 parents 4766c98 + 4df007e
commit b03aa4b
Show file tree

Hide file tree

Showing 116 changed files with 2,575 additions and 2,129 deletions.
diff --git a/build/package.json b/build/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "asar": "^0.8.0",
     "async": "~0.2.9",
-    "donna": "1.0.10",
+    "donna": "^1.0.12",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
     "github-releases": "~0.3.0",

diff --git a/build/tasks/spec-task.coffee b/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}", path.join(packagePath, 'spec')]
           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}", "--log-file=ci.log", path.join(packagePath, 'spec')]
           opts:
             cwd: packagePath
             env: _.extend({}, process.env, ATOM_PATH: rootDir)
@@ -95,7 +95,7 @@ module.exports = (grunt) ->
     if process.platform in ['darwin', 'linux']
       options =
         cmd: appPath
-        args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}"]
+        args: ['--test', "--resource-path=#{resourcePath}", coreSpecsPath]
         opts:
           env: _.extend({}, process.env,
             ATOM_INTEGRATION_TESTS_ENABLED: true
@@ -104,7 +104,7 @@ module.exports = (grunt) ->
     else if process.platform is 'win32'
       options =
         cmd: process.env.comspec
-        args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}", '--log-file=ci.log']
+        args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", '--log-file=ci.log', coreSpecsPath]
         opts:
           env: _.extend({}, process.env,
             ATOM_INTEGRATION_TESTS_ENABLED: true

diff --git a/exports/atom.coffee b/exports/atom.coffee
@@ -2,6 +2,7 @@ TextBuffer = require 'text-buffer'
 {Point, Range} = TextBuffer
 {File, Directory} = require 'pathwatcher'
 {Emitter, Disposable, CompositeDisposable} = require 'event-kit'
+Grim = require 'grim'
 
 module.exports =
   BufferedNodeProcess: require '../src/buffered-node-process'
@@ -21,4 +22,20 @@ module.exports =
 # only be exported when not running as a child node process
 unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.Task = require '../src/task'
-  module.exports.TextEditor = require '../src/text-editor'
+
+  TextEditor = (params) ->
+    atom.workspace.buildTextEditor(params)
+
+  TextEditor.prototype = require('../src/text-editor').prototype
+
+  Object.defineProperty module.exports, 'TextEditor',
+    enumerable: true
+    get: ->
+      Grim.deprecate """
+        The `TextEditor` constructor is no longer public.
+
+        To construct a text editor, use `atom.workspace.buildTextEditor()`.
+        To check if an object is a text editor, look for for the existence of
+        a public method that you're using (e.g. `::getText`).
+      """
+      TextEditor
diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson
@@ -18,7 +18,6 @@
   'ctrl-d': 'core:delete'
 
   # Atom Specific
-  'cmd-alt-ctrl-s': 'application:run-all-specs'
   'enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'

diff --git a/keymaps/linux.cson b/keymaps/linux.cson
@@ -9,7 +9,6 @@
   'ctrl-alt-r': 'window:reload'
   'ctrl-shift-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
-  'ctrl-alt-s': 'application:run-all-specs'
   'ctrl-shift-o': 'application:open-folder'
   'ctrl-alt-o': 'application:add-project-folder'
   'ctrl-shift-pageup': 'pane:move-item-left'

diff --git a/keymaps/win32.cson b/keymaps/win32.cson
@@ -15,7 +15,6 @@
   'ctrl-alt-r': 'window:reload'
   'ctrl-alt-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
-  'ctrl-alt-s': 'application:run-all-specs'
   'ctrl-shift-o': 'application:open-folder'
   'ctrl-alt-o': 'application:add-project-folder'
   'ctrl-shift-left': 'pane:move-item-left'

diff --git a/menus/darwin.cson b/menus/darwin.cson
@@ -164,7 +164,6 @@
         label: 'Developer'
         submenu: [
           { label: 'Open In Dev Mode…', command: 'application:open-dev' }
-          { label: 'Run Atom Specs', command: 'application:run-all-specs' }
           { label: 'Run Package Specs', command: 'window:run-package-specs' }
           { label: 'Toggle Developer Tools', command: 'window:toggle-dev-tools' }
         ]

diff --git a/menus/linux.cson b/menus/linux.cson
@@ -121,7 +121,6 @@
         label: 'Developer'
         submenu: [
           { label: 'Open In &Dev Mode…', command: 'application:open-dev' }
-          { label: 'Run &Atom Specs', command: 'application:run-all-specs' }
           { label: 'Run Package &Specs', command: 'window:run-package-specs' }
           { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' }
         ]

diff --git a/menus/win32.cson b/menus/win32.cson
@@ -120,7 +120,6 @@
         label: 'Developer'
         submenu: [
           { label: 'Open In &Dev Mode…', command: 'application:open-dev' }
-          { label: 'Run &Atom Specs', command: 'application:run-all-specs' }
           { label: 'Run Package &Specs', command: 'window:run-package-specs' }
           { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' }
         ]

diff --git a/package.json b/package.json
@@ -15,14 +15,15 @@
   "electronVersion": "0.30.7",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^6.0.0",
+    "atom-keymap": "^6.1.0",
     "babel-core": "^5.8.21",
     "bootstrap": "^3.3.4",
     "clear-cut": "^2.0.1",
     "coffee-script": "1.8.0",
     "color": "^0.7.3",
     "event-kit": "^1.3.0",
-    "first-mate": "^5.0.0",
+    "find-parent-dir": "^0.3.0",
+    "first-mate": "^5.1.0",
     "fs-plus": "^2.8.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
@@ -40,13 +41,14 @@
     "pathwatcher": "^6.2",
     "property-accessors": "^1.1.3",
     "random-words": "0.0.1",
+    "resolve": "^1.1.6",
     "runas": "^3.1",
     "scandal": "^2.2",
     "scoped-property-store": "^0.17.0",
     "scrollbar-style": "^3.2",
     "season": "^5.3",
     "semver": "^4.3.3",
-    "service-hub": "^0.6.2",
+    "service-hub": "^0.7.0",
     "source-map-support": "^0.3.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.8.1",
@@ -73,10 +75,10 @@
     "autocomplete-atom-api": "0.9.2",
     "autocomplete-css": "0.11.0",
     "autocomplete-html": "0.7.2",
-    "autocomplete-plus": "2.22.0",
+    "autocomplete-plus": "2.23.0",
     "autocomplete-snippets": "1.7.1",
     "autoflow": "0.26.0",
-    "autosave": "0.22.0",
+    "autosave": "0.23.0",
     "background-tips": "0.26.0",
     "bookmarks": "0.38.0",
     "bracket-matcher": "0.78.0",
@@ -85,8 +87,8 @@
     "dev-live-reload": "0.47.0",
     "encoding-selector": "0.21.0",
     "exception-reporting": "0.37.0",
-    "find-and-replace": "0.185.0",
-    "fuzzy-finder": "0.90.0",
+    "find-and-replace": "0.187.1",
+    "fuzzy-finder": "0.91.0",
     "git-diff": "0.56.0",
     "go-to-line": "0.30.0",
     "grammar-selector": "0.47.0",
@@ -95,26 +97,26 @@
     "keybinding-resolver": "0.33.0",
     "line-ending-selector": "0.2.0",
     "link": "0.31.0",
-    "markdown-preview": "0.154.0",
+    "markdown-preview": "0.155.0",
     "metrics": "0.52.0",
     "notifications": "0.59.0",
     "open-on-github": "0.38.0",
     "package-generator": "0.40.0",
     "release-notes": "0.53.0",
     "settings-view": "0.230.1",
-    "snippets": "0.100.0",
+    "snippets": "0.101.0",
     "spell-check": "0.61.0",
     "status-bar": "0.79.0",
     "styleguide": "0.44.0",
     "symbols-view": "0.109.0",
-    "tabs": "0.84.0",
+    "tabs": "0.85.0",
     "timecop": "0.33.0",
-    "tree-view": "0.190.0",
+    "tree-view": "0.192.2",
     "update-package-dependencies": "0.10.0",
-    "welcome": "0.30.0",
+    "welcome": "0.31.0",
     "whitespace": "0.31.0",
     "wrap-guide": "0.38.0",
-    "language-c": "0.48.0",
+    "language-c": "0.49.0",
     "language-clojure": "0.18.0",
     "language-coffee-script": "0.42.0",
     "language-csharp": "0.11.0",
@@ -125,14 +127,14 @@
     "language-html": "0.42.0",
     "language-hyperlink": "0.14.0",
     "language-java": "0.16.0",
-    "language-javascript": "0.96.0",
+    "language-javascript": "0.97.0",
     "language-json": "0.17.0",
     "language-less": "0.28.2",
     "language-make": "0.19.0",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.0",
     "language-perl": "0.30.0",
-    "language-php": "0.30.0",
+    "language-php": "0.31.0",
     "language-property-list": "0.8.0",
     "language-python": "0.40.0",
     "language-ruby": "0.60.0",