From 26772ac8dd7705c82b58abf0ee7394b64ad5e6d0 Mon Sep 17 00:00:00 2001
From: newtextdoc1111 <newtextdoc1111@gmail.com>
Date: Fri, 21 Nov 2025 19:05:22 +0900
Subject: [PATCH] feat: Add manual formatting trigger and settings for
 auto-formatting

---
 web/js/auto-formatter.js | 26 +++++++++++++++++
 web/js/main.js           | 63 ++++++++++++++++++++++++++++++++++++----
 web/js/settings.js       |  1 +
 3 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/web/js/auto-formatter.js b/web/js/auto-formatter.js
index afc6bbe..d62cdb4 100644
--- a/web/js/auto-formatter.js
+++ b/web/js/auto-formatter.js
@@ -137,6 +137,7 @@ export class AutoFormatterEventHandler {
     handleBlur(event, nodeInfo) {
         if (
             settingValues.enableAutoFormat &&
+            settingValues.autoFormatTrigger === 'auto' &&
             event.target.tagName === 'TEXTAREA'
         ) {
             const textarea = event.target;
@@ -156,4 +157,29 @@ export class AutoFormatterEventHandler {
     handleKeyUp(event) { }
     handleMouseMove(event) { }
     handleClick(event) { }
+
+    /**
+     * Format textarea content via manual trigger (e.g., keyboard shortcut)
+     * @param {HTMLTextAreaElement} textarea - The textarea element to format
+     * @param {NodeInfo} nodeInfo - The node information
+     * @returns {boolean} - True if formatting was performed, false otherwise
+     */
+    applyFormatTextarea(textarea, nodeInfo) {
+        if (!textarea || textarea.tagName !== 'TEXTAREA') {
+            return false;
+        }
+
+        if (!settingValues.enableAutoFormat) {
+            return false;
+        }
+
+        const text = textarea.value;
+
+        if (shouldAutoFormat(text, nodeInfo)) {
+            formatTextareaOnBlur(textarea);
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/web/js/main.js b/web/js/main.js
index 29fcd1c..25b150a 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -13,16 +13,17 @@ import { NodeInfo } from "./node-info.js";
 const id = "AutocompletePlus";
 const name = "Autocomplete Plus";
 
+// --- Module-level variables ---
+const autocompleteEventHandler = new AutocompleteEventHandler();
+const relatedTagsEventHandler = new RelatedTagsEventHandler();
+const autoFormatterEventHandler = new AutoFormatterEventHandler();
+const attachedElementNodeInfoMap = new WeakMap(); // Map to track attached elements and their node info
+
 // --- Functions ---
 /**
  * Initialize event handlers for the autocomplete and related tags features.
  */
 function initializeEventHandlers() {
-    const autocompleteEventHandler = new AutocompleteEventHandler();
-    const relatedTagsEventHandler = new RelatedTagsEventHandler();
-    const autoFormatterEventHandler = new AutoFormatterEventHandler();
-    const attachedElementNodeInfoMap = new WeakMap(); // Map to track attached elements and their node info
-
     // Function to attach listeners
     function attachListeners(element, nodeInfo) {
         if (attachedElementNodeInfoMap.has(element)) return; // Prevent double attachment
@@ -302,6 +303,46 @@ app.registerExtension({
         await loadDataAsync();
     },
 
+    // --- Commands ---
+    commands: [
+        {
+            id: id + ".formatPrompt",
+            label: name + ": Format Prompt",
+            function: () => {
+                const activeEl = document.activeElement;
+
+                if (!activeEl || activeEl.tagName !== 'TEXTAREA') {
+                    console.debug('[Autocomplete-Plus] Format command: No textarea is currently focused');
+                    return;
+                }
+
+                const nodeInfo = attachedElementNodeInfoMap.get(activeEl);
+                if (!nodeInfo) {
+                    console.warn('[Autocomplete-Plus] Format command: Node info not found for focused textarea');
+                    // Use fallback NodeInfo
+                    const fallbackNodeInfo = new NodeInfo('Unknown', 'unknown');
+                    autoFormatterEventHandler.applyFormatTextarea(activeEl, fallbackNodeInfo);
+                    return;
+                }
+
+                const formatted = autoFormatterEventHandler.applyFormatTextarea(activeEl, nodeInfo);
+                if (formatted) {
+                    console.debug('[Autocomplete-Plus] Format command: Formatting applied');
+                } else {
+                    console.debug('[Autocomplete-Plus] Format command: Formatting skipped (blocklisted or not applicable)');
+                }
+            }
+        }
+    ],
+
+    // --- Keybindings ---
+    keybindings: [
+        {
+            combo: { key: "f", alt: true, shift: true },
+            commandId: id + ".formatPrompt"
+        }
+    ],
+
     // One the Settings Screen, displays reverse order in same category
     settings: [
         // --- Tag source Settings ---
@@ -476,6 +517,18 @@ app.registerExtension({
         },
 
         // --- Auto format settings ---
+        {
+            id: id + '.AutoFormatter.Trigger',
+            name: 'Auto Format Trigger',
+            tooltip: 'Auto: Format automatically when leaving text field.\nManual: Format only via keyboard shortcut. default keybind: (Alt+Shift+F)',
+            type: 'combo',
+            options: ['auto', 'manual'],
+            defaultValue: 'auto',
+            category: [name, 'AutoFormatter', 'Auto Format Trigger'],
+            onChange: (newVal, oldVal) => {
+                settingValues.autoFormatTrigger = newVal;
+            },
+        },
         {
             id: id + '.AutoFormatter.EnableAutoFormat',
             name: 'Enable Auto Format',
diff --git a/web/js/settings.js b/web/js/settings.js
index 177b620..0cbc7b3 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -23,6 +23,7 @@ export const settingValues = {
 
     // Auto format settings
     enableAutoFormat: true,
+    autoFormatTrigger: 'auto', // Options: 'auto' (format on blur + shortcut), 'manual' (shortcut only)
 
 
     // Internal logic settings