[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode 7960c74 417/486: Do not allow subword-match when
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode 7960c74 417/486: Do not allow subword-match when detecting built-in formatting macros |
Date: |
Sat, 7 Aug 2021 09:26:05 -0400 (EDT) |
branch: elpa/rust-mode
commit 7960c74d4f575fec7b0b435a86f8f07594f24f9f
Author: Dato Simó <dato@net.com.org.es>
Commit: Nathan Moreau <nathan.moreau@m4x.org>
Do not allow subword-match when detecting built-in formatting macros
Before this change, a user-created macro like ‘cprintln!’ would see the
‘println’ subword highlighted as a built-in macro, and the leading ‘c’
left without color.
After this commit, only full words will be recognized as built-ins, and
‘cprintln!’ is highlighted as a regular macro in full, not as a built-in.
In addition, this commit fixes the same issue for the write! macro.
---
rust-mode.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rust-mode.el b/rust-mode.el
index b912140..b361749 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -676,7 +676,7 @@ Returns nil if the point is not within a Rust string."
1 font-lock-preprocessor-face keep)
;; Builtin formatting macros
- (,(concat (rust-re-grab (concat (regexp-opt
rust-builtin-formatting-macros) "!")) (concat rust-formatting-macro-opening-re
"\\(?:" rust-start-of-string-re) "\\)?")
+ (,(concat (rust-re-grab (concat (rust-re-word (regexp-opt
rust-builtin-formatting-macros)) "!")) (concat rust-formatting-macro-opening-re
"\\(?:" rust-start-of-string-re) "\\)?")
(1 'rust-builtin-formatting-macro-face)
(rust-string-interpolation-matcher
(rust-end-of-string)
@@ -684,7 +684,7 @@ Returns nil if the point is not within a Rust string."
(0 'rust-string-interpolation-face t nil)))
;; write! macro
- (,(concat (rust-re-grab "write\\(ln\\)?!") (concat
rust-formatting-macro-opening-re "[[:space:]]*[^\"]+,[[:space:]]*"
rust-start-of-string-re))
+ (,(concat (rust-re-grab (concat (rust-re-word "write\\(ln\\)?") "!"))
(concat rust-formatting-macro-opening-re "[[:space:]]*[^\"]+,[[:space:]]*"
rust-start-of-string-re))
(1 'rust-builtin-formatting-macro-face)
(rust-string-interpolation-matcher
(rust-end-of-string)
- [nongnu] elpa/rust-mode fe02536 395/486: Add `await` to list of keywords, (continued)
- [nongnu] elpa/rust-mode fe02536 395/486: Add `await` to list of keywords, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c62185a 397/486: Merge pull request #304 from kurnevsky/raw-string-propertize, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 295e234 404/486: rust-compile, rust-run, rust-test: respect rust-cargo-bin. (#321), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 5aeae14 407/486: rust-format-diff-buffer: use start-process rather than make-process., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 86b82ad 408/486: rust-format-diff-buffer-sentinel: use diff-mode and pop-to-buffer., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 836a8a9 409/486: Don't set indent-tabs-mode. (#324), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 897af24 410/486: rust-mode.el: check for possible space between variable name and type (#325), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 74c2647 411/486: Highlight variable name in a for-loop (#326), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode bb9bbd2 413/486: readme: recommend setting indent-tabs-mode to nil, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 6dca073 414/486: readme: make other useful packages a list, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 7960c74 417/486: Do not allow subword-match when detecting built-in formatting macros,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 5ad9b59 418/486: subword-match for built-in formatting macros: add a test., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 484d675 419/486: Adding GitHub actions., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c5ab165 423/486: mention LSP support, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a36bc70 426/486: Merge pull request #340 from brotzeit/readme, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 6a57253 427/486: rust-dbg-wrap-or-unwrap: bind to C-c C-d rather than C-c d., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode e8345f6 440/486: Add triagebot configuration (#364), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a364b24 445/486: Make *rustfmt* buffer readonly., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 15a077a 458/486: rustc-colon-compilation-regexps: improve highlighting., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 00177f5 461/486: compile-mode integration: add link to code references. (#391), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 5585cf9 477/486: rust-mode: Cosmetics, ELPA Syncer, 2021/08/07