Merge branch 'master' into wl-electron-37

src/atom-environment.coffee

@@ -790,6 +790,7 @@ class AtomEnvironment extends Model
   # Returns a {Promise} that resolves when the DevTools have been opened or
   # closed.
   toggleDevTools: ->
+    require("devtron").install()
     @applicationDelegate.toggleWindowDevTools()
 
   # Extended: Execute code in dev tools.

src/browser/spawner.coffee

@@ -0,0 +1,36 @@
+ChildProcess = require 'child_process'
+
+# Spawn a command and invoke the callback when it completes with an error
+# and the output from standard out.
+#
+# * `command`    The underlying OS command {String} to execute.
+# * `args` (optional) The {Array} with arguments to be passed to command.
+# * `callback` (optional) The {Function} to call after the command has run. It will be invoked with arguments:
+#   * `error` (optional) An {Error} object returned by the command, `null` if no error was thrown.
+#     * `code` Error code returned by the command.
+#     * `stdout`  The {String} output text generated by the command.
+#   * `stdout`  The {String} output text generated by the command.
+#
+# Returns `undefined`.
+exports.spawn = (command, args, callback) ->
+  stdout = ''
+
+  try
+    spawnedProcess = ChildProcess.spawn(command, args)
+  catch error
+    # Spawn can throw an error
+    process.nextTick -> callback?(error, stdout)
+    return
+
+  spawnedProcess.stdout.on 'data', (data) -> stdout += data
+
+  error = null
+  spawnedProcess.on 'error', (processError) -> error ?= processError
+  spawnedProcess.on 'close', (code, signal) ->
+    error ?= new Error("Command failed: #{signal ? code}") if code isnt 0
+    error?.code ?= code
+    error?.stdout ?= stdout
+    callback?(error, stdout)
+  # This is necessary if using Powershell 2 on Windows 7 to get the events to raise
+  # http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
+  spawnedProcess.stdin.end()

src/browser/squirrel-update.coffee

@@ -1,6 +1,8 @@
-ChildProcess = require 'child_process'
 fs = require 'fs-plus'
 path = require 'path'
+Spawner = require './spawner'
+WinRegistry = require './win-registry'
+WinPowerShell = require './win-powershell'
 
 appFolder = path.resolve(process.execPath, '..')
 rootAtomFolder = path.resolve(appFolder, '..')
@@ -10,118 +12,18 @@ exeName = path.basename(process.execPath)
 
 if process.env.SystemRoot
   system32Path = path.join(process.env.SystemRoot, 'System32')
-  regPath = path.join(system32Path, 'reg.exe')
-  powershellPath = path.join(system32Path, 'WindowsPowerShell', 'v1.0', 'powershell.exe')
   setxPath = path.join(system32Path, 'setx.exe')
 else
-  regPath = 'reg.exe'
-  powershellPath = 'powershell.exe'
   setxPath = 'setx.exe'
 
-# Registry keys used for context menu
-fileKeyPath = 'HKCU\\Software\\Classes\\*\\shell\\Atom'
-directoryKeyPath = 'HKCU\\Software\\Classes\\directory\\shell\\Atom'
-backgroundKeyPath = 'HKCU\\Software\\Classes\\directory\\background\\shell\\Atom'
-applicationsKeyPath = 'HKCU\\Software\\Classes\\Applications\\atom.exe'
-environmentKeyPath = 'HKCU\\Environment'
-
-# Spawn a command and invoke the callback when it completes with an error
-# and the output from standard out.
-spawn = (command, args, callback) ->
-  stdout = ''
-
-  try
-    spawnedProcess = ChildProcess.spawn(command, args)
-  catch error
-    # Spawn can throw an error
-    process.nextTick -> callback?(error, stdout)
-    return
-
-  spawnedProcess.stdout.on 'data', (data) -> stdout += data
-
-  error = null
-  spawnedProcess.on 'error', (processError) -> error ?= processError
-  spawnedProcess.on 'close', (code, signal) ->
-    error ?= new Error("Command failed: #{signal ? code}") if code isnt 0
-    error?.code ?= code
-    error?.stdout ?= stdout
-    callback?(error, stdout)
-  # This is necessary if using Powershell 2 on Windows 7 to get the events to raise
-  # http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
-  spawnedProcess.stdin.end()
-
-
-# Spawn reg.exe and callback when it completes
-spawnReg = (args, callback) ->
-  spawn(regPath, args, callback)
-
-# Spawn powershell.exe and callback when it completes
-spawnPowershell = (args, callback) ->
-  # set encoding and execute the command, capture the output, and return it via .NET's console in order to have consistent UTF-8 encoding
-  # http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
-  # to address https://github.com/atom/atom/issues/5063
-  args[0] = """
-    [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
-    $output=#{args[0]}
-    [Console]::WriteLine($output)
-  """
-  args.unshift('-command')
-  args.unshift('RemoteSigned')
-  args.unshift('-ExecutionPolicy')
-  args.unshift('-noprofile')
-  spawn(powershellPath, args, callback)
-
 # Spawn setx.exe and callback when it completes
 spawnSetx = (args, callback) ->
