Merge branch 'master' into mb-adjust-app-name-by-channel

Conflicts:
	build/Gruntfile.coffee

.travis.yml

@@ -8,17 +8,19 @@ branches:
 env:
   global:
     - ATOM_ACCESS_TOKEN=da809a6077bb1b0aa7c5623f7b2d5f1fec2faae4
-    - NODE_VERSION=0.12
 
 compiler: clang
 
 matrix:
   include:
     - os: linux
+      env: NODE_VERSION=0.12
+    - os: linux
+      env: NODE_VERSION=4
     - os: osx
-      env: ATOM_SPECS_TASK=core
+      env: ATOM_SPECS_TASK=core NODE_VERSION=0.12
     - os: osx
-      env: ATOM_SPECS_TASK=packages
+      env: ATOM_SPECS_TASK=packages NODE_VERSION=0.12
 
 sudo: false
 

apm/package.json

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

build/Gruntfile.coffee

@@ -36,6 +36,8 @@ module.exports = (grunt) ->
   buildDir = grunt.option('build-dir')
   buildDir ?= path.join(os.tmpdir(), 'atom-build')
   buildDir = path.resolve(buildDir)
+  disableAutoUpdate = grunt.option('no-auto-update') ? false
+
   channel = grunt.option('channel')
   channel ?= process.env.JANKY_BRANCH if process.env.JANKY_BRANCH in ['stable', 'beta']
   channel ?= 'dev'
@@ -168,7 +170,7 @@ module.exports = (grunt) ->
     pkg: grunt.file.readJSON('package.json')
 
     atom: {
-      appName, channel, metadata,
+      appName, channel, metadata, disableAutoUpdate,
       appFileName, apmFileName,
       appDir, buildDir, contentsDir, installDir, shellAppDir, symbolsDir,
     }

build/package.json

@@ -22,7 +22,7 @@
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.16.0",
     "grunt-download-electron": "^2.1.1",
-    "grunt-electron-installer": "1.0.3-0",
+    "grunt-electron-installer": "1.0.3",
     "grunt-lesslint": "0.17.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",
@@ -33,7 +33,7 @@
     "rcedit": "~0.3.0",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
-    "runas": "^2",
+    "runas": "^3.1",
     "tello": "1.0.5",
     "temp": "~0.8.1",
     "underscore-plus": "1.x",

build/tasks/build-task.coffee

@@ -186,4 +186,5 @@ module.exports = (grunt) ->
     dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
     dependencies.push('copy-info-plist') if process.platform is 'darwin'
     dependencies.push('set-exe-icon') if process.platform is 'win32'
+    dependencies.push('disable-autoupdate') if grunt.config.get('atom.disableAutoUpdate')
     grunt.task.run(dependencies...)

build/tasks/disable-autoupdate-task.coffee

@@ -0,0 +1,12 @@
+fs = require 'fs'
+path = require 'path'
+
+module.exports = (grunt) ->
+
+  grunt.registerTask 'disable-autoupdate', 'Set up disableAutoUpdate field in package.json file', ->
+    appDir = fs.realpathSync(grunt.config.get('atom.appDir'))
+
+    metadata = grunt.file.readJSON(path.join(appDir, 'package.json'))
+    metadata._disableAutoUpdate = grunt.config.get('atom.disableAutoUpdate')
+
+    grunt.file.write(path.join(appDir, 'package.json'), JSON.stringify(metadata))

build/tasks/publish-build-task.coffee

