markdown-actions 1.0.8 → 1.0.9

package/src/index.js

@@ -156,83 +156,122 @@ export function insertHeader(textarea, level = 1, toggle = false) {
   if (!textarea || textarea.disabled || textarea.readOnly) return
   if (level < 1 || level > 6) level = 1
   
+  debugLog('insertHeader', `============ START ============`);
   debugLog('insertHeader', `Level: ${level}, Toggle: ${toggle}`);
+  debugLog('insertHeader', `Initial cursor: ${textarea.selectionStart}-${textarea.selectionEnd}`);
   
   const headerKey = `header${level === 1 ? '1' : level}`
   const style = mergeWithDefaults(FORMATS[headerKey] || FORMATS.header1)
+  debugLog('insertHeader', `Style prefix: "${style.prefix}"`);
   
-  // Save original cursor position
+  // Save original positions and get line info BEFORE applyLineOperation
+  const value = textarea.value
   const originalStart = textarea.selectionStart
   const originalEnd = textarea.selectionEnd
-  const value = textarea.value
   
-  // Find line boundaries
+  // Find the current line boundaries to check existing header
   let lineStart = originalStart
   while (lineStart > 0 && value[lineStart - 1] !== '\n') {
     lineStart--
   }
-  
   let lineEnd = originalEnd
   while (lineEnd < value.length && value[lineEnd] !== '\n') {
     lineEnd++
   }
   
-  // Get the current line
-  const currentLine = value.slice(lineStart, lineEnd)
-  debugLog('insertHeader', `Current line: "${currentLine}"`);
+  // Get current line and check for existing header
+  const currentLineContent = value.slice(lineStart, lineEnd)
+  debugLog('insertHeader', `Current line (before): "${currentLineContent}"`);
   
-  // Check for existing header
-  const existingHeaderMatch = currentLine.match(/^(#{1,6})\s*/)
+  const existingHeaderMatch = currentLineContent.match(/^(#{1,6})\s*/)
   const existingLevel = existingHeaderMatch ? existingHeaderMatch[1].length : 0
   const existingPrefixLength = existingHeaderMatch ? existingHeaderMatch[0].length : 0
   
-  debugLog('insertHeader', `Existing level: ${existingLevel}, Target level: ${level}`);
-  
-  // Determine the new line content
-  let newLine
-  let prefixChange = 0
-  
-  if (toggle && existingLevel === level) {
-    // Toggle off - remove the header
-    debugLog('insertHeader', 'Toggling OFF header');
-    newLine = currentLine.replace(/^#{1,6}\s*/, '')
-    prefixChange = -existingPrefixLength
-  } else if (existingLevel > 0) {
-    // Replace existing header with new one
-    debugLog('insertHeader', 'Replacing header');
-    const cleanedLine = currentLine.replace(/^#{1,6}\s*/, '')
-    newLine = style.prefix + cleanedLine
-    prefixChange = style.prefix.length - existingPrefixLength
-  } else {
-    // Add new header
-    debugLog('insertHeader', 'Adding new header');
-    newLine = style.prefix + currentLine
-    prefixChange = style.prefix.length
-  }
+  debugLog('insertHeader', `Existing header check:`);
+  debugLog('insertHeader', `  - Match: ${existingHeaderMatch ? `"${existingHeaderMatch[0]}"` : 'none'}`);
+  debugLog('insertHeader', `  - Existing level: ${existingLevel}`);
+  debugLog('insertHeader', `  - Existing prefix length: ${existingPrefixLength}`);
+  debugLog('insertHeader', `  - Target level: ${level}`);
   
-  // Build the result
-  const result = {
-    text: newLine,
-    selectionStart: lineStart,
-    selectionEnd: lineEnd
-  }
+  // Determine if we're toggling off
+  const shouldToggleOff = toggle && existingLevel === level
+  debugLog('insertHeader', `Should toggle OFF: ${shouldToggleOff} (toggle=${toggle}, existingLevel=${existingLevel}, level=${level})`);
   
-  // Adjust cursor position based on prefix change
-  if (originalStart === originalEnd) {
-    // No selection - adjust cursor position
-    result.selectionStart = Math.max(originalStart + prefixChange, lineStart)
-    result.selectionEnd = result.selectionStart
-  } else {
-    // Has selection - preserve it with adjustment
-    result.selectionStart = Math.max(originalStart + prefixChange, lineStart)
-    result.selectionEnd = Math.max(originalEnd + prefixChange, lineStart)
-  }
-  
-  debugLog('insertHeader', `Result: "${result.text}" (${result.selectionStart}, ${result.selectionEnd})`);
+  // Use applyLineOperation for consistent behavior
+  const result = applyLineOperation(
+    textarea,
+    (ta) => {
+      const currentLine = ta.value.slice(ta.selectionStart, ta.selectionEnd)
+      debugLog('insertHeader', `Line in operation: "${currentLine}"`);
+      
+      // Remove any existing header formatting
+      const cleanedLine = currentLine.replace(/^#{1,6}\s*/, '')
+      debugLog('insertHeader', `Cleaned line: "${cleanedLine}"`);
+      
+      let newLine
+      
+      if (shouldToggleOff) {
+        // Toggle off - just use the cleaned line
+        debugLog('insertHeader', 'ACTION: Toggling OFF - removing header');
+        newLine = cleanedLine
+      } else if (existingLevel > 0) {
+        // Replace existing header with new one
+        debugLog('insertHeader', `ACTION: Replacing H${existingLevel} with H${level}`);
+        newLine = style.prefix + cleanedLine
+      } else {
+        // Add new header
+        debugLog('insertHeader', 'ACTION: Adding new header');
+        newLine = style.prefix + cleanedLine
+      }
+      
+      debugLog('insertHeader', `New line: "${newLine}"`);
+      
+      return {
+        text: newLine,
+        selectionStart: ta.selectionStart,
+        selectionEnd: ta.selectionEnd
+      }
+    },
+    {
+      prefix: style.prefix,
+      // Custom selection adjustment for headers
+      adjustSelection: (isRemoving, selStart, selEnd, lineStartPos) => {
+        debugLog('insertHeader', `Adjusting selection:`);
+        debugLog('insertHeader', `  - isRemoving param: ${isRemoving}`);
+        debugLog('insertHeader', `  - shouldToggleOff: ${shouldToggleOff}`);
+        debugLog('insertHeader', `  - selStart: ${selStart}, selEnd: ${selEnd}`);
+        debugLog('insertHeader', `  - lineStartPos: ${lineStartPos}`);
+        
+        if (shouldToggleOff) {
+          // Removing the header entirely
+          const adjustment = Math.max(selStart - existingPrefixLength, lineStartPos)
+          debugLog('insertHeader', `  - Removing header, adjusting by -${existingPrefixLength}`);
+          return {
+            start: adjustment,
+            end: selStart === selEnd ? adjustment : Math.max(selEnd - existingPrefixLength, lineStartPos)
+          }
+        } else if (existingPrefixLength > 0) {
+          // Replacing existing header with new one
+          const prefixDiff = style.prefix.length - existingPrefixLength
+          debugLog('insertHeader', `  - Replacing header, adjusting by ${prefixDiff}`);
+          return {
+            start: selStart + prefixDiff,
+            end: selEnd + prefixDiff
+          }
+        } else {
+          // Adding new header
+          debugLog('insertHeader', `  - Adding header, adjusting by +${style.prefix.length}`);
+          return {
+            start: selStart + style.prefix.length,
+            end: selEnd + style.prefix.length
+          }
+        }
+      }
+    }
+  )
   
-  // Expand selection to full line for replacement
-  textarea.selectionStart = lineStart
-  textarea.selectionEnd = lineEnd
+  debugLog('insertHeader', `Final result: text="${result.text}", cursor=${result.selectionStart}-${result.selectionEnd}`);
+  debugLog('insertHeader', `============ END ============`);
   
   insertText(textarea, result)
 }