From 294e66ba3d84e06d0d63f4edabd174c4e4ade5cb Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Wed, 28 Aug 2019 02:12:20 +0900
Subject: [PATCH] Add font-lock for multiple catch

This syntax was added in PHP 7.1.

 * https://wiki.php.net/rfc/multiple-catch
 * https://www.php.net/manual/language.exceptions.php
 * https://www.php.net/manual/migration71.new-features.php#migration71.new-features.mulit-catch-exception-handling

The rule allows line breaks, but the pattern is not subject to
coloring due to font lock restrictions. In this trial and error,
I considered replacing some CC-Mode functions, but I gave up.
---
 php-mode.el                              |  9 ++++++-
 tests/lang/try-cactch/multiple.php       |  7 +++++
 tests/lang/try-cactch/multiple.php.faces | 34 ++++++++++++++++++++++++
 tests/php-mode-test.el                   |  1 +
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/lang/try-cactch/multiple.php
 create mode 100644 tests/lang/try-cactch/multiple.php.faces

diff --git a/php-mode.el b/php-mode.el
index 65beeb16..7ba0383f 100644
--- a/php-mode.el
+++ b/php-mode.el
@@ -1513,7 +1513,14 @@ a completion list."
      ;; 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)
-
+     ;; Multiple catch (FooException | BarException $e)
+     (,(rx symbol-start "catch" symbol-end
+           (* (syntax whitespace)) "(" (* (syntax whitespace))
+           (group (+ (or (syntax word) (syntax symbol)))))
+      (1 font-lock-type-face)
+      (,(rx (* (syntax whitespace)) "|" (* (syntax whitespace))
+            (group (+ (or (syntax word) (syntax symbol))) symbol-end))
+       nil nil (1 font-lock-type-face)))
      ;; 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
diff --git a/tests/lang/try-cactch/multiple.php b/tests/lang/try-cactch/multiple.php
new file mode 100644
index 00000000..9285ae62
--- /dev/null
+++ b/tests/lang/try-cactch/multiple.php
@@ -0,0 +1,7 @@
+<?php
+
+try {
+} catch (ErrorException | PDOException $e) {
+} catch (Foo | Bar | Buz | Fuga $e) {
+} catch (Throwable $e) {
+}
diff --git a/tests/lang/try-cactch/multiple.php.faces b/tests/lang/try-cactch/multiple.php.faces
new file mode 100644
index 00000000..e5481413
--- /dev/null
+++ b/tests/lang/try-cactch/multiple.php.faces
@@ -0,0 +1,34 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("try" . php-keyword)
+ (" {\n} ")
+ ("catch" . php-keyword)
+ (" (")
+ ("ErrorException" . font-lock-type-face)
+ (" | ")
+ ("PDOException" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("e" . php-variable-name)
+ (") {\n} ")
+ ("catch" . php-keyword)
+ (" (")
+ ("Foo" . font-lock-type-face)
+ (" | ")
+ ("Bar" . font-lock-type-face)
+ (" | ")
+ ("Buz" . font-lock-type-face)
+ (" | ")
+ ("Fuga" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("e" . php-variable-name)
+ (") {\n} ")
+ ("catch" . php-keyword)
+ (" (")
+ ("Throwable" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("e" . php-variable-name)
+ (") {\n}\n"))
diff --git a/tests/php-mode-test.el b/tests/php-mode-test.el
index 3027456d..0ef1021d 100644
--- a/tests/php-mode-test.el
+++ b/tests/php-mode-test.el
@@ -674,6 +674,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/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))
   (with-php-mode-test ("lang/types/keywords.php" :faces t))