diff --git a/apm/package.json b/apm/package.json index 90abba7da..91130b51f 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.130" + "atom-package-manager": "0.131.0" } } diff --git a/package.json b/package.json index 127a186ba..87cad1f46 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,10 @@ "url": "http://github.com/atom/atom/raw/master/LICENSE.md" } ], - "atomShellVersion": "0.20.7", + "atomShellVersion": "0.21.0", "dependencies": { "async": "0.2.6", - "atom-keymap": "^2.5.2", + "atom-keymap": "^3.1.0", "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372", "clear-cut": "0.4.0", "coffee-script": "1.8.0", @@ -29,11 +29,11 @@ "delegato": "^1", "emissary": "^1.3.1", "event-kit": "^1.0.1", - "first-mate": "^2.2.5", + "first-mate": "^3.0.0", "fs-plus": "^2.3.2", "fstream": "0.1.24", "fuzzaldrin": "^2.1", - "git-utils": "^2.2", + "git-utils": "^3.0.0", "grim": "1.1.0", "guid": "0.0.10", "jasmine-json": "~0.0", @@ -43,19 +43,19 @@ "marked": "^0.3", "mixto": "^1", "mkdirp": "0.3.5", - "nslog": "^1.0.1", - "oniguruma": "^3.0.6", + "nslog": "^2.0.0", + "oniguruma": "^4.0.0", "optimist": "0.4.0", - "pathwatcher": "^2.6.1", + "pathwatcher": "^3.1.0", "property-accessors": "^1", "q": "^1.0.1", "random-words": "0.0.1", "react-atom-fork": "^0.11.4", "reactionary-atom-fork": "^1.0.0", - "runas": "1.0.1", - "scandal": "1.0.3", + "runas": "2.0.0", + "scandal": "2.0.0", "scoped-property-store": "^0.16.2", - "scrollbar-style": "^1.0.2", + "scrollbar-style": "^2.0.0", "season": "^5.1.1", "semver": "2.2.1", "serializable": "^1", @@ -63,7 +63,7 @@ "space-pen": "3.8.2", "stacktrace-parser": "0.1.1", "temp": "0.7.0", - "text-buffer": "^3.10.1", + "text-buffer": "^4.0.0", "theorist": "^1.0.2", "underscore-plus": "^1.6.6", "vm-compatibility-layer": "0.1.0" @@ -81,16 +81,16 @@ "one-light-ui": "0.1.0", "solarized-dark-syntax": "0.32.0", "solarized-light-syntax": "0.19.0", - "archive-view": "0.44.0", + "archive-view": "0.46.0", "autocomplete": "0.44.0", "autoflow": "0.21.0", "autosave": "0.20.0", "background-tips": "0.22.0", "bookmarks": "0.35.0", - "bracket-matcher": "0.69.0", + "bracket-matcher": "0.70.0", "command-palette": "0.34.0", "deprecation-cop": "0.33.0", - "dev-live-reload": "0.39.0", + "dev-live-reload": "0.41.0", "encoding-selector": "0.17.0", "exception-reporting": "0.21.0", "find-and-replace": "0.156.0", @@ -98,25 +98,25 @@ "git-diff": "0.50.0", "go-to-line": "0.30.0", "grammar-selector": "0.44.0", - "image-view": "0.47.0", + "image-view": "0.48.0", "incompatible-packages": "0.21.0", "keybinding-resolver": "0.27.0", - "link": "0.29.0", - "markdown-preview": "0.129.0", + "link": "0.30.0", + "markdown-preview": "0.131.0", "metrics": "0.41.0", "notifications": "0.26.0", "open-on-github": "0.32.0", "package-generator": "0.37.0", "release-notes": "0.47.0", "settings-view": "0.174.0", - "snippets": "0.70.0", - "spell-check": "0.52.0", - "status-bar": "0.58.0", - "styleguide": "0.42.0", - "symbols-view": "0.79.0", - "tabs": "0.65.0", + "snippets": "0.72.0", + "spell-check": "0.54.0", + "status-bar": "0.57.0", + "styleguide": "0.43.0", + "symbols-view": "0.81.0", + "tabs": "0.64.0", "timecop": "0.28.0", - "tree-view": "0.151.0", + "tree-view": "0.154.0", "update-package-dependencies": "0.7.0", "welcome": "0.21.0", "whitespace": "0.28.0", diff --git a/src/language-mode.coffee b/src/language-mode.coffee index e7c924a48..89373cc6e 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -32,7 +32,7 @@ class LanguageMode return unless commentStartEntry? - commentEndEntry = atom.config.getAll('editor.commentEnd', {scope}).find (entry) -> + commentEndEntry = _.find atom.config.getAll('editor.commentEnd', {scope}), (entry) -> entry.scopeSelector is commentStartEntry.scopeSelector commentStartString = commentStartEntry?.value commentEndString = commentEndEntry?.value diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index 2c022cc32..35c012936 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -176,7 +176,7 @@ class MenuManager element?.classList.toString().split(' ') ? [] sortPackagesMenu: -> - packagesMenu = @template.find ({label}) -> MenuHelpers.normalizeLabel(label) is 'Packages' + packagesMenu = _.find @template, ({label}) -> MenuHelpers.normalizeLabel(label) is 'Packages' return unless packagesMenu?.submenu? packagesMenu.submenu.sort (item1, item2) -> diff --git a/src/pane-container.coffee b/src/pane-container.coffee index bcda87bbc..f36169e3b 100644 --- a/src/pane-container.coffee +++ b/src/pane-container.coffee @@ -48,7 +48,7 @@ class PaneContainer extends Model deserializeParams: (params) -> params.root = atom.deserializers.deserialize(params.root, container: this) params.destroyEmptyPanes = atom.config.get('core.destroyEmptyPanes') - params.activePane = params.root.getPanes().find (pane) -> pane.id is params.activePaneId + params.activePane = find params.root.getPanes(), (pane) -> pane.id is params.activePaneId params serializeParams: (params) -> @@ -147,7 +147,7 @@ class PaneContainer extends Model find @getPanes(), (pane) -> pane.itemForURI(uri)? paneForItem: (item) -> - @getPanes().find (pane) -> item in pane.getItems() + find @getPanes(), (pane) -> item in pane.getItems() saveAll: -> pane.saveItems() for pane in @getPanes() diff --git a/src/view-registry.coffee b/src/view-registry.coffee index 0eb2590cf..a9104af5f 100644 --- a/src/view-registry.coffee +++ b/src/view-registry.coffee @@ -1,3 +1,4 @@ +{find} = require 'underscore-plus' Grim = require 'grim' {Disposable} = require 'event-kit' @@ -148,4 +149,4 @@ class ViewRegistry throw new Error("Can't create a view for #{object.constructor.name} instance. Please register a view provider.") findProvider: (object) -> - @providers.find ({modelConstructor}) -> object instanceof modelConstructor + find @providers, ({modelConstructor}) -> object instanceof modelConstructor