branch: elpa/d-mode
commit 685a8cc805697549dc4b3551ae6ba060fb48f304
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
Expand "is" rule for other infix keyword variants and negation
---
d-mode.el | 4 ++--
tests/fonts.d | 2 ++
tests/fonts.d.html | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index b942c9c..7a879a6 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
;; Maintainer: Russel Winder <[email protected]>
;; Vladimir Panteleev <[email protected]>
;; Created: March 2007
-;; Version: 201911071821
+;; Version: 201911071844
;; Keywords: D programming language emacs cc-mode
;; Package-Requires: ((emacs "25.1"))
@@ -480,7 +480,7 @@ operators."
(looking-at c-identifier-start)
(progn
(c-forward-token-2)
- (looking-at (d-make-keywords-re t '("in"))))))
+ (looking-at (d-make-keywords-re t '("is" "!is" "in" "!in"))))))
nil)
;; D: cc-mode gets confused due to "scope" being a keyword that can
diff --git a/tests/fonts.d b/tests/fonts.d
index e73f593..12c5c25 100644
--- a/tests/fonts.d
+++ b/tests/fonts.d
@@ -23,3 +23,5 @@ scope(exit) void fun();
@property empty() { return false; }
auto s = "enum Type {}";
+
+assert(a !in b);
diff --git a/tests/fonts.d.html b/tests/fonts.d.html
index d448849..b65027b 100644
--- a/tests/fonts.d.html
+++ b/tests/fonts.d.html
@@ -23,3 +23,5 @@
<span class="c-annotation-face">@property</span> <span
class="function-name">empty</span>() { <span class="keyword">return</span>
<span class="constant">false</span>; }
<span class="keyword">auto</span> <span class="variable-name">s</span> = <span
class="string">"enum Type {}"</span>;
+
+<span class="keyword">assert</span>(a <span
class="negation-char">!</span><span class="keyword">in</span> b);