[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/scala-mode da67179 050/217: Merge pull request #15 from no
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/scala-mode da67179 050/217: Merge pull request #15 from non/bug/fix-annotations |
Date: |
Sun, 29 Aug 2021 11:30:41 -0400 (EDT) |
branch: elpa/scala-mode
commit da67179b0f426ed1d16a7fc6101c50a9de0388d7
Merge: 3149a3d 11a710d
Author: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Commit: Heikki Vesalainen <heikkivesalainen@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 ":"
- [nongnu] elpa/scala-mode 150e3d2 012/217: updated README with some TODOs, (continued)
- [nongnu] elpa/scala-mode 150e3d2 012/217: updated README with some TODOs, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 64c496a 016/217: Fixed #4: numbers in ids, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 6bc98fd 024/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode b0c821d 023/217: Working on README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 7faea31 027/217: also handle .sbt files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 0930f14 026/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 2527376 032/217: Merge pull request #12 from non/topic/optional-padding, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 6aeb341 034/217: Edited README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode bd0cd1a 035/217: Examples.md contains discussion on indenting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 35f3eef 036/217: Fixes #10, if body in parameter lists, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode da67179 050/217: Merge pull request #15 from non/bug/fix-annotations,
ELPA Syncer <=
- [nongnu] elpa/scala-mode 95e3742 063/217: fix typo in readme, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ecb0d57 055/217: correct emacs version in check, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode d65f062 064/217: indent `while` like `if`, `for` et al (fixes #22), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 280bff9 037/217: fix hex literal highlighting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 3149a3d 049/217: Merge pull request #16 from gpampara/readme-update, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode aad6559 041/217: scala-indent:align-forms: obey scala-indent:indent-value-expression, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 94f34b2 077/217: Rm trailing whitespace from all project files., ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 5d2416f 088/217: Reverted unintended removal of whitespace deletion hook, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 56280a2 062/217: Made scala-indent:indent-on-scaladoc-asterisk be an integral part of the mode., ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode caaebbd 078/217: Rm unneccessary `integerp` invocation., ELPA Syncer, 2021/08/29