@@ -77,7 +77,12 @@ getAssets = ->
       ]
     when 'win32'
       assets = [{assetName: 'atom-windows.zip', sourcePath: 'Atom'}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
+
+      # NuGet packages can't have dots in their pre-release name, so we remove
+      # those dots in `grunt-electron-installer` when generating the package.
+      nupkgVersion = version.replace(/\.(\d+)$/, '$1')
+
+      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{nupkgVersion}-full.nupkg", "atom-#{nupkgVersion}-delta.nupkg"]
         cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
         assets.push({assetName: squirrelAsset, sourcePath: assetName})
       assets

package.json

@@ -12,10 +12,10 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "0.30.6",
+  "electronVersion": "0.30.7",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "5.1.11",
+    "atom-keymap": "^6.0.0",
     "babel-core": "^5.8.21",
     "bootstrap": "^3.3.4",
     "clear-cut": "^2.0.1",
@@ -26,7 +26,7 @@
     "fs-plus": "^2.8.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
-    "git-utils": "^3.0.0",
+    "git-utils": "^4",
     "grim": "1.4.2",
     "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.4",
@@ -34,21 +34,22 @@
     "less-cache": "0.22",
     "marked": "^0.3.4",
     "normalize-package-data": "^2.0.0",
-    "nslog": "^2.0.0",
-    "oniguruma": "^4.2.4",
-    "pathwatcher": "^5.0.0",
+    "nslog": "^3",
+    "oniguruma": "^5",
+    "pathwatcher": "^6.2",
+    "property-accessors": "^1.1.3",
     "random-words": "0.0.1",
-    "runas": "2.0.0",
-    "scandal": "2.1.2",
+    "runas": "^3.1",
+    "scandal": "^2.2",
     "scoped-property-store": "^0.17.0",
-    "scrollbar-style": "^3.1",
+    "scrollbar-style": "^3.2",
     "season": "^5.3",
     "semver": "^4.3.3",
     "service-hub": "^0.6.2",
     "source-map-support": "^0.3.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.8.1",
-    "text-buffer": "7.0.3",
+    "text-buffer": "7.1.2",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "yargs": "^3.23.0"
@@ -61,8 +62,8 @@
     "base16-tomorrow-dark-theme": "0.27.0",
     "base16-tomorrow-light-theme": "0.9.0",
     "one-dark-ui": "1.1.4",
-    "one-dark-syntax": "1.1.0",
-    "one-light-syntax": "1.1.0",
+    "one-dark-syntax": "1.1.1",
+    "one-light-syntax": "1.1.1",
     "one-light-ui": "1.1.4",
     "solarized-dark-syntax": "0.38.1",
     "solarized-light-syntax": "0.22.1",
@@ -84,7 +85,7 @@
     "encoding-selector": "0.21.0",
     "exception-reporting": "0.37.0",
     "find-and-replace": "0.182.0",
-    "fuzzy-finder": "0.89.0",
+    "fuzzy-finder": "0.90.0",
     "git-diff": "0.56.0",
     "go-to-line": "0.30.0",
     "grammar-selector": "0.47.0",
@@ -92,22 +93,22 @@
     "incompatible-packages": "0.25.0",
     "keybinding-resolver": "0.33.0",
     "line-ending-selector": "0.0.5",
-    "link": "0.30.0",
+    "link": "0.31.0",
     "markdown-preview": "0.154.0",
     "metrics": "0.51.0",
     "notifications": "0.59.0",
     "open-on-github": "0.38.0",
     "package-generator": "0.40.0",
     "release-notes": "0.53.0",
-    "settings-view": "0.221.0",
+    "settings-view": "0.222.0",
     "snippets": "0.100.0",
-    "spell-check": "0.59.0",
+    "spell-check": "0.60.0",
     "status-bar": "0.79.0",
     "styleguide": "0.44.0",
-    "symbols-view": "0.107.0",
+    "symbols-view": "0.108.0",
     "tabs": "0.84.0",
     "timecop": "0.33.0",
-    "tree-view": "0.188.0",
+    "tree-view": "0.189.0",
     "update-package-dependencies": "0.10.0",
     "welcome": "0.30.0",
     "whitespace": "0.31.0",
@@ -120,10 +121,10 @@
     "language-gfm": "0.81.0",
     "language-git": "0.10.0",
     "language-go": "0.39.0",
-    "language-html": "0.41.2",
+    "language-html": "0.41.3",
     "language-hyperlink": "0.14.0",
     "language-java": "0.16.0",
-    "language-javascript": "0.95.0",
+    "language-javascript": "0.96.0",
     "language-json": "0.16.0",
     "language-less": "0.28.2",
     "language-make": "0.17.0",

script/clean

@@ -20,6 +20,7 @@ var commands = [
   [__dirname, '..', 'build', 'node_modules'],
   [__dirname, '..', 'apm', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
+  [__dirname, '..', 'electron'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],
   [home, '.atom', '.apm'],

src/browser/application-menu.coffee

@@ -103,6 +103,8 @@ class ApplicationMenu
     downloadingUpdateItem.visible = false
     installUpdateItem.visible = false
 
+    return if @autoUpdateManager.isDisabled()
+
     switch state
       when 'idle', 'error', 'no-update-available'
         checkForUpdateItem.visible = true
@@ -117,10 +119,9 @@ class ApplicationMenu
   #
   # Returns an Array of menu item Objects.
   getDefaultTemplate: ->
-    [
+    template = [
       label: "Atom"
       submenu: [
-          {label: "Check for Update", metadata: {autoUpdate: true}}
           {label: 'Reload', accelerator: 'Command+R', click: => @focusedWindow()?.reload()}
           {label: 'Close Window', accelerator: 'Command+Shift+W', click: => @focusedWindow()?.close()}
           {label: 'Toggle Dev Tools', accelerator: 'Command+Alt+I', click: => @focusedWindow()?.toggleDevTools()}
@@ -128,6 +129,10 @@ class ApplicationMenu
       ]
     ]
 
+    # Add `Check for Update` button if autoUpdateManager is enabled.
+    template[0].submenu.unshift({label: "Check for Update", metadata: {autoUpdate: true}}) unless @autoUpdateManager.isDisabled()
+    template
+
   focusedWindow: ->
     _.find global.atomApplication.windows, (atomWindow) -> atomWindow.isFocused()
 

src/browser/atom-application.coffee

@@ -72,7 +72,8 @@ class AtomApplication
     @pidsToOpenWindows = {}
     @windows = []
 
-    @autoUpdateManager = new AutoUpdateManager(@version, options.test)
+    disableAutoUpdate = require(path.join(@resourcePath, 'package.json'))._disableAutoUpdate ? false
+    @autoUpdateManager = new AutoUpdateManager(@version, options.test, disableAutoUpdate)
     @applicationMenu = new ApplicationMenu(@version, @autoUpdateManager)
     @atomProtocolHandler = new AtomProtocolHandler(@resourcePath, @safeMode)
 

src/browser/auto-update-manager.coffee

@@ -15,7 +15,7 @@ module.exports =
 class AutoUpdateManager
   _.extend @prototype, EventEmitter.prototype
 
-  constructor: (@version, @testMode) ->
+  constructor: (@version, @testMode, @disabled) ->
     @state = IdleState
     if process.platform is 'win32'
       # Squirrel for Windows can't handle query params
@@ -52,8 +52,9 @@ class AutoUpdateManager
       @setState(UpdateAvailableState)
       @emitUpdateAvailableEvent(@getWindows()...)
 
-    # Only released versions should check for updates.
-    @scheduleUpdateCheck() unless /\w{7}/.test(@version)
+    # Only check for updates periodically if enabled and running in release
+    # version.
+    @scheduleUpdateCheck() unless /\w{7}/.test(@version) or @disabled
 
     switch process.platform
       when 'win32'
@@ -61,6 +62,9 @@ class AutoUpdateManager
       when 'linux'
         @setState(UnsupportedState)
 
+  isDisabled: ->
+    @disabled
+
   emitUpdateAvailableEvent: (windows...) ->
     return unless @releaseVersion?
     for atomWindow in windows

src/context-menu-manager.coffee

@@ -82,25 +82,25 @@ class ContextMenuManager
   #
   # * `itemsBySelector` An {Object} whose keys are CSS selectors and whose
   #   values are {Array}s of item {Object}s containing the following keys:
-  #   * `label` (Optional) A {String} containing the menu item's label.
-  #   * `command` (Optional) A {String} containing the command to invoke on the
+  #   * `label` (optional) A {String} containing the menu item's label.
+  #   * `command` (optional) A {String} containing the command to invoke on the
   #     target of the right click that invoked the context menu.
-  #   * `enabled` (Optional) A {Boolean} indicating whether the menu item
+  #   * `enabled` (optional) A {Boolean} indicating whether the menu item
   #     should be clickable. Disabled menu items typically appear grayed out.
   #     Defaults to `true`.
-  #   * `submenu` (Optional) An {Array} of additional items.
-  #   * `type` (Optional) If you want to create a separator, provide an item
+  #   * `submenu` (optional) An {Array} of additional items.
+  #   * `type` (optional) If you want to create a separator, provide an item
   #      with `type: 'separator'` and no other keys.
-  #   * `visible` (Optional) A {Boolean} indicating whether the menu item
+  #   * `visible` (optional) A {Boolean} indicating whether the menu item
   #     should appear in the menu. Defaults to `true`.
-  #   * `created` (Optional) A {Function} that is called on the item each time a
+  #   * `created` (optional) A {Function} that is called on the item each time a
   #     context menu is created via a right click. You can assign properties to
   #    `this` to dynamically compute the command, label, etc. This method is
   #    actually called on a clone of the original item template to prevent state
   #    from leaking across context menu deployments. Called with the following
   #    argument:
   #     * `event` The click event that deployed the context menu.
-  #   * `shouldDisplay` (Optional) A {Function} that is called to determine
+  #   * `shouldDisplay` (optional) A {Function} that is called to determine
   #     whether to display this item on a given context menu deployment. Called
   #     with the following argument:
   #     * `event` The click event that deployed the context menu.

src/text-editor-component.coffee

@@ -33,6 +33,13 @@ class TextEditorComponent
   stylingChangeAnimationFrameRequested: false
   gutterComponent: null
   mounted: true
+  initialized: false
+
+  Object.defineProperty @prototype, "domNode",
+    get: -> @domNodeValue
+    set: (domNode) ->
+      atom.assert domNode?, "TextEditorComponent::domNode was set to null."
+      @domNodeValue = domNode
 
   constructor: ({@editor, @hostElement, @rootElement, @stylesElement, @useShadowDOM, tileSize}) ->
     @tileSize = tileSize if tileSize?
@@ -101,6 +108,7 @@ class TextEditorComponent
 
     @updateSync()
     @checkForVisibilityChange()
+    @initialized = true
 
   destroy: ->
     @mounted = false
@@ -557,7 +565,11 @@ class TextEditorComponent
     disposables.add(@editor.onDidDestroy(stopDragging))
 
   isVisible: ->
-    @domNode.offsetHeight > 0 or @domNode.offsetWidth > 0
+    # Investigating an exception that occurs here due to ::domNode being null.
+    atom.assert @domNode?, "TextEditorComponent::domNode was null.", (error) =>
+      error.metadata = {@initialized}
+
+    @domNode? and (@domNode.offsetHeight > 0 or @domNode.offsetWidth > 0)
 
   pollDOM: =>
     unless @checkForVisibilityChange()