Rename CallExpr to JsCallExpression and NewExpr to `JsNewExpres…

…sion`

crates/rome_formatter/src/cst.rs

@@ -1,7 +1,7 @@
 use crate::{FormatElement, FormatResult, Formatter, ToFormatElement};
 use rslint_parser::ast::{
-	CallExpr, JsArrayBindingPattern, JsArrayExpression, JsArrowFunctionExpression,
-	JsBlockStatement, JsBooleanLiteralExpression, JsCallArguments, JsCaseClause, JsCatchClause,
+	JsArrayBindingPattern, JsArrayExpression, JsArrowFunctionExpression, JsBlockStatement,
+	JsBooleanLiteralExpression, JsCallArguments, JsCallExpression, JsCaseClause, JsCatchClause,
 	JsClassDeclaration, JsConstructorParameters, JsContinueStatement, JsDebuggerStatement,
 	JsDefaultClause, JsDoWhileStatement, JsEmptyStatement, JsExpressionStatement, JsFinallyClause,
 	JsForInStatement, JsForStatement, JsFunctionDeclaration, JsGetterClassMember,
@@ -138,7 +138,7 @@ impl ToFormatElement for SyntaxNode {
 			JsSyntaxKind::JS_ARRAY_BINDING_PATTERN => JsArrayBindingPattern::cast(self.clone())
 				.unwrap()
 				.to_format_element(formatter),
-			JsSyntaxKind::CALL_EXPR => CallExpr::cast(self.clone())
+			JsSyntaxKind::JS_CALL_EXPRESSION => JsCallExpression::cast(self.clone())
 				.unwrap()
 				.to_format_element(formatter),
 			JsSyntaxKind::JS_CALL_ARGUMENTS => JsCallArguments::cast(self.clone())

crates/rome_formatter/src/ts/expressions/call_expression.rs

@@ -1,7 +1,7 @@
 use crate::{format_elements, FormatElement, FormatResult, Formatter, ToFormatElement};
-use rslint_parser::ast::CallExpr;
+use rslint_parser::ast::JsCallExpression;
 
-impl ToFormatElement for CallExpr {
+impl ToFormatElement for JsCallExpression {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
 		let name = formatter.format_node(self.callee()?)?;
 		let arguments = formatter.format_node(self.arguments()?)?;

crates/rome_formatter/src/ts/expressions/expression.rs

@@ -4,9 +4,9 @@ use crate::{
 };
 use rslint_parser::ast::{
 	JsAnyExpression, JsAssignmentExpression, JsAwaitExpression, JsBinaryExpression,
-	JsComputedMemberExpression, JsConditionalExpression, JsLogicalExpression,
+	JsComputedMemberExpression, JsConditionalExpression, JsLogicalExpression, JsNewExpression,
 	JsParenthesizedExpression, JsThisExpression, JsUnaryExpression, JsYieldArgument,
-	JsYieldExpression, NewExpr, NewTarget,
+	JsYieldExpression, NewTarget,
 };
 use rslint_parser::{token_set, TokenSet, T};
 
@@ -39,8 +39,8 @@ impl ToFormatElement for JsAnyExpression {
 			JsAnyExpression::JsStaticMemberExpression(static_member_expression) => {
 				static_member_expression.to_format_element(formatter)
 			}
-			JsAnyExpression::NewExpr(new_expr) => new_expr.to_format_element(formatter),
-			JsAnyExpression::CallExpr(call_expression) => {
+			JsAnyExpression::JsNewExpression(new_expr) => new_expr.to_format_element(formatter),
+			JsAnyExpression::JsCallExpression(call_expression) => {
 				call_expression.to_format_element(formatter)
 			}
 			JsAnyExpression::JsUnaryExpression(unary_expression) => {
@@ -125,7 +125,7 @@ impl ToFormatElement for JsComputedMemberExpression {
 	}
 }
 
-impl ToFormatElement for NewExpr {
+impl ToFormatElement for JsNewExpression {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
 		let arguments = if let Some(arguments) = self.arguments() {
 			formatter.format_node(arguments)?
@@ -137,7 +137,7 @@ impl ToFormatElement for NewExpr {
 			formatter.format_token(&self.new_token()?)?,
 			// TODO handle TsTypeArgs
 			space_token(),
-			formatter.format_node(self.object()?)?,
+			formatter.format_node(self.callee()?)?,
 			arguments,
 		])
 	}

crates/rslint_parser/src/ast/expr_ext.rs

@@ -331,15 +331,6 @@ impl Template {
 	}
 }
 
-impl CallExpr {
-	pub fn opt_chain_token(&self) -> Option<SyntaxToken> {
-		self.syntax()
-			.children_with_tokens()
-			.filter_map(|child| child.into_token())
-			.find(|tok| tok.kind() == QUESTIONDOT)
-	}
-}
-
 /// A simple macro for making assign, binop, or unary operators
 #[macro_export]
 macro_rules! op {