chore: simplify code to check only yield expressions

kaioduarte · kaioduarte · commit 214d8ae9784f · 2022-12-11T15:10:17.000Z
diff --git a/crates/rome_js_analyze/src/analyzers/nursery/use_yield.rs b/crates/rome_js_analyze/src/analyzers/nursery/use_yield.rs
@@ -4,7 +4,7 @@ use rome_console::markup;
 use rome_js_syntax::{
     JsFunctionDeclaration, JsFunctionExpression, JsLanguage, JsMethodClassMember, JsSyntaxKind,
 };
-use rome_rowan::{declare_node_union, AstNode, NodeOrToken, SyntaxNode, SyntaxToken};
+use rome_rowan::{declare_node_union, AstNode, SyntaxNode};
 
 declare_rule! {
     /// Require generator functions to contain `yield`.
@@ -74,7 +74,7 @@ impl Rule for UseYield {
 
         if start_token.is_some()
             && !function_body_syntax.clone().into_list().is_empty()
-            && !has_yield_kw(NodeOrToken::from(function_body_syntax))?
+            && !has_yield_expression(function_body_syntax)?
         {
             return Some(());
         }
@@ -91,20 +91,18 @@ impl Rule for UseYield {
     }
 }
 
-/// Traverses the syntax tree and verifies the presence of the yield keyword.
-fn has_yield_kw(
-    node: NodeOrToken<SyntaxNode<JsLanguage>, SyntaxToken<JsLanguage>>,
-) -> Option<bool> {
-    if node.kind() == JsSyntaxKind::YIELD_KW {
+/// Traverses the syntax tree and verifies the presence of n yield expression.
+fn has_yield_expression(node: SyntaxNode<JsLanguage>) -> Option<bool> {
+    if node.kind() == JsSyntaxKind::JS_YIELD_EXPRESSION {
         return Some(true);
     }
 
-    if node.kind() == JsSyntaxKind::FUNCTION_KW || node.as_token().is_some() {
+    if node.kind() == JsSyntaxKind::FUNCTION_KW {
         return Some(false);
     }
 
-    for child in node.as_node()?.children_with_tokens() {
-        if !has_yield_kw(child)? {
+    for child in node.children() {
+        if !has_yield_expression(child)? {
             continue;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use rome_console::markup;`
`4`	`4`	`use rome_js_syntax::{`
`5`	`5`	`JsFunctionDeclaration, JsFunctionExpression, JsLanguage, JsMethodClassMember, JsSyntaxKind,`
`6`	`6`	`};`
`7`		`-use rome_rowan::{declare_node_union, AstNode, NodeOrToken, SyntaxNode, SyntaxToken};`
	`7`	`+use rome_rowan::{declare_node_union, AstNode, SyntaxNode};`
`8`	`8`
`9`	`9`	`declare_rule! {`
`10`	`10`	/// Require generator functions to contain `yield`.
`@@ -74,7 +74,7 @@ impl Rule for UseYield {`
`74`	`74`
`75`	`75`	`if start_token.is_some()`
`76`	`76`	`&& !function_body_syntax.clone().into_list().is_empty()`
`77`		`- && !has_yield_kw(NodeOrToken::from(function_body_syntax))?`
	`77`	`+ && !has_yield_expression(function_body_syntax)?`
`78`	`78`	`{`
`79`	`79`	`return Some(());`
`80`	`80`	`}`
`@@ -91,20 +91,18 @@ impl Rule for UseYield {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`-/// Traverses the syntax tree and verifies the presence of the yield keyword.`
`95`		`-fn has_yield_kw(`
`96`		`- node: NodeOrToken<SyntaxNode<JsLanguage>, SyntaxToken<JsLanguage>>,`
`97`		`-) -> Option<bool> {`
`98`		`- if node.kind() == JsSyntaxKind::YIELD_KW {`
	`94`	`+/// Traverses the syntax tree and verifies the presence of n yield expression.`
	`95`	`+fn has_yield_expression(node: SyntaxNode<JsLanguage>) -> Option<bool> {`
	`96`	`+ if node.kind() == JsSyntaxKind::JS_YIELD_EXPRESSION {`
`99`	`97`	`return Some(true);`
`100`	`98`	`}`
`101`	`99`
`102`		`- if node.kind() == JsSyntaxKind::FUNCTION_KW \|\| node.as_token().is_some() {`
	`100`	`+ if node.kind() == JsSyntaxKind::FUNCTION_KW {`
`103`	`101`	`return Some(false);`
`104`	`102`	`}`
`105`	`103`
`106`		`- for child in node.as_node()?.children_with_tokens() {`
`107`		`- if !has_yield_kw(child)? {`
	`104`	`+ for child in node.children() {`
	`105`	`+ if !has_yield_expression(child)? {`
`108`	`106`	`continue;`
`109`	`107`	`}`
`110`	`108`