refactoring: <down> and <tab> in editors are commands

Dyalog · Apr 1, 2015 · aa54f22 · aa54f22
1 parent 8dfeb93
commit aa54f22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/client/editor.coffee b/client/editor.coffee
@@ -64,22 +64,7 @@ module.exports = (e, opts) -> # opts contains callbacks to ide.coffee
     keyMap: 'dyalog', matchBrackets: true, autoCloseBrackets: {pairs: '()[]{}', explode: '{}'}
     gutters: ['breakpoints', 'CodeMirror-linenumbers'], indentUnit: 4
     extraKeys:
-      'Shift-Tab': 'indentLess'
-      Tab: ->
-        if cm.somethingSelected()
-          cm.execCommand 'indentMore'
-        else
-          c = cm.getCursor(); s = cm.getLine c.line
-          if /^ *$/.test s[...c.ch]
-            cm.execCommand 'indentMore'
-          else
-            emit 'Autocomplete', line: s, pos: c.ch, token: id
-        return
-      Down: ->
-        l = cm.getCursor().line
-        if l != cm.lineCount() - 1 || /^\s*$/.test cm.getLine l then cm.execCommand 'goLineDown'
-        else cm.execCommand 'goDocEnd'; cm.execCommand 'newlineAndIndent'; xline = l + 1
-        return
+      'Shift-Tab': 'indentLess', Tab: 'tabOrAutocomplete', Down: 'downOrXline'
 
   cm.on 'cursorActivity', ->
     if xline != null
@@ -178,6 +163,21 @@ module.exports = (e, opts) -> # opts contains callbacks to ide.coffee
       if isDebugger
         emit 'SetLineAttributes', win: id, nLines: cm.lineCount(), lineAttributes: stop: breakpoints[..].sort (x, y) -> x - y
       return
+    tabOrAutocomplete: ->
+      if cm.somethingSelected()
+        cm.execCommand 'indentMore'
+      else
+        c = cm.getCursor(); s = cm.getLine c.line
+        if /^ *$/.test s[...c.ch]
+          cm.execCommand 'indentMore'
+        else
+          emit 'Autocomplete', line: s, pos: c.ch, token: id
+      return
+    downOrXline: ->
+      l = cm.getCursor().line
+      if l != cm.lineCount() - 1 || /^\s*$/.test cm.getLine l then cm.execCommand 'goLineDown'
+      else cm.execCommand 'goDocEnd'; cm.execCommand 'newlineAndIndent'; xline = l + 1
+      return
   ###
       F6 = -> opts.openInExternalEditor cm.getValue(), cm.getCursor().line, (err, text) ->
         if err then $.alert '' + err, 'Error' else c = cm.getCursor().line; cm.setValue text; cm.setCursor c

diff --git a/client/keymap.coffee b/client/keymap.coffee
@@ -198,9 +198,7 @@ bqbqc = ((s) -> join s.split('\n').map (l) ->
 """ + [0...26].map((i) -> "\n#{chr i + ord 'Ⓐ'} _#{chr i + ord 'a'}").join '' # underscored alphabet: Ⓐ _a ...
 
 createCommand = (xx) -> CodeMirror.commands[xx] ?= (cm) -> (if (h = cm.dyalogCommands) && h[xx] then h[xx]()); return
-createCommand 'CBP'
-createCommand 'MA'
-
+['CBP', 'MA', 'tabOrAutocomplete', 'downOrXline'].forEach createCommand
 '''
   [     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F]
   [00] QT ER TB BT EP UC DC RC LC US DS RS LS UL DL RL