repl: fix repl after V8 upgrade

ofrobots · targos · commit a33909e1074c · 2016-06-29T10:43:07.000+02:00
V8 improved the error message for illegal token in v8/v8@879b617b. This breaks the recoverable error handling in repl. Ref: #6482 PR-URL: #7016 Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/lib/repl.js b/lib/repl.js
@@ -1224,15 +1224,12 @@ function isRecoverableError(e, self) {
     }
 
     if (message.startsWith('Unexpected end of input') ||
-        message.startsWith('missing ) after argument list'))
+        message.startsWith('missing ) after argument list') ||
+        message.startsWith('Unexpected token'))
       return true;
 
-    if (message.startsWith('Unexpected token')) {
-      if (message.includes('ILLEGAL') && bailOnIllegalToken(self.lineParser))
-        return false;
-      else
-        return true;
-    }
+    if (message === 'Invalid or unexpected token')
+      return !bailOnIllegalToken(self.lineParser);
   }
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -1224,15 +1224,12 @@ function isRecoverableError(e, self) {`
`1224`	`1224`	`}`
`1225`	`1225`
`1226`	`1226`	`if (message.startsWith('Unexpected end of input') \|\|`
`1227`		`- message.startsWith('missing ) after argument list'))`
	`1227`	`+ message.startsWith('missing ) after argument list') \|\|`
	`1228`	`+ message.startsWith('Unexpected token'))`
`1228`	`1229`	`return true;`
`1229`	`1230`
`1230`		`- if (message.startsWith('Unexpected token')) {`
`1231`		`- if (message.includes('ILLEGAL') && bailOnIllegalToken(self.lineParser))`
`1232`		`- return false;`
`1233`		`- else`
`1234`		`- return true;`
`1235`		`- }`
	`1231`	`+ if (message === 'Invalid or unexpected token')`
	`1232`	`+ return !bailOnIllegalToken(self.lineParser);`
`1236`	`1233`	`}`
`1237`	`1234`	`return false;`
`1238`	`1235`	`}`