[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode c0e3878 183/486: Merge pull request #81 from Mic
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode c0e3878 183/486: Merge pull request #81 from MicahChalmer/fix-issue-80 |
Date: |
Sat, 7 Aug 2021 09:25:15 -0400 (EDT) |
branch: elpa/rust-mode
commit c0e3878c6a0104196bc12d6e17cb249ee853a61e
Merge: 102ad5f 88ff62a
Author: Felix S Klock II <pnkfelix@pnkfx.org>
Commit: Felix S Klock II <pnkfelix@pnkfx.org>
Merge pull request #81 from MicahChalmer/fix-issue-80
Remove unnecessary code with call to undefined function
---
rust-mode-tests.el | 29 +++++++++++++++++++++++++++++
rust-mode.el | 8 --------
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index 4a6cf20..5312f38 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -2168,6 +2168,35 @@ type Foo<T> where T: Copy = Box<T>;
'((10 11))
'(7 9))))
+
+(ert-deftest font-lock-extend-region-in-string ()
+
+ (with-temp-buffer
+ (rust-mode)
+ (insert "
+fn foo() {
+ let x = r\"
+Fontification needs to include this whole string or none of it.
+ \"
+}")
+ (font-lock-fontify-buffer)
+ (let ((font-lock-beg 13)
+ (font-lock-end 42))
+ (rust-font-lock-extend-region)
+ (should (<= font-lock-beg 13))
+ (should (>= font-lock-end 106))
+ )
+ (let ((font-lock-beg 42)
+ (font-lock-end 108))
+ (rust-font-lock-extend-region)
+ (should (<= font-lock-beg 25))
+ (should (>= font-lock-end 108)))
+ (let ((font-lock-beg 1)
+ (font-lock-end 12))
+ (rust-font-lock-extend-region)
+ (should (<= font-lock-beg 1))
+ (should (>= font-lock-end 12)))))
+
;; If electric-pair-mode is available, load it and run the tests that use it.
If not,
;; no error--the tests will be skipped.
(require 'elec-pair nil t)
diff --git a/rust-mode.el b/rust-mode.el
index 3d1ba02..40a2492 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -459,14 +459,6 @@
(goto-char (nth 8 end-ppss))
(ignore-errors (forward-sexp))
(setq font-lock-end (max font-lock-end (point)))))
-
- ;; If we have the beginning of a raw string in the region, make sure
we have the end of
- ;; it.
- (when (or beg-in-str end-in-str)
- (save-excursion
- (goto-char font-lock-beg)
- (while (and (< (point) font-lock-end) (ignore-errors
(rust-look-for-raw-string (buffer-end 1)))))
- (setq font-lock-end (max font-lock-end (point)))))
)))
(or (/= font-lock-beg orig-beg)
- [nongnu] elpa/rust-mode 2f0c84f 150/486: rust-align-to-method-chain: Jump over symbols, not words, (continued)
- [nongnu] elpa/rust-mode 2f0c84f 150/486: rust-align-to-method-chain: Jump over symbols, not words, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 2e800ee 151/486: workaround emacs 23 issues., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 2be934c 147/486: Merge pull request #55 from kriben/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4e938b1 164/486: Merge pull request #63 from krig/panic-compilation-warning, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f17e11a 162/486: Match panics during build as compilation warnings, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b4ff35c 168/486: remove rust-mode-character-literal-syntax-table, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 5ed4675 171/486: Merge pull request #73 from MicahChalmer/raw-string-multiline-edit-fix, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 9d773b4 170/486: Fix multi-line raw strings when editing, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 6bc1540 186/486: Support nested block comments, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 7baae9c 180/486: Merge pull request #78 from tromey/fix-issue-33, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c0e3878 183/486: Merge pull request #81 from MicahChalmer/fix-issue-80,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 75da3b0 189/486: Merge pull request #89 from MicahChalmer/fix-slow-angle-bracket-matching, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a2e9f56 199/486: Merge pull request #84 from birkenfeld/compilation-note, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 92584c3 209/486: Fix the special case for the first line, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b76e803 208/486: Correctly indent where clauses, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 304ae4b 219/486: Change font-lock face for module names., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode ae49380 221/486: Merge pull request #121 from fbergroth/integrate-rustfmt, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 315cc59 233/486: Re-indent on }, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode bc77e16 240/486: remove emacs 23 support, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 620d718 257/486: Fix #160, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode cffb950f2 258/486: [master] Remove redundant progn., ELPA Syncer, 2021/08/07