-  spawn(setxPath, args, callback)
+  Spawner.spawn(setxPath, args, callback)
 
 # Spawn the Update.exe with the given arguments and invoke the callback when
 # the command completes.
 spawnUpdate = (args, callback) ->
-  spawn(updateDotExe, args, callback)
-
-# Install the Open with Atom explorer context menu items via the registry.
-installContextMenu = (callback) ->
-  addToRegistry = (args, callback) ->
-    args.unshift('add')
-    args.push('/f')
-    spawnReg(args, callback)
-
-  installFileHandler = (callback) ->
-    args = ["#{applicationsKeyPath}\\shell\\open\\command", '/ve', '/d', "\"#{process.execPath}\" \"%1\""]
-    addToRegistry(args, callback)
-
-  installMenu = (keyPath, arg, callback) ->
-    args = [keyPath, '/ve', '/d', 'Open with Atom']
-    addToRegistry args, ->
-      args = [keyPath, '/v', 'Icon', '/d', "\"#{process.execPath}\""]
-      addToRegistry args, ->
-        args = ["#{keyPath}\\command", '/ve', '/d', "\"#{process.execPath}\" \"#{arg}\""]
-        addToRegistry(args, callback)
-
-  installMenu fileKeyPath, '%1', ->
-    installMenu directoryKeyPath, '%1', ->
-      installMenu backgroundKeyPath, '%V', ->
-        installFileHandler(callback)
-
-# Get the user's PATH environment variable registry value.
-getPath = (callback) ->
-  spawnPowershell ['[environment]::GetEnvironmentVariable(\'Path\',\'User\')'], (error, stdout) ->
-    if error?
-      return callback(error)
-
-    pathOutput = stdout.replace(/^\s+|\s+$/g, '')
-    callback(null, pathOutput)
-
-# Uninstall the Open with Atom explorer context menu items via the registry.
-uninstallContextMenu = (callback) ->
-  deleteFromRegistry = (keyPath, callback) ->
-    spawnReg(['delete', keyPath, '/f'], callback)
-
-  deleteFromRegistry fileKeyPath, ->
-    deleteFromRegistry directoryKeyPath, ->
-      deleteFromRegistry backgroundKeyPath, ->
-        deleteFromRegistry(applicationsKeyPath, callback)
+  Spawner.spawn(updateDotExe, args, callback)
 
 # Add atom and apm to the PATH
 #
@@ -160,7 +62,7 @@ addCommandsToPath = (callback) ->
   installCommands (error) ->
     return callback(error) if error?
 
-    getPath (error, pathEnv) ->
+    WinPowerShell.getPath (error, pathEnv) ->
       return callback(error) if error?
 
       pathSegments = pathEnv.split(/;+/).filter (pathSegment) -> pathSegment
@@ -171,7 +73,7 @@ addCommandsToPath = (callback) ->
 
 # Remove atom and apm from the PATH
 removeCommandsFromPath = (callback) ->
-  getPath (error, pathEnv) ->
+  WinPowerShell.getPath (error, pathEnv) ->
     return callback(error) if error?
 
     pathSegments = pathEnv.split(/;+/).filter (pathSegment) ->
@@ -220,7 +122,7 @@ exports.existsSync = ->
 exports.restartAtom = (app) ->
   if projectPath = global.atomApplication?.lastFocusedWindow?.projectPath
     args = [projectPath]
-  app.once 'will-quit', -> spawn(path.join(binFolder, 'atom.cmd'), args)
+  app.once 'will-quit', -> Spawner.spawn(path.join(binFolder, 'atom.cmd'), args)
   app.quit()
 
 # Handle squirrel events denoted by --squirrel-* command line arguments.
@@ -228,19 +130,19 @@ exports.handleStartupEvent = (app, squirrelCommand) ->
   switch squirrelCommand
     when '--squirrel-install'
       createShortcuts ->
