Merge pull request #4671 from johanthoren/develop

Add support for parinfer-rust-mode

modules/editor/parinfer/README.org

@@ -17,7 +17,9 @@ https://raw.githubusercontent.com/DogLooksGood/parinfer-mode/a7c041454e05ec2b883
 More information can be found about it [[https://shaunlebron.github.io/parinfer/][in the project's documentation]].
 
 ** Module Flags
-This module provides no flags.
++ =+rust= Use [[github:justinbarclay/parinfer-rust-mode][parinfer-rust-mode]] instead of the now deprecated [[github:DogLooksGood/parinfer-mode][parinfer-mode]].
+  This depends on Emacs being compiled with the option `--with-modules`. The
+  pre-built library is only available for Linux, Windows and MacOS.
 
 ** Packages
 + [[https://github.com/DogLooksGood/parinfer-mode][parinfer]]

modules/editor/parinfer/config.el

@@ -1,6 +1,7 @@
 ;;; editor/parinfer/config.el -*- lexical-binding: t; -*-
 
 (use-package! parinfer
+  :unless (featurep! +rust)
   :hook ((emacs-lisp-mode
           clojure-mode
           scheme-mode
@@ -21,4 +22,27 @@
         :i "<tab>"     #'parinfer-smart-tab:dwim-right-or-complete
         :i "<backtab>" #'parinfer-smart-tab:dwim-left
         :localleader
-        :desc "Toggle parinfer-mode" "m" #'parinfer-toggle-mode))
+        "m" #'parinfer-toggle-mode))
+(use-package! parinfer-rust-mode
+  :when (featurep! +rust)
+  :when (bound-and-true-p module-file-suffix)
+  :hook ((emacs-lisp-mode
+          clojure-mode
+          scheme-mode
+          lisp-mode
+          racket-mode
+          hy-mode) . parinfer-rust-mode)
+  :init
+  (setq parinfer-rust-library
+        (concat user-emacs-directory
+                ".local/etc/parinfer-rust/"
+                (cond ((eq system-type 'darwin) "parinfer-rust-darwin.so")
+                      ((eq system-type 'gnu/linux) "parinfer-rust-linux.so")
+                      ((eq system-type 'windows-nt) "parinfer-rust-windows.dll")
+                      ((eq system-type 'berkeley-unix) "libparinfer_rust.so"))))
+  (setq parinfer-rust-auto-download (if (eq system-type 'berkeley-unix) nil t))
+  :config
+  (map! :map parinfer-rust-mode-map
+        :localleader
+        "m" #'parinfer-rust-switch-mode
+        "M" #'parinfer-rust-toggle-disable))

modules/editor/parinfer/doctor.el

@@ -0,0 +1,11 @@
+;;; editor/parinfer/doctor.el -*- lexical-binding: t; -*-
+
+(when (featurep! +rust)
+  (unless (fboundp 'module-load)
+    (warn! "Your emacs wasn't built with dynamic modules support. `parinfer-rust-mode' won't work"))
+  (when (and (eq system-type 'berkeley-unix)
+             (not (file-readable-p (concat user-emacs-directory
+                                           ".local/etc/parinfer-rust/libparinfer_rust.so"))))
+    (warn! (concat "Could not read " user-emacs-directory
+                   ".local/etc/parinfer-rust/libparinfer_rust.so. "
+                   "`parinfer-rust-mode' won't work"))))

modules/editor/parinfer/packages.el

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/parinfer/packages.el
 
-(when (featurep! :editor evil)
+(when (and (not (featurep! +rust)) (featurep! :editor evil))
   ;; Parinfer uses `evil-define-key' without loading evil, so if evil is
   ;; installed *after* parinfer, parinfer will throw up void-function errors.
   ;; because evil-define-key (a macro) wasn't expanded at compile-time. So we
@@ -11,4 +11,8 @@
   ;; separate session:
   (autoload 'evil-define-key "evil-core" nil nil 'macro))
 
-(package! parinfer :pin "8659c99a9475ee34af683fdf8f272728c6bebb3a")
+(if (featurep! +rust)
+    (package! parinfer-rust-mode :pin "c825606e6aca4a2ed18c0af321df5f36a3c8c774")
+  (package! parinfer
+    :recipe (:host github :repo "emacsattic/parinfer")
+    :pin "8659c99a9475ee34af683fdf8f272728c6bebb3a"))