[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/d-mode 398f185 171/346: Merge pull request #85 from Martin
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/d-mode 398f185 171/346: Merge pull request #85 from MartinNowak/fix49 |
Date: |
Sun, 29 Aug 2021 11:00:24 -0400 (EDT) |
branch: elpa/d-mode
commit 398f1854d53863185e60873b494eec0263bdd0dd
Merge: e64d5fc 908d55b
Author: Vladimir Panteleev <github.private@thecybershadow.net>
Commit: GitHub <noreply@github.com>
Merge pull request #85 from MartinNowak/fix49
fix #49 - Occasional incorrect fontification of string literals due
---
d-mode-test.el | 1 +
d-mode.el | 4 ++--
tests/I0049.d | 8 ++++++++
tests/I0049.d.html | 8 ++++++++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/d-mode-test.el b/d-mode-test.el
index 808f37f..6fddc64 100644
--- a/d-mode-test.el
+++ b/d-mode-test.el
@@ -308,6 +308,7 @@ is expected to succeed, and nil otherwise."
(d-test-deftest i0030 "tests/I0030.d" t)
(d-test-deftest i0035 "tests/I0035.d" (version< "24.4" emacs-version))
(d-test-deftest i0039 "tests/I0039.d" (version< "24.4" emacs-version))
+(d-test-deftest i0049 "tests/I0049.d" t)
(d-test-deftest i0064 "tests/I0064.d" t)
(d-test-deftest i0069 "tests/I0069.txt" t)
(d-test-deftest i0072 "tests/I0072.txt" t)
diff --git a/d-mode.el b/d-mode.el
index 94a5c98..95d0ed1 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
;; Maintainer: Russel Winder <russel@winder.org.uk>
;; Vladimir Panteleev <vladimir@thecybershadow.net>
;; Created: March 2007
-;; Version: 201610221417
+;; Version: 201802141931
;; Keywords: D programming language emacs cc-mode
;;;; NB Version number is date and time yyyymmddhhMM UTC.
@@ -752,7 +752,7 @@ Key bindings:
(zero-or-more
(not (any "`\\"))))
(minimal-match
- (one-or-more
+ (zero-or-more
(submatch "\\")
(minimal-match
(zero-or-more
diff --git a/tests/I0049.d b/tests/I0049.d
new file mode 100644
index 0000000..fabcce8
--- /dev/null
+++ b/tests/I0049.d
@@ -0,0 +1,8 @@
+// #run: (d-test-fontification)
+
+unittest
+{
+ `beg`;
+ "\"bugbugbug";
+ `end`;
+}
diff --git a/tests/I0049.d.html b/tests/I0049.d.html
new file mode 100644
index 0000000..88dea22
--- /dev/null
+++ b/tests/I0049.d.html
@@ -0,0 +1,8 @@
+<span class="comment-delimiter">// </span><span class="comment">#run:
(d-test-fontification)
+</span>
+<span class="keyword">unittest</span>
+{
+ <span class="string">`beg`</span>;
+ <span class="string">"\"bugbugbug"</span>;
+ <span class="string">`end`</span>;
+}
- [nongnu] elpa/d-mode daf5e05 149/346: Add basic fontification test, (continued)
- [nongnu] elpa/d-mode daf5e05 149/346: Add basic fontification test, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 8318eef 151/346: tests: Work around 24.3 oddity to fix fontification tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 0f3bf01 150/346: tests: Use an older variable name to fix pre-25.1 fontification tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 6db43b2 153/346: tests: Add additional tests for #30, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode c9e0b97 154/346: tests: Improve imenu test machinery, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode e26260c 156/346: Fix imenu for functions with multiple tail qualifiers, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode fda6318 165/346: Fix imenu for structs/classes with protection specifiers, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode d7f46a2 166/346: Add aliases to imenu, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 98af62e 167/346: tests: Add test for #26 variant with compile- and run-time argument lists, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode a97c92c 168/346: d-mode: Remove 'bit' from keyword list., ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 398f185 171/346: Merge pull request #85 from MartinNowak/fix49,
ELPA Syncer <=
- [nongnu] elpa/d-mode 8cf1ec5 174/346: Work around Emacs bug #18845, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode f384327 179/346: Fix imenu with typename ending with keyword, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode e809bd1 181/346: Fix imenu with conditional non-function declarations, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 5e08129 192/346: Fix indentation of function out contracts, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 06fb0ff 189/346: Fix indentation of enums with a base type, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 1afddc7 190/346: Fix a typo in a regex, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 382a677 195/346: Use c-major-mode-is, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 9edcfbd 197/346: Remove unused bits from d-in-knr-argdecl, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 175c6e5 193/346: Fix indentation of function constraints/contracts?, ELPA Syncer, 2021/08/29
- [nongnu] elpa/d-mode 5fdba4e 202/346: Add pragma keyword, ELPA Syncer, 2021/08/29