From 63f9ef2ebbc2fef52570809e452435d3db552a41 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Fri, 20 Jan 2023 21:02:45 +0000
Subject: [PATCH] chore(lsp): tweak naming of manual formatting
 functions/settings

---
 modules/languages/siren-golang.el |  5 +++--
 modules/lsp/siren-lsp.el          | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index 24df598..6e361cd 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -125,12 +125,13 @@
 
   :preface
   (defun siren-lsp-go-mode-setup ()
-    (setq-local siren-lsp-format-buffer-func 'siren-lsp-go-format-buffer)
+    (setq-local siren-lsp-manual-format-buffer-func
+                'siren-lsp-go-manual-format-buffer)
     (lsp-format-buffer-on-save-mode t)
     (lsp-organize-imports-on-save-mode t)
     (lsp-deferred))
 
-  (defun siren-lsp-go-format-buffer ()
+  (defun siren-lsp-go-manual-format-buffer ()
     (lsp-format-buffer)
     (golines-format-buffer)))
 
diff --git a/modules/lsp/siren-lsp.el b/modules/lsp/siren-lsp.el
index 801fda1..7a76209 100644
--- a/modules/lsp/siren-lsp.el
+++ b/modules/lsp/siren-lsp.el
@@ -10,7 +10,7 @@
   :general
   (:keymaps 'lsp-mode-map
             "C-c C-." 'lsp-rename
-            "C-c C-f" 'siren-lsp-format-buffer)
+            "C-c C-f" 'siren-lsp-manual-format-buffer)
 
   :commands
   lsp
@@ -57,14 +57,18 @@
     (setq-local company-idle-delay 0.1
                 company-minimum-prefix-length 1))
 
-  ;; Allow overriding manual buffer formatting triggered by C-c C-f. Typically
-  ;; this will be used to perform additional formatting steps not performed by
-  ;; default via the on-safe hook.
-  (defvar-local siren-lsp-format-buffer-func nil)
-  (defun siren-lsp-format-buffer ()
+  (defvar-local siren-lsp-manual-format-buffer-func nil)
+  (defun siren-lsp-manual-format-buffer ()
+    "Intended for manual formatting triggering, e.g. C-c C-f.
+
+Supports overriding the default formatting function by setting the
+`siren-lsp-manual-format-buffer-func' buffer-local variable.
+
+Typically this will be used to perform additional formatting
+steps not performed by default via the on-save hook."
     (interactive)
-    (if siren-lsp-format-buffer-func
-        (apply siren-lsp-format-buffer-func nil)
+    (if siren-lsp-manual-format-buffer-func
+        (apply siren-lsp-manual-format-buffer-func nil)
       (lsp-format-buffer)))
 
   :config