Skip to content

Replace the tree-sitter linking with native treesitter modes #1445 #1447

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

Open
ksinkar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace the tree-sitter linking with native treesitter modes #1445 #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@

### Bugs fixed

- [#1445](https://github.com/bbatsov/prelude/issues/1445): prelude-rust fails to load due to tree-sitter dependency issue
- [#1302](https://github.com/bbatsov/prelude/issues/1302): `C-a` should be bound to `org-beginning-of-line` in org-mode buffers.

## 1.0.0 (2020-09-15)
Expand Down
16 changes: 5 additions & 11 deletions modules/prelude-rust.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,24 @@
;; https://rust-analyzer.github.io/manual.html#rust-analyzer-language-server-binary


(prelude-require-packages '(rust-mode
(prelude-require-packages '(rust-ts-mode
cargo
flycheck-rust
tree-sitter
tree-sitter-langs
yasnippet
ron-mode))

(require 'tree-sitter)
(require 'tree-sitter-langs)

(add-to-list 'super-save-predicates
(lambda () (not (eq major-mode 'rust-mode))))
(lambda () (not (eq major-mode 'rust-ts-mode))))

(with-eval-after-load 'rust-mode
(add-hook 'rust-mode-hook 'cargo-minor-mode)
(add-hook 'rust-mode-ts-hook 'cargo-minor-mode)
(add-hook 'flycheck-mode-hook 'flycheck-rust-setup)

;; enable lsp for rust, by default it uses rust-analyzer as lsp server
(add-hook 'rust-mode-hook 'lsp)

;; enable tree-sitter for nicer syntax highlighting
(add-hook 'rust-mode-hook #'tree-sitter-mode)
(add-hook 'rust-mode-hook #'tree-sitter-hl-mode)
(add-hook 'rust-mode-ts-hook 'lsp)

(defun prelude-rust-mode-defaults ()
;; format on save
Expand All @@ -83,7 +77,7 @@

(setq prelude-rust-mode-hook 'prelude-rust-mode-defaults)

(add-hook 'rust-mode-hook (lambda ()
(add-hook 'rust-mode-ts-hook (lambda ()
(run-hooks 'prelude-rust-mode-hook))))

(provide 'prelude-rust)
Expand Down