[javascript mode] Fix expressionAllowed for changed handling of return

marijnh · marijnh · commit 28bc517692b6 · 2017-10-09T23:51:36.000+02:00
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
@@ -756,7 +756,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function expressionAllowed(stream, state, backUp) {
     return state.tokenize == tokenBase &&
-      /^(?:operator|sof|keyword [bc]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+      /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
       (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {`
`756`	`756`
`757`	`757`	`function expressionAllowed(stream, state, backUp) {`
`758`	`758`	`return state.tokenize == tokenBase &&`
`759`		`- /^(?:operator\|sof\|keyword [bc]\|case\|new\|export\|default\|spread\|[\[{}\(,;:]\|=>)$/.test(state.lastType) \|\|`
	`759`	`+ /^(?:operator\|sof\|keyword [bcd]\|case\|new\|export\|default\|spread\|[\[{}\(,;:]\|=>)$/.test(state.lastType) \|\|`
`760`	`760`	`(state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp \|\| 0))))`
`761`	`761`	`}`
`762`	`762`