-        installContextMenu ->
+        WinRegistry.installContextMenu ->
           addCommandsToPath ->
             app.quit()
       true
     when '--squirrel-updated'
       updateShortcuts ->
-        installContextMenu ->
+        WinRegistry.installContextMenu ->
           addCommandsToPath ->
             app.quit()
       true
     when '--squirrel-uninstall'
       removeShortcuts ->
-        uninstallContextMenu ->
+        WinRegistry.uninstallContextMenu ->
           removeCommandsFromPath ->
             app.quit()
       true

src/browser/win-powershell.coffee

@@ -0,0 +1,39 @@
+path = require 'path'
+Spawner = require './spawner'
+
+if process.env.SystemRoot
+  system32Path = path.join(process.env.SystemRoot, 'System32')
+  powershellPath = path.join(system32Path, 'WindowsPowerShell', 'v1.0', 'powershell.exe')
+else
+  powershellPath = 'powershell.exe'
+
+# Spawn powershell.exe and callback when it completes
+spawnPowershell = (args, callback) ->
+  # Set encoding and execute the command, capture the output, and return it
+  # via .NET's console in order to have consistent UTF-8 encoding.
+  # See http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
+  # to address https://github.com/atom/atom/issues/5063
+  args[0] = """
+    [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
+    $output=#{args[0]}
+    [Console]::WriteLine($output)
+  """
+  args.unshift('-command')
+  args.unshift('RemoteSigned')
+  args.unshift('-ExecutionPolicy')
+  args.unshift('-noprofile')
+  Spawner.spawn(powershellPath, args, callback)
+
+# Get the user's PATH environment variable registry value.
+#
+# * `callback` The {Function} to call after registry operation is done.
+#   It will be invoked with the same arguments provided by {Spawner.spawn}.
+#
+# Returns the user's path {String}.
+exports.getPath = (callback) ->
+  spawnPowershell ['[environment]::GetEnvironmentVariable(\'Path\',\'User\')'], (error, stdout) ->
+    if error?
+      return callback(error)
+
+    pathOutput = stdout.replace(/^\s+|\s+$/g, '')
+    callback(null, pathOutput)

src/browser/win-registry.coffee

@@ -0,0 +1,62 @@
+path = require 'path'
+Spawner = require './spawner'
+
+if process.env.SystemRoot
+  system32Path = path.join(process.env.SystemRoot, 'System32')
+  regPath = path.join(system32Path, 'reg.exe')
+else
+  regPath = 'reg.exe'
+
+# Registry keys used for context menu
+fileKeyPath = 'HKCU\\Software\\Classes\\*\\shell\\Atom'
+directoryKeyPath = 'HKCU\\Software\\Classes\\directory\\shell\\Atom'
+backgroundKeyPath = 'HKCU\\Software\\Classes\\directory\\background\\shell\\Atom'
+applicationsKeyPath = 'HKCU\\Software\\Classes\\Applications\\atom.exe'
+
+# Spawn reg.exe and callback when it completes
+spawnReg = (args, callback) ->
+  Spawner.spawn(regPath, args, callback)
+
+# Install the Open with Atom explorer context menu items via the registry.
+#
+# * `callback` The {Function} to call after registry operation is done.
+#   It will be invoked with the same arguments provided by {Spawner.spawn}.
+#
+# Returns `undefined`.
+exports.installContextMenu = (callback) ->
+  addToRegistry = (args, callback) ->
+    args.unshift('add')
+    args.push('/f')
+    spawnReg(args, callback)
+
+  installFileHandler = (callback) ->
+    args = ["#{applicationsKeyPath}\\shell\\open\\command", '/ve', '/d', "\"#{process.execPath}\" \"%1\""]
+    addToRegistry(args, callback)
+
+  installMenu = (keyPath, arg, callback) ->
+    args = [keyPath, '/ve', '/d', 'Open with Atom']
+    addToRegistry args, ->
+      args = [keyPath, '/v', 'Icon', '/d', "\"#{process.execPath}\""]
+      addToRegistry args, ->
+        args = ["#{keyPath}\\command", '/ve', '/d', "\"#{process.execPath}\" \"#{arg}\""]
+        addToRegistry(args, callback)
+
+  installMenu fileKeyPath, '%1', ->
+    installMenu directoryKeyPath, '%1', ->
+      installMenu backgroundKeyPath, '%V', ->
+        installFileHandler(callback)
+
+# Uninstall the Open with Atom explorer context menu items via the registry.
+#
+# * `callback` The {Function} to call after registry operation is done.
+#   It will be invoked with the same arguments provided by {Spawner.spawn}.
+#
+# Returns `undefined`.
+exports.uninstallContextMenu = (callback) ->
+  deleteFromRegistry = (keyPath, callback) ->
+    spawnReg(['delete', keyPath, '/f'], callback)
+
+  deleteFromRegistry fileKeyPath, ->
+    deleteFromRegistry directoryKeyPath, ->
+      deleteFromRegistry backgroundKeyPath, ->
+        deleteFromRegistry(applicationsKeyPath, callback)

