Skip to content

Commit e452995

Browse files
committed
rust--after-revert-hook should preserve point position.
Otherwise, rust-format-buffer always moves point to the end of the buffer.
1 parent ba5ff90 commit e452995

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

rust-mode-tests.el

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,6 +2561,18 @@ Fontification needs to include this whole string or none of it.
25612561
)
25622562
)
25632563

2564+
(ert-deftest rust-test-revert-hook-preserves-point ()
2565+
(with-temp-buffer
2566+
;; Insert some code, and put point in the middle.
2567+
(insert "fn foo() {}\n")
2568+
(insert "fn bar() {}\n")
2569+
(insert "fn baz() {}\n")
2570+
(goto-char (point-min))
2571+
(forward-line 1)
2572+
(let ((initial-point (point)))
2573+
(rust--after-revert-hook)
2574+
(should (equal initial-point (point))))))
2575+
25642576
;; If electric-pair-mode is available, load it and run the tests that use it. If not,
25652577
;; no error--the tests will be skipped.
25662578
(require 'elec-pair nil t)

rust-mode.el

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,9 +1365,10 @@ This is written mainly to be used as `end-of-defun-function' for Rust."
13651365
;; to use `font-lock-ensure', which doesn't exist in Emacs 24 and earlier.
13661366
;; If it's not available, fall back to calling `font-lock-fontify-region'
13671367
;; on the whole buffer.
1368-
(if (fboundp 'font-lock-ensure)
1369-
(font-lock-ensure)
1370-
(font-lock-fontify-region (point-min) (point-max))))
1368+
(save-excursion
1369+
(if (fboundp 'font-lock-ensure)
1370+
(font-lock-ensure)
1371+
(font-lock-fontify-region (point-min) (point-max)))))
13711372

13721373
(defun rust--before-save-hook ()
13731374
(when rust-format-on-save (rust-format-buffer)))

0 commit comments

Comments
 (0)