branch: externals/phps-mode
commit aa0c23dcc5ff5cef28da17a28f07454390f093c8
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Updated font-locks for token color syntax
---
phps-mode-lexer.el | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 8efb699..44c60c8 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -199,24 +199,17 @@
(cond
((or
- (string= token 'T_OBJECT_OPERATOR)
- (string= token 'T_PAAMAYIM_NEKUDOTAYIM)
- (string= token 'T_NS_SEPARATOR)
(string= token 'T_VARIABLE)
- (string= token 'T_STRING_VARNAME)
- (string= token 'T_NUM_STRING)
- (string= token 'T_DOLLAR_OPEN_CURLY_BRACES)
- (string= token 'T_CURLY_OPEN)
- (string= token 'T_STRING)
- (string= token "]")
- (string= token "{")
- (string= token "}")
- )
+ (string= token 'T_STRING_VARNAME))
(overlay-put (make-overlay start end) 'font-lock-face
'font-lock-variable-name-face))
- ((string= token 'T_INLINE_HTML)
+ ((or (string= token 'T_STRING)
+ (string= token 'T_NUM_STRING))
(overlay-put (make-overlay start end) 'font-lock-face
'font-lock-string-face))
+ ((string= token 'T_INLINE_HTML)
+ (overlay-put (make-overlay start end) 'font-lock-face
'font-lock-reference-face))
+
((string= token 'T_COMMENT)
(overlay-put (make-overlay start end) 'font-lock-face
'font-lock-comment-face))
@@ -232,6 +225,14 @@
(overlay-put (make-overlay start end) 'font-lock-face
'font-lock-string-face))
((or
+ (string= token "]")
+ (string= token "{")
+ (string= token "}")
+ (string= token 'T_DOLLAR_OPEN_CURLY_BRACES)
+ (string= token 'T_CURLY_OPEN)
+ (string= token 'T_OBJECT_OPERATOR)
+ (string= token 'T_PAAMAYIM_NEKUDOTAYIM)
+ (string= token 'T_NS_SEPARATOR)
(string= token 'T_EXIT)
(string= token 'T_DIE)
(string= token 'T_FUNCTION)