Merge branch 'master' into structural-folding

src/app/binding-set.coffee

@@ -1,40 +1,40 @@
 $ = require 'jquery'
 _ = require 'underscore'
-Specificity = require 'specificity'
 fs = require 'fs'
 
+Specificity = require 'specificity'
 PEG = require 'pegjs'
 
 module.exports =
 class BindingSet
   selector: null
+  keystrokeMap: null
   commandForEvent: null
-  keystrokePatternParser: null
+  parser: null
 
   constructor: (@selector, mapOrFunction) ->
     @parser = PEG.buildParser(fs.read(require.resolve 'keystroke-pattern.pegjs'))
     @specificity = Specificity(@selector)
-    @commandForEvent = @buildEventHandler(mapOrFunction)
+    @keystrokeMap = {}
 
-  buildEventHandler: (mapOrFunction) ->
     if _.isFunction(mapOrFunction)
-      mapOrFunction
+      @commandForEvent = mapOrFunction
     else
-      mapOrFunction = @normalizeKeystrokePatterns(mapOrFunction)
-      (event) =>
-        for pattern, command of mapOrFunction
-          return command if event.keystroke == pattern
+      @keystrokeMap = @normalizeKeystrokeMap(mapOrFunction)
+      @commandForEvent = (event) =>
+        for keystroke, command of @keystrokeMap
+          return command if event.keystroke == keystroke
         null
 
-  normalizeKeystrokePatterns: (map) ->
-    normalizedMap = {}
-    for pattern, event of map
-      normalizedMap[@normalizeKeystrokePattern(pattern)] = event
-    normalizedMap
+  normalizeKeystrokeMap: (keystrokeMap) ->
+    normalizeKeystrokeMap = {}
+    for keystroke, command of keystrokeMap
+      normalizeKeystrokeMap[@normalizeKeystroke(keystroke)] = command
 
-  normalizeKeystrokePattern: (pattern) ->
-    keys = @parser.parse(pattern)
+    normalizeKeystrokeMap
+
+  normalizeKeystroke: (keystroke) ->
+    keys = @parser.parse(keystroke)
     modifiers = keys[0...-1]
     modifiers.sort()
     [modifiers..., _.last(keys)].join('-')
-

src/app/editor.coffee

@@ -454,7 +454,7 @@ class Editor extends View
 
       return if oldScreenRange.start.row > @lastRenderedScreenRow
 
-      maxEndRow = Math.max(@getLastVisibleScreenRow() + @lineOverdraw, @lastRenderedScreenRow)
+      maxEndRow = Math.max(@getFirstVisibleScreenRow() + @lineOverdraw, @lastRenderedScreenRow)
       @gutter.renderLineNumbers(@firstRenderedScreenRow, maxEndRow) if e.lineNumbersChanged
 
       newScreenRange = newScreenRange.copy()

src/app/keymap.coffee

@@ -1,12 +1,13 @@
+$ = require 'jquery'
+_ = require 'underscore'
 fs = require 'fs'
+
 BindingSet = require 'binding-set'
 Specificity = require 'specificity'
 
-$ = require 'jquery'
-
 module.exports =
 class Keymap
-  bindingSetsBySelector: null
+  bindingSets: null
 
   constructor: ->
     @bindingSets = []
@@ -26,10 +27,17 @@ class Keymap
   bindKeys: (selector, bindings) ->
     @bindingSets.unshift(new BindingSet(selector, bindings))
 
-  bindKey: (selector, pattern, eventName) ->
-    bindings = {}
-    bindings[pattern] = eventName
-    @bindKeys(selector, bindings)
+  bindingsForElement: (element) ->
+    keystrokeMap = {}
+    currentNode = $(element)
+
+    while currentNode.length
+      bindingSets = @bindingSets.filter (set) -> currentNode.is(set.selector)
+      bindingSets.sort (a, b) -> b.specificity - a.specificity
+      _.defaults(keystrokeMap, set.keystrokeMap) for set in bindingSets
+      currentNode = currentNode.parent()
+
+    keystrokeMap
 
   handleKeyEvent: (event) ->
     event.keystroke = @keystrokeStringForEvent(event)
@@ -47,9 +55,6 @@ class Keymap
       currentNode = currentNode.parent()
     true
 
-  reset: ->
-    @bindingSets = []
-
   triggerCommandEvent: (keyEvent, commandName) ->
     commandEvent = $.Event(commandName)
     commandEvent.keyEvent = keyEvent

src/app/keymaps/atom.coffee

@@ -0,0 +1,7 @@
+window.keymap.bindKeys '*'
+  'meta-w': 'close'
+  'alt-meta-i': 'show-console'
+  right: 'move-right'
+  left: 'move-left'
+  down: 'move-down'
+  up: 'move-up'

src/app/keymaps/editor.coffee

@@ -1,15 +1,3 @@
-window.keymap.bindKeys '*'
-  'meta-s': 'save'
-  'meta-w': 'close'
-  'alt-meta-i': 'show-console'
-  'meta-+': 'increase-font-size'
-  'meta--': 'decrease-font-size'
-
-  right: 'move-right'
-  left: 'move-left'
-  down: 'move-down'
-  up: 'move-up'
-
 window.keymap.bindKeys '.editor',
   'meta-s': 'save'
   'shift-right': 'select-right'
@@ -39,3 +27,5 @@ window.keymap.bindKeys '.editor',
   'meta-]': 'indent-selected-rows'
   'meta-{': 'show-previous-buffer'
   'meta-}': 'show-next-buffer'
+  'meta-+': 'increase-font-size'
+  'meta--': 'decrease-font-size'

src/app/keymaps/keybindings-view.coffee

@@ -0,0 +1,5 @@
+window.keymap.bindKeys '*',
+  'ctrl-?': 'keybindings-view:attach'
+
+window.keymap.bindKeys ".keybindings-view",
+  'escape': 'keybindings-view:detach'

src/app/root-view.coffee

@@ -114,6 +114,9 @@ class RootView extends View
     if not previousActiveEditor or editor.buffer.path != previousActiveEditor.buffer.path
       @trigger 'active-editor-path-change', editor.buffer.path
 
+  activeKeybindings: ->
+    keymap.bindingsForElement(document.activeElement)
+
   setTitle: (title='untitled') ->
     document.title = title
 

src/extensions/keybindings-view/index.coffee

@@ -0,0 +1 @@
+module.exports = require 'keybindings-view/keybindings-view'

src/extensions/keybindings-view/keybindings-view.coffee

@@ -0,0 +1,31 @@
+{View, $$} = require 'space-pen'
+
+module.exports =
+class KeybindingsView extends View
+  @activate: (rootView, state) ->
+    requireStylesheet 'keybinding-view.css'
+    @instance = new this(rootView)
+
+  @content: (rootView) ->
+    @div class: 'keybindings-view', tabindex: -1, =>
+      @ul outlet: 'keybindingList'
+
+  initialize: (@rootView) ->
+    @rootView.on 'keybindings-view:attach', => @attach()
+    @on 'keybindings-view:detach', => @detach()
+
+  attach: ->
+    @keybindingList.empty()
+    @keybindingList.append $$ ->
+      for keystroke, command of rootView.activeKeybindings()
+        @li =>
+          @span class: 'keystroke', "#{keystroke}"
+          @span ":"
+          @span "#{command}"
+
+    @rootView.append(this)
+    @focus()
+
+  detach: ->
+    super()
+    @rootView.focus()