Skip to content

Commit 49ee230

Browse files
author
Demis Balbach
committed
Simplify method-modifiers regex
1 parent f4cdd87 commit 49ee230

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

php-mode.el

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,10 +1553,16 @@ a completion list."
15531553
("\\(?:[[:word:]\\]\\)\\([[:space:]]as\\)" (1 'php-import-declaration))
15541554

15551555
;; Class modifiers (abstract, final)
1556-
("\\(abstract\\|final\\)[[:space:]]\\(?:class\\)" (1 'php-modifiers-class))
1556+
("\\(abstract\\|final\\)[[:space:]]\\(?:class\\)" (1 'php-class-modifiers))
15571557

1558-
;; Method modifiers (abstract, final, static)
1559-
("\\(abstract\\|final\\)[[:space:]]\\(?:static[[:space:]]\\)?\\(?:public\\|private\\|protected\\)" (1 'php-modifiers-method))
1558+
;; Method modifiers (abstract, final)
1559+
("\\(abstract\\|final\\)[[:space:]]\\(?:static\\|public\\|private\\|protected\\)" (1 'php-method-modifiers))
1560+
1561+
;; Method access protection
1562+
1563+
1564+
;; Property access protection
1565+
;("\\(private\\|protected\\|public\\)\\(?:[[:space:]]const[[:space:]][[:word:]]\\|[[:space:]]\$[[:word:]]\\)" (1 'php-property-access))
15601566

15611567
;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
15621568
;; not in $obj->var()

0 commit comments

Comments
 (0)