Updates to yield delegation linting. Fixes jshintgh-1544

jongeir · Nov 3, 2014 · aad9062 · aad9062
1 parent b5dd259
commit aad9062
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/jshint.js b/src/jshint.js
@@ -4218,8 +4218,15 @@ var JSHINT = (function () {
       warning("W104", state.tokens.curr, "yield");
     }
     funct["(generator)"] = "yielded";
+    var delegatingYield = false;
+    if (state.option.inESNext() && peek() == "*") {
+      delegatingYield = true;
+      advance("*");
+    }
     if (this.line === state.tokens.next.line || !state.option.inMoz(true)) {
-      if (state.tokens.next.id !== ";" && !state.tokens.next.reach && state.tokens.next.nud) {
+      if (delegatingYield ||
+          (state.tokens.next.id !== ";" && !state.tokens.next.reach && state.tokens.next.nud)) {
+
         nobreaknonadjacent(state.tokens.curr, state.tokens.next);
         this.first = expression(10);
 

diff --git a/tests/unit/fixtures/yield-expressions.js b/tests/unit/fixtures/yield-expressions.js
@@ -82,4 +82,5 @@ function* G() {
     yield ? yield : yield;
     yield ? yield ? yield : yield : yield;
     yield ? yield ? yield : yield : yield ? yield : yield;
+    yield* (function*(){})();
 }