Merge pull request #461 from fabacino/bugfix/fix-return-type-highligh…

…ting Fix highlighting of return types for abstract functions
emacs-php · Apr 23, 2018 · e85d963 · e85d963
2 parents 52ae90a + 06da1d7
commit e85d963
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/php-mode.el b/php-mode.el
@@ -15,7 +15,7 @@
 (defconst php-mode-version-number "1.19.0"
   "PHP Mode version number.")
 
-(defconst php-mode-modified "2018-04-08"
+(defconst php-mode-modified "2018-04-23"
   "PHP Mode build date.")
 
 ;; This file is free software; you can redistribute it and/or
@@ -1700,7 +1700,7 @@ a completion list."
 
      ;; Highlight return types in functions and methods.
      ("function.+:\\s-*\\??\\(\\(?:\\sw\\|\\s_\\)+\\)" 1 font-lock-type-face)
-     (")\\s-*:\\s-*\\??\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*\{" 1 font-lock-type-face)
+     (")\\s-*:\\s-*\\??\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*\\(?:\{\\|;\\)" 1 font-lock-type-face)
 
      ;; Highlight class names used as nullable type hints
      ("\\?\\(\\(:?\\sw\\|\\s_\\)+\\)\\s-+\\$" 1 font-lock-type-face)

diff --git a/tests/type-hints.php b/tests/type-hints.php
@@ -125,6 +125,12 @@ public function getNullableObject(
     ): ?stdClass {
     }
 
+    abstract public function getOtherObject(
+    ): stdClass;
+
+    abstract public function getOtherNullableObject(
+    ): ?stdClass;
+
     public function getNsObject(
     ): \path\to\my\Object {
     }

diff --git a/tests/type-hints.php.faces b/tests/type-hints.php.faces
@@ -343,6 +343,26 @@
  ("(\n    ): ?")
  ("stdClass" . font-lock-type-face)
  (" {\n    }\n\n    ")
+ ("abstract" . php-keyword)
+ (" ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOtherObject" . php-function-name)
+ ("(\n    ): ")
+ ("stdClass" . font-lock-type-face)
+ (";\n\n    ")
+ ("abstract" . php-keyword)
+ (" ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOtherNullableObject" . php-function-name)
+ ("(\n    ): ?")
+ ("stdClass" . font-lock-type-face)
+ (";\n\n    ")
  ("public" . php-keyword)
  (" ")
  ("function" . php-keyword)