Fix wrong autofix for regexp/order-in-character-class rule (#53)

Author: ota-meshi

lib/rules/order-in-character-class.ts

@@ -132,9 +132,7 @@ export default createRule("order-in-character-class", {
                                         yield fixer.insertTextBeforeRange(
                                             targetRange,
                                             fixerApplyEscape(
-                                                (isNeedEscape(next, moveTarget)
-                                                    ? "\\"
-                                                    : "") + next.raw,
+                                                escapeRaw(next, moveTarget),
                                                 node,
                                             ),
                                         )
@@ -260,19 +258,24 @@ export default createRule("order-in-character-class", {
 })
 
 /**
- *Check whether the given CharacterClassElement is need escape.
+ * get the escape text from the given CharacterClassElement.
  */
-function isNeedEscape(
-    next: CharacterClassElement,
-    target: CharacterClassElement,
-) {
-    if (!next.raw.startsWith("-")) {
-        return false
+function escapeRaw(node: CharacterClassElement, target: CharacterClassElement) {
+    let raw = node.raw
+    if (raw.startsWith("-")) {
+        const parent = target.parent as CharacterClass
+        const prev = parent.elements[parent.elements.indexOf(target) - 1]
+        if (
+            prev &&
+            (prev.type === "Character" || prev.type === "CharacterSet")
+        ) {
+            raw = `\\${raw}`
+        }
     }
-    const parent = target.parent as CharacterClass
-    const prev = parent.elements[parent.elements.indexOf(target) - 1]
-    if (!prev || (prev.type !== "Character" && prev.type !== "CharacterSet")) {
-        return false
+    if (target.raw.startsWith("-")) {
+        if (node.type === "Character" || node.type === "CharacterSet") {
+            raw = `${raw}\\`
+        }
     }
-    return true
+    return raw
 }

tests/lib/rules/order-in-character-class.ts

@@ -185,5 +185,26 @@ tester.run("order-in-character-class", rule as any, {
                 "Expected character class elements to be in ascending order. '-' should be before 'a-b'.",
             ],
         },
+        {
+            code: String.raw`/[-$a]/u`,
+            output: String.raw`/[$\-a]/u`,
+            errors: [
+                "Expected character class elements to be in ascending order. '$' should be before '-'.",
+            ],
+        },
+        {
+            code: String.raw`/[-_\s]+/gu`,
+            output: String.raw`/[\s\-_]+/gu`,
+            errors: [
+                "Expected character class elements to be in ascending order. '\\s' should be before '-'.",
+            ],
+        },
+        {
+            code: String.raw`/[-_-]/u`,
+            output: String.raw`/[-\-_]/u`,
+            errors: [
+                "Expected character class elements to be in ascending order. '-' should be before '_'.",
+            ],
+        },
     ],
 })