Merge pull request #525 from emacs-php/recoloring-const-assign

Add php-constant-assign face to "const" statement

Author: zonuexe

php-face.el

@@ -92,6 +92,10 @@
   "PHP Mode face used to highlight constants."
   :group 'php-faces)
 
+(defface php-constant-assign '((t (:inherit font-lock-type-face)))
+  "PHP Mode face used to highlight constant assigning (\"const\" statement)."
+  :group 'php-faces)
+
 (defface php-magical-constant '((t (:inherit font-lock-builtin-face)))
   "PHP Mode face used to highlight magical constants."
   :group 'php-faces)

php-mode.el

@@ -1391,6 +1391,7 @@ a completion list."
      ;; 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))
+     ("\\<\\(const\\)\\s-+\\(\\_<.+?\\_>\\)" (1 'php-keyword) (2 'php-constant-assign))
 
      ;; Highlight special variables
      ("\\(\\$\\)\\(this\\)\\>" (1 'php-$this-sigil) (2 'php-$this))

tests/lang/constants/const.php

@@ -0,0 +1,19 @@
+<?php
+
+const A = 'A';
+const a = 'a';
+const B='B';
+const b='b';
+const Aa = 'Aa';
+const AA = 'AA';
+const AB='AB';
+const Ab='AA';
+const α = '';
+const Ａ = '';
+const ａ = '';
+const あ = 'あ';
+const 漢 = '漢';
+const あα = 'あα';
+const 漢_ = '漢_';
+const あ_='あ_';
+const X='X';const y='y';

tests/lang/constants/const.php.faces

@@ -0,0 +1,111 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("const" . php-keyword)
+ (" ")
+ ("A" . php-constant-assign)
+ (" = ")
+ ("'A'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("a" . php-constant-assign)
+ (" = ")
+ ("'a'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("B" . php-constant-assign)
+ ("=")
+ ("'B'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("b" . php-constant-assign)
+ ("=")
+ ("'b'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("Aa" . php-constant-assign)
+ (" = ")
+ ("'Aa'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("AA" . php-constant-assign)
+ (" = ")
+ ("'AA'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("AB" . php-constant-assign)
+ ("=")
+ ("'AB'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("Ab" . php-constant-assign)
+ ("=")
+ ("'AA'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("α" . php-constant-assign)
+ (" = ")
+ ("''" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("Ａ" . php-constant-assign)
+ (" = ")
+ ("''" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("ａ" . php-constant-assign)
+ (" = ")
+ ("''" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("あ" . php-constant-assign)
+ (" = ")
+ ("'あ'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("漢" . php-constant-assign)
+ (" = ")
+ ("'漢'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("あα" . php-constant-assign)
+ (" = ")
+ ("'あα'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("漢_" . php-constant-assign)
+ (" = ")
+ ("'漢_'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("あ_" . php-constant-assign)
+ ("=")
+ ("'あ_'" . php-string)
+ (";\n")
+ ("const" . php-keyword)
+ (" ")
+ ("X" . php-constant-assign)
+ ("=")
+ ("'X'" . php-string)
+ (";")
+ ("const" . php-keyword)
+ (" ")
+ ("y" . php-constant-assign)
+ ("=")
+ ("'y'" . php-string)
+ (";\n"))