Merge branch 'misterflippy-fix-newline-replacement'

Author: prantlf

benchmarks/fail.js

@@ -61,15 +61,15 @@ function getLineAndColumn (offset) {
 function pastInput ({ offset }) {
   const start = Math.max(0, offset - 20)
   const previous = inputSource.substr(start, offset - start)
-  return (offset > 20 ? '...' : '') + previous.replace(/\n/g, '')
+  return (offset > 20 ? '...' : '') + previous.replace(/\r?\n/g, '')
 }
 
 function upcomingInput ({ offset }) {
   let start = Math.max(0, offset - 20)
   start += offset - start
   const rest = inputSource.length - start
   const next = inputSource.substr(start, Math.min(20, rest))
-  return next.replace(/\n/g, '') + (rest > 20 ? '...' : '')
+  return next.replace(/\r?\n/g, '') + (rest > 20 ? '...' : '')
 }
 
 function showPosition ({ offset }) {

src/native-parser.js

@@ -13,15 +13,15 @@ function getLineAndColumn (input, offset) {
 function pastInput (input, offset) {
   var start = Math.max(0, offset - 20)
   var previous = input.substr(start, offset - start)
-  return (offset > 20 ? '...' : '') + previous.replace(/\n/g, '')
+  return (offset > 20 ? '...' : '') + previous.replace(/\r?\n/g, '')
 }
 
 function upcomingInput (input, offset) {
   var start = Math.max(0, offset - 20)
   start += offset - start
   var rest = input.length - start
   var next = input.substr(start, Math.min(20, rest))
-  return next.replace(/\n/g, '') + (rest > 20 ? '...' : '')
+  return next.replace(/\r?\n/g, '') + (rest > 20 ? '...' : '')
 }
 
 function getPositionContext (input, offset) {