rome · MichaReiser · Nov 3, 2022 · Nov 3, 2022 · 95th · Nov 3, 2022
diff --git a/crates/rome_js_formatter/src/utils/string_utils.rs b/crates/rome_js_formatter/src/utils/string_utils.rs
@@ -453,24 +453,16 @@ impl<'token> LiteralStringNormaliser<'token> {
                             }
                         } else if signal == CharSignal::Keep {
                             reduced_string.push(current_char);
+                            signal = CharSignal::None;
                         }
                         // The next character is another backslash, or
                         // a character that should be kept in the next iteration
-                        else if matches!(
-                            next_character,
-                            '\\' | 'v' | 'b' | 'f' | 'n' | 't' | 'r' | 'u' | 'x'
-                        ) {
+                        else if "^\n\r\"'01234567\\bfnrtuvx\u{2028}\u{2029}"
+                            .contains(*next_character)
+                        {
                             signal = CharSignal::Keep;
                             // fallback, keep the backslash
                             reduced_string.push(current_char);
-                        }
-                        // these are character that should stay, but
-                        // the next iteration should decide if to keep them or not
-                        else if !next_character.is_alphabetic()
-                            && *next_character != alternate_quote.as_char()
-                            && *next_character != preferred_quote.as_char()
-                        {
-                            reduced_string.push(current_char);
                         } else {
                             // these, usually characters that can have their
                             // escape removed: "\a" => "a"
@@ -512,23 +504,15 @@ impl<'token> LiteralStringNormaliser<'token> {
                         }
                     } else if current_char == alternate_quote.as_char() {
                         match signal {
-                            CharSignal::None => {
+                            CharSignal::None | CharSignal::Keep => {
                                 reduced_string.push(alternate_quote.as_char());
                             }
-                            CharSignal::Keep => {
-                                reduced_string.push(alternate_quote.as_char());
-                                signal = CharSignal::None;
-                            }
-                            AlreadyPrinted(the_char) => {
-                                if the_char == alternate_quote.as_char() {
-                                    signal = CharSignal::None;
-                                    continue;
-                                }
-                            }
+                            AlreadyPrinted(_) => (),
                         }
                     } else {
                         reduced_string.push(current_char);
                     }
+                    signal = CharSignal::None;
                 }
             }
         }

diff --git a/crates/rome_js_formatter/tests/specs/prettier/js/directives/escaped.js.snap b/crates/rome_js_formatter/tests/specs/prettier/js/directives/escaped.js.snap
@@ -1,5 +1,7 @@
 ---
 source: crates/rome_js_formatter/tests/prettier_tests.rs
+info:
+  test_file: js/directives/escaped.js
 ---
 
 # Input
@@ -48,7 +50,7 @@ source: crates/rome_js_formatter/tests/prettier_tests.rs
 ```diff
 --- Prettier
 +++ Rome
-@@ -6,19 +6,19 @@
+@@ -6,20 +6,20 @@
  "\'";
  "\"";
  "\\";
@@ -59,19 +61,22 @@ source: crates/rome_js_formatter/tests/prettier_tests.rs
 +"hola";
  "hol\\a (the a is not escaped)";
  "hol\\a (the a is not escaped)";
- "multiple \a unnecessary \a escapes";
 -"multiple \a unnecessary \a escapes";
+ "multiple \a unnecessary \a escapes";
 +"multiple a unnecessary a escapes";
  "unnecessarily escaped character preceded by escaped backslash \\\a";
- "unnecessarily escaped character preceded by escaped backslash \\\a";
+-"unnecessarily escaped character preceded by escaped backslash \\\a";
++"unnecessarily escaped character preceded by escaped backslash \\a";
  "unescaped character preceded by two escaped backslashes       \\\\a";
  "unescaped character preceded by two escaped backslashes       \\\\a";
  "\a\a"; // consecutive unnecessarily escaped characters
 -"\a\a"; // consecutive unnecessarily escaped characters
+-"escaped \u2030 \‰ (should still stay escaped)";
 +"aa"; // consecutive unnecessarily escaped characters
- "escaped \u2030 \‰ (should still stay escaped)";
++"escaped \u2030 ‰ (should still stay escaped)";
 
  // Meaningful escapes
+ // Commented out to avoid `SyntaxError: Octal literals are not allowed in strict mode.`
 ```
 
 # Output
@@ -93,12 +98,12 @@ source: crates/rome_js_formatter/tests/prettier_tests.rs
 "multiple \a unnecessary \a escapes";
 "multiple a unnecessary a escapes";
 "unnecessarily escaped character preceded by escaped backslash \\\a";
-"unnecessarily escaped character preceded by escaped backslash \\\a";
+"unnecessarily escaped character preceded by escaped backslash \\a";
 "unescaped character preceded by two escaped backslashes       \\\\a";
 "unescaped character preceded by two escaped backslashes       \\\\a";
 "\a\a"; // consecutive unnecessarily escaped characters
 "aa"; // consecutive unnecessarily escaped characters
-"escaped \u2030 \‰ (should still stay escaped)";
+"escaped \u2030 ‰ (should still stay escaped)";
 
 // Meaningful escapes
 // Commented out to avoid `SyntaxError: Octal literals are not allowed in strict mode.`

diff --git a/crates/rome_js_formatter/tests/specs/prettier/js/quotes/strings.js.snap b/crates/rome_js_formatter/tests/specs/prettier/js/quotes/strings.js.snap