Merge f5f2464 into e910f82

chalk · Jun 14, 2017 · b1c97d2 · b1c97d2
2 parents e910f82 + f5f2464
commit b1c97d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -131,6 +131,11 @@ function exec(str, cols, opts) {
 			rows.push('');
 		}
 
+		if (rowLength + lengths[i] > cols && options.wordWrap === false) {
+			wrapWord(rows, word, cols);
+			continue;
+		}
+
 		rows[rows.length - 1] += word;
 	}
 

diff --git a/test.js b/test.js
@@ -81,8 +81,11 @@ test('no word-wrapping', t => {
 	const res = fn(fixture3, 15, {wordWrap: false});
 	t.is(res, '12345678\n901234567890 12\n345');
 
-	const res2 = fn(fixture, 5, {wordWrap: false});
-	t.is(res2, 'The q\nuick\nbrown\n[31mfox j[39m\n[31mumped[39m\n[31mover[39m\n[31m[39mthe l\nazy [32md[39m\n[32mog an[39m\n[32md the[39m\n[32mn ran[39m\n[32maway[39m\n[32mwith[39m\n[32mthe u[39m\n[32mnicor[39m\n[32mn.[39m');
+	const res2 = fn(fixture3, 5, {wordWrap: false});
+	t.is(res2, '12345\n678\n90123\n45678\n90 12\n345');
+
+	const res3 = fn(fixture, 5, {wordWrap: false});
+	t.is(res3, 'The q\nuick\nbrown\n[31mfox j[39m\n[31mumped[39m\n[31mover[39m\n[31m[39mthe l\nazy [32md[39m\n[32mog an[39m\n[32md the[39m\n[32mn ran[39m\n[32maway[39m\n[32mwith[39m\n[32mthe u[39m\n[32mnicor[39m\n[32mn.[39m');
 });
 
 // https://github.com/chalk/wrap-ansi/issues/10