[version-control] Migrate to spacemacs|defc (#16565)

* [version-control] Migrate to `spacemacs|defc` As mentioned in #16555 (comment). * Remove some remains of git-gutter+
syl20bnr · Sep 11, 2024 · fdb8acb · fdb8acb
1 parent 0b7a58b
commit fdb8acb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 30 deletions.
diff --git a/layers/+source-control/version-control/config.el b/layers/+source-control/version-control/config.el
@@ -24,16 +24,19 @@
 (defvar spacemacs--smerge-ts-full-hint-toggle nil
   "Display smerge transient-state documentation.")
 
-(defvar version-control-global-margin t
-  "If non-nil, will show diff margins globally.")
+(spacemacs|defc version-control-global-margin t
+  "If non-nil, will show diff margins globally."
+  'boolean)
 
-(defvar version-control-diff-tool 'diff-hl
-  "Options are `diff-hl' (the prefered choice) or `git-gutter' to show
-version-control markers.")
+(spacemacs|defc version-control-diff-tool 'diff-hl
+  "Options are `diff-hl' (the preferred choice) or `git-gutter' to show
+version-control markers."
+  '(choice (const diff-hl) (const git-gutter)))
 
-(defvar version-control-diff-side 'right
+(spacemacs|defc version-control-diff-side 'right
   "Side on which to show version-control markers.
-Options are `left' and `right'.")
+Options are `left' and `right'."
+  '(choice (const left) (const right)))
 
 ;; change face
 (defface diff-hl-change

diff --git a/layers/+source-control/version-control/funcs.el b/layers/+source-control/version-control/funcs.el
@@ -31,17 +31,15 @@
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-next-hunk)
-       (git-gutter  'git-gutter:next-hunk)
-       (git-gutter+ 'git-gutter+-next-hunk)))))
+       (git-gutter  'git-gutter:next-hunk)))))
 
 (defun spacemacs/vcs-previous-hunk ()
   (interactive)
   (let ((current-prefix-arg t))
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-previous-hunk)
-       (git-gutter  'git-gutter:previous-hunk)
-       (git-gutter+ 'git-gutter+-previous-hunk)))))
+       (git-gutter  'git-gutter:previous-hunk)))))
 
 (defun spacemacs/vcs-revert-hunk ()
   (interactive)
@@ -50,8 +48,7 @@
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-revert-hunk)
-       (git-gutter  'git-gutter:revert-hunk)
-       (git-gutter+ 'git-gutter+-revert-hunks)))))
+       (git-gutter  'git-gutter:revert-hunk)))))
 
 (defun spacemacs/vcs-stage-hunk ()
   (interactive)
@@ -69,44 +66,39 @@
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-diff-goto-hunk)
-       (git-gutter  'git-gutter:popup-hunk)
-       (git-gutter+ 'git-gutter+-show-hunk-inline-at-point)))))
+       (git-gutter  'git-gutter:popup-hunk)))))
 
 (defun spacemacs/vcs-enable-margin ()
   (interactive)
   (let ((current-prefix-arg t))
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-mode)
-       (git-gutter  'git-gutter-mode)
-       (git-gutter+ 'git-gutter+-mode)))))
+       (git-gutter  'git-gutter-mode)))))
 
 (defun spacemacs/vcs-disable-margin ()
   (interactive)
   (let ((current-prefix-arg nil))
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'diff-hl-mode)
-       (git-gutter  'git-gutter-mode)
-       (git-gutter+ 'git-gutter+-mode)))))
+       (git-gutter  'git-gutter-mode)))))
 
 (defun spacemacs/vcs-enable-margin-globally ()
   (interactive)
   (let ((current-prefix-arg t))
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'global-diff-hl-mode)
-       (git-gutter  'global-git-gutter-mode)
-       (git-gutter+ 'global-git-gutter+-mode)))))
+       (git-gutter  'global-git-gutter-mode)))))
 
 (defun spacemacs/vcs-disable-margin-globally ()
   (interactive)
   (let ((current-prefix-arg nil))
     (call-interactively
      (cl-case version-control-diff-tool
        (diff-hl     'global-diff-hl-mode)
-       (git-gutter  'global-git-gutter-mode)
-       (git-gutter+ 'global-git-gutter+-mode)))))
+       (git-gutter  'global-git-gutter-mode)))))
 
 (defun spacemacs/vcs-show-help ()
   (interactive)
@@ -117,15 +109,13 @@
   (interactive)
   (cl-case version-control-diff-tool
     (diff-hl     diff-hl-mode)
-    (git-gutter  (bound-and-true-p git-gutter-mode))
-    (git-gutter+ (bound-and-true-p git-gutter+-mode))))
+    (git-gutter  (bound-and-true-p git-gutter-mode))))
 
 (defun spacemacs/vcs-margin-global-p ()
   (interactive)
   (cl-case version-control-diff-tool
     (diff-hl     global-diff-hl-mode)
-    (git-gutter  global-git-gutter-mode)
-    (git-gutter+ global-git-gutter+-mode)))
+    (git-gutter  global-git-gutter-mode)))
 
 (spacemacs|add-toggle version-control-margin
   :status (spacemacs/vcs-margin-p)
@@ -164,6 +154,3 @@ the number of conflicts detected by `smerge-mode'."
   (interactive)
   (setq spacemacs--smerge-ts-full-hint-toggle
         (not spacemacs--smerge-ts-full-hint-toggle)))
-
-(defun spacemacs//git-gutter+-refresh-in-all-buffers ()
-  (git-gutter+-in-all-buffers (when git-gutter+-mode (git-gutter+-refresh))))