Skip to content

Fix stdin issue for rust--format-fix-rustfmt-buffer. #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 14, 2020
Merged

Fix stdin issue for rust--format-fix-rustfmt-buffer. #367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e39f3
rust--format-fix-rustfmt-buffer: replace "stdin:" as well as "<stdin>:".
mookid Apr 12, 2020
4581759
rust-format-show-buffer: default to true.
mookid Apr 12, 2020
6f32687
rust-goto-format-problem: make sure to always just to a buffer that e…
mookid Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rust-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ to the function arguments. When nil, `->' will be indented one level."
:safe #'booleanp
:group 'rust-mode)

(defcustom rust-format-show-buffer nil
(defcustom rust-format-show-buffer t
"Show *rustfmt* buffer if formatting detected problems."
:type 'boolean
:safe #'booleanp
Expand Down Expand Up @@ -1484,6 +1484,8 @@ This is written mainly to be used as `end-of-defun-function' for Rust."
(with-current-buffer (get-buffer rust-rustfmt-buffername)
(goto-char (point-min))
(while (re-search-forward "--> <stdin>:" nil t)
(replace-match (format "--> %s:" buffer-name)))
(while (re-search-forward "--> stdin:" nil t)
(replace-match (format "--> %s:" buffer-name)))))

;; If rust-mode has been configured to navigate to source of the error
Expand Down Expand Up @@ -1532,7 +1534,7 @@ rustfmt complain in the echo area."
(if (re-search-forward "\nerror:.+\n" nil t)
(buffer-substring p0 (point))
(buffer-substring p0 (point-max)))))))))
(when (and target-buffer target-point)
(when (and target-buffer (get-buffer target-buffer) target-point)
(switch-to-buffer target-buffer)
(goto-char (point-min))
(forward-line (1- (car target-point)))
Expand Down