Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35

src/browser/atom-application.coffee

@@ -373,6 +373,8 @@ class AtomApplication
   #   :windowDimensions - Object with height and width keys.
   #   :window - {AtomWindow} to open file paths in.
   openPaths: ({pathsToOpen, executedFrom, pidToKillWhenClosed, newWindow, devMode, safeMode, windowDimensions, profileStartup, window}={}) ->
+    devMode = Boolean(devMode)
+    safeMode = Boolean(safeMode)
     locationsToOpen = (@locationForPathToOpen(pathToOpen, executedFrom) for pathToOpen in pathsToOpen)
     pathsToOpen = (locationToOpen.pathToOpen for locationToOpen in locationsToOpen)
 

src/config.coffee

@@ -699,7 +699,7 @@ class Config
         @endTransaction()
         fn(args...)
       result = callback()
-      new Promise (resolve, reject) =>
+      new Promise (resolve, reject) ->
         result.then(endTransaction(resolve)).catch(endTransaction(reject))
     catch error
       @endTransaction()

src/default-directory-searcher.coffee

@@ -1,8 +1,7 @@
 Task = require './task'
 
-# Public: Searches local files for lines matching a specified regex.
-#
-# Implements thenable so it can be used with `Promise.all()`.
+# Searches local files for lines matching a specified regex. Implements `.then()`
+# so that it can be used with `Promise.all()`.
 class DirectorySearch
   constructor: (rootPaths, regex, options) ->
     scanHandlerOptions =
@@ -22,31 +21,25 @@ class DirectorySearch
         @task.terminate()
         resolve()
 
-  # Public: Implementation of `then()` to satisfy the *thenable* contract.
-  # This makes it possible to use a `DirectorySearch` with `Promise.all()`.
-  #
-  # Returns `Promise`.
   then: (args...) ->
     @promise.then.apply(@promise, args)
 
-  # Public: Cancels the search.
   cancel: ->
     # This will cause @promise to reject.
     @task.cancel()
     null
 
-
 # Default provider for the `atom.directory-searcher` service.
 module.exports =
 class DefaultDirectorySearcher
-  # Public: Determines whether this object supports search for a `Directory`.
+  # Determines whether this object supports search for a `Directory`.
   #
   # * `directory` {Directory} whose search needs might be supported by this object.
   #
   # Returns a `boolean` indicating whether this object can search this `Directory`.
   canSearchDirectory: (directory) -> true
 
-  # Public: Performs a text search for files in the specified `Directory`, subject to the
+  # Performs a text search for files in the specified `Directory`, subject to the
   # specified parameters.
   #
   # Results are streamed back to the caller by invoking methods on the specified `options`,

src/text-editor-presenter.coffee

@@ -1244,14 +1244,7 @@ class TextEditorPresenter
   updateHighlightState: (decorationId, properties, screenRange) ->
     return unless @startRow? and @endRow? and @lineHeight? and @hasPixelPositionRequirements()
 
-    return if screenRange.isEmpty()
-
-    if screenRange.start.row < @startRow
-      screenRange.start.row = @startRow
-      screenRange.start.column = 0
-    if screenRange.end.row >= @endRow
-      screenRange.end.row = @endRow
-      screenRange.end.column = 0
+    @constrainRangeToVisibleRowRange(screenRange)
 
     return if screenRange.isEmpty()
 
@@ -1281,6 +1274,23 @@ class TextEditorPresenter
 
     true
 
+  constrainRangeToVisibleRowRange: (screenRange) ->
+    if screenRange.start.row < @startRow
+      screenRange.start.row = @startRow
+      screenRange.start.column = 0
+
+    if screenRange.end.row < @startRow
+      screenRange.end.row = @startRow
+      screenRange.end.column = 0
+
+    if screenRange.start.row >= @endRow
+      screenRange.start.row = @endRow
+      screenRange.start.column = 0
+
+    if screenRange.end.row >= @endRow
+      screenRange.end.row = @endRow
+      screenRange.end.column = 0
+
   repositionRegionWithinTile: (region, tileStartRow) ->
     region.top  += @scrollTop - tileStartRow * @lineHeight
     region.left += @scrollLeft