Add block statement face

emacs-php · Jan 2, 2020 · 249281d · 249281d
1 parent 908cfa7
commit 249281d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/php-face.el b/php-face.el
@@ -256,6 +256,11 @@
   :group 'php-faces
   :tag "PHP Property Static")
 
+(defface php-block-statement '((t (:inherit php-keyword)))
+  "Face used to highlight block statements (if, elseif, for, foreach, while, declare, switch, catch)."
+  :group 'php-faces
+  :tag "PHP Block Statement")
+
 (define-obsolete-face-alias 'php-annotations-annotation-face 'php-doc-annotation-tag "1.19.0")
 
 (provide 'php-face)

diff --git a/php-mode.el b/php-mode.el
@@ -1572,7 +1572,10 @@ a completion list."
 
      ;; Property static modifier
      ("\\(static\\)\\(?:[[:space:]]private\\|[[:space:]]protected\\|[[:space:]]public\\)?\\(?:[[:space:]]\$?[[:word:]]+\\)\\(?:[[:space:]]*=[[:space:]]*[^;]+\\)?\\(?:;\\)" (1 'php-property-static))
-
+
+     ;; Block statements (if, elseif, for, foreach, catch, switch, while, declare)
+     ("\\(if\\|elseif\\|for\\|foreach\\|catch\\|switch\\|while\\|declare\\)\\(?:[[:space:]]*\([[:space:]]*.*[[:space:]]*\)\\)" (1 'php-block-statement))
+
      ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
      ;; not in $obj->var()
      ("\\(->\\)\\(\\sw+\\)\\s-*(" (1 'php-object-op) (2 'php-method-call))