src/text-editor-component.coffee

@@ -491,7 +491,7 @@ class TextEditorComponent
     screenPosition = Point.fromObject(screenPosition)
     screenPosition = @editor.clipScreenPosition(screenPosition) if clip
 
-    unless @presenter.isRowVisible(screenPosition.row)
+    unless @presenter.isRowRendered(screenPosition.row)
       @presenter.setScreenRowsToMeasure([screenPosition.row])
 
     unless @linesComponent.lineNodeForScreenRow(screenPosition.row)?
@@ -503,7 +503,7 @@ class TextEditorComponent
 
   screenPositionForPixelPosition: (pixelPosition) ->
     row = @linesYardstick.measuredRowForPixelPosition(pixelPosition)
-    if row? and not @presenter.isRowVisible(row)
+    if row? and not @presenter.isRowRendered(row)
       @presenter.setScreenRowsToMeasure([row])
       @updateSyncPreMeasurement()
 
@@ -513,9 +513,9 @@ class TextEditorComponent
 
   pixelRectForScreenRange: (screenRange) ->
     rowsToMeasure = []
-    unless @presenter.isRowVisible(screenRange.start.row)
+    unless @presenter.isRowRendered(screenRange.start.row)
       rowsToMeasure.push(screenRange.start.row)
-    unless @presenter.isRowVisible(screenRange.end.row)
+    unless @presenter.isRowRendered(screenRange.end.row)
       rowsToMeasure.push(screenRange.end.row)
 
     if rowsToMeasure.length > 0

src/text-editor-presenter.coffee

@@ -601,42 +601,19 @@ class TextEditorPresenter
     tileState.lineNumbers ?= {}
     visibleLineNumberIds = {}
 
-    startRow = screenRows[screenRows.length - 1]
-    endRow = Math.min(screenRows[0] + 1, @model.getScreenLineCount())
+    for screenRow in screenRows when @isRowRendered(screenRow)
+      lineId = @linesByScreenRow.get(screenRow).id
+      {bufferRow, softWrappedAtStart: softWrapped} = @displayLayer.softWrapDescriptorForScreenRow(screenRow)
+      foldable = not softWrapped and @model.isFoldableAtBufferRow(bufferRow)
+      decorationClasses = @lineNumberDecorationClassesForRow(screenRow)
+      blockDecorationsBeforeCurrentScreenRowHeight = @lineTopIndex.pixelPositionAfterBlocksForRow(screenRow) - @lineTopIndex.pixelPositionBeforeBlocksForRow(screenRow)
+      blockDecorationsHeight = blockDecorationsBeforeCurrentScreenRowHeight
+      if screenRow % @tileSize isnt 0
+        blockDecorationsAfterPreviousScreenRowHeight = @lineTopIndex.pixelPositionBeforeBlocksForRow(screenRow) - @lineHeight - @lineTopIndex.pixelPositionAfterBlocksForRow(screenRow - 1)
+        blockDecorationsHeight += blockDecorationsAfterPreviousScreenRowHeight
 
