branch: elpa/scala-mode
commit da67179b0f426ed1d16a7fc6101c50a9de0388d7
Merge: 3149a3d 11a710d
Author: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Commit: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Merge pull request #15 from non/bug/fix-annotations
Correct annotation highlighting.
---
scala-mode-fontlock.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scala-mode-fontlock.el b/scala-mode-fontlock.el
index df62187..219b79b 100644
--- a/scala-mode-fontlock.el
+++ b/scala-mode-fontlock.el
@@ -327,6 +327,10 @@ Does not continue past limit.
;; User defined constants
(,(scala-font-lock:create-user-constant-re) 0 font-lock-constant-face)
+ ;; Annotations
+ (, (rx (and "@" (in "a-zA-Z_.") (0+ (in "a-zA-Z0-9_."))))
+ . font-lock-preprocessor-face)
+
;; reserved symbols
(scala-font-lock:mark-reserved-symbols 2 font-lock-keyword-face)
@@ -388,8 +392,6 @@ Does not continue past limit.
(3 font-lock-type-face nil t)))
;; Some patterns from Erik
- (,(rx "@" (in "a-zA-Z_") (0+ (in "a-zA-Z0-9_")))
- . font-lock-preprocessor-face)
;; :
(,(rx ":"
