Merge pull request #583 from emacs-php/face-function-call

Highlight function calls as php-function-call

Author: zonuexe

Diff for: php-face.el

@@ -86,7 +86,32 @@
   :group 'php-faces
   :tag "PHP Variable Sigil")
 
-(defface php-object-op '((t (:inherit default)))
+(defface php-operator '((t (:inherit default)))
+  "PHP Mode face used to operators."
+  :group 'php-faces
+  :tag "PHP Operator")
+
+(defface php-assignment-op '((t (:inherit php-operator)))
+  "PHP Mode face used to assignment operators (=, +=, ...)."
+  :group 'php-faces
+  :tag "PHP Object Op")
+
+(defface php-comparison-op '((t (:inherit php-operator)))
+  "PHP Mode face used to comparison operators (==, !=, ===, ...)."
+  :group 'php-faces
+  :tag "PHP Comparison Op")
+
+(defface php-logical-op '((t (:inherit php-operator)))
+  "PHP Mode face used to logical operators (&&, ||, ?:)."
+  :group 'php-faces
+  :tag "PHP Logical Op")
+
+(defface php-string-op '((t (:inherit php-operator)))
+  "PHP Mode face used to logical operators (.)."
+  :group 'php-faces
+  :tag "PHP String Op")
+
+(defface php-object-op '((t (:inherit php-operator)))
   "PHP Mode face used to object operators (->)."
   :group 'php-faces
   :tag "PHP Object Op")
@@ -131,7 +156,7 @@
   :group 'php-faces
   :tag "PHP $this Sigil")
 
-(defface php-errorcontrol-op '((t (:inherit  font-lock-type-face)))
+(defface php-errorcontrol-op '((t (:inherit font-lock-type-face)))
   "PHP Mode face used to highlight errorcontrol operators (@).."
   :group 'php-faces
   :tag "PHP ErrorControl Op")

Diff for: php-mode.el

@@ -1610,6 +1610,8 @@ a completion list."
    ;;   is usually overkill.
    `(
      ("\\<\\(@\\)" 1 'php-errorcontrol-op)
+     ;; Highlight function calls
+     ("\\(\\_<\\(?:\\sw\\|\\s_\\)+?\\_>\\)\\s-*(" 1 'php-function-call)
      ;; Highlight all upper-cased symbols as constant
      ("\\<\\([A-Z_][A-Z0-9_]+\\)\\>" 1 'php-constant)
 

Diff for: tests/7.4/typed-property.php.faces

@@ -58,7 +58,9 @@
  ("print" . php-function-name)
  ("()
     {
-        var_dump(")
+        ")
+ ("var_dump" . php-function-call)
+ ("(")
  ("$" . php-$this-sigil)
  ("this" . php-$this)
  ("->" . php-object-op)

Diff for: tests/comments.php.24.faces

@@ -129,7 +129,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = hoge();\n\n        ")
+ (" = ")
+ ("hoge" . php-function-call)
+ ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
  ("        ")

Diff for: tests/comments.php.27.faces

@@ -130,7 +130,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = hoge();\n\n        ")
+ (" = ")
+ ("hoge" . php-function-call)
+ ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
  ("        ")

Diff for: tests/comments.php.faces

@@ -129,7 +129,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = hoge();\n\n        ")
+ (" = ")
+ ("hoge" . php-function-call)
+ ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
  ("        ")

Diff for: tests/issue-439.php.faces

@@ -39,11 +39,15 @@
  ("g" . php-variable-name)
  (" = ")
  ("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
- (";\n\nvar_dump(")
+ (";\n\n")
+ ("var_dump" . php-function-call)
+ ("(")
  ("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
  (");\n\n")
  ("if" . php-keyword)
- (" (1 === 1) {\n    var_dump(")
+ (" (1 === 1) {\n    ")
+ ("var_dump" . php-function-call)
+ ("(")
  ("<<<\"ABC\"\n    Let'go Justin\n    ABC" . php-string)
  (");\n}\n")
  )

Diff for: tests/lang/function/calls.php

@@ -0,0 +1,19 @@
+<?php
+
+if (isset($foo)) {
+    1+bar()+foo();
+}
+
+$foo->string();
+$foo->isset();
+
+
+$a->b();
+$a = a();
+$aaa = aaa();
+$_aa = _aa();
+$a_a = a_a();
+$aa_ = aa_();
+$a1c = a1c();
+$あ = あ();
+$_a = $a();

Diff for: tests/lang/function/calls.php.faces

@@ -0,0 +1,70 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("if" . php-keyword)
+ (" (")
+ ("isset" . php-keyword)
+ ("(")
+ ("$" . php-variable-sigil)
+ ("foo" . php-variable-name)
+ (")) {\n    1+")
+ ("bar" . php-function-call)
+ ("()+")
+ ("foo" . php-function-call)
+ ("();\n}\n\n")
+ ("$" . php-variable-sigil)
+ ("foo" . php-variable-name)
+ ("->" . php-object-op)
+ ("string" . php-method-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("foo" . php-variable-name)
+ ("->" . php-object-op)
+ ("isset" . php-method-call)
+ ("();\n\n\n")
+ ("$" . php-variable-sigil)
+ ("a" . php-variable-name)
+ ("->" . php-object-op)
+ ("b" . php-method-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("a" . php-variable-name)
+ (" = ")
+ ("a" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("aaa" . php-variable-name)
+ (" = ")
+ ("aaa" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("_aa" . php-variable-name)
+ (" = ")
+ ("_aa" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("a_a" . php-variable-name)
+ (" = ")
+ ("a_a" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("aa_" . php-variable-name)
+ (" = ")
+ ("aa_" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("a1c" . php-variable-name)
+ (" = ")
+ ("a1c" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("あ" . php-variable-name)
+ (" = ")
+ ("あ" . php-function-call)
+ ("();\n")
+ ("$" . php-variable-sigil)
+ ("_a" . php-variable-name)
+ (" = ")
+ ("$" . php-variable-sigil)
+ ("a" . php-variable-name)
+ ("();\n"))

Diff for: tests/php-mode-test.el

@@ -680,6 +680,7 @@ Meant for `php-mode-test-issue-503'."
                                     (t t))))
   (with-php-mode-test ("doc-comment/return-type.php" :faces t))
   (with-php-mode-test ("doc-comment/inheritdoc.php" :faces t))
+  (with-php-mode-test ("lang/function/calls.php" :faces t))
   (with-php-mode-test ("lang/try-cactch/multiple.php" :faces t))
   (with-php-mode-test ("lang/types/cast.php" :faces t))
   (with-php-mode-test ("lang/types/function.php" :faces t))