-    if startRow > 0
-      rowBeforeStartRow = startRow - 1
-      lastBufferRow = @model.bufferRowForScreenRow(rowBeforeStartRow)
-    else
-      lastBufferRow = null
-
-    if endRow > startRow
-      bufferRows = @model.bufferRowsForScreenRows(startRow, endRow - 1)
-      previousBufferRow = -1
-      foldable = false
-      for bufferRow, i in bufferRows
-         # don't compute foldability more than once per buffer row
-        if previousBufferRow isnt bufferRow
-          foldable = @model.isFoldableAtBufferRow(bufferRow)
-          previousBufferRow = bufferRow
-
-        if bufferRow is lastBufferRow
-          softWrapped = true
-        else
-          lastBufferRow = bufferRow
-          softWrapped = false
-
-        screenRow = startRow + i
-        lineId = @linesByScreenRow.get(screenRow).id
-        decorationClasses = @lineNumberDecorationClassesForRow(screenRow)
-        blockDecorationsBeforeCurrentScreenRowHeight = @lineTopIndex.pixelPositionAfterBlocksForRow(screenRow) - @lineTopIndex.pixelPositionBeforeBlocksForRow(screenRow)
-        blockDecorationsHeight = blockDecorationsBeforeCurrentScreenRowHeight
-        if screenRow % @tileSize isnt 0
-          blockDecorationsAfterPreviousScreenRowHeight = @lineTopIndex.pixelPositionBeforeBlocksForRow(screenRow) - @lineHeight - @lineTopIndex.pixelPositionAfterBlocksForRow(screenRow - 1)
-          blockDecorationsHeight += blockDecorationsAfterPreviousScreenRowHeight
-
-        tileState.lineNumbers[lineId] = {screenRow, bufferRow, softWrapped, decorationClasses, foldable, blockDecorationsHeight}
-        visibleLineNumberIds[lineId] = true
+      tileState.lineNumbers[lineId] = {screenRow, bufferRow, softWrapped, decorationClasses, foldable, blockDecorationsHeight}
+      visibleLineNumberIds[lineId] = true
 
     for id of tileState.lineNumbers
       delete tileState.lineNumbers[id] unless visibleLineNumberIds[id]
@@ -1153,13 +1130,11 @@ class TextEditorPresenter
 
     if rangeIsReversed
       headScreenPosition = screenRange.start
-      headBufferPosition = bufferRange.start
     else
       headScreenPosition = screenRange.end
-      headBufferPosition = bufferRange.end
 
     if properties.class is 'folded' and Decoration.isType(properties, 'line-number')
-      screenRow = @model.screenRowForBufferRow(headBufferPosition.row)
+      screenRow = @model.screenRowForBufferRow(bufferRange.start.row)
       @lineNumberDecorationsByScreenRow[screenRow] ?= {}
       @lineNumberDecorationsByScreenRow[screenRow][decorationId] = properties
     else
@@ -1550,8 +1525,8 @@ class TextEditorPresenter
   getVisibleRowRange: ->
     [@startRow, @endRow]
 
-  isRowVisible: (row) ->
-    @startRow <= row < @endRow
+  isRowRendered: (row) ->
+    @getStartTileRow() <= row < @constrainRow(@getEndTileRow() + @tileSize)
 
   isOpenTagCode: (tagCode) ->
     @displayLayer.isOpenTagCode(tagCode)

src/text-editor.coffee

@@ -231,6 +231,7 @@ class TextEditor extends Model
     @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
 
     scopeDescriptor = @getRootScopeDescriptor()
+    subscriptions.add @config.onDidChange 'editor.atomicSoftTabs', scope: scopeDescriptor, @resetDisplayLayer.bind(this)
     subscriptions.add @config.onDidChange 'editor.tabLength', scope: scopeDescriptor, @resetDisplayLayer.bind(this)
     subscriptions.add @config.onDidChange 'editor.invisibles', scope: scopeDescriptor, @resetDisplayLayer.bind(this)
     subscriptions.add @config.onDidChange 'editor.showInvisibles', scope: scopeDescriptor, @resetDisplayLayer.bind(this)
@@ -1702,8 +1703,6 @@ class TextEditor extends Model
   #     operations, but uses more time and memory. (default: false)
   #   * `reversed` (optional) {Boolean} Creates the marker in a reversed
   #     orientation. (default: false)
-  #   * `persistent` (optional) {Boolean} Whether to include this marker when
-  #     serializing the buffer. (default: true)
   #   * `invalidate` (optional) {String} Determines the rules by which changes
   #     to the buffer *invalidate* the marker. (default: 'overlap') It can be
   #     any of the following strategies, in order of fragility:
@@ -1737,8 +1736,6 @@ class TextEditor extends Model
   #     operations, but uses more time and memory. (default: false)
   #   * `reversed` (optional) {Boolean} Creates the marker in a reversed
   #     orientation. (default: false)
-  #   * `persistent` (optional) {Boolean} Whether to include this marker when
-  #     serializing the buffer. (default: true)
   #   * `invalidate` (optional) {String} Determines the rules by which changes
   #     to the buffer *invalidate* the marker. (default: 'overlap') It can be
   #     any of the following strategies, in order of fragility:
@@ -3011,7 +3008,7 @@ class TextEditor extends Model
     maintainClipboard = false
     for selection in @getSelectionsOrderedByBufferPosition()
       if not selection.isEmpty()
-        selection.copy(maintainClipboard, true)
+        selection.copy(maintainClipboard, false)
         maintainClipboard = true
     return