feat(rome_json_parser): Clippy & Unicode table generation

rome · Nov 21, 2022 · 83d8b95 · 83d8b95
1 parent eab845d
commit 83d8b95
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
 * text=auto eol=lf
-crates/rome_js_parser/src/lexer/tables.rs linguist-generated=true text=auto eol=lf
+crates/rome_js_unicode_table/src/tables.rs linguist-generated=true text=auto eol=lf
 **/generated/* linguist-generated=true text=auto eol=lf
 crates/rome_js_analyze/src/analyzers.rs linguist-generated=true text=auto eol=lf
 crates/rome_js_analyze/src/assists.rs linguist-generated=true text=auto eol=lf

diff --git a/crates/rome_js_unicode_table/src/tables.rs b/crates/rome_js_unicode_table/src/tables.rs
diff --git a/crates/rome_json_parser/src/lexer/mod.rs b/crates/rome_json_parser/src/lexer/mod.rs
@@ -510,24 +510,23 @@ impl<'src> Lexer<'src> {
                             self.advance(1);
                         }
 
-                        Some(_) => match state {
-                            LexStringState::InString => {
+                        Some(_) => {
+                            if matches!(state, LexStringState::InString) {
                                 let c = self.current_char_unchecked();
                                 self.diagnostics.push(
                                     ParseDiagnostic::new(
                                         self.file_id,
                                         "Invalid escape sequence",
                                         escape_start..self.text_position() + (c as char).text_len(),
                                     )
-                                    .hint(r#"Valid escape sequences are: `\\`, `\/`, `/"`, `\b\`, `\f`, `\n`, `\r`, `\t` or any unicode escape sequence `\uXXXX` where X is hexedecimal number. "#),
+                                        .hint(r#"Valid escape sequences are: `\\`, `\/`, `/"`, `\b\`, `\f`, `\n`, `\r`, `\t` or any unicode escape sequence `\uXXXX` where X is hexedecimal number. "#),
                                 );
                                 state = LexStringState::InvalidEscapeSequence;
                             }
-                            _ => {}
-                        },
+                        }
 
-                        None => match state {
-                            LexStringState::InString => {
+                        None => {
+                            if matches!(state, LexStringState::InString) {
                                 self.diagnostics.push(ParseDiagnostic::new(
                                     self.file_id,
                                     "Expected an escape sequence following a backslash, but found none",
@@ -537,8 +536,7 @@ impl<'src> Lexer<'src> {
                                 );
                                 state = LexStringState::InvalidEscapeSequence;
                             }
-                            _ => {}
-                        },
+                        }
                     }
                 }
                 WHS if matches!(chr, b'\n' | b'\r') => {
@@ -615,11 +613,12 @@ impl<'src> Lexer<'src> {
         self.assert_byte(b'u');
         self.assert_at_char_boundary();
 
-        let start = self
-            .text_position()
+        let start = self.text_position();
+
+        let start = start
             // Subtract 1 to get position of `\`
             .checked_sub(TextSize::from(1))
-            .unwrap_or(self.text_position());
+            .unwrap_or(start);
 
         self.advance(1); // Advance over `u'`
 

diff --git a/crates/rome_json_parser/tests/spec_test.rs b/crates/rome_json_parser/tests/spec_test.rs
@@ -52,7 +52,7 @@ pub fn run(test_case: &str, _snapshot_name: &str, test_directory: &str, outcome:
         for diagnostic in diagnostics {
             let error = diagnostic
                 .clone()
-                .with_file_path(&file_name)
+                .with_file_path(file_name)
                 .with_file_source_code(&content);
 
             formatter

diff --git a/xtask/codegen/src/unicode.rs b/xtask/codegen/src/unicode.rs
@@ -5,7 +5,7 @@ use quote::quote;
 
 mod paths {
     pub const DERIVED_CORE_PROPERTIES: &str = "target/DerivedCoreProperties.txt";
-    pub const TABLES: &str = "crates/rome_js_parser/src/lexer/tables.rs";
+    pub const TABLES: &str = "crates/rome_js_unicode_table/src/tables.rs";
 }
 
 pub fn generate_tables() -> Result<()> {