branch: elpa/d-mode
commit 5190c1d378a36e790f709d8f6bc133f21e5a25f2
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
Fix fontification of parameters of lambdas inside expressions
---
d-mode.el | 4 ++--
tests/fonts_params.d | 2 ++
tests/fonts_params.d.html | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index 8987b78..dfd3fb9 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: 201911121951
+;; Version: 201911122034
;; Keywords: D programming language emacs cc-mode
;; Package-Requires: ((emacs "25.1"))
@@ -812,7 +812,7 @@ CONTEXT is as in `c-forward-decl-or-cast-1'."
;; (message "(c-get-fontification-context %S) @ %S -> %S" args (point) res)
(when (and
(c-major-mode-is 'd-mode)
- (eq (car res) nil)
+ (memq (car res) '(nil arglist))
(save-excursion
(and
(progn
diff --git a/tests/fonts_params.d b/tests/fonts_params.d
index 8e3e0b2..578ce38 100644
--- a/tests/fonts_params.d
+++ b/tests/fonts_params.d
@@ -10,6 +10,8 @@ alias dg5 = fun(a, b => b + 1);
void fun()
{
+ each!((key) {});
+
foreach (a; c) foo();
foreach (a, b; c) foo();
foreach (a; c) {}
diff --git a/tests/fonts_params.d.html b/tests/fonts_params.d.html
index 0d6c716..447f8e1 100644
--- a/tests/fonts_params.d.html
+++ b/tests/fonts_params.d.html
@@ -10,6 +10,8 @@
<span class="type">void</span> <span class="function-name">fun</span>()
{
+ each<span class="negation-char">!</span>((<span
class="variable-name">key</span>) {});
+
<span class="keyword">foreach</span> (<span
class="variable-name">a</span>; c) foo();
<span class="keyword">foreach</span> (<span
class="variable-name">a</span>, <span class="variable-name">b</span>; c) foo();
<span class="keyword">foreach</span> (<span
class="variable-name">a</span>; c) {}