GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — repl: fix multiline history editing string order · nodejs/node@ab99ee6

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal/readline
- interface.js
test/parallel
- test-repl-multiline-navigation.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/readline/interface.js‎`

Copy file name to clipboardExpand all lines: lib/internal/readline/interface.js

+9-3Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -467,9 +467,15 @@ class Interface extends InterfaceConstructor {`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`// Convert newlines to a consistent format for history storage`
`470`		`- [kNormalizeHistoryLineEndings](line, from, to) {`
	`470`	`+ [kNormalizeHistoryLineEndings](line, from, to, reverse = true) {`
`471`	`471`	`// Multiline history entries are saved reversed`
`472`		`- if (StringPrototypeIncludes(line, '\r')) {`
	`472`	`+ // History is structured with the newest entries at the top`
	`473`	`+ // and the oldest at the bottom. Multiline histories, however, only occupy`
	`474`	`+ // one line in the history file. When loading multiline history with`
	`475`	`+ // an old node binary, the history will be saved in the old format.`
	`476`	`+ // This is why we need to reverse the multilines.`
	`477`	`+ // Reversing the multilines is necessary when adding / editing and displaying them`
	`478`	`+ if (reverse) {`
`473`	`479`	`// First reverse the lines for proper order, then convert separators`
`474`	`480`	`return ArrayPrototypeJoin(`
`475`	`481`	`ArrayPrototypeReverse(StringPrototypeSplit(line, from)),`
`@@ -488,7 +494,7 @@ class Interface extends InterfaceConstructor {`
`488`	`494`
`489`	`495`	`// If the trimmed line is empty then return the line`
`490`	`496`	`if (StringPrototypeTrim(this.line).length === 0) return this.line;`
`491`		`- const normalizedLine = this[kNormalizeHistoryLineEndings](this.line, '\n', '\r');`
	`497`	`+ const normalizedLine = this[kNormalizeHistoryLineEndings](this.line, '\n', '\r', false);`
`492`	`498`
`493`	`499`	`if (this.history.length === 0 \|\| this.history[0] !== normalizedLine) {`
`494`	`500`	`if (this[kLastCommandErrored] && this.historyIndex === 0) {`

Collapse file

`‎test/parallel/test-repl-multiline-navigation.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-repl-multiline-navigation.js

+12-20Lines changed: 12 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ const common = require('../common');`
`7`	`7`	`const assert = require('assert');`
`8`	`8`	`const repl = require('internal/repl');`
`9`	`9`	`const stream = require('stream');`
`10`		`-const fs = require('fs');`
`11`	`10`
`12`	`11`	`class ActionStream extends stream.Stream {`
`13`	`12`	`run(data) {`
`@@ -42,23 +41,11 @@ class ActionStream extends stream.Stream {`
`42`	`41`	`}`
`43`	`42`	`ActionStream.prototype.readable = true;`
`44`	`43`
`45`		`-function cleanupTmpFile() {`
`46`		`- try {`
`47`		`- // Write over the file, clearing any history`
`48`		`- fs.writeFileSync(defaultHistoryPath, '');`
`49`		`- } catch (err) {`
`50`		`- if (err.code === 'ENOENT') return true;`
`51`		`- throw err;`
`52`		`- }`
`53`		`- return true;`
`54`		`-}`
`55`		`-`
`56`	`44`	`const tmpdir = require('../common/tmpdir');`
`57`	`45`	`tmpdir.refresh();`
`58`		`-const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`59`	`46`
`60`	`47`	`{`
`61`		`- cleanupTmpFile();`
	`48`	+ const historyPath = tmpdir.resolve(`.${Math.floor(Math.random() * 10000)}`);
`62`	`49`	`// Make sure the cursor is at the right places.`
`63`	`50`	`// If the cursor is at the end of a long line and the down key is pressed,`
`64`	`51`	`// Move the cursor to the end of the next line, if shorter.`
`@@ -97,7 +84,7 @@ const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`97`	`84`	`});`
`98`	`85`
`99`	`86`	`repl.createInternalRepl(`
`100`		`- { NODE_REPL_HISTORY: defaultHistoryPath },`
	`87`	`+ { NODE_REPL_HISTORY: historyPath },`
`101`	`88`	`{`
`102`	`89`	`terminal: true,`
`103`	`90`	`input: new ActionStream(),`
`@@ -112,7 +99,7 @@ const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`112`	`99`	`}`
`113`	`100`
`114`	`101`	`{`
`115`		`- cleanupTmpFile();`
	`102`	+ const historyPath = tmpdir.resolve(`.${Math.floor(Math.random() * 10000)}`);
`116`	`103`	`// If the last command errored and the user is trying to edit it,`
`117`	`104`	`// The errored line should be removed from history`
`118`	`105`	`const checkResults = common.mustSucceed((r) => {`
`@@ -130,12 +117,17 @@ const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`130`	`117`	`r.input.run([{ name: 'enter' }]);`
`131`	`118`
`132`	`119`	`assert.strictEqual(r.history.length, 1);`
`133`		- assert.strictEqual(r.history[0], 'let lineWithMistake = `I have some\rproblem with my syntax`');
	`120`	`+ // Check that the line is properly set in the history structure`
	`121`	+ assert.strictEqual(r.history[0], 'problem with my syntax`\rlet lineWithMistake = `I have some');
`134`	`122`	`assert.strictEqual(r.line, '');`
	`123`	`+`
	`124`	`+ r.input.run([{ name: 'up' }]);`
	`125`	`+ // Check that the line is properly displayed`
	`126`	+ assert.strictEqual(r.line, 'let lineWithMistake = `I have some\nproblem with my syntax`');
`135`	`127`	`});`
`136`	`128`
`137`	`129`	`repl.createInternalRepl(`
`138`		`- { NODE_REPL_HISTORY: defaultHistoryPath },`
	`130`	`+ { NODE_REPL_HISTORY: historyPath },`
`139`	`131`	`{`
`140`	`132`	`terminal: true,`
`141`	`133`	`input: new ActionStream(),`
`@@ -150,7 +142,7 @@ const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`150`	`142`	`}`
`151`	`143`
`152`	`144`	`{`
`153`		`- cleanupTmpFile();`
	`145`	+ const historyPath = tmpdir.resolve(`.${Math.floor(Math.random() * 10000)}`);
`154`	`146`	`const outputBuffer = [];`
`155`	`147`
`156`	`148`	`// Test that the REPL preview is properly shown on multiline commands`
`@@ -182,7 +174,7 @@ const defaultHistoryPath = tmpdir.resolve('.node_repl_history');`
`182`	`174`	`});`
`183`	`175`
`184`	`176`	`repl.createInternalRepl(`
`185`		`- { NODE_REPL_HISTORY: defaultHistoryPath },`
	`177`	`+ { NODE_REPL_HISTORY: historyPath },`
`186`	`178`	`{`
`187`	`179`	`preview: true,`
`188`	`180`	`terminal: true,`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.