Multiline WIP

This commit is contained in:
Alon Salant 2013-01-15 23:31:40 -08:00
parent 69d80e2ded
commit 4a52814a79
2 changed files with 92 additions and 8 deletions

View File

@ -1,22 +1,23 @@
// Generated by CoffeeScript 1.5.0-pre
(function() {
var CoffeeScript, merge, repl, replDefaults, vm;
var CoffeeScript, addMultilineHandler, merge, nodeREPL, replDefaults, vm;
vm = require('vm');
repl = require('repl');
nodeREPL = require('repl');
CoffeeScript = require('./coffee-script');
merge = require('./helpers').merge;
replDefaults = {
prompt: "coffee> ",
prompt: 'coffee> ',
"eval": function(code, context, file, cb) {
try {
if (/^\(\s+\)$/.test(code)) {
code = '';
return cb(null);
}
code = code.replace(/子/mg, '\n');
code = CoffeeScript.compile(code, {
filename: file,
bare: true
@ -28,12 +29,55 @@
}
};
addMultilineHandler = function(repl) {
var inputStream, multiline, nodeLineListener, outputStream, rli;
rli = repl.rli, inputStream = repl.inputStream, outputStream = repl.outputStream;
multiline = {
enabled: false,
prompt: new Array(repl.prompt.length).join('.') + ' ',
buffer: ''
};
nodeLineListener = rli.listeners('line')[0];
rli.removeListener('line', nodeLineListener);
rli.on('line', function(cmd) {
if (multiline.enabled === true) {
multiline.buffer += "" + cmd + "\n";
return rli.prompt(true);
} else {
return nodeLineListener(cmd);
}
});
return inputStream.on('keypress', function(char, key) {
if (!(key && key.ctrl && !key.meta && !key.shift && key.name === 'v')) {
return;
}
multiline.enabled = !multiline.enabled;
if (multiline.enabled === false) {
if (!multiline.buffer.match(/\n/)) {
rli.setPrompt(repl.prompt);
rli.prompt(true);
return;
}
multiline.buffer = multiline.buffer.replace(/\n/mg, '子');
rli.emit('line', multiline.buffer);
return multiline.buffer = '';
} else {
rli.setPrompt(multiline.prompt);
return rli.prompt(true);
}
});
};
module.exports = {
start: function(opts) {
var repl;
if (opts == null) {
opts = {};
}
return repl.start(merge(replDefaults, opts));
opts = merge(replDefaults, opts);
repl = nodeREPL.start(opts);
addMultilineHandler(repl);
return repl;
}
};

View File

@ -1,5 +1,5 @@
vm = require 'vm'
repl = require 'repl'
nodeREPL = require 'repl'
CoffeeScript = require './coffee-script'
{merge} = require './helpers'
@ -7,12 +7,52 @@ replDefaults =
prompt: 'coffee> ',
eval: (code, context, file, cb) ->
try
code = '' if /^\(\s+\)$/.test code # Empty command won't parse
return cb(null) if /^\(\s+\)$/.test code # Empty command
code = code.replace //mg, '\n' # Temporary hack, see TODO below
code = CoffeeScript.compile(code, {filename: file, bare: true})
cb(null, vm.runInContext(code, context, file))
catch err
cb(err)
# TODO: how to test?
addMultilineHandler = (repl) ->
{rli, inputStream, outputStream} = repl
multiline =
enabled: off
prompt: new Array(repl.prompt.length).join('.') + ' '
buffer: ''
# Proxy node's line listener
nodeLineListener = rli.listeners('line')[0]
rli.removeListener 'line', nodeLineListener
rli.on 'line', (cmd) ->
if multiline.enabled is on
multiline.buffer += "#{cmd}\n"
rli.prompt true
else
nodeLineListener(cmd)
# Handle Ctrl-v
inputStream.on 'keypress', (char, key) ->
return unless key and key.ctrl and not key.meta and not key.shift and key.name is 'v'
multiline.enabled = !multiline.enabled
if multiline.enabled is off
unless multiline.buffer.match /\n/
rli.setPrompt repl.prompt
rli.prompt true
return
# TODO: how to encode line breaks so the node repl will pass the complete multiline to our eval?
multiline.buffer = multiline.buffer.replace /\n/mg, ''
rli.emit 'line', multiline.buffer
multiline.buffer = ''
else
rli.setPrompt multiline.prompt
rli.prompt true
module.exports =
start: (opts = {}) ->
repl.start merge(replDefaults, opts)
opts = merge(replDefaults, opts)
repl = nodeREPL.start opts
addMultilineHandler(repl)
repl