Merge pull request #499 from fabacino/bugfix/highlight-kwd-methods

Fix highlighting of static method calls

Author: zonuexe

php-mode-test.el

@@ -928,6 +928,11 @@ style from Drupal."
   "Test highlighting of type hints and return types."
   (with-php-mode-test ("type-hints.php" :faces t)))
 
+(ert-deftest php-mode-test-static-method-calls ()
+  "Test highlighting of static method calls which are named the same
+as a keyword."
+  (with-php-mode-test ("static-method-calls.php" :faces t)))
+
 (ert-deftest php-mode-debug-test ()
   "Test running php-mode-debug and php-mode-debug--buffer."
   (with-temp-buffer

php-mode.el

@@ -16,7 +16,7 @@
 (defconst php-mode-version-number "1.21.0"
   "PHP Mode version number.")
 
-(defconst php-mode-modified "2019-02-28"
+(defconst php-mode-modified "2019-03-04"
   "PHP Mode build date.")
 
 ;; This file is free software; you can redistribute it and/or
@@ -1686,6 +1686,10 @@ a completion list."
      ;; Support the ::class constant in PHP5.6
      ("\\sw+\\(::\\)\\(class\\)\\b" (1 'php-paamayim-nekudotayim) (2 'php-constant))
 
+     ;; Highlight static method calls as such. This is necessary for method
+     ;; names which are identical to keywords to be highlighted correctly.
+     ("\\sw+::\\(\\sw+\\)(" 1 'php-static-method-call)
+
      ;; While c-opt-cpp-* highlights the <?php opening tags, it is not
      ;; possible to make it highlight short open tags and closing tags
      ;; as well. So we force the correct face on all cases that

tests/constants.php.faces

@@ -43,7 +43,8 @@
  (";\n")
  ("SomeClass" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("classIdentifier();\n\n")
+ ("classIdentifier" . php-static-method-call)
+ ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
  ("// " . font-lock-comment-delimiter-face)

tests/identifiers.php.faces

@@ -35,13 +35,16 @@
  ("the constant face. Just like c++-mode \"NS::Class::method()\"\n" . font-lock-comment-face)
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method();\n")
+ ("method" . php-static-method-call)
+ ("();\n")
  ("\\SpaceName\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method();\n")
+ ("method" . php-static-method-call)
+ ("();\n")
  ("\\My_Class" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method();\n\n")
+ ("method" . php-static-method-call)
+ ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
  ("// " . font-lock-comment-delimiter-face)

tests/issue-201.php.faces

@@ -18,10 +18,13 @@
  (";\n")
  ("self" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test();\n")
+ ("test" . php-static-method-call)
+ ("();\n")
  ("static" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test();\n")
+ ("test" . php-static-method-call)
+ ("();\n")
  ("parent" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test();\n"))
+ ("test" . php-static-method-call)
+ ("();\n"))

tests/static-method-calls.php

@@ -0,0 +1,13 @@
+<?php
+
+ClassName::method();
+\Project\Module\ClassName::method();
+\ClassName::method();
+
+ClassName::new();
+\Project\Module\ClassName::new();
+\ClassName::new();
+
+ClassName::clone();
+\Project\Module\ClassName::clone();
+\ClassName::clone();

tests/static-method-calls.php.faces

@@ -0,0 +1,39 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("method" . php-static-method-call)
+ ("();\n")
+ ("\\Project\\Module\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("method" . php-static-method-call)
+ ("();\n")
+ ("\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("method" . php-static-method-call)
+ ("();\n\n")
+ ("ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("new" . php-static-method-call)
+ ("();\n")
+ ("\\Project\\Module\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("new" . php-static-method-call)
+ ("();\n")
+ ("\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("new" . php-static-method-call)
+ ("();\n\n")
+ ("ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("clone" . php-static-method-call)
+ ("();\n")
+ ("\\Project\\Module\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("clone" . php-static-method-call)
+ ("();\n")
+ ("\\ClassName" . php-constant)
+ ("::" . php-paamayim-nekudotayim)
+ ("clone" . php-static-method-call)
+ ("();\n"))