branch: elpa/typescript-mode
commit fb4431947922223c0ca820006a9507979b8fd53d
Merge: 12b6aae381 a7cd7a92a5
Author: Jostein Kjønigsen <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #125 from Fuco1/fix/prefer-constant-over-keyword
fix(font-lock): prefer fontifying constants over keywords
---
typescript-mode.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/typescript-mode.el b/typescript-mode.el
index 388f8a64e0..c0ed37cac5 100644
--- a/typescript-mode.el
+++ b/typescript-mode.el
@@ -312,13 +312,13 @@ Match group 1 is MUMBLE.")
(defconst typescript--font-lock-keywords-2
(append typescript--font-lock-keywords-1
- (list (list typescript--keyword-re 1 font-lock-keyword-face)
+ (list (cons typescript--constant-re font-lock-constant-face)
+ (list typescript--keyword-re 1 font-lock-keyword-face)
(list "\\_<for\\_>"
"\\s-+\\(each\\)\\_>" nil nil
(list 1 'font-lock-keyword-face))
(cons "\\_<yield\\(\\*\\|\\_>\\)" 'font-lock-keyword-face)
- (cons typescript--basic-type-re font-lock-type-face)
- (cons typescript--constant-re font-lock-constant-face)))
+ (cons typescript--basic-type-re font-lock-type-face)))
"Level two font lock keywords for `typescript-mode'.")
;; typescript--pitem is the basic building block of the lexical
