Merge branch 'master' into as-fallback-to-storage-folder

src/block-decorations-component.coffee

@@ -26,7 +26,10 @@ class BlockDecorationsComponent
 
     for id, blockDecorationState of @oldState.blockDecorations
       unless @newState.blockDecorations.hasOwnProperty(id)
-        @blockDecorationNodesById[id].remove()
+        blockDecorationNode = @blockDecorationNodesById[id]
+        blockDecorationNode.previousSibling.remove()
+        blockDecorationNode.nextSibling.remove()
+        blockDecorationNode.remove()
         delete @blockDecorationNodesById[id]
         delete @oldState.blockDecorations[id]
 
@@ -41,19 +44,27 @@ class BlockDecorationsComponent
     for decorationId, blockDecorationNode of @blockDecorationNodesById
       style = getComputedStyle(blockDecorationNode)
       decoration = @newState.blockDecorations[decorationId].decoration
-      marginBottom = parseInt(style.marginBottom) ? 0
-      marginTop = parseInt(style.marginTop) ? 0
-      @presenter.setBlockDecorationDimensions(
-        decoration,
-        blockDecorationNode.offsetWidth,
-        blockDecorationNode.offsetHeight + marginTop + marginBottom
-      )
+      topRuler = blockDecorationNode.previousSibling
+      bottomRuler = blockDecorationNode.nextSibling
+
+      width = blockDecorationNode.offsetWidth
+      height = bottomRuler.offsetTop - topRuler.offsetTop
+      @presenter.setBlockDecorationDimensions(decoration, width, height)
 
   createAndAppendBlockDecorationNode: (id) ->
     blockDecorationState = @newState.blockDecorations[id]
+    blockDecorationClass = "atom--block-decoration-#{id}"
+    topRuler = document.createElement("div")
     blockDecorationNode = @views.getView(blockDecorationState.decoration.getProperties().item)
-    blockDecorationNode.id = "atom--block-decoration-#{id}"
+    bottomRuler = document.createElement("div")
+    topRuler.classList.add(blockDecorationClass)
+    blockDecorationNode.classList.add(blockDecorationClass)
+    bottomRuler.classList.add(blockDecorationClass)
+
+    @container.appendChild(topRuler)
     @container.appendChild(blockDecorationNode)
+    @container.appendChild(bottomRuler)
+
     @blockDecorationNodesById[id] = blockDecorationNode
     @updateBlockDecorationNode(id)
 
@@ -63,9 +74,13 @@ class BlockDecorationsComponent
     blockDecorationNode = @blockDecorationNodesById[id]
 
     if newBlockDecorationState.isVisible
+      blockDecorationNode.previousSibling.classList.remove("atom--invisible-block-decoration")
       blockDecorationNode.classList.remove("atom--invisible-block-decoration")
+      blockDecorationNode.nextSibling.classList.remove("atom--invisible-block-decoration")
     else
+      blockDecorationNode.previousSibling.classList.add("atom--invisible-block-decoration")
       blockDecorationNode.classList.add("atom--invisible-block-decoration")
+      blockDecorationNode.nextSibling.classList.add("atom--invisible-block-decoration")
 
     if oldBlockDecorationState.screenRow isnt newBlockDecorationState.screenRow
       blockDecorationNode.dataset.screenRow = newBlockDecorationState.screenRow

src/default-directory-provider.coffee

@@ -16,8 +16,8 @@ class DefaultDirectoryProvider
   # * `null` if the given URI is not compatibile with this provider.
   directoryForURISync: (uri) ->
     normalizedPath = path.normalize(uri)
-    {protocol} = url.parse(uri)
-    directoryPath = if protocol?
+    {host} = url.parse(uri)
+    directoryPath = if host
       uri
     else if not fs.isDirectorySync(normalizedPath) and fs.isDirectorySync(path.dirname(normalizedPath))
       path.dirname(normalizedPath)
@@ -26,7 +26,7 @@ class DefaultDirectoryProvider
 
     # TODO: Stop normalizing the path in pathwatcher's Directory.
     directory = new Directory(directoryPath)
-    if protocol?
+    if host
       directory.path = directoryPath
       if fs.isCaseInsensitive()
         directory.lowerCasePath = directoryPath.toLowerCase()

src/lines-tile-component.coffee

@@ -149,7 +149,7 @@ class LinesTileComponent
     if newLineState.screenRow isnt oldLineState.screenRow
       insertionPoint.dataset.screenRow = newLineState.screenRow
 
-    precedingBlockDecorationsSelector = newLineState.precedingBlockDecorations.map((d) -> "#atom--block-decoration-#{d.id}").join(',')
+    precedingBlockDecorationsSelector = newLineState.precedingBlockDecorations.map((d) -> ".atom--block-decoration-#{d.id}").join(',')
 
     if precedingBlockDecorationsSelector isnt oldLineState.precedingBlockDecorationsSelector
       insertionPoint.setAttribute("select", precedingBlockDecorationsSelector)
@@ -180,7 +180,7 @@ class LinesTileComponent
     if newLineState.screenRow isnt oldLineState.screenRow
       insertionPoint.dataset.screenRow = newLineState.screenRow
 
-    followingBlockDecorationsSelector = newLineState.followingBlockDecorations.map((d) -> "#atom--block-decoration-#{d.id}").join(',')
+    followingBlockDecorationsSelector = newLineState.followingBlockDecorations.map((d) -> ".atom--block-decoration-#{d.id}").join(',')
 
     if followingBlockDecorationsSelector isnt oldLineState.followingBlockDecorationsSelector
       insertionPoint.setAttribute("select", followingBlockDecorationsSelector)

src/notification-manager.coffee

@@ -3,6 +3,9 @@ Notification = require '../src/notification'
 
 # Public: A notification manager used to create {Notification}s to be shown
 # to the user.
+#
+# An instance of this class is always available as the `atom.notifications`
+# global.
 module.exports =
 class NotificationManager
   constructor: ->

src/text-editor-element.coffee

@@ -92,7 +92,7 @@ class TextEditorElement extends HTMLElement
       @emitter.emit("did-change-scroll-left", arguments...)
 
   initialize: (model, {@views, @config, @themes, @workspace, @assert, @styles, @grammars}, @autoHeight = true, @scrollPastEnd = true) ->
-    throw new Error("Must pass a config parameter when initializing TextEditorElements") unless @views?
+    throw new Error("Must pass a views parameter when initializing TextEditorElements") unless @views?
     throw new Error("Must pass a config parameter when initializing TextEditorElements") unless @config?
     throw new Error("Must pass a themes parameter when initializing TextEditorElements") unless @themes?
     throw new Error("Must pass a workspace parameter when initializing TextEditorElements") unless @workspace?