kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

Merge pull request #2914 from danielgtaylor/repl-history 

repl history implementation improvements
This commit is contained in:
Jeremy Ashkenas 2013-04-07 21:47:16 -07:00
parent 170f311101 0e2d2ea637
commit 740a7bcb45
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/coffee-script/repl.js
View File

@ -93,7 +93,8 @@
};
addHistory = function(repl, filename, maxSize) {
var buffer, fd, readFd, size, stat;
var buffer, fd, lastLine, readFd, size, stat;
lastLine = null;
try {
stat = fs.statSync(filename);
size = Math.min(maxSize, stat.size);
@ -101,18 +102,20 @@
buffer = new Buffer(size);
fs.readSync(readFd, buffer, 0, size, stat.size - size);
repl.rli.history = buffer.toString().split('\n').reverse();
if (size === maxSize) {
if (stat.size > maxSize) {
repl.rli.history.pop();
}
if (repl.rli.history[0] === '') {
repl.rli.history.shift();
}
repl.rli.historyIndex = -1;
lastLine = repl.rli.history[0];
} catch (_error) {}
fd = fs.openSync(filename, 'a');
repl.rli.addListener('line', function(code) {
if (code && code.length && code !== '.history') {
return fs.write(fd, "" + code + "\n");
if (code && code.length && code !== '.history' && lastLine !== code) {
fs.write(fd, "" + code + "\n");
return lastLine = code;
}
});
process.on('exit', function() {
@ -121,18 +124,7 @@
return repl.commands['.history'] = {
help: 'Show command history',
action: function() {
var history, k;
history = ((function() {
var _i, _len, _ref1, _results;
_ref1 = Object.keys(repl.rli.history);
_results = [];
for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
k = _ref1[_i];
_results.push(repl.rli.history[k]);
}
return _results;
})()).reverse();
repl.outputStream.write("" + (history.join('\n')) + "\n");
repl.outputStream.write("" + (repl.rli.history.slice(0).reverse().join('\n')) + "\n");
return repl.displayPrompt();
}
};

12
src/repl.coffee
View File

@ -82,8 +82,9 @@ addMultilineHandler = (repl) ->
# Store and load command history from a file
addHistory = (repl, filename, maxSize) ->
lastLine = null
try
# Get file info and at most 10KB of command history
# Get file info and at most maxSize of command history
stat = fs.statSync filename
size = Math.min maxSize, stat.size
# Read last `size` bytes from the file
@ -93,17 +94,19 @@ addHistory = (repl, filename, maxSize) ->
# Set the history on the interpreter
repl.rli.history = buffer.toString().split('\n').reverse()
# If the history file was truncated we should pop off a potential partial line
repl.rli.history.pop() if size is maxSize
repl.rli.history.pop() if stat.size > maxSize
# Shift off the final blank newline
repl.rli.history.shift() if repl.rli.history[0] is ''
repl.rli.historyIndex = -1
lastLine = repl.rli.history[0]
fd = fs.openSync filename, 'a'
repl.rli.addListener 'line', (code) ->
if code and code.length and code isnt '.history'
if code and code.length and code isnt '.history' and lastLine isnt code
# Save the latest command in the file
fs.write fd, "#{code}\n"
lastLine = code
process.on 'exit', ->
fs.closeSync fd
@ -112,8 +115,7 @@ addHistory = (repl, filename, maxSize) ->
repl.commands['.history'] =
help: 'Show command history'
action: ->
history = (repl.rli.history[k] for k in Object.keys(repl.rli.history)).reverse()
repl.outputStream.write "#{history.join '\n'}\n"
repl.outputStream.write "#{repl.rli.history[..].reverse().join '\n'}\n"
repl.displayPrompt()
module.exports =