Don't let review panel entries go off the top of the screen

services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee

@@ -44,14 +44,35 @@ define [
 					
 					sl_console.log "focused_entry_index", focused_entry_index
 
+					# As we go backwards, we run the risk of pushing things off the top of the editor.
+					# If we go through the entries before and assume they are as pushed together as they
+					# could be, we can work out the 'ceiling' that each one can't go through. I.e. the first
+					# on can't go beyond the toolbar height, the next one can't go beyond the bottom of the first
+					# one at this minimum height, etc.
+					heights = (entry.$layout_el.height() for entry in entries_before)
+					previousMinTop = TOOLBAR_HEIGHT
+					min_tops = []
+					for height in heights
+						min_tops.push previousMinTop
+						previousMinTop += PADDING + height
+					min_tops.reverse()
+
 					line_height = 15
 					
-					# Put the focused entry exactly where it wants to be
+					# Put the focused entry as close to where it wants to be as possible
-					focused_entry_top = Math.max(TOOLBAR_HEIGHT, focused_entry.scope.entry.screenPos.y)
+					focused_entry_top = Math.max(previousMinTop, focused_entry.scope.entry.screenPos.y)
 					focused_entry.$box_el.css(top: focused_entry_top)
 					focused_entry.$indicator_el.css(top: focused_entry_top)
 					focused_entry.$callout_el.css(top: focused_entry_top + line_height, height: 0)
 					
+					positionLayoutEl = ($callout_el, original_top, top) ->
+						if original_top <= top
+							entry.$callout_el.removeClass("rp-entry-callout-inverted")
+							entry.$callout_el.css(top: original_top + line_height, height: top - original_top)
+						else
+							entry.$callout_el.addClass("rp-entry-callout-inverted")
+							entry.$callout_el.css(top: top + line_height + 1, height: original_top - top)
+
 					previousBottom = focused_entry_top + focused_entry.$layout_el.height()
 					for entry in entries_after
 						original_top = entry.scope.entry.screenPos.y
@@ -60,23 +81,21 @@ define [
 						previousBottom = top + height
 						entry.$box_el.css(top: top)
 						entry.$indicator_el.css(top: top)
-						entry.$callout_el.removeClass("rp-entry-callout-inverted")
+						positionLayoutEl(entry.$callout_el, original_top, top)
-						entry.$callout_el.css(top: original_top + line_height, height: top - original_top)
 						sl_console.log "ENTRY", {entry: entry.scope.entry, top}
 
 					previousTop = focused_entry_top
 					entries_before.reverse() # Work through backwards, starting with the one just above
-					for entry in entries_before
+					for entry, i in entries_before
 						original_top = entry.scope.entry.screenPos.y
 						height = entry.$layout_el.height()
 						original_bottom = original_top + height
 						bottom = Math.min(original_bottom, previousTop - PADDING)
-						top = bottom - height
+						top = Math.max(bottom - height, min_tops[i])
 						previousTop = top
 						entry.$box_el.css(top: top)
 						entry.$indicator_el.css(top: top)
-						entry.$callout_el.addClass("rp-entry-callout-inverted")
+						positionLayoutEl(entry.$callout_el, original_top, top)
-						entry.$callout_el.css(top: top + line_height + 1, height: original_top - top)
 						sl_console.log "ENTRY", {entry: entry.scope.entry, top}
 				
 				scope.$applyAsync () ->