Rename *_literal_token tokens to *_literal

crates/rome_formatter/src/format_json.rs

@@ -16,8 +16,8 @@ fn tokenize_token(syntax_token: SyntaxToken) -> FormatElement {
 		SyntaxKind::NULL_KW => token("null"),
 		SyntaxKind::TRUE_KW => token("true"),
 		SyntaxKind::FALSE_KW => token("false"),
-		SyntaxKind::JS_STRING_LITERAL_TOKEN => token(syntax_token.text_trimmed()),
-		SyntaxKind::JS_NUMBER_LITERAL_TOKEN => token(syntax_token.text_trimmed()),
+		SyntaxKind::JS_STRING_LITERAL => token(syntax_token.text_trimmed()),
+		SyntaxKind::JS_NUMBER_LITERAL => token(syntax_token.text_trimmed()),
 		SyntaxKind::MINUS => token("-"),
 		_ => panic!("Unsupported JSON token {:?}", syntax_token),
 	}

crates/rome_formatter/src/formatter.rs

@@ -88,7 +88,7 @@ impl Formatter {
 	///
 	/// let mut builder = TreeBuilder::<'_, JsLanguage>::new();
 	/// builder.start_node(SyntaxKind::JS_STRING_LITERAL_EXPRESSION);
-	/// builder.token(SyntaxKind::JS_STRING_LITERAL_TOKEN, "'abc'");
+	/// builder.token(SyntaxKind::JS_STRING_LITERAL, "'abc'");
 	/// builder.finish_node();
 	/// let node = builder.finish();
 	///

crates/rslint_lexer/src/highlight.rs

@@ -120,12 +120,10 @@ impl<'s> Iterator for Highlighter<'s> {
 			}
 			t if t.is_punct() => rgb![86, 182, 194],
 			t if t.is_keyword() => rgb![198, 120, 221],
-			SyntaxKind::JS_STRING_LITERAL_TOKEN
-			| SyntaxKind::BACKTICK
-			| SyntaxKind::TEMPLATE_CHUNK => {
+			SyntaxKind::JS_STRING_LITERAL | SyntaxKind::BACKTICK | SyntaxKind::TEMPLATE_CHUNK => {
 				rgb![152, 195, 121]
 			}
-			SyntaxKind::JS_NUMBER_LITERAL_TOKEN => rgb![209, 154, 102],
+			SyntaxKind::JS_NUMBER_LITERAL => rgb![209, 154, 102],
 			SyntaxKind::DOLLARCURLY => rgb![198, 120, 221],
 			SyntaxKind::ERROR_TOKEN => rgb![244, 71, 71],
 			SyntaxKind::COMMENT => rgb![127, 132, 142],

crates/rslint_lexer/src/lib.rs

@@ -862,7 +862,7 @@ impl<'src> Lexer<'src> {
 				Some(err),
 			)
 		} else {
-			tok!(JS_NUMBER_LITERAL_TOKEN, self.cur - start)
+			tok!(JS_NUMBER_LITERAL, self.cur - start)
 		}
 	}
 
@@ -1009,7 +1009,7 @@ impl<'src> Lexer<'src> {
 									}
 								},
 								_ => {
-									return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), diagnostic)
+									return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), diagnostic)
 								}
 							}
 						}
@@ -1020,15 +1020,15 @@ impl<'src> Lexer<'src> {
 						let err = Diagnostic::error(self.file_id, "", "expected a character after a regex escape, but found none")
 							.primary(self.cur..self.cur + 1, "expected a character following this");
 
-						return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
+						return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), Some(err));
 					}
 				},
 				None => {
 					let err = Diagnostic::error(self.file_id, "", "unterminated regex literal")
 						.primary(self.cur..self.cur, "...but the file ends here")
 						.secondary(start..start + 1, "a regex literal starts there...");
 
-					return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
+					return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), Some(err));
 				},
 				_ => {},
 			}
@@ -1333,7 +1333,7 @@ impl<'src> Lexer<'src> {
 						Some(err),
 					)
 				} else {
-					tok!(JS_STRING_LITERAL_TOKEN, self.cur - start)
+					tok!(JS_STRING_LITERAL, self.cur - start)
 				}
 			}
 			IDT => self.resolve_identifier((byte as char, start)),

crates/rslint_lexer/src/tests.rs

