chore: wip

Author: iamzjohn

packages/pickier/src/format.ts

@@ -28,20 +28,23 @@ function makeIndent(visualLevels: number, cfg: PickierConfig): string {
 }
 
 function convertDoubleToSingle(str: string): string {
-  // strip surrounding quotes
+  // strip surrounding quotes: "xyz" → xyz
   const inner = str.slice(1, -1)
-  // unescape escaped double quotes, keep other escapes intact
-  const unescaped = inner.replace(/\\"/g, '"')
-  // escape single quotes that aren't already escaped
-  const escapedSingles = unescaped.replace(/(?<!\\)'/g, '\\\'')
-  return `'${escapedSingles}'`
+  // Strategy: swap quote types for cleaner output
+  // Unescape escaped double quotes: \"  → "
+  // Swap single quotes to double quotes: ' → " (since they're literals in the string)
+  let result = inner.replace(/\\"/g, '"')  // unescape \"
+  result = result.replace(/'/g, '"')        // swap ' to "
+  return `'${result}'`
 }
 
 function convertSingleToDouble(str: string): string {
   const inner = str.slice(1, -1)
-  const unescaped = inner.replace(/\\'/g, '\'')
-  const escapedDoubles = unescaped.replace(/"/g, '\\"')
-  return `"${escapedDoubles}"`
+  // Unescape escaped single quotes: \'  → '
+  // Swap double quotes to single quotes: " → '
+  let result = inner.replace(/\\'/g, '\'')
+  result = result.replace(/"/g, '\'')
+  return `"${result}"`
 }
 
 function fixQuotes(content: string, preferred: 'single' | 'double', filePath: string): string {
@@ -56,26 +59,11 @@ function fixQuotes(content: string, preferred: 'single' | 'double', filePath: st
     let output = ''
     let i = 0
     let inString: 'single' | 'double' | 'template' | null = null
-    let escaped = false
     let stringStart = 0
 
     while (i < line.length) {
       const ch = line[i]
 
-      if (escaped) {
-        output += ch
-        escaped = false
-        i++
-        continue
-      }
-
-      if (ch === '\\' && inString) {
-        escaped = true
-        output += ch
-        i++
-        continue
-      }
-
       // Check for string boundaries
       if (!inString) {
         if (ch === '"') {
@@ -100,8 +88,17 @@ function fixQuotes(content: string, preferred: 'single' | 'double', filePath: st
         i++
       }
       else {
-        // Inside a string - check if we're exiting
-        if ((inString === 'double' && ch === '"') || (inString === 'single' && ch === '\'')) {
+        // Inside a string - check if we're exiting (but not if escaped)
+        // Count consecutive backslashes before this position
+        let backslashCount = 0
+        let j = i - 1
+        while (j >= 0 && line[j] === '\\') {
+          backslashCount++
+          j--
+        }
+        const isEscaped = backslashCount % 2 === 1
+
+        if (!isEscaped && ((inString === 'double' && ch === '"') || (inString === 'single' && ch === '\''))) {
           // Found closing quote - convert if needed
           const stringContent = line.slice(stringStart + 1, i)
           if (inString === 'double' && preferred === 'single') {
@@ -120,14 +117,14 @@ function fixQuotes(content: string, preferred: 'single' | 'double', filePath: st
           i++
           continue
         }
-        if (inString === 'template' && ch === '`') {
+        if (!isEscaped && inString === 'template' && ch === '`') {
           // Template literal end
           output += ch
           inString = null
           i++
           continue
         }
-        // Still inside string, buffer it
+        // Still inside string, continue scanning
         i++
       }
     }

packages/pickier/src/linter.ts

@@ -237,12 +237,17 @@ export async function runLintProgrammatic(
         fixed = next.join('\n')
       }
       fixed = applyPluginFixes(file, fixed, cfg)
-      if (!options.dryRun && fixed !== src) {
-        writeFileSync(file, fixed, 'utf8')
-        // OPTIMIZATION: Only re-scan if content actually changed
+
+      // If content changed, re-scan the fixed version
+      if (fixed !== src) {
         const newSuppress = parseDisableDirectives(fixed)
         const newCommentLines = getCommentLines(fixed)
         issues = scanContentOptimized(file, fixed, cfg, newSuppress, newCommentLines)
+
+        // Write file only if not dry-run
+        if (!options.dryRun) {
+          writeFileSync(file, fixed, 'utf8')
+        }
       }
     }
 
@@ -1356,16 +1361,21 @@ export async function runLint(globs: string[], options: LintOptions): Promise<nu
         }
         // Apply plugin rule fixers only (no global formatting in lint --fix)
         fixed = applyPluginFixes(file, fixed, cfg)
-        if (!options.dryRun && fixed !== src) {
-          writeFileSync(file, fixed, 'utf8')
-          // OPTIMIZATION: Only re-scan if content actually changed
+
+        // If content changed, re-scan the fixed version
+        if (fixed !== src) {
           const newSuppress = parseDisableDirectives(fixed)
           const newCommentLines = getCommentLines(fixed)
           issues = scanContentOptimized(file, fixed, cfg, newSuppress, newCommentLines)
-        }
 
-        if (options.dryRun && src !== fixed && (options.verbose !== undefined ? options.verbose : cfg.verbose)) {
-          logger.debug(colors.gray(`dry-run: would apply fixes in ${relative(process.cwd(), file)}`))
+          // Write file only if not dry-run
+          if (!options.dryRun) {
+            writeFileSync(file, fixed, 'utf8')
+          }
+
+          if (options.dryRun && (options.verbose !== undefined ? options.verbose : cfg.verbose)) {
+            logger.debug(colors.gray(`dry-run: would apply fixes in ${relative(process.cwd(), file)}`))
+          }
         }
       }