Format buffer when no region is active.

brotzeit · Jul 10, 2021 · 34f0ef7 · 34f0ef7
1 parent 47378ff
commit 34f0ef7
Showing 1 changed file with 14 additions and 21 deletions.
diff --git a/rustic-rustfmt.el b/rustic-rustfmt.el
@@ -206,27 +206,20 @@ This operation requires a nightly version of rustfmt.
   (unless (or (eq major-mode 'rustic-mode)
               (eq major-mode 'rustic-macro-expansion-mode))
     (error "Not a rustic-mode buffer."))
-  (let* ((buf (current-buffer))
-         (file (buffer-file-name buf))
-         (r-begin)
-         (r-end))
-    (cond ((region-active-p)
-           (setq r-begin begin)
-           (setq r-end end))
-          (t
-           (setq r-begin (region-beginning))
-           (setq r-end (region-end))))
-    (let ((start (+ 1 (count-lines 1 r-begin)))
-          (len (- (count-lines r-begin r-end) 1)))
-      (rustic-compilation-process-live t)
-      (rustic-format-start-process
-       'rustic-format-file-sentinel
-       :buffer buf
-       :command
-       (append (list rustic-cargo-bin "+nightly" "fmt" "--")
-               (rustic-compute-rustfmt-file-lines-args file
-                                                       start
-                                                       (+ start len)))))))
+  (if (not (region-active-p)) (rustic-format-buffer)
+    (let* ((buf (current-buffer))
+           (file (buffer-file-name buf)))
+      (let ((start (+ 1 (count-lines 1 begin)))
+            (len (- (count-lines begin end) 1)))
+        (rustic-compilation-process-live t)
+        (rustic-format-start-process
+         'rustic-format-file-sentinel
+         :buffer buf
+         :command
+         (append (list rustic-cargo-bin "+nightly" "fmt" "--")
+                 (rustic-compute-rustfmt-file-lines-args file
+                                                         start
+                                                         (+ start len))))))))
 
 ;;;###autoload
 (defun rustic-format-buffer ()