@@ -170,12 +170,12 @@ fn all_whitespace() {
 fn empty_string() {
 	assert_lex! {
 		r#""""#,
-		JS_STRING_LITERAL_TOKEN:2
+		JS_STRING_LITERAL:2
 	}
 
 	assert_lex! {
 		"''",
-		JS_STRING_LITERAL_TOKEN:2
+		JS_STRING_LITERAL:2
 	}
 }
 
@@ -219,12 +219,12 @@ fn template_literals() {
 fn simple_string() {
 	assert_lex! {
 		r#"'abcdefghijklmnopqrstuvwxyz123456789\'10🦀'"#,
-		JS_STRING_LITERAL_TOKEN:45
+		JS_STRING_LITERAL:45
 	}
 
 	assert_lex! {
 		r#""abcdefghijklmnopqrstuvwxyz123456789\"10🦀""#,
-		JS_STRING_LITERAL_TOKEN:45
+		JS_STRING_LITERAL:45
 	}
 }
 
@@ -245,25 +245,25 @@ fn string_unicode_escape_invalid() {
 fn string_unicode_escape_valid() {
 	assert_lex! {
 		r#""abcd\u2000a""#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u2000a'"#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 }
 
 #[test]
 fn string_unicode_escape_valid_resolving_to_endquote() {
 	assert_lex! {
 		r#""abcd\u0022a""#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u0027a'"#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 }
 
@@ -284,12 +284,12 @@ fn string_hex_escape_invalid() {
 fn string_hex_escape_valid() {
 	assert_lex! {
 		r#""abcd \x00 \xAB""#,
-		JS_STRING_LITERAL_TOKEN:16
+		JS_STRING_LITERAL:16
 	}
 
 	assert_lex! {
 		r#"'abcd \x00 \xAB'"#,
-		JS_STRING_LITERAL_TOKEN:16
+		JS_STRING_LITERAL:16
 	}
 }
 
@@ -328,7 +328,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		JS_STRING_LITERAL_TOKEN:14,
+		JS_STRING_LITERAL:14,
 		SEMICOLON:1
 	}
 
@@ -339,7 +339,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		JS_STRING_LITERAL_TOKEN:14,
+		JS_STRING_LITERAL:14,
 		SEMICOLON:1
 	}
 }
@@ -677,31 +677,31 @@ fn labels_y() {
 fn number_basic() {
 	assert_lex! {
 		"1",
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		"123456 ",
-		JS_NUMBER_LITERAL_TOKEN:6,
+		JS_NUMBER_LITERAL:6,
 		WHITESPACE:1
 	}
 
 	assert_lex! {
 		"90",
-		JS_NUMBER_LITERAL_TOKEN:2
+		JS_NUMBER_LITERAL:2
 	}
 
 	assert_lex! {
 		".13",
-		JS_NUMBER_LITERAL_TOKEN:3
+		JS_NUMBER_LITERAL:3
 	}
 }
 
 #[test]
 fn number_basic_err() {
 	assert_lex! {
 		"2_?",
-		JS_NUMBER_LITERAL_TOKEN:2, // numeric separator error
+		JS_NUMBER_LITERAL:2, // numeric separator error
 		QUESTION:1
 	}
 
@@ -712,7 +712,7 @@ fn number_basic_err() {
 
 	assert_lex! {
 		r#"25\uFEFFb"#,
-		JS_NUMBER_LITERAL_TOKEN:2,
+		JS_NUMBER_LITERAL:2,
 		ERROR_TOKEN:6,
 		IDENT:1
 	}
@@ -727,19 +727,19 @@ fn number_basic_err() {
 fn number_complex() {
 	assert_lex! {
 		"3e-5 123e+56",
-		JS_NUMBER_LITERAL_TOKEN:4,
+		JS_NUMBER_LITERAL:4,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:7
+		JS_NUMBER_LITERAL:7
 	}
 
 	assert_lex! {
 		"3.14159e+1",
-		JS_NUMBER_LITERAL_TOKEN:10
+		JS_NUMBER_LITERAL:10
 	}
 
 	assert_lex! {
 		".0e34",
-		JS_NUMBER_LITERAL_TOKEN:5
+		JS_NUMBER_LITERAL:5
 	}
 }
 
@@ -750,52 +750,52 @@ fn dot_number_disambiguation() {
 		DOT:1,
 		IDENT:1,
 		PLUS:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		".0e+5",
-		JS_NUMBER_LITERAL_TOKEN:5
+		JS_NUMBER_LITERAL:5
 	}
 }
 
 #[test]
 fn binary_literals() {
 	assert_lex! {
 		"0b10101010, 0B10101010, 0b10101010n",
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:11
+		JS_NUMBER_LITERAL:11
 	}
 }
 
 #[test]
 fn octal_literals() {
 	assert_lex! {
 		"0o01742242, 0B10101010, 0b10101010n",
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:11
+		JS_NUMBER_LITERAL:11
 	}
 }
 
 #[test]
 fn bigint_literals() {
 	assert_lex! {
 		"0n 1743642n 1n",
-		JS_NUMBER_LITERAL_TOKEN:2,
+		JS_NUMBER_LITERAL:2,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:8,
+		JS_NUMBER_LITERAL:8,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:2
+		JS_NUMBER_LITERAL:2
 	}
 }
 
@@ -821,15 +821,15 @@ fn shebang() {
 	assert_lex! {
 		"#0",
 		ERROR_TOKEN:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		"0#!/bin/deno",
-		JS_NUMBER_LITERAL_TOKEN:1,
+		JS_NUMBER_LITERAL:1,
 		HASH:1,
 		BANG:1,
-		JS_REGEX_LITERAL_TOKEN:9
+		JS_REGEX_LITERAL:9
 	}
 }
 
@@ -877,7 +877,7 @@ fn regex() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		JS_REGEX_LITERAL_TOKEN:7
+		JS_REGEX_LITERAL:7
 	}
 }
 
@@ -891,11 +891,11 @@ fn division() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:1,
+		JS_NUMBER_LITERAL:1,
 		WHITESPACE:1,
 		SLASH:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 }
 
@@ -1007,7 +1007,7 @@ fn issue_30() {
 fn fuzz_fail_7() {
 	assert_lex! {
 		"/\u{0}/ª\u{80}",
-		JS_REGEX_LITERAL_TOKEN:5,
+		JS_REGEX_LITERAL:5,
 		ERROR_TOKEN:2
 	}
 }

crates/rslint_parser/src/ast.rs

@@ -455,10 +455,7 @@ mod tests {
 		for (node, separator) in elements.into_iter() {
 			if let Some(node) = node {
 				builder.start_node(SyntaxKind::JS_NUMBER_LITERAL_EXPRESSION);
-				builder.token(
-					SyntaxKind::JS_NUMBER_LITERAL_TOKEN,
-					node.to_string().as_str(),
-				);
+				builder.token(SyntaxKind::JS_NUMBER_LITERAL, node.to_string().as_str());
 				builder.finish_node();
 			}
 

crates/rslint_parser/src/ast/expr_ext.rs

@@ -25,7 +25,7 @@ impl JsLiteralMemberName {
 	/// use rslint_parser::ast::JsLiteralMemberName;
 	///
 	/// let node: SyntaxNode = TreeBuilder::wrap_with_node(SyntaxKind::JS_LITERAL_MEMBER_NAME, |builder| {
-	///   builder.token(SyntaxKind::JS_STRING_LITERAL_TOKEN, "\"abcd\"");
+	///   builder.token(SyntaxKind::JS_STRING_LITERAL, "\"abcd\"");
 	/// });
 	///
 	/// let static_member_name = node.to::<JsLiteralMemberName>();
@@ -41,7 +41,7 @@ impl JsLiteralMemberName {
 	/// use rslint_parser::ast::JsLiteralMemberName;
 	///
 	/// let node: SyntaxNode = TreeBuilder::wrap_with_node(SyntaxKind::JS_LITERAL_MEMBER_NAME, |builder| {
-	///   builder.token(SyntaxKind::JS_NUMBER_LITERAL_TOKEN, "5");
+	///   builder.token(SyntaxKind::JS_NUMBER_LITERAL, "5");
 	/// });
 	///
 	/// let static_member_name = node.to::<JsLiteralMemberName>();
@@ -69,7 +69,7 @@ impl JsLiteralMemberName {
 		let name = value.text_trimmed();
 
 		let result = match value.kind() {
-			JS_STRING_LITERAL_TOKEN => String::from(&name[1..name.len() - 1]),
+			JS_STRING_LITERAL => String::from(&name[1..name.len() - 1]),
 			_ => String::from(name),
 		};