Fix code gen for union tokens to correctly reflect optionality.

rome · Nov 12, 2021 · 586ee7d · 586ee7d
1 parent a96d636
commit 586ee7d
Show file tree

Hide file tree

Showing 8 changed files with 562 additions and 816 deletions.
diff --git a/crates/rome_formatter/src/ts/declarators/variable_declaration_statement.rs b/crates/rome_formatter/src/ts/declarators/variable_declaration_statement.rs
@@ -3,9 +3,8 @@ use crate::{
 	Formatter, ToFormatElement,
 };
 use rslint_parser::ast::{
-	AstNode, JsVariableDeclaration, JsVariableDeclarationStatement, JsVariableDeclarator,
+	JsVariableDeclaration, JsVariableDeclarationStatement, JsVariableDeclarator,
 };
-use rslint_parser::SyntaxError;
 
 impl ToFormatElement for JsVariableDeclarationStatement {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
@@ -25,11 +24,7 @@ impl ToFormatElement for JsVariableDeclaration {
 		}
 
 		Ok(format_elements![
-			formatter.format_token(
-				&self
-					.kind_token()
-					.ok_or_else(|| SyntaxError::MissingRequiredChild(self.syntax().clone()))?
-			)?,
+			formatter.format_token(&self.kind_token()?)?,
 			space_token(),
 			join_elements(token(","), declarators),
 		])

diff --git a/crates/rslint_parser/src/ast.rs b/crates/rslint_parser/src/ast.rs
@@ -364,14 +364,12 @@ mod support {
 	use crate::SyntaxList;
 	use crate::{SyntaxError, SyntaxResult};
 
-	// TODO: #1725 remove once API are set in stone
-	#[allow(dead_code)]
-	pub(super) fn child<N: AstNode>(parent: &SyntaxNode) -> Option<N> {
+	pub(super) fn node<N: AstNode>(parent: &SyntaxNode) -> Option<N> {
 		parent.children().find_map(N::cast)
 	}
 
-	pub(super) fn as_optional_node<N: AstNode>(parent: &SyntaxNode) -> Option<N> {
-		parent.children().find_map(N::cast)
+	pub(super) fn required_node<N: AstNode>(parent: &SyntaxNode) -> SyntaxResult<N> {
+		node(parent).ok_or_else(|| SyntaxError::MissingRequiredChild(parent.clone()))
 	}
 
 	pub(super) fn elements(parent: &SyntaxNode) -> SyntaxElementChildren {
@@ -409,29 +407,11 @@ mod support {
 			.find(|it| it.kind() == kind)
 	}
 
-	pub(super) fn as_optional_token(parent: &SyntaxNode, kind: SyntaxKind) -> Option<SyntaxToken> {
-		parent
-			.children_with_tokens()
-			.filter_map(|it| it.into_token())
-			.find(|it| it.kind() == kind)
-	}
-
-	pub(super) fn as_mandatory_node<N: AstNode>(parent: &SyntaxNode) -> SyntaxResult<N> {
-		parent
-			.children()
-			.find_map(N::cast)
-			.ok_or_else(|| SyntaxError::MissingRequiredChild(parent.clone()))
-	}
-
-	pub(super) fn as_mandatory_token(
+	pub(super) fn required_token(
 		parent: &SyntaxNode,
 		kind: SyntaxKind,
 	) -> SyntaxResult<SyntaxToken> {
-		parent
-			.children_with_tokens()
-			.filter_map(|it| it.into_token())
-			.find(|it| it.kind() == kind)
-			.ok_or_else(|| SyntaxError::MissingRequiredChild(parent.clone()))
+		token(parent, kind).ok_or_else(|| SyntaxError::MissingRequiredChild(parent.clone()))
 	}
 
 	pub(super) fn find_token(
@@ -447,6 +427,14 @@ mod support {
 					.any(|possible_kind| *possible_kind == it.kind())
 			})
 	}
+
+	pub(super) fn find_required_token(
+		parent: &SyntaxNode,
+		possible_kinds: &[SyntaxKind],
+	) -> SyntaxResult<SyntaxToken> {
+		find_token(parent, possible_kinds)
+			.ok_or_else(|| SyntaxError::MissingRequiredChild(parent.clone()))
+	}
 }
 
 #[cfg(test)]

diff --git a/crates/rslint_parser/src/ast/expr_ext.rs b/crates/rslint_parser/src/ast/expr_ext.rs
@@ -5,7 +5,7 @@ use SyntaxKind::*;
 
 impl BracketExpr {
 	pub fn object(&self) -> Option<JsAnyExpression> {
-		support::child(self.syntax())
+		support::node(self.syntax())
 	}
 
 	pub fn prop(&self) -> Option<JsAnyExpression> {
@@ -15,7 +15,7 @@ impl BracketExpr {
 
 impl CondExpr {
 	pub fn test(&self) -> Option<JsAnyExpression> {
-		support::child(self.syntax())
+		support::node(self.syntax())
 	}
 
 	pub fn cons(&self) -> Option<JsAnyExpression> {
@@ -29,7 +29,7 @@ impl CondExpr {
 
 impl LiteralProp {
 	pub fn key(&self) -> SyntaxResult<PropName> {
-		support::as_mandatory_node::<PropName>(self.syntax())
+		support::required_node::<PropName>(self.syntax())
 	}
 
 	pub fn value(&self) -> SyntaxResult<JsAnyExpression> {
@@ -144,7 +144,7 @@ impl BinExpr {
 	}
 
 	pub fn lhs(&self) -> Option<JsAnyExpression> {
-		support::child(self.syntax())
+		support::node(self.syntax())
 	}
 
 	pub fn rhs(&self) -> Option<JsAnyExpression> {