moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix word wrap crash reported by user when pipe codes are in play" 

This reverts commit 0a486d290f.
This commit is contained in:
Bryan Ashby 2018-02-04 10:39:14 -07:00
parent 1261af00c3
commit aecc24079f
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/string_util.js
View File

@ -218,6 +218,8 @@ function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1
} }
const PIPE_REGEXP = /(\|[A-Z\d]{2})/g; const PIPE_REGEXP = /(\|[A-Z\d]{2})/g;
//const ANSI_REGEXP = /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
//const ANSI_OR_PIPE_REGEXP = new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
const ANSI_OR_PIPE_REGEXP = new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g'); const ANSI_OR_PIPE_REGEXP = new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
// //
@ -273,23 +275,12 @@ function renderSubstr(str, start, length) {
// //
// See also https://github.com/chalk/ansi-regex/blob/master/index.js // See also https://github.com/chalk/ansi-regex/blob/master/index.js
// //
function renderStringLength(s, options = { pipe : true, ansi : true } ) { function renderStringLength(s) {
let m; let m;
let pos; let pos;
let len = 0; let len = 0;
let re; const re = ANSI_OR_PIPE_REGEXP;
if(options.pipe && options.ansi) {
re = ANSI_OR_PIPE_REGEXP;
} else if(options.pipe) {
re = PIPE_REGEXP;
} else if(options.ansi) {
re = ANSI.getFullMatchRegExp();
} else {
// no options - just return string length.
return s.length;
}
re.lastIndex = 0; // we recycle the rege; reset re.lastIndex = 0; // we recycle the rege; reset
// //

2
core/word_wrap.js
View File

@ -49,7 +49,7 @@ function wordWrapText(text, options) {
function appendWord() { function appendWord() {
word.match(REGEXP_GOBBLE).forEach( w => { word.match(REGEXP_GOBBLE).forEach( w => {
renderLen = renderStringLength(w, { ansi : true, pipe : false } ); renderLen = renderStringLength(w);
if(result.renderLen[i] + renderLen > options.width) { if(result.renderLen[i] + renderLen > options.width) {
if(0 === i) { if(